build

src/components/addr-add-edit-modal/index.vue

@@ -1,18 +1,18 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="title"
     :center="true"
     align="left"
     top="8vh"
     width="600px"
-    @close="showModelThis = false"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
-    v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
     append-to-body
+    @close="showModelThis = false"
   >
     <el-card style="margin-top: -20px">
       <el-form
@@ -72,86 +72,86 @@ import {
   isEmoticon,
   isSpecialSymbol,
   hasSpace,
-  isAddr,
-} from "@/utils/validate";
-import { province_list, city_list, county_list } from "@/assets/js/area-data";
-import asyncRequest from "@/apis/components/addr-add-edit-modal";
+  isAddr
+} from '@/utils/validate'
+import { province_list, city_list, county_list } from '@/assets/js/area-data'
+import asyncRequest from '@/apis/components/addr-add-edit-modal'
 export default {
-  name: "AddrAddEditModal",
-  props: ["showModel", "index", "sitem", "type"],
+  name: 'AddrAddEditModal',
+  props: ['showModel', 'index', 'sitem', 'type'],
   data() {
     const validateWeight = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("不能为空!"));
+      if (value === '') {
+        callback(new Error('不能为空!'))
       } else {
         if (!isnumber(value)) {
-          callback(new Error("仅支持整数!"));
+          callback(new Error('仅支持整数!'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空！"));
+      if (value === '') {
+        callback(new Error('手机号不能为空！'))
       } else {
         if (!isMobile(value)) {
-          callback(new Error("手机号格式不正确！"));
+          callback(new Error('手机号格式不正确！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validatecontactor = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("联系人不能为空！"));
+      if (value === '') {
+        callback(new Error('联系人不能为空！'))
       } else {
         if (value.length < 2 || value.length > 10) {
-          callback(new Error("联系人规则为2~10位汉字！"));
+          callback(new Error('联系人规则为2~10位汉字！'))
         } else {
           if (!isChinese(value)) {
-            callback(new Error("联系人规则为2~10位汉字！"));
+            callback(new Error('联系人规则为2~10位汉字！'))
           } else if (isEmoticon(value)) {
-            callback(new Error("联系人规则为2~10位汉字！"));
+            callback(new Error('联系人规则为2~10位汉字！'))
           } else {
-            callback();
+            callback()
           }
         }
       }
-    };
+    }
     const validateAddr = (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 if (isAddr(value)) {
-          callback();
+          callback()
         } else {
-          callback(new Error("详细地址填写不规范！"));
+          callback(new Error('详细地址填写不规范！'))
         }
       }
-    };
+    }
     return {
       roleList: [],
       loading: false,
-      title: "",
+      title: '',
       organizeList: [],
       pickerOptions: {
         disabledDate: (time) => {
-          return time.getTime() < new Date().valueOf();
-        },
+          return time.getTime() < new Date().valueOf()
+        }
       },
       showModelThis: this.showModel,
       ruleForm: {
-        receipt_quantity: "",
-        contactor: "",
-        mobile: "",
+        receipt_quantity: '',
+        contactor: '',
+        mobile: '',
         addr_code: [],
-        addr: "",
-        id: "",
+        addr: '',
+        id: ''
       },
       rulesThis: this.rules,
       rules: {
@@ -159,80 +159,80 @@ export default {
           {
             required: true,
             validator: validateWeight,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
 
         contactor: [
           {
             required: true,
-            trigger: "blur",
-            validator: validatecontactor,
-          },
+            trigger: 'blur',
+            validator: validatecontactor
+          }
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
 
         addr_code: [
           {
-            type: "array",
+            type: 'array',
             required: false,
-            message: "收货省市区不能为空",
-            trigger: "change",
-          },
+            message: '收货省市区不能为空',
+            trigger: 'change'
+          }
         ],
         addr: [
           {
             required: true,
             validator: validateAddr,
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     itemidChange(e) {
-      this.ruleForm.itemid = e;
-      this.$refs.ruleForm.validateField("itemid");
+      this.ruleForm.itemid = e
+      this.$refs.ruleForm.validateField('itemid')
     },
     async initForm() {
-      this.loading = true;
+      this.loading = true
 
       if (this.index === -1) {
-        this.title = "添加收货地址";
+        this.title = '添加收货地址'
       } else {
-        this.title = "修改收货地址";
+        this.title = '修改收货地址'
       }
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.loading = false
     },
 
     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 {
             receipt_quantity,
             contactor,
@@ -241,122 +241,122 @@ export default {
             addr_code_name,
             addr,
             in_addr,
-            id,
-          } = this.sitem;
+            id
+          } = this.sitem
           this.ruleForm = {
             receipt_quantity,
             contactor,
             mobile,
-            in_addr: in_addr || "",
+            in_addr: in_addr || '',
             addr_code: addr_code && addr_code.length === 3 ? addr_code : [],
-            addr_code_name: addr_code_name || "",
+            addr_code_name: addr_code_name || '',
             addr,
-            id: id || "",
-          };
+            id: id || ''
+          }
         }
-      });
+      })
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
-          this.showModelThis = false;
-          //addr_code_name
-          this.$emit("refresh", {
+          this.showModelThis = false
+          // addr_code_name
+          this.$emit('refresh', {
             index: this.index,
-            item: JSON.parse(JSON.stringify(this.ruleForm)),
-          });
+            item: JSON.parse(JSON.stringify(this.ruleForm))
+          })
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
-    //省市区选择
+    // 省市区选择
     async select_area_change(e) {
-      this.ruleForm.addr_code = e;
-      this.$refs.ruleForm.validateField("addr_code");
+      this.ruleForm.addr_code = e
+      this.$refs.ruleForm.validateField('addr_code')
 
-      const { addr_code } = this.ruleForm;
+      const { addr_code } = this.ruleForm
       if (addr_code && addr_code.length === 3) {
-        let arrCode = addr_code[addr_code.length - 1];
+        const arrCode = addr_code[addr_code.length - 1]
         // console.log(model);
-        let { code, data, message } = await asyncRequest.addrall({
-          code: arrCode,
-        });
+        const { code, data, message } = await asyncRequest.addrall({
+          code: arrCode
+        })
         if (code === 0) {
-          const { province, city, area } = data;
-          let province_name = province && province.name ? province.name : "";
-          let city_name = city && city.name ? city.name : "";
-          let area_name = area && area.name ? area.name : "";
+          const { province, city, area } = data
+          const province_name = province && province.name ? province.name : ''
+          const city_name = city && city.name ? city.name : ''
+          const area_name = area && area.name ? area.name : ''
           this.addrForm.addr_code_name =
             province_name && city_name && area_name
               ? `${province_name}/${city_name}/${area_name}`
-              : "";
+              : ''
         } else if (code >= 100 && code <= 104) {
-          await this.logout();
+          await this.logout()
         } else {
-          this.$message.warning(message);
+          this.$message.warning(message)
         }
       } else {
-        this.addrForm.addr_code_name = "";
+        this.addrForm.addr_code_name = ''
       }
     },
     get_code(name1, name2, name3) {
-      let name = "",
-        code = [];
+      let name = ''
+      let code = []
       if (name1 && name2 && name3) {
-        for (let x in province_list) {
+        for (const x in province_list) {
           if (name1 === province_list[x]) {
-            code.push(x);
-            name += province_list[x];
-            break;
+            code.push(x)
+            name += province_list[x]
+            break
           }
         }
         if (code.length === 1) {
-          for (let y in city_list) {
+          for (const y in city_list) {
             if (name2 === city_list[y]) {
-              code.push(y);
-              name += "/" + city_list[y];
-              break;
+              code.push(y)
+              name += '/' + city_list[y]
+              break
             }
           }
         }
         if (code.length === 2) {
-          for (let z in county_list) {
+          for (const z in county_list) {
             if (name3 === county_list[z]) {
-              code.push(z);
-              name += "/" + county_list[z];
-              break;
+              code.push(z)
+              name += '/' + county_list[z]
+              break
             }
           }
         }
 
         if (code.length === 3) {
-          let str1 = "",
-            str2 = "",
-            isok = false;
-          str1 = code[0].slice(0, 2);
-          str2 = code[1].slice(2, 4);
+          let str1 = ''
+          let str2 = ''
+          let isok = false
+          str1 = code[0].slice(0, 2)
+          str2 = code[1].slice(2, 4)
           if (
             code[1].indexOf(str1) === 0 &&
             code[2].indexOf(str1) === 0 &&
             code[2].indexOf(str2) == 2
           ) {
-            isok = true;
+            isok = true
           }
           if (!isok) {
-            name = "";
-            code = [];
+            name = ''
+            code = []
           }
         } else {
-          name = "";
-          code = [];
+          name = ''
+          code = []
         }
       }
-      return { name: name, code: code };
-    },
-  },
-};
+      return { name: name, code: code }
+    }
+  }
+}
 </script>
 
 <style></style>

src/views/sellOut/sellAfterApply/components/approval-results.vue

@@ -17,7 +17,7 @@
           :size="'mini'"
           :value="formData.wsm_code"
           placeholder="退货仓库"
-          :is-detail="true"
+          :is-detail="false"
           :is-relation="true"
           :names="wsm_code_name"
           :company-no="currentCompany"
@@ -103,8 +103,6 @@ export default {
       }
     }
   },
-  mounted() {
-  },
   methods: {
     async stockChange(e) {
       const { code, label, contactor, mobile, addr_cn } = e

src/views/sellOut/sellAfterApply/components/supplier-confirm.vue

@@ -14,7 +14,7 @@
         <el-input v-model="formData.contactor" />
       </el-form-item>
       <el-form-item label="联系电话" prop="mobile">
-        <el-input v-model="formData.mobile" max-length="11" />
+        <el-input v-model="formData.mobile" :maxlength="11" />
       </el-form-item>
       <el-form-item label="退货地址" prop="addr_code">
         <select-area
@@ -40,7 +40,7 @@
 </template>
 <script>
 import { replaceTextWrapAndSpace } from '@/utils'
-import { isMobile } from '@/utils/validate'
+import { hasSpace, isAddr, isMobile, isSpecialSymbol } from '@/utils/validate'
 
 const validatename = (rule, value, callback) => {
   if (value === '') {
@@ -60,6 +60,22 @@ const validatemobile = (rule, value, callback) => {
     }
   }
 }
+
+const validateAddr = (rule, value, callback) => {
+  if (value === '') {
+    callback(new Error('详细地址不能为空！'))
+  } else {
+    if (hasSpace(value)) {
+      callback(new Error('不能出现回车/换行符！'))
+    } else if (isSpecialSymbol(value)) {
+      callback(new Error('不能使用英文特殊字符！'))
+    } else if (isAddr(value)) {
+      callback()
+    } else {
+      callback(new Error('详细地址填写不规范！'))
+    }
+  }
+}
 export default {
   name: 'SupplierExam',
   mixins: [],
@@ -90,7 +106,8 @@ export default {
           {
             required: true,
             trigger: 'change',
-            message: '想输入详细地址'
+            validator: validateAddr
+            // message: '想输入详细地址'
           }
         ],
         status: [

src/views/sellOut/sellAfterApply/components/supplier_exam.vue

@@ -14,7 +14,7 @@
         <el-input v-model="formData.contactor" />
       </el-form-item>
       <el-form-item label="联系电话" prop="mobile">
-        <el-input v-model="formData.mobile" max-length="11" />
+        <el-input v-model="formData.mobile" :maxlength="11" />
       </el-form-item>
       <el-form-item label="退货地址" prop="addr_code">
         <select-area
@@ -40,7 +40,7 @@
 </template>
 <script>
 import { replaceTextWrapAndSpace } from '@/utils'
-import { isMobile } from '@/utils/validate'
+import { hasSpace, isAddr, isMobile, isSpecialSymbol } from '@/utils/validate'
 
 const validatename = (rule, value, callback) => {
   if (value === '') {
@@ -61,6 +61,22 @@ const validatemobile = (rule, value, callback) => {
   }
 }
 
+const validateAddr = (rule, value, callback) => {
+  if (value === '') {
+    callback(new Error('详细地址不能为空！'))
+  } else {
+    if (hasSpace(value)) {
+      callback(new Error('不能出现回车/换行符！'))
+    } else if (isSpecialSymbol(value)) {
+      callback(new Error('不能使用英文特殊字符！'))
+    } else if (isAddr(value)) {
+      callback()
+    } else {
+      callback(new Error('详细地址填写不规范！'))
+    }
+  }
+}
+
 export default {
   name: 'SupplierExam',
   mixins: [],
@@ -92,7 +108,8 @@ export default {
           {
             required: true,
             trigger: 'change',
-            message: '请输入详细地址'
+            validator: validateAddr
+            // message: '请输入详细地址'
           }
         ],
         status: [

src/views/supplierSellOut/supplierSellAfterApply/components/approval-results.vue

@@ -17,7 +17,7 @@
           :size="'mini'"
           :value="formData.wsm_code"
           placeholder="退货仓库"
-          :is-detail="true"
+          :is-detail="false"
           :is-relation="true"
           :names="wsm_code_name"
           :company-no="currentCompany"

src/views/supplierSellOut/supplierSellAfterApply/components/supplier-confirm.vue

@@ -14,7 +14,7 @@
         <el-input v-model="formData.contactor" />
       </el-form-item>
       <el-form-item label="联系电话" prop="mobile">
-        <el-input v-model="formData.mobile" max-length="11" />
+        <el-input v-model="formData.mobile" :maxlength="11" />
       </el-form-item>
       <el-form-item label="退货地址" prop="addr_code">
         <select-area
@@ -40,7 +40,7 @@
 </template>
 <script>
 import { replaceTextWrapAndSpace } from '@/utils'
-import { isMobile } from '@/utils/validate'
+import { hasSpace, isAddr, isMobile, isSpecialSymbol } from '@/utils/validate'
 
 const validatename = (rule, value, callback) => {
   if (value === '') {
@@ -60,6 +60,22 @@ const validatemobile = (rule, value, callback) => {
     }
   }
 }
+
+const validateAddr = (rule, value, callback) => {
+  if (value === '') {
+    callback(new Error('详细地址不能为空！'))
+  } else {
+    if (hasSpace(value)) {
+      callback(new Error('不能出现回车/换行符！'))
+    } else if (isSpecialSymbol(value)) {
+      callback(new Error('不能使用英文特殊字符！'))
+    } else if (isAddr(value)) {
+      callback()
+    } else {
+      callback(new Error('详细地址填写不规范！'))
+    }
+  }
+}
 export default {
   name: 'SupplierExam',
   mixins: [],
@@ -90,7 +106,8 @@ export default {
           {
             required: true,
             trigger: 'change',
-            message: '想输入详细地址'
+            validator: validateAddr
+            // message: '想输入详细地址'
           }
         ],
         status: [

src/views/supplierSellOut/supplierSellAfterApply/components/supplier_exam.vue

@@ -14,7 +14,7 @@
         <el-input v-model="formData.contactor" />
       </el-form-item>
       <el-form-item label="联系电话" prop="mobile">
-        <el-input v-model="formData.mobile" max-length="11" />
+        <el-input v-model="formData.mobile" :maxlength="11" />
       </el-form-item>
       <el-form-item label="退货地址" prop="addr_code">
         <select-area
@@ -40,7 +40,7 @@
 </template>
 <script>
 import { replaceTextWrapAndSpace } from '@/utils'
-import { isMobile } from '@/utils/validate'
+import { hasSpace, isAddr, isMobile, isSpecialSymbol } from '@/utils/validate'
 
 const validatename = (rule, value, callback) => {
   if (value === '') {
@@ -61,6 +61,22 @@ const validatemobile = (rule, value, callback) => {
   }
 }
 
+const validateAddr = (rule, value, callback) => {
+  if (value === '') {
+    callback(new Error('详细地址不能为空！'))
+  } else {
+    if (hasSpace(value)) {
+      callback(new Error('不能出现回车/换行符！'))
+    } else if (isSpecialSymbol(value)) {
+      callback(new Error('不能使用英文特殊字符！'))
+    } else if (isAddr(value)) {
+      callback()
+    } else {
+      callback(new Error('详细地址填写不规范！'))
+    }
+  }
+}
+
 export default {
   name: 'SupplierExam',
   mixins: [],
@@ -92,7 +108,7 @@ export default {
           {
             required: true,
             trigger: 'change',
-            message: '请输入详细地址'
+            validator: validateAddr
           }
         ],
         status: [

src/views/supplierSellOut/supplierSellReturn/components/approval-results.vue

@@ -17,7 +17,7 @@
           :size="'mini'"
           :value="formData.return_wsm"
           placeholder="退货仓库"
-          :is-detail="true"
+          :is-detail="false"
           :is-relation="true"
           :names="wsm_code_name"
           :company-no="currentCompany"