Your Name 3 роки тому
батько
коміт
413e03c331

+ 1 - 1
build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 let devModules = ['all'];
 // let devModules = ['index','statisticalReport','appoint','RMS','TMS'];
-// let devModules = ['index','SporadicManage'];
+// let devModules = ['index','SporadicManage','inward'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

+ 6 - 1
src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -550,8 +550,13 @@ export default {
       }
     },
     ondrawer(num) {
-      this.line.requestUrl =
+      if(getCookie("orgCode") == "biemeierchejian"){
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + "二厂:零星单拼出厂" 
+      }else{
+        this.line.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date();
+      }
       this.drawer = true;
       this.a = num;
     },

+ 0 - 1
src/views/inward/components/truckAppoint/purInwardRequirement.vue

@@ -144,7 +144,6 @@ export default {
         });
     },
     stopRequirement(scope){
-
       this.$confirm("是否停用", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 14 - 3
src/views/inward/components/truckOrder/addPurInwardOrder.vue

@@ -167,7 +167,7 @@ export default {
       lineDrawer:false,
       //线路的表格
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
       //已经选择车辆物资信息
@@ -203,10 +203,18 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
         this.option.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2&carrierSsoId=" + getCookie("userId");
-    } else {
+    }else if(getCookie("orgCode") == "biemeierchejian"){
+         this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"铁专线精煤";
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&con=" + "采购内转"
+        this.option.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2";
+    } 
+    else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
         this.option.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2";
     } 
   },
@@ -306,7 +314,10 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-    } else {
+    }else if(getCookie("orgCode") == "biemeierchejian"){
+         this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"铁专线精煤"
+    }else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
     } 

+ 1 - 1
src/views/statisticalReport/components/inwardReport/putInwardReport.vue

@@ -63,7 +63,7 @@ export default {
         this.totalCapacity = res.total;
     },
     getRequestUrl(){
-        this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441?apiId=425&startTime=null&endTime=null&i=' +new Date();
+        this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441&startTime=null&endTime=null&i=' +new Date();
      
     },
     onclick() {