Browse Source

前端零星退货及趟次修改啊

luobang 3 years ago
parent
commit
70e90901cb

+ 0 - 4
config/index.js

@@ -67,10 +67,6 @@ let proxyTable = {
     target: "http://172.16.33.166:8080",
     // target: "http://localhost:8080",
     // target: "http://localhost:8019",
-    // target: "http://192.168.1.107:8019",
-    // target: "http://192.168.1.112:8019",
-    // target: "http://localhost:8019",
-    // target: "http://192.168.1.107:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

+ 4 - 0
src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue

@@ -61,6 +61,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

+ 4 - 0
src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/Load.vue

@@ -53,6 +53,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

+ 4 - 0
src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue

@@ -61,6 +61,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

+ 4 - 0
src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue

@@ -54,6 +54,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

+ 4 - 0
src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue

@@ -54,6 +54,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

+ 4 - 0
src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/unload.vue

@@ -53,6 +53,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

+ 18 - 13
src/views/SporadicManage/components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue

@@ -103,9 +103,10 @@
          <el-input
           class="inline-input"
           v-model="materialTimes"
-          placeholder="趟次"
+          placeholder="趟次-非必填"
           :trigger-on-focus="false"
           @input="onInputTimes()"
+          @blur="onblur()"
         >
         </el-input>
         </el-form-item>
@@ -420,6 +421,16 @@ export default {
         this.$message.warning('趟次请输入数字')
       }
     },
+    onblur(){
+      this.isMoreTrips = false
+      if(this.materaialTimes <= 0){
+        this.$message.warning('趟次必须大于0')
+        this.materialTimes = null
+      }
+      if(this.materialTimes > 1 ){
+        this.isMoreTrips = true
+      }
+    },
     onInputPriority(scope){
       if(!isNumber(scope)){
         this.$message.warning('装卸货次序请输入数字')
@@ -447,7 +458,7 @@ export default {
         this.inputLine = "零星中转"
       }
       if(this.orderType == 19){
-        this.inputLine = "零星退货"
+        this.inputLine = "退货"
       }
     },
     drawTable(){
@@ -586,18 +597,12 @@ export default {
     },
     // 确认
     makeSure() {
-        let amOrder = {
-          supplierId:this.supplierId,
-          lineId:this.lineId,
-          carrierId: this.carrierId,
-          orderType:this.orderType,
-          receiveId: this.consigneeId,
-          userId:getCookie("orgCode"),
-          mapList: this.tableData,
-          isMoreTrips:Number(this.isMoreTrips)
+        if(this.isMoreTrips == false){
+          this.materialTimes = 1
+        }
+        if(Number(this.materialTimes) != 0){
+          this.isMoreTrips = true
         }
-        console.log(amOrder)
-        debugger
         this.disabled = true
         if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
           this.disabled = false

+ 2 - 2
src/views/SporadicManage/router/index.js

@@ -44,7 +44,7 @@ import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSpo
 import oldSporadicInwardGrossWeight from '../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue'
 import oldSporadicInwardoutFactory from '../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue'
 import oldSporadicInwardtareWeight from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
-import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
+import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/Load.vue'
 import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
 
 //钢材退货运输预约
@@ -177,7 +177,7 @@ const constantRouterMap = [
       {path:'oldSporadicInwardoutFactory',name:'oldSporadicInwardoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardoutFactory},
       {path:'oldSporadicInwardtareWeight',name:'oldSporadicInwardtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardtareWeight},
       {path:'oldSporadicInwardUnload',name:'oldSporadicInwardUnload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardUnload},
-
+      {path:'oldSporadicInwardload',name:'oldSporadicInwardload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardload},
     ]    
   }
 ];