huk 3 سال پیش
والد
کامیت
0df93c6976

+ 1 - 1
build/utils.js

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

+ 1 - 5
src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -450,11 +450,7 @@ export default {
               state = 0;
             }
           } else {
-            this.$message({
-              message: "重量不能为空!",
-              type: "warning",
-            });
-            state = 0;
+            state = 1;
           }
         });
       }

+ 2 - 2
src/views/appoint/components/saleContract/addSaleOrderSend.vue

@@ -582,9 +582,9 @@ export default {
         this.drawer = true;
       }else if(num == 2){
         if(!this.materialId){
-          this.$message.warning('请选择物资后,点击')
+          this.$message.warning('请选择物资后,点击')
         }else if(!this.lineId){
-          this.$message.warning('请选择线路后,点击')
+          this.$message.warning('请选择线路后,点击')
         }else{
           this.truckDrawer = true;
         }

+ 5 - 0
src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -116,6 +116,11 @@ export default {
       this.axios
         .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
+          res.data.data.forEach(e => {
+            if(e.specificationModel == "()"){
+              e.specificationModel = null;
+            } 
+          });
           this.tableData = res.data.data;
         });
     },

+ 5 - 0
src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -116,6 +116,11 @@ export default {
       this.axios
         .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
+          res.data.data.forEach(e => {
+            if(e.specificationModel == "()"){
+              e.specificationModel = null;
+            } 
+          });
           this.tableData = res.data.data;
         });
     },

+ 3 - 3
src/views/sale/components/transport_order/receiveOrder.vue

@@ -142,19 +142,19 @@ export default {
       first: {
         // first请求数据的地址,承运商(运输订单状态为已接收,接收状态为已接收)
         requestUrl:
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId=" +
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
           getCookie("userId"),
       },
       second: {
         // second请求数据的地址,承运商暂时设置为默认(运输订单状态为)
         requestUrl:
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierSsoId=" +
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
           getCookie("userId"),
       },
       third: {
         // second请求数据的地址
         requestUrl:
-          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId=" +
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
           getCookie("userId"),
       },
       activeName: "first",