tishi

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']
+// let devModules = ['index','SporadicManage']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/enFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=12",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=5&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/grossWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12",
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/outFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=13",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/grossWeight.vue

@@ -27,7 +27,7 @@ export default {
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=13&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/load.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=13",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&con=" + this.input;
     },
    }
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=13",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/tareWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=13",
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13&con=" + this.input;
     },
   },
 };

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

@@ -120,9 +120,11 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      carrierUserId:'',
       //模态窗的框计算
       inputText: null,
       //是否弹出对话框
@@ -134,22 +136,22 @@ export default {
       //未下发的表格
       option: {
         requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3",
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + '',
         selectionType: "select",
       },
       //已下发的表格
       first: {
         requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4",
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +'',
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
         // 控制显示当选列
         selectionType: "radio",
       },
       Received:{
-        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5",
+        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +'',
       },
       //物资信息的数据
       tableData: [],
@@ -187,7 +189,22 @@ export default {
       index: null,
     };
   },
+  created(){
+      this.carrierUserId = getCookie('userId')
+      console.log(this.carrierUserId)
+      this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId ,
+      this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
+      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
+      this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId 
+  },
   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
+      }     
+    },
     //下发
     Issue() {
       if (this.selectionList.length == 0) {
@@ -223,6 +240,8 @@ export default {
     },
     //对话框点击确定，执行增加车牌号
     determine() {
+      console.log(this.selectOrderId)
+      console.log(this.capacityId)
       this.axios
         .post("/api/v1/oms/updateOmstruckOrder", {
           orderId: this.selectOrderId,
@@ -259,15 +278,9 @@ export default {
         });
       });
     },
-    //模态窗的框计算
-    inputClick() {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&con=" +
-        this.inputText;
-    },
     //单选按钮选中的值
     currentRadioChange(row) {
-      this.capacityId = row.capacityId;
+      this.capacityId = row.carrierId;
       this.capacityNumber = row.capacityNumber;
     },
     //打开模态窗口

src/views/inward/components/truckAppoint/addPlan.vue

@@ -139,8 +139,8 @@ export default {
 
 <style lang="scss" scoped>
 .addInwardPlan{
-    .form-box{
-  display: inline-block;
+.form-box{
+  display: inline-block !important;
   margin-left: 38%;
   .el-input{
     width:288px

src/views/inward/components/truckAppoint/addRequirement.vue

@@ -328,7 +328,7 @@ export default {
   }
 }
 .box-form {
-  display: inline-block ;
+  display: inline-block !important ;
   padding-left: 38%;
   .el-form-item {
     display: flex;

src/views/inward/components/truckAppoint/updateRequirement.vue

@@ -18,11 +18,6 @@
     </el-input>
   </el-form-item>
 </el-form>
-<el-form :inline="true" class="demo-form-inline" :label-position="left" label-width="80px">
-  <el-form-item label="外轮船名">
-    <el-input v-model="foreignShipName" disabled>浏览</el-input>
-  </el-form-item>
-</el-form>
 <el-form :inline="true" class="demo-form-inline" :label-position="left" label-width="80px">
   <el-form-item label="发货单位">
     <el-input v-model="supplierName" disabled> </el-input>
@@ -233,7 +228,7 @@ export default {
   }
 }
 .box-form {
-  display: inline-block ;
+  display: inline-block !important;
   padding-left: 38%;
   .el-form-item {
     display: flex;

src/views/inward/components/truckOrder/decomposePlan.vue

@@ -276,7 +276,7 @@ export default {
 <style lang="scss" scoped>
 .desomposePlan{
   .form-box{
-  display: flex;
+  display: inline-block !important;
   margin-left: 38%;
   .el-input{
     width:288px
@@ -286,7 +286,7 @@ export default {
   }
 }
 .box-form{
-  display: inline-block;
+  display: inline-block !important;
   padding-left: 38%;
   .el-form-item{
   display: flex;