Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/config/routerBefore.js

@@ -105,9 +105,9 @@ const routerBefore = function (router, constantRouterMap) {
     store.commit('breadcrumb', breadcrumbFn(to, store.state.routes));
     //  标题
     if (to.meta && !to.meta.title) {
-      // document.title = titleFn(to, store.state.routes) + ' ' + document.title.substr(document.title.indexOf('-'));
+      document.title = titleFn(to, store.state.routes) + ' ' + document.title.substr(document.title.indexOf('-'));
     } else {
-      // document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
+      document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
     }
     if (to.query.ticket) {
       setCookie('ticket', to.query.ticket, '', '/');

src/views/RMS/components/addCarrier.vue

@@ -8,15 +8,41 @@
       </div>
     <el-upload
       class="upload-demo"
-      action="http://localhost:8060/api/v1/rms/rmscarrier/uploadCarrier"
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess"
+      :on-success="handleAvatarSuccess1"
       :file-list="fileList"
+      :before-upload="beforeUpload2"
       list-type="picture">
-      <el-button size="small" type="primary">点击上传照片</el-button>
+      <el-button size="small" type="primary">点击上传运输证</el-button>
       <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
     </el-upload>
+    <el-upload
+      class="upload-demo"
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleAvatarSuccess2"
+      :file-list="fileList"
+      :before-upload="beforeUpload2"
+      list-type="picture">
+      <el-button size="small" type="primary">点击上传经营许可证</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+    </el-upload>
+    <el-upload
+      class="upload-demo"
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleAvatarSuccess3"
+      :file-list="fileList"
+      :before-upload="beforeUpload2"
+      list-type="picture">
+      <el-button size="small" type="primary">点击上传营业执照</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+    </el-upload>
+
 
     <div class="form-box f1">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
@@ -79,12 +105,52 @@ export default {
          registerDate:"",
          mapValue:""
       },
-      imageUrl:""
+      imageUrl1:"",
+      imageUrl2:"",
+      imageUrl3:"",
+      imageUrls:[],
     };
   },
   methods: {
-    handleAvatarSuccess(res,file){
-      this.imageUrl=URL.createObjectURL(file.raw);
+    beforeUpload2 (file) {
+        const isLt2M = file.size < 1024 * 1024 * 0.5
+        console.log('大小' + isLt2M)
+        if (!isLt2M) {
+          this.$message.error('上传文件大小不能超过500kb!')
+        }
+        let size = file.size / 1024
+        console.log('大小' + size)
+        let _URL = window.URL || window.webkitURL
+        let img = new Image()
+        img.onload = function () {
+          let width = img.width
+          let height = img.height
+          console.log('width--->' + width)
+          console.log('height--->' + height)
+        }
+        img.src = _URL.createObjectURL(file)
+        return isLt2M
+    },
+    handleAvatarSuccess1(res,file){
+      this.imageUrl1=URL.createObjectURL(file.raw);
+      // this.axios
+      // .then((res) => {
+      //   if (res.data.code == 200) {
+      //     this.$message({
+      //     type: "success",
+      //     message: "新增成功!",
+      //     });
+      //   } 
+      //   else {
+      //     this.$message.error("图片上传失败，图片格式不得超过500kb且只能是jpg/png文件！");
+      //   }
+      // });
+    },
+    handleAvatarSuccess2(res,file){
+      this.imageUrl2=URL.createObjectURL(file.raw);
+    },
+    handleAvatarSuccess3(res,file){
+      this.imageUrl3=URL.createObjectURL(file.raw);
     },
     handleRemove(file,fileList){
       console.log(file,fileList)
@@ -98,7 +164,6 @@ export default {
     },
     currentRadioChange(selection){
       this.mapList=selection, 
-      console.log(this.mapList) 
       this.bidArea=this.mapList.bidArea
      
     },
@@ -130,18 +195,27 @@ export default {
       let registerDate={
         registerDate: this.form1.registerDate,
       };
+      let imageUrls={
+        imageUrl1:this.imageUrl1,
+        imageUrl1:this.imageUrl2,
+        imageUrl1:this.imageUrl3
+      };
+      console.log(imageUrls)
       let mapValue={
         RmsCarrier:RmsCarrier,
-        registerDate:registerDate
+        registerDate:registerDate,
+        imageUrls:imageUrls
       };
       if(
         reg.test(RmsCarrier.carrierContactNumber)==false
       )this.$message.error("输入的格式不正确");
        else if(
           RmsCarrier.carrierName ==null ||
-        // RmsCarrier.carrierTransportCertificate ==null ||
-        // RmsCarrier.carrierBusinessLicense ==null ||
-        // RmsCarrier.carrierBusinessAblelicense ==null ||
+
+          // imageUrls.imageUrl1 ==null ||
+          // imageUrls.imageUrl2 ==null ||
+          // imageUrls.imageUrl3 ==null ||
+
           RmsCarrier.carrierAbbreviation ==null ||
           RmsCarrier.carrierAddress ==null ||
           RmsCarrier.registerNo ==null ||

src/views/RMS/components/addPersonnel.vue

@@ -36,8 +36,7 @@ export default {
         personnelWorkshopid: this.form1.personnelWorkshopid,
         personnelShifts: this.form1.personnelShifts,
         personnelTeam:this.form1.personnelTeam,
-        departmentId: this.form1.shipperId,
-        username:this.form1.username
+        departmentId: this.form1.shipperId
       };
       if(
         RmsPersonnel.personnelJobNumber ==null ||
@@ -46,11 +45,9 @@ export default {
         RmsPersonnel.personnelWorkshopid==null ||
         RmsPersonnel.personnelShifts==null ||
         RmsPersonnel.departmentId==null ||
-        RmsPersonnel.personnelTeam==null||
-        RmsPersonnel.username==null
+        RmsPersonnel.personnelTeam==null
       )this.$message.error("存在空值！");
       else
-      
       this.axios
         .post(
           "/api/v1/rms/insertPersonnel",

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -2,7 +2,6 @@
   <!-- 添加销售订单 -->
   <div class="addSalePlan">
     <page-title>新增</page-title>
-    <el-divider content-position="left">销售订单</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="284" v-model="form1" ref="from1"></dil-form>
     </div>

src/views/appoint/components/saleContract/addSaleOrderArrange.vue

@@ -2,7 +2,6 @@
   <!-- 添加销售订单排车 -->
   <div class="addSalePlan">
     <page-title>新增销售订单排车</page-title>
-
     <div class="table_form from">
       <div class="materialId">
         <span class="text"> 物资： </span>

src/views/appoint/components/saleContract/addSalePlan.vue

@@ -2,7 +2,6 @@
   <!-- 添加销售计划 -->
   <div class="addSalePlan">
     <PageTitle>新增</PageTitle>
-    <el-divider content-position="left">销售计划</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="281" v-model="form1" ref="from1"></dil-form>
     </div>

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -2,7 +2,6 @@
   <!-- 添加汽运单价 -->
   <div class="addSalePlan">
     <page-title>新增</page-title>
-    <el-divider content-position="left">汽运单价</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
     </div>

src/views/configManager/app.html

@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta content="智慧物流平台" name="keywords">
     <meta content="智慧物流平台" name="description">
-    <title>首页1 - 智慧物流平台</title>
+    <title>首页 - 智慧物流平台</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
     <link href="../static/img/favicon.ico" rel="shortcut icon"/>
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>

src/views/homepage/components/homepage.vue

@@ -1,15 +1,84 @@
 <template>
-  <div>首页
-      
+  <div>
+    首页
+    <el-button @click="onClick">ces1</el-button>
   </div>
 </template>
 
 <script>
 export default {
-
-}
+  methods: {
+    onClick() {
+      let data = {
+        userId: "",
+        userCode: "A12345",
+        userName: "A12345",
+        qrCode: "",
+        sex: "",
+        age: "",
+        cardNo: "",
+        birthDate: "",
+        nativePlace: "",
+        orgCode: "yunli",
+        orgName: "运力",
+        dep: "",
+        workTeam: "",
+        profilePhoto: "",
+        photo: "",
+        mobile: "13487481520",
+        qq: "",
+        wechat: "",
+        tel: "",
+        email: "213213@qq.com",
+        homeAddr: "",
+        entryDate: "",
+        workDate: "",
+        political: "",
+        title: "",
+        degree: "",
+        major: "",
+        gradSchool: "",
+        ability: "",
+        tranHis: "",
+        certificate: "",
+        special: "",
+        assessment: "",
+        leaveStatus: "",
+        onlineStatus: "",
+        status: "",
+        remark: "",
+        expireDays: "",
+        leave: "",
+        address: "",
+        ip: "",
+        rank: "",
+        responsibility: "",
+        groupData: "",
+        companyData: "",
+        groupId: "506514577756917769",
+        companyId: "713710108567277568",
+        photoType: "",
+        orgId: "922512907093282816",
+      };
+      this.store.dispatch("system/usersManage/addUser", data).then((res) => {
+        console.log(res);
+        if (res.code === "0") {
+          if (this.qrRole.length > 0) {
+            this.addRoleToUser(res.data.userId, res.data.userCode);
+          }
+          if (form.dutys.length > 0) {
+            this.addUserDutys(res.data.userId, form.dutys);
+          }
+          this.$message.success("添加成功");
+          this.$emit("on-then", "success", form);
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style>
-
 </style>

src/views/index/app.html

@@ -8,7 +8,7 @@
     <meta content="智慧物流平台" name="description">
     <title>登录 - 智慧物流平台</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
-    <!-- <link href="../static/img/favicon.ico" rel="shortcut icon"/> -->
+    <link href="../static/img/favicon.ico" rel="shortcut icon"/>
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
     <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
     <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>

src/views/sale/components/transport_appointment/openDistributionSection.vue

@@ -43,7 +43,7 @@
     </el-drawer>
 
     <el-drawer title="选择车" :visible.sync="drawer" :direction="direction" :before-close="handleClose"
-				:modal="false" size="30%" style="margin-top: 5.625rem;">
+				:modal="false" size="30%" style="margin-top: 2.625rem;">
         <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px;width:160px" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick2()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询

src/views/sale/components/transport_excute/qualityResult.vue

@@ -24,7 +24,7 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getQualityResult?apiId=111&orderType=1",
+                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=1",
             },
         }
     },

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchasFuelOldMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchaseAccessoriesMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

src/views/systemConfig/components/organizManage.vue

@@ -1,22 +1,6 @@
 <template>
   <div class="organizManage-main">
     <div class="organizManage-mainLeft">
-      <!-- 下拉选择公司 -->
-      <!-- <div class="_company-select" v-if="companys !== '' && companys.length > 1">
-                <el-dropdown
-                    trigger="click"
-                    @command="selectComPany"
-                >
-                    <span class="el-dropdown-link">
-                        {{companyName}}<i class="el-icon-arrow-down el-icon--right"></i>
-                    </span>
-                    <el-dropdown-menu slot="dropdown">
-                        <div v-for="item in companys" :key="item.id">
-                            <el-dropdown-item :command="item">{{item.companyName}}</el-dropdown-item>
-                        </div>
-                    </el-dropdown-menu>
-                </el-dropdown>
-            </div> -->
       <div class="public-function-div">
         机构树
         <el-button
@@ -26,18 +10,6 @@
           class="orgShowHidden"
           >{{ isAllDataShow ? "显示停用组织" : "隐藏停用组织" }}</el-button
         >
-        <!-- <el-button
-                    @click="setCheckedNodes"
-                    type="success"
-                    size="small"
-                    class="refresh"
-                >展开</el-button>
-                <el-button
-                    @click="setCheckedKeys"
-                    type="success"
-                    size="small"
-                    class="refresh2"
-                >收起</el-button> -->
         <el-button
           @click="controllNode()"
           type="success"
@@ -183,20 +155,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="机构类别"
-                          prop="cate">
-              <el-select v-model="formItem.cate"
-                         style="width: 100%;"
-                         size="small"
-                         @change="changeval">
-                <el-option v-for="item in dataDictionary.state.dict.CATE"
-                           :value="item.value"
-                           :key="item.value"
-                           :label="item.label"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="机构编码" prop="orgCode">
               <el-input
@@ -207,13 +165,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="机构级别" prop="rank">
-              <el-select v-model="formItem.rank" style="width: 100%;" size="small">
-                <el-option v-for="item in formItemRank" :value="item.value" :key="item.value"  :label="item.label"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="机构名称" prop="orgName">
               <el-input
@@ -1205,7 +1156,12 @@ export default {
                     form: data,
                   })
                   .then((res) => {
-                    //
+                    console.log(res,'修改成功')
+                    console.log(res.data.orgId,'机构主键id');
+                    console.log(res.data.depType,"机构级别");
+                    console.log(res.data.orgName,"机构名称");
+                    console.log(res.data.pId,"父级机构id");
+                    
                     this.addLoading1 = false;
                     //
                     if (res.code === "0") {
@@ -1251,6 +1207,11 @@ export default {
             this.store
               .dispatch("system/organizManage/addOrg", data)
               .then((res) => {
+                console.log(res,'添加成功')
+                console.log(res.data.orgId,'机构主键id');
+                console.log(res.data.depType,"机构级别");
+                console.log(res.data.orgName,"机构名称");
+                console.log(res.data.pId,"父级机构id");
                 //
                 this.addLoading2 = false;
                 //

src/views/systemConfig/components/usersAddAndEdit.vue

@@ -616,7 +616,7 @@
                 style="float: right"
                 @click="formSubmit"
                 size="small"
-                >保 存</el-button
+                >保 存1</el-button
               >
               <el-button
                 plain