build

src/views/sellOut/deliveryWorkOrder/components/express.vue

@@ -1,29 +1,22 @@
 <template>
   <el-form
+    ref="ruleForm"
+    v-loading="loading"
     :model="ruleForm"
     :rules="rules"
-    ref="ruleForm"
     :size="'mini'"
-    label-width="90px"
+    status-icon
+    label-width="95px"
+    class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="8">
-        <el-form-item label="物流公司" prop="post_name">
-          <search-express
-            :value="ruleForm.post_name"
-            :placeholder="'请输入物流公司'"
-            :names="''"
-            :size="'mini'"
-            :order_source="''"
-            :is-detail="!(status == '2' && ppowers.some((i) => i == '2'))"
-            @searchChange="handleCompany"
-          />
-        </el-form-item>
+      <el-col :span="18">
         <el-form-item label="物流费用" prop="post_fee">
           <digital-input
             :values="ruleForm.post_fee"
             :placeholder="'物流费用'"
             :min="0"
+            :disabled="type === 'view' || type === 'post_fee'"
             :max="100000000000"
             :position="'right'"
             :precision="2"
@@ -33,171 +26,253 @@
             @reschange="number_change($event, 'post_fee')"
           />
         </el-form-item>
-        <el-form-item label="物流单号" prop="post_code">
-          <div>
-            <el-alert title="多物流单号请用逗号'，'隔开" type="warning" :closable="false">
-            </el-alert>
-          </div>
-          <el-input
-            placeholder="请输入物流单号"
-            maxlength="100"
+        <el-form-item label="物流公司" prop="post_name">
+          <search-express
+            :value="ruleForm.post_name"
+            :placeholder="'物流公司'"
+            :names="''"
             :size="'mini'"
-            v-model="ruleForm.post_code"
-            clearable
+            :order_source="order_source"
+            :is-detail="false"
+            @searchChange="handleCompany"
+          /> </el-form-item>
+        <el-col
+          v-for="(domain, index) in ruleForm.post_code"
+          :key="domain.key"
+          :span="12"
+        >
+          <el-form-item
+            :key="domain.key"
+            :label="'物流单号' + (index + 1)"
+            :prop="'post_code.' + index + '.value'"
+            :rules="const_post"
           >
-          </el-input>
-        </el-form-item>
-        <el-form-item>
+            <el-input
+              v-model="domain.value"
+              placeholder="物流单号"
+              minlength="9"
+              maxlength="20"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-delete"
+                @click.prevent="removeDomain(index)"
+              />
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" style="text-align: right; padding: 0 0 16px 0">
+          <el-button
+            type="warning"
+            :size="'mini'"
+            icon="el-icon-circle-plus-outline"
+            @click="addDomain"
+          >添加快递单号</el-button>
           <el-button
             type="primary"
-            class="fr"
             :size="'mini'"
+            icon="el-icon-search"
             @click="submitForm"
-            :loading="loading"
-            >保 存
+          >保 存
           </el-button>
-        </el-form-item>
+        </el-col>
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
-
-import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
-import { isAlphanumeric } from "@/utils/validate";
+import asyncRequest from '@/apis/service/sellOut/deliveryWorkOrder'
+import resToken from '@/mixins/resToken'
+import { isnumber, isNumeric } from '@/utils/validate'
 export default {
-  name: "allotFlow",
+  name: 'WsmInOrderAdd',
   mixins: [resToken],
-  props: ["id", "sitem"],
-  computed: {
-    powers() {
-      const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "allotDetail") || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
-    ppowers() {
-      const tran =
-        this.$store.getters.roleProcess.find((i) => i.process_type === "DBD") || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
-  },
+  props: ['id', 'sitem', 'newTime'],
   data() {
-    const validateExpressSn = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("物流单号不能为空！"));
+    const validate_num = (rule, value, callback) => {
+      const { required } = rule
+      if (required && value === '') {
+        callback(new Error('不能为空！'))
       } else {
-        if (!isAlphanumeric(value)) {
-          callback(new Error("请输入正确的物流单号"));
+        callback()
+      }
+    }
+    const validateCode = (rule, value, callback) => {
+      const { required } = rule
+      const l = value.length
+      if (required) {
+        if (value === '') {
+          callback(new Error('物流单号不能为空!'))
+        } else if (l < 9 || l > 20) {
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
+        } else if (isnumber(value)) {
+          callback()
+        } else if (!isNumeric(value)) {
+          console.log(!isNumeric(value))
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
         } else {
-          callback();
+          callback()
         }
-      }
-    };
-    const validate_post_fee = (rule, value, callback) => {
-      const { required } = rule;
-      if (required && value === "") {
-        callback(new Error("不能为空！"));
       } else {
-        callback();
+        callback()
       }
-    };
+    }
 
     return {
-      status: "",
-      ruleForm: {
-        post_name: [], //发货物流公司
-        post_code: "", //物流单号
-        post_fee: "",
+      loading: true,
+      order_source: '',
+      const_post: {
+        required: true,
+        validator: validateCode,
+        trigger: 'blur'
       },
-      rules: {
-        post_name: [
-          {
-            // type: "array",
-            // required: true,
-            message: "请选择发货公司",
-            trigger: "change",
-          },
-        ],
-        post_fee: [
-          {
-            // required: true,
-            // validator: validate_post_fee,
-            trigger: "blur",
-          },
-        ],
+      ruleForm: {
+        post_name: [],
         post_code: [
           {
-            // required: true,
-            trigger: "blur",
-            // validator: validateExpressSn,s
-          },
+            value: '',
+            key: Date.now()
+          }
         ],
+        post_fee: ''
       },
-    };
+      rules: {
+        post_name: {
+          type: 'array',
+          required: true,
+          trigger: 'change',
+          message: '请输入物流公司'
+        },
+        post_code: {
+          required: true,
+          validator: validateCode,
+          trigger: 'blur'
+        },
+        post_fee: {
+          required: true,
+          validator: validate_num,
+          trigger: 'blur'
+        }
+      }
+    }
+  },
+  watch: {
+    newTime: function(val) {
+      if (val) {
+        this.initForm()
+      }
+    }
+  },
+  mounted() {
+    this.initForm()
   },
   methods: {
-    async number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+    async initForm() {
+      this.loading = true
+      await this.resetForm()
+      this.loading = false
     },
-    getComma(str){
-      const isHasComma =  str.indexOf('，') !== -1
-      const isHasEComma = str.indexOf(',') !== -1
-      const commas = []
-      if(isHasComma) commas.push('，')
-      if(isHasEComma) commas.push(',')
-      return {
-        isHasComma: isHasComma || isHasEComma,
-        commas
+    removeDomain(index) {
+      if (this.ruleForm.post_code.length === 1) {
+        this.$message.warning('至少填写一个快递单号！')
+        return
       }
+      if (index !== -1) {
+        this.ruleForm.post_code.splice(index, 1)
+      }
+    },
+    addDomain() {
+      this.ruleForm.post_code.push({
+        value: '',
+        key: Date.now()
+      })
+    },
+    // 初始化表单
+    async resetForm() {
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+
+          const {
+            post_code,
+            post_name,
+            post_fee,
+            remark,
+            order_source
+          } = this.sitem
+          this.order_source = order_source
+          this.ruleForm = {
+            post_name: post_name ? [post_name] : [],
+            post_code: [
+              {
+                value: post_code || '',
+                key: Date.now()
+              }
+            ],
+            post_fee: post_fee || '',
+            remark: remark || ''
+            // sendtime: "",
+          }
+        }
+      })
     },
-    // 商品保存提交
+    // 保存更改
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          const { post_code } = model;
-          const { isHasComma, commas } = this.getComma(post_code)
+          this.loading = true
+          const { post_code, post_name, post_fee } = this.ruleForm
+          const { outChildCode } = this.sitem
 
-          if(isHasComma){
-            let postCodeChunks;
-            postCodeChunks = post_code.split(commas[0])
-            if(commas[1]) postCodeChunks.forEach()
+          const model = {
+            list: post_code.map(post_code => ({
+              post_fee,
+              post_code: post_code.value,
+              post_name: Array.isArray(post_name) ? post_name[0] : post_name,
+              outChildCode
+            }))
           }
 
-          model.outChildCode = this.sitem.outChildCode;
-          model.post_name = model.post_name.toString();
-          
-          let res = await asyncRequest.express({list:[model]});
-          this.loading = false;
-          
-          if (res && res.code === 0) {
-            //
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
+          delete model['page']
+
+          const { code, message } = await asyncRequest.express(model)
+          this.loading = false
+          if (code === 0) {
+            this.$notify.success({
+              title: '添加成功',
+              message: ''
+            })
+            this.$emit('refresh')
+          } else if (code >= 100 && code <= 104) {
+            await this.logout()
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
     handleCompany(e) {
-      this.ruleForm.post_name = e && e.code ? [e.label] : [];
-      this.$refs.ruleForm.validateField("post_name");
+      const { code, id, label } = e
+      this.ruleForm.post_name = label ? [label] : []
+      this.$refs.ruleForm.validateField('post_name')
     },
-  },
-};
+    number_change(e, key) {
+      this.ruleForm[key] = e + '' || '0'
+      this.$refs.ruleForm.validateField(key)
+    }
+  }
+}
 </script>
+
+<style lang="scss" scoped>
+.account {
+}
+</style>

src/views/sellOut/deliveryWorkOrder/detail.vue

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

src/views/sellOut/deliveryWorkOrder/sendOutOrder.vue

@@ -204,7 +204,7 @@ export default {
           this.$notify.warning({
             title: "以下单号不能为空!",
             message:
-              "发货单号/发货单物流公司/发货单物流单号/发货单物流费用/发货单备注",
+              "发货工单号/发货工单物流公司/发货工单物流单号/发货工单物流费用",
           });
           this.loading = false;
           return;

src/views/sellOut/sellOutOrder/components/want-deliver.vue

@@ -1,11 +1,11 @@
 <template>
   <el-form
+    ref="ruleForm"
     v-loading="loading"
     :model="ruleForm"
     :rules="rules"
     :size="'mini'"
     status-icon
-    ref="ruleForm"
     label-width="95px"
     class="demo-ruleForm"
   >
@@ -13,9 +13,9 @@
       <el-col :span="8">
         <el-form-item label="发货总数" prop="send_num" required>
           <el-input
+            v-model="ruleForm.send_num"
             disabled
             placeholder="发货总数"
-            v-model="ruleForm.send_num"
             maxlength="100"
           />
         </el-form-item>
@@ -39,10 +39,10 @@
       <el-col :span="16">
         <el-form-item label="备注" prop="remark">
           <el-input
+            v-model="ruleForm.remark"
             type="textarea"
             placeholder="备注"
             :autosize="{ minRows: 4, maxRows: 4 }"
-            v-model="ruleForm.remark"
             maxlength="100"
           />
         </el-form-item>
@@ -59,22 +59,21 @@
                 :order_source="order_source"
                 :is-detail="false"
                 @searchChange="handleCompany"
-              /> </el-form-item
-          ></el-col>
+              /> </el-form-item></el-col>
           <el-col
-            :span="8"
             v-for="(domain, index) in ruleForm.post_code"
             :key="domain.key"
+            :span="8"
           >
             <el-form-item
-              :label="'物流单号' + (index + 1)"
               :key="domain.key"
+              :label="'物流单号' + (index + 1)"
               :prop="'post_code.' + index + '.value'"
               :rules="const_post"
             >
               <el-input
-                placeholder="物流单号"
                 v-model="domain.value"
+                placeholder="物流单号"
                 minlength="9"
                 maxlength="20"
               >
@@ -82,7 +81,7 @@
                   slot="append"
                   icon="el-icon-delete"
                   @click.prevent="removeDomain(index)"
-                ></el-button>
+                />
               </el-input>
             </el-form-item>
           </el-col>
@@ -93,154 +92,157 @@
         <el-button
           type="warning"
           :size="'mini'"
-          @click="addDomain"
           icon="el-icon-circle-plus-outline"
-          >添加快递单号</el-button
-        >
-        <el-button type="primary" :size="'mini'" @click="submitForm" icon="el-icon-search"
-          >保 存
+          @click="addDomain"
+        >添加快递单号</el-button>
+        <el-button
+          type="primary"
+          :size="'mini'"
+          icon="el-icon-search"
+          @click="submitForm"
+        >保 存
         </el-button>
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
-import resToken from "@/mixins/resToken";
-import { isnumber, isNumeric, hasSpace, isSpecialSymbol } from "@/utils/validate";
+import asyncRequest from '@/apis/service/sellOut/sellOutOrder'
+import resToken from '@/mixins/resToken'
+import { isnumber, isNumeric, hasSpace, isSpecialSymbol } from '@/utils/validate'
 // import ladderPriceVue from "@/views/goodStore/goodsCost/ladderPrice.vue";
 export default {
-  name: "wsmInOrderAdd",
-  props: ["id", "sitem", "newTime"],
+  name: 'WsmInOrderAdd',
   mixins: [resToken],
+  props: ['id', 'sitem', 'newTime'],
   data() {
     const validate_num = (rule, value, callback) => {
-      const { required } = rule;
-      if (required && value === "") {
-        callback(new Error("不能为空！"));
+      const { required } = rule
+      if (required && value === '') {
+        callback(new Error('不能为空！'))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     const validateCode = (rule, value, callback) => {
-      const { required } = rule;
-      const l = value.length;
-      //else if (value === "0") {//之前支持0
+      const { required } = rule
+      const l = value.length
+      // else if (value === "0") {//之前支持0
       //   callback();
       // }
       if (required) {
-        if (value === "") {
-          callback(new Error("物流单号不能为空!"));
+        if (value === '') {
+          callback(new Error('物流单号不能为空!'))
         } else if (l < 9 || l > 20) {
-          callback(new Error("仅支持纯数字或字母数字组合(9~20位)!"));
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
         } else if (isnumber(value)) {
-          callback();
+          callback()
         } else if (!isNumeric(value)) {
-          console.log(!isNumeric(value));
-          callback(new Error("仅支持纯数字或字母数字组合(9~20位)!"));
+          console.log(!isNumeric(value))
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
         } else {
-          callback();
+          callback()
         }
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     const validate_remark = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("不能为空！"));
+      if (value === '') {
+        callback(new Error('不能为空！'))
       } else if (hasSpace(value)) {
-        callback(new Error("不能出现回车/换行符！"));
+        callback(new Error('不能出现回车/换行符！'))
       } else if (isSpecialSymbol(value)) {
-        callback(new Error("不能使用英文特殊字符！"));
+        callback(new Error('不能使用英文特殊字符！'))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
 
     return {
       loading: true,
-      order_source: "",
+      order_source: '',
       const_post: {
         required: true,
         validator: validateCode,
-        trigger: "blur",
+        trigger: 'blur'
       },
       ruleForm: {
-        outCode: "",
-        send_num: "",
+        outCode: '',
+        send_num: '',
         post_name: [],
         post_code: [
           {
-            value: "",
-            key: Date.now(),
-          },
+            value: '',
+            key: Date.now()
+          }
         ],
-        post_fee: "",
-        remark: "",
+        post_fee: '',
+        remark: ''
         // sendtime: "",
       },
       rules: {
         post_name: {
-          type: "array",
+          type: 'array',
           required: true,
-          trigger: "change",
-          message: "请输入物流公司",
+          trigger: 'change',
+          message: '请输入物流公司'
         },
         post_code: {
           required: true,
           validator: validateCode,
-          trigger: "blur",
+          trigger: 'blur'
         },
         post_fee: {
           required: true,
           validator: validate_num,
-          trigger: "blur",
+          trigger: 'blur'
         },
         remark: {
           required: true,
           validator: validate_remark,
-          trigger: "blur",
-        },
-      },
-    };
+          trigger: 'blur'
+        }
+      }
+    }
   },
   watch: {
-    newTime: function (val) {
+    newTime: function(val) {
       if (val) {
-        this.initForm();
+        this.initForm()
       }
-    },
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
   },
   methods: {
     async initForm() {
-      this.loading = true;
-      await this.resetForm();
-      this.loading = false;
+      this.loading = true
+      await this.resetForm()
+      this.loading = false
     },
     removeDomain(index) {
       if (this.ruleForm.post_code.length === 1) {
-        this.$message.warning("至少填写一个快递单号！");
-        return;
+        this.$message.warning('至少填写一个快递单号！')
+        return
       }
       if (index !== -1) {
-        this.ruleForm.post_code.splice(index, 1);
+        this.ruleForm.post_code.splice(index, 1)
       }
     },
     addDomain() {
       this.ruleForm.post_code.push({
-        value: "",
-        key: Date.now(),
-      });
+        value: '',
+        key: Date.now()
+      })
     },
-    //初始化表单
+    // 初始化表单
     async resetForm() {
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
 
           const {
             outCode,
@@ -249,48 +251,48 @@ export default {
             post_name,
             post_fee,
             remark,
-            order_source,
-          } = this.sitem;
-          this.order_source = order_source;
+            order_source
+          } = this.sitem
+          this.order_source = order_source
           this.ruleForm = {
-            outCode: outCode || "",
-            send_num: send_num || "",
+            outCode: outCode || '',
+            send_num: send_num || '',
             post_name: post_name ? [post_name] : [],
             post_code: [
               {
-                value: post_code || "",
-                key: Date.now(),
-              },
+                value: post_code || '',
+                key: Date.now()
+              }
             ],
-            post_fee: post_fee || "",
-            remark: remark || "",
+            post_fee: post_fee || '',
+            remark: remark || ''
             // sendtime: "",
-          };
+          }
         }
-      });
+      })
     },
     // 保存更改
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.loading = true;
-          const { post_name, post_code } = this.ruleForm;
-          const postName = post_name.toString();
-          let post_list = "";
+          this.loading = true
+          const { post_name, post_code } = this.ruleForm
+          const postName = post_name.toString()
+          let post_list = ''
           // isok = true,
           // is_has = 0;
           post_code.forEach((si, sii) => {
-            post_list += `${sii === 0 ? "" : ","}${si.value}`;
+            post_list += `${sii === 0 ? '' : ','}${si.value}`
             // if (si.value === "0") {//之前支持0
             //   is_has++;
             //   if (postName !== "其他") {
             //     isok = false;
             //   }
             // }
-          });
+          })
           // if (!isok) {
           //   this.$message.warning("快递单号填零，物流公司必须选择其他！");
           //   this.loading = false;
@@ -302,44 +304,44 @@ export default {
           //   return;
           // }
 
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.post_name = postName;
-          model.post_code = post_list;
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          model.post_name = postName
+          model.post_code = post_list
 
-          delete model["send_num"];
-          delete model["page"];
-          console.log(model);
+          delete model['send_num']
+          delete model['page']
+          console.log(model)
 
-          const { code, message } = await asyncRequest.saleoutsend(model);
-          this.loading = false;
+          const { code, message } = await asyncRequest.saleoutsend(model)
+          this.loading = false
           if (code === 0) {
             this.$notify.success({
-              title: "添加成功",
-              message: "",
-            });
-            this.$emit("refresh");
+              title: '添加成功',
+              message: ''
+            })
+            this.$emit('refresh')
           } else if (code >= 100 && code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(message);
+            this.$message.warning(message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
     handleCompany(e) {
-      const { code, id, label } = e;
-      this.ruleForm.post_name = label ? [label] : [];
-      this.$refs.ruleForm.validateField("post_name");
+      const { code, id, label } = e
+      this.ruleForm.post_name = label ? [label] : []
+      this.$refs.ruleForm.validateField('post_name')
     },
     number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
-    },
-  },
-};
+      this.ruleForm[key] = e + '' || '0'
+      this.$refs.ruleForm.validateField(key)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/supplierSellOut/supplierDeliveryWorkOrder/components/express.vue

@@ -1,29 +1,22 @@
 <template>
   <el-form
+    ref="ruleForm"
+    v-loading="loading"
     :model="ruleForm"
     :rules="rules"
-    ref="ruleForm"
     :size="'mini'"
-    label-width="90px"
+    status-icon
+    label-width="95px"
+    class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="12"
-        ><el-form-item label="物流公司" prop="post_name">
-          <search-express
-            :value="ruleForm.post_name"
-            :placeholder="'请输入物流公司'"
-            :names="''"
-            :size="'mini'"
-            :order_source="''"
-            :is-detail="!(status == '2' && ppowers.some((i) => i == '2'))"
-            @searchChange="handleCompany"
-          />
-        </el-form-item>
+      <el-col :span="18">
         <el-form-item label="物流费用" prop="post_fee">
           <digital-input
             :values="ruleForm.post_fee"
             :placeholder="'物流费用'"
             :min="0"
+            :disabled="type === 'view' || type === 'post_fee'"
             :max="100000000000"
             :position="'right'"
             :precision="2"
@@ -33,147 +26,263 @@
             @reschange="number_change($event, 'post_fee')"
           />
         </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item label="物流单号" prop="post_code">
-          <el-input
-            placeholder="请输入物流单号"
-            maxlength="100"
+        <el-form-item label="物流公司" prop="post_name">
+          <search-express
+            :value="ruleForm.post_name"
+            :placeholder="'物流公司'"
+            :names="''"
             :size="'mini'"
-            v-model="ruleForm.post_code"
-            clearable
+            :order_source="order_source"
+            :is-detail="false"
+            @searchChange="handleCompany"
+          /> </el-form-item>
+        <el-col
+          v-for="(domain, index) in ruleForm.post_code"
+          :key="domain.key"
+          :span="12"
+        >
+          <el-form-item
+            :key="domain.key"
+            :label="'物流单号' + (index + 1)"
+            :prop="'post_code.' + index + '.value'"
+            :rules="const_post"
           >
-          </el-input>
-        </el-form-item>
-        <el-form-item>
+            <el-input
+              v-model="domain.value"
+              placeholder="物流单号"
+              minlength="9"
+              maxlength="20"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-delete"
+                @click.prevent="removeDomain(index)"
+              />
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" style="text-align: right; padding: 0 0 16px 0">
+          <el-button
+            type="warning"
+            :size="'mini'"
+            icon="el-icon-circle-plus-outline"
+            @click="addDomain"
+          >添加快递单号</el-button>
           <el-button
             type="primary"
-            class="fr"
             :size="'mini'"
+            icon="el-icon-search"
             @click="submitForm"
-            :loading="loading"
-            >保 存
+          >保 存
           </el-button>
-        </el-form-item>
+        </el-col>
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
-
-import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
-import { isAlphanumeric } from "@/utils/validate";
+import asyncRequest from '@/apis/service/sellOut/deliveryWorkOrder'
+import resToken from '@/mixins/resToken'
+import { isnumber, isNumeric, hasSpace, isSpecialSymbol } from '@/utils/validate'
 export default {
-  name: "allotFlow",
+  name: 'WsmInOrderAdd',
   mixins: [resToken],
-  props: ["id", "sitem"],
-  computed: {
-    powers() {
-      const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "allotDetail") || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
-    ppowers() {
-      const tran =
-        this.$store.getters.roleProcess.find((i) => i.process_type === "DBD") || {};
-      const { action } = tran ?? {};
-      return action ?? [];
-    },
-  },
+  props: ['id', 'sitem', 'newTime'],
   data() {
-    const validateExpressSn = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("物流单号不能为空！"));
+    const validate_num = (rule, value, callback) => {
+      const { required } = rule
+      if (required && value === '') {
+        callback(new Error('不能为空！'))
       } else {
-        if (!isAlphanumeric(value)) {
-          callback(new Error("请输入正确的物流单号"));
+        callback()
+      }
+    }
+    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('物流单号不能为空!'))
+        } else if (l < 9 || l > 20) {
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
+        } else if (isnumber(value)) {
+          callback()
+        } else if (!isNumeric(value)) {
+          console.log(!isNumeric(value))
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
         } else {
-          callback();
+          callback()
         }
-      }
-    };
-    const validate_post_fee = (rule, value, callback) => {
-      const { required } = rule;
-      if (required && value === "") {
-        callback(new Error("不能为空！"));
       } else {
-        callback();
+        callback()
       }
-    };
+    }
 
     return {
-      status: "",
-      ruleForm: {
-        post_name: [], //发货物流公司
-        post_code: "", //物流单号
-        post_fee: "",
+      loading: true,
+      order_source: '',
+      const_post: {
+        required: true,
+        validator: validateCode,
+        trigger: 'blur'
       },
-      rules: {
-        post_name: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择发货公司",
-            trigger: "change",
-          },
-        ],
-        post_fee: [
-          {
-            required: true,
-            validator: validate_post_fee,
-            trigger: "blur",
-          },
-        ],
+      ruleForm: {
+        post_name: [],
         post_code: [
           {
-            required: true,
-            trigger: "blur",
-            validator: validateExpressSn,
-          },
+            value: '',
+            key: Date.now()
+          }
         ],
+        post_fee: ''
+        // remark: ''
+        // sendtime: "",
       },
-    };
+      rules: {
+        post_name: {
+          type: 'array',
+          required: true,
+          trigger: 'change',
+          message: '请输入物流公司'
+        },
+        post_code: {
+          required: true,
+          validator: validateCode,
+          trigger: 'blur'
+        },
+        post_fee: {
+          required: true,
+          validator: validate_num,
+          trigger: 'blur'
+        }
+        // remark: {
+        //   required: true,
+        //   validator: validate_remark,
+        //   trigger: 'blur'
+        // }
+      }
+    }
+  },
+  watch: {
+    newTime: function(val) {
+      if (val) {
+        this.initForm()
+      }
+    }
+  },
+  mounted() {
+    this.initForm()
   },
   methods: {
-    async number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+    async initForm() {
+      this.loading = true
+      await this.resetForm()
+      this.loading = false
     },
-    // 商品保存提交
+    removeDomain(index) {
+      if (this.ruleForm.post_code.length === 1) {
+        this.$message.warning('至少填写一个快递单号！')
+        return
+      }
+      if (index !== -1) {
+        this.ruleForm.post_code.splice(index, 1)
+      }
+    },
+    addDomain() {
+      this.ruleForm.post_code.push({
+        value: '',
+        key: Date.now()
+      })
+    },
+    // 初始化表单
+    async resetForm() {
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+
+          const {
+            post_code,
+            post_name,
+            post_fee,
+            remark,
+            order_source
+          } = this.sitem
+          this.order_source = order_source
+          this.ruleForm = {
+            post_name: post_name ? [post_name] : [],
+            post_code: [
+              {
+                value: post_code || '',
+                key: Date.now()
+              }
+            ],
+            post_fee: post_fee || '',
+            remark: remark || ''
+            // sendtime: "",
+          }
+        }
+      })
+    },
+    // 保存更改
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
-          if (this.loading) {return;}
-          this.loading = true;
-          const model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.outChildCode = this.sitem.outChildCode;
-          model.post_name = model.post_name.toString();
-          let res = await asyncRequest.express({list:[model]});
-          this.loading = false;
-          
-          if (res && res.code === 0) {
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
+          if (this.loading) {
+            return
+          }
+          this.loading = true
+          const { post_code, post_name, post_fee } = this.ruleForm
+          const { outChildCode } = this.sitem
+
+          const model = {
+            list: post_code.map(post_code => ({
+              post_fee,
+              post_code: post_code.value,
+              post_name: Array.isArray(post_name) ? post_name[0] : post_name,
+              outChildCode
+            }))
+          }
+
+          delete model['page']
+
+          const { code, message } = await asyncRequest.express(model)
+          this.loading = false
+          if (code === 0) {
+            this.$notify.success({
+              title: '添加成功',
+              message: ''
+            })
+            this.$emit('refresh')
+          } else if (code >= 100 && code <= 104) {
+            await this.logout()
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
     handleCompany(e) {
-      console.log(e);
-      this.ruleForm.post_name = e && e.code ? [e.label] : [];
-      this.$refs.ruleForm.validateField("post_name");
+      const { code, id, label } = e
+      this.ruleForm.post_name = label ? [label] : []
+      this.$refs.ruleForm.validateField('post_name')
     },
-  },
-};
+    number_change(e, key) {
+      this.ruleForm[key] = e + '' || '0'
+      this.$refs.ruleForm.validateField(key)
+    }
+  }
+}
 </script>
+
+<style lang="scss" scoped>
+.account {
+}
+</style>