snow 2 years ago
parent
commit
08b4f7419d

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 4 - 6
src/views/sellOut/deliveryWorkOrder/components/express.vue

@@ -230,16 +230,14 @@ export default {
           const { outChildCode } = this.sitem
 
           const model = {
-            list: post_code.map(post_code => ({
+            list: [{
               post_fee,
-              post_code: post_code.value,
+              outChildCode,
               post_name: Array.isArray(post_name) ? post_name[0] : post_name,
-              outChildCode
-            }))
+              post_code: post_code.map(({ value }) => value).join(',')
+            }]
           }
 
-          delete model['page']
-
           const { code, message } = await asyncRequest.express(model)
           this.loading = false
           if (code === 0) {

+ 2 - 1
src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -95,7 +95,8 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="待库管发货" name="2"  v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')">
+            <!-- v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')" -->
+            <el-collapse-item title="待库管发货" name="2">
               <express-node @refresh="() => initData()" :sitem="sitem" />
             </el-collapse-item>
           </el-collapse>

+ 5 - 17
src/views/supplierSellOut/supplierDeliveryWorkOrder/components/express.vue

@@ -84,7 +84,7 @@
 <script>
 import asyncRequest from '@/apis/service/sellOut/deliveryWorkOrder'
 import resToken from '@/mixins/resToken'
-import { isnumber, isNumeric, hasSpace, isSpecialSymbol } from '@/utils/validate'
+import { isnumber, isNumeric } from '@/utils/validate'
 export default {
   name: 'WsmInOrderAdd',
   mixins: [resToken],
@@ -101,9 +101,6 @@ export default {
     const validateCode = (rule, value, callback) => {
       const { required } = rule
       const l = value.length
-      // else if (value === "0") {//之前支持0
-      //   callback();
-      // }
       if (required) {
         if (value === '') {
           callback(new Error('物流单号不能为空!'))
@@ -139,8 +136,6 @@ export default {
           }
         ],
         post_fee: ''
-        // remark: ''
-        // sendtime: "",
       },
       rules: {
         post_name: {
@@ -159,11 +154,6 @@ export default {
           validator: validate_num,
           trigger: 'blur'
         }
-        // remark: {
-        //   required: true,
-        //   validator: validate_remark,
-        //   trigger: 'blur'
-        // }
       }
     }
   },
@@ -240,16 +230,14 @@ export default {
           const { outChildCode } = this.sitem
 
           const model = {
-            list: post_code.map(post_code => ({
+            list: [{
               post_fee,
-              post_code: post_code.value,
+              outChildCode,
               post_name: Array.isArray(post_name) ? post_name[0] : post_name,
-              outChildCode
-            }))
+              post_code: post_code.map(({ value }) => value).join(',')
+            }]
           }
 
-          delete model['page']
-
           const { code, message } = await asyncRequest.express(model)
           this.loading = false
           if (code === 0) {

+ 0 - 2
src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -179,8 +179,6 @@ import asyncRequest from "@/apis/service/supplierSellOut/supplierSellReturn";
 import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
 
-
-
 export default {
   name: "sellReturn",
   mixins: [mixinPage, resToken, companyHelper],

Some files were not shown because too many files changed in this diff