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

build/utils.js

@@ -15,10 +15,27 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
-// let devModules = ['index','RMS','systemConfig','TMS']
+// let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
+// let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 let devModules = ['all'];
-// let devModules = ['index','appoint','sale','RMS']
-
+// let devModules = ['index','TMS','RMS']
+// let devModules = ['index','SporadicManage','TMS']
+// let devModules = ['index','SporadicManage'];
+// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
+// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
+//  let devModules = ['all'];
+// let devModules = ['index','RMS']
+//let devModules = ['index','SporadicManage','TMS']
+// let devModules = ['index','SporadicManage'];
+// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
+// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
+// let devModules = ['index','inward','SporadicManage']
+// let devModules = ['index','']
+// let devModules = ['all'];
+// let devModules = ['index','RMS','systemConfig','TMS']
+// let devModules = ['all'];
+// let devModules = ['index','inward','appoint','sale']
+// let devModules = ['index','SporadicManage']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/RMS/components/addCarrier.vue

@@ -28,7 +28,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -51,7 +51,7 @@
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier2"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier2"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -74,7 +74,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier3"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier3"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -235,16 +235,12 @@ export default {
         this.$message.error("承运商名称不能为空");
       } else if (!this.form1.carrierType) {
         this.$message.error("承运商类型不能为空");
-      }else if(!this.form1.contactsName){
-        this.$message.error("联系人不能为空");
-      }else if(!this.form1.carrierContactNumber){
-        this.$message.error("联系电话不能为空");
-      }else if (!this.imageUrl1) {
-        this.$message.error("请上传运输证");
-      } else if (!this.imageUrl2) {
-        this.$message.error("请上传经营许可证");
-      } else if (!this.imageUrl3) {
-        this.$message.error("请上传营业执照");
+      // }else if (!this.imageUrl1) {
+      //   this.$message.error("请上传运输证");
+      // } else if (!this.imageUrl2) {
+      //   this.$message.error("请上传经营许可证");
+      // } else if (!this.imageUrl3) {
+      //   this.$message.error("请上传营业执照");
       }else {
         status = true;
       }

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=394&orderType=12&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/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -259,11 +259,11 @@ export default {
   created() {
     if (getCookie("orgCode") == "chengyunshang") {
       this.third.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" +
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
         getCookie("userId");
     } else {
       this.third.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" + null;
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
     }
   },
   methods: {
@@ -324,13 +324,13 @@ export default {
         //判断是否是承运商查询车辆
         if (getCookie("orgCode") == "chengyunshang") {
           this.third.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" +
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
             getCookie("userId") +
             "&index=" +
             this.input;
         } else {
           this.third.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" +
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
             null +
             "&index=" +
             this.input;

src/views/TMS/components/importedFuel/transportReserveRanEdit.vue

@@ -94,11 +94,11 @@ export default {
     //判断是否是承运商
     if (getCookie("orgCode") == "chengyunshang") {
       this.third.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" +
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
         getCookie("userId");
     } else {
       this.third.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" + null;
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
     }
   },
   mounted() {
@@ -110,13 +110,13 @@ export default {
         //判断是否是承运商
         if (getCookie("orgCode") == "chengyunshang") {
           this.third.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" +
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
             getCookie("userId") +
             "&con=" +
             this.input;
         } else {
           this.third.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSSOId=" +
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
             null +
             "&con=" +
             this.input;

src/views/index/components/download.vue

@@ -47,7 +47,7 @@ export default {
 
             if(that.type == 'android') {
 
-                window.location.href = 'https://wl.dasteel.cn:32322 /%E6%95%B0%E8%A3%81%E7%89%A9%E6%B5%81.apk';
+                window.location.href = 'https://wl.dasteel.cn:32322/%E6%95%B0%E8%A3%81%E7%89%A9%E6%B5%81.apk';
                 
 
             } else {

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;