tj

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index','RMS','systemConfig','TMS']
-let devModules = ['all'];
+// let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
-// let devModules = ['index','SporadicManage','inward']
+let devModules = ['index','SporadicManage','RMS']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -56,7 +56,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://192.168.1.108:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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/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
@@ -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/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
@@ -529,20 +530,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 +539,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