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

build/utils.js

@@ -11,12 +11,22 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
 // index模块（登录）为必须，all 为所有
-//    登录     合同                       首页       内转     排队   资源   销售                       零星物资
-// ['index','appoint'，'configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
-//       统计报表       组织机构/系统管理 采购  仓储
-//  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['all'];
-// let devModules = ['index','TMS','statisticalReport','RMS','inward'];
+//   index    销售    采购     规范          质量          生产      车间
+// ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
+//    物流         进程     成本   报表          基础配置        系统配置
+//  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
+
+// let devModules = ['index','RMS','systemConfig']
+ //let devModules = ['index','RMS','statisticalReport','SporadicManage','TMS','WMS'];
+ let devModules = ['all'];
+// let devModules = ['index','RMS']
+
+
+// let devModules = ['index','RMS','systemConfig','TMS']
+//let devModules = ['all'];
+// let devModules = ['index','inward','appoint','sale']
+// let devModules = ['index','SporadicManage','RMS']
+
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/RMS/components/addCarDriver.vue

@@ -121,7 +121,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addConsignee.vue

@@ -1,10 +1,32 @@
 <template>
   <!-- 添加收货客户信息 -->
-  <div class="addWagonLoad">
+  <div class="addConsignee">
     <PageTitle>返回</PageTitle>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="367" v-model="form1" ref="from1"></dil-form>
       </div>
+      <div class="f-box">
+         <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="收货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateConsignee"
+          :fetch-suggestions="querySearchConsignee"
+          placeholder="请输入收货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectConsignee"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.consigneeCompanyName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+      </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -20,10 +42,39 @@ export default {
   data() {
     return {
       form1: {},
+      stateConsignee:null,
+      restaurantsConsignee:null,
     };
   },
   mounted() {},
   methods: {
+        //收货单位弹出层
+    handleSelectConsignee(item){
+      console.log(this.consigneeId)
+      this.consigneeId = item.consigneeId
+      item.consigneeCompanyName = this.consigneeCompanyName
+      console.log(this.consigneeId)
+      console.log('这是选中的收货单位')
+    },
+    //以下是发货单位边输边查搜索
+    querySearchConsignee(queryString, cb) {
+      this.axios.post('/api/v1/uc/getConsigneeByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res)
+          var restaurantsConsignee = res.data.data
+          var results = queryString ? restaurantsConsignee.filter(this.createFilterConsignee(queryString)) :restaurantsConsignee;
+            // 调用 callback 返回建议列表的数据
+          console.log(results,"results");
+          cb(results);
+        }
+      })    
+      },
+    createFilterConsignee(queryString) {
+        return (restaurantsConsignee) => {
+          return (restaurantsConsignee.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是收货单位边输边查搜索
      makeSure() {
        console.log(this.form1)
        let RmsConsignee={
@@ -34,16 +85,12 @@ export default {
          consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
          consigneeContactName:this.form1.consigneeContactName,
          consigneeContactTel:this.form1.consigneeContactTel,
+         consigneeFarId:this.consigneeId
        };
-              console.log("RmsConsignee",RmsConsignee)
+        console.log("RmsConsignee",RmsConsignee)
+
        if(
-        RmsConsignee.companyName == null ||
-        RmsConsignee.consigneeAbbreviation==null ||
-        RmsConsignee. consigneeRegisteredAddress ==null ||
-        RmsConsignee.consigneeReceiveAddress == null ||
-        RmsConsignee.consigneeRegistrationTime == null ||
-        RmsConsignee.consigneeContactName == null ||
-        RmsConsignee.consigneeContactTel == null
+        RmsConsignee.companyName == null
        )this.$message.error("存在空值！");
        else
          this.axios
@@ -64,7 +111,6 @@ export default {
             } else {
               this.$message.error("新增失败,可能有重复");
             }
-          // this.$refs['table'].resetField();
           });
     },
     // 取消
@@ -75,6 +121,10 @@ export default {
 };
 </script>
 <style lang='scss' >
+  .addConsignee{
+  .f-box{
+    margin-left: 36%;
+  }
   .button-box{
     display: flex;
     justify-content: center;
@@ -105,4 +155,6 @@ export default {
       }
     }
   }
+  }
+  
 </style>

src/views/RMS/components/addGatepost.vue

@@ -66,7 +66,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addMaterial.vue

@@ -50,6 +50,7 @@ export default {
       drawer: false,
       direction: 'rtl',
       inputText:"",
+      materialTypeId:"",
       options:{
         requestUrl:"/api/v1/rms/getMaterialTypeList?apiId=376",
         selectionType:"radio",
@@ -61,28 +62,25 @@ export default {
   methods: {
       currentRadioChange(selection){
       this.mapList=selection,
+      this.materialTypeId = this.mapList.materialTypeId;
       console.log(this.mapList)
       this.materialTypeName=this.mapList.materialTypeName
     },
     onclick(){
       this.options.requestUrl="/api/v1/rms/getMaterialTypeList?apiId=376&con=" +this.inputText;
     },
-     makeSure() {
+     makeSure() {  
+       
       let RmsMaterial = {
         materialName:this.form1.materialName,
         materialSpecification:this.form1.materialSpecification,
         materialModel:this.form1.materialModel,
-        materialTypeId:this.mapList.materialTypeId,
+        materialTypeId:this.materialTypeId,
         unitOfMeasureId:this.form1.unitOfMeasureId,
         materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
       };
-      if(
-        RmsMaterial.materialName==null ||
-        RmsMaterial.materialSpecification==null ||
-        RmsMaterial.materialModel==null ||
-        RmsMaterial.materialTypeId==null ||
-        RmsMaterial.unitOfMeasureId==null ||
-        RmsMaterial.materialTheoreticalWeight==null 
+    if(
+        RmsMaterial.materialName==null
       )this.$message.error("存在空值！");
       else
       this.axios
@@ -101,7 +99,7 @@ export default {
           } else {
             this.$message.error("新增失败");
           }
-          this.$refs['table'].resetField();
+          //this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addNotice.vue

@@ -56,7 +56,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addOilPrice.vue

@@ -54,7 +54,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+        //  this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addPier.vue

@@ -52,7 +52,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+        //  this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addPort.vue

@@ -54,7 +54,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addPortStorageYard.vue

@@ -52,7 +52,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addRawWarehouse.vue

@@ -52,7 +52,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+        //  this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addRmsShipper.vue

@@ -64,7 +64,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addSupplier.vue

@@ -1,10 +1,33 @@
 <template>
   <!-- 添加供应商信息 -->
-  <div class="addWagonLoad">
+  <div class="addSupplier">
     <PageTitle>返回</PageTitle>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="320" v-model="form1" ref="from1"></dil-form>
-      </div>
+     </div>
+     <div class="f-box">
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="父级单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入父级单位名称(非必填)"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+     </el-form>  
+     </div>
+     
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -21,10 +44,38 @@ export default {
     return {
       form1: {},
       value: undefined,
+       //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      restaurantsSupplier:null,
+      stateSupplier:null,
     };
   },
   mounted() {},
   methods: {
+    //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是发货单位边输边查搜索
      makeSure() {
        console.log(this.form1)
       let RmsSupplier = {
@@ -32,14 +83,12 @@ export default {
         supplierAddress: this.form1.supplierAddress,
         supplierRegisterDate: this.form1.supplierRegisterDate,
         supplierContactsName: this.form1.supplierContactsName,
-        supplierContactNumber: this.form1.supplierContactNumber
+        supplierContactNumber: this.form1.supplierContactNumber,
+        supplierId:this.supplierId
       };
+      console.log(RmsSupplier);
       if(
-        RmsSupplier.supplierName==null ||
-        RmsSupplier.supplierAddress==null ||
-        RmsSupplier.supplierRegisterDate==null ||
-        RmsSupplier.supplierContactsName==null ||
-        RmsSupplier.supplierContactNumber==null 
+        RmsSupplier.supplierName==null
       )this.$message.error("存在空值！");
       else
       this.axios
@@ -58,7 +107,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs['table'].resetField();
+         // this.$refs['table'].resetField();
         });
     },
     // 取消
@@ -69,7 +118,8 @@ export default {
 };
 </script>
 <style lang='scss' >
- .button-box{
+ .addSupplier{
+    .button-box{
     display: flex;
     justify-content: center;
     .el-button{
@@ -77,6 +127,9 @@ export default {
       margin-right: 10px;
     }
   }
+  .f-box{
+    margin-left: 38%;
+  }
 .form-box{
   display: flex;
   justify-content: center;
@@ -97,4 +150,6 @@ export default {
     }
   }
 }
+ }
+ 
 </style>

src/views/RMS/components/addTruckCalculate.vue

@@ -99,7 +99,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          this.$refs["table"].resetField();
+         // this.$refs["table"].resetField();
         });
     },
 

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue

@@ -99,7 +99,11 @@ export default {
     },
     handleClick(tab, event) {
       
-      console.log(tab, event);
+      this.option1.requestUrl = this.option1.requestUrl + "&test=" + new Date()
+      this.option2.requestUrl = this.option2.requestUrl + "&test=" + new Date()
+      console.log(this.option1.requestUrl)
+      console.log(this.option2.requestUrl)
+     
     }, // 下发
     // 下发
     sendClick() {

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/transportOrder.vue

@@ -11,7 +11,7 @@
       </el-button>
     </div>
     <div class="transportOrder_bottom">
-      <el-tabs v-model="activeName">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
         <!-- 已下发 -->
         <el-tab-pane label="已下发" name="first">
           <dilTable v-bind.sync="first"></dilTable>
@@ -90,9 +90,6 @@ export default {
   },
   created(){
       this.carrierUserId = getCookie('userId')
-      console.log("-----")
-      console.log(getCookie('orgCode'))
-      console.log("-----")
       if(getCookie('orgCode') == "dagangadmin"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5"
@@ -103,12 +100,14 @@ export default {
   },
   methods: {
     onclick(){
-      if(this.input != ''){
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
-      }else{
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
-      }     
+      console.log("dianji")
     },
+    handleClick(tab, event) {
+      this.first.requestUrl = this.first.requestUrl + "&test=" + new Date()
+      this.Received.requestUrl = this.Received.requestUrl + "&test=" + new Date()
+      console.log(this.first.requestUrl,this.Received.requestUrl)
+
+    }, // 下发
     // 查看物资详情
     detailclick(row) {
       // 记录重复点击次数

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -309,6 +309,7 @@ export default {
           slot: true,
         },
       ],
+      consigneeId:null,
       // 收货单位ID
       receiveId:null,
       //承运商ID
@@ -470,7 +471,8 @@ export default {
     },
     // 返回主界面
     makeSure1() {
-      console.log(this.selectionList1) 
+      console.log(this.selectionList1)
+      //debugger  
       this.selectionList1.forEach((e) => {
         var addmap = {
           materialCode: e.materialCode,
@@ -529,20 +531,7 @@ export default {
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/importedFuel/transportReserveRan");
-    },
-    currentRadioChange1(selection) {
-      console.log(selection);
-      this.receiveName = selection.consigneeCompanyName;
-      this.receiveId = selection.consigneeId;
-    },
-    currentRadioChange2(selection) {
-      this.supplierName = selection.supplierName;
-      this.supplierId = selection.supplierId;
-    },
-    currentRadioChange4(selection) {
-      this.unloadPointId = selection.warehouseId;
-      this.unloadPointName = selection.warehouseName;
+      
     },
     currentRadioChange5(selection) {
       console.log(selection)
@@ -551,24 +540,10 @@ export default {
       }else{
           this.lineName = selection.lineName+'  '+selection.lineDesk 
           this.lineId = selection.lineId;
-      }
-      
-    },
-    currentRadioChange3(selection) {
-      this.carriermapList = [];
-      this.carriermapList = selection;
-    },
-    jgao(){
-      this.$alert('有数据未填写')
-      return
+      } 
     },
     // 确认
     makeSure() {
-        console.log(this.supplierId,"this.supplierId")
-        console.log(this.consigneeId,"this.consigneeId")
-        console.log(this.carrierId,"this.carrierId")
-        console.log(this.lineId,"this.lineId")
-        console.log(this.tableData)
         if(this.supplierId==null||this.lineId==null||this.carrierId==null||this.consigneeId==null){
           this.$alert('存在空值')
           return

src/views/SporadicManage/components/steelReturn/transportAppoint/addSteelReturnTransportAppoint.vue

@@ -455,7 +455,7 @@ export default {
           mapList: this.tableData,
         };
         console.log(amsOrder);
-        debugger
+        //debugger
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
             this.$router.push("/steelReturn/steelTransportAppoint");

src/views/TMS/components/domesticMine/approveWagonPlease.vue

@@ -36,13 +36,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3",
+        requestUrl: "/api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3&con="+this.input;
+      this.option.requestUrl = "/api/v1/tms/getApproveAllWagonPlease?apiId=70&resultType=3&con="+this.input;
     },
     btnclick() {
       this.$router.push("/approveWagonPleaseAdd");

src/views/TMS/components/importedTruck/breakdownPlanCheck.vue

@@ -63,13 +63,13 @@ export default {
       option1: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=89&orderStatus=3&orderType=8&planId=null" ,
+          "/api/v1/oms/getAllTruckOrder?apiId=89&orderStatus=3&orderType=8" ,
           mapList: [],
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=86&orderStatus=8&orderType=8&planId=null",
+          "/api/v1/oms/getAllTruckOrder?apiId=86&orderStatus=8&orderType=8",
       },
       form1: [],
       orderId: 0,
@@ -91,16 +91,10 @@ export default {
     onclick() {
       if (this.activeName == "first") {
         this.option1.requestUrl =
-          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=3&orderType=1" +
-          this.$route.params.planId +
-          "&con=" +
-          this.input;
+          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=3&orderType=1&con=" +this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=8&orderType=1" +
-          this.$route.params.planId +
-          "&con=" +
-          this.input;
+          "/api/v1/oms/selectAllOrderForSale?apiId=168/1&orderStatus=8&orderType=1&con=" +this.input;
       }
     },
      

src/views/TMS/components/importedTruck/submitWaybill.vue

@@ -52,7 +52,7 @@ export default {
     };
   },
   mounted() {
-      debugger
+     // debugger
     this.restaurants = this.loadAll();
   },
   methods: {

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/exFactoryNew.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -22,13 +23,25 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18",
+        requestUrl: "",
       },
     };
   },
+  created(){
+    
+     if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + getCookie("userId");
+      } else {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + null ;
+      }
+  },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&con=" + this.input;
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + getCookie("userId")+"&con=" + this.input;;
+      } else {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=18&carrierSsoId=" + null +"&con=" + this.input;
+      }
     },
    }
 };