Merge branch 'dev' into sit

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

@@ -6,7 +6,7 @@
     :size="'mini'"
     status-icon
     ref="ruleForm"
-    label-width="90px"
+    label-width="95px"
     class="demo-ruleForm"
   >
     <el-row>
@@ -19,19 +19,6 @@
             maxlength="100"
           />
         </el-form-item>
-        <el-form-item label="物流公司" prop="post_name">
-          <search-express
-            :value="ruleForm.post_name"
-            :placeholder="'物流公司'"
-            :names="''"
-            :size="'mini'"
-            :is-detail="false"
-            @searchChange="handleCompany"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="8">
         <el-form-item label="物流费用" prop="post_fee">
           <digital-input
             :values="ruleForm.post_fee"
@@ -47,27 +34,64 @@
             @reschange="number_change($event, 'post_fee')"
           />
         </el-form-item>
-        <el-form-item label="物流单号" prop="post_code">
-          <el-input
-            placeholder="物流单号"
-            v-model="ruleForm.post_code"
-            maxlength="100"
-          />
-        </el-form-item>
       </el-col>
+
       <el-col :span="16">
         <el-form-item label="备注" prop="remark">
           <el-input
             type="textarea"
             placeholder="备注"
+            :autosize="{ minRows: 4, maxRows: 4 }"
             v-model="ruleForm.remark"
             maxlength="100"
           />
         </el-form-item>
       </el-col>
+      <el-col :span="24">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="物流公司" prop="post_name">
+              <search-express
+                :value="ruleForm.post_name"
+                :placeholder="'物流公司'"
+                :names="''"
+                :size="'mini'"
+                :is-detail="false"
+                @searchChange="handleCompany"
+              /> </el-form-item
+          ></el-col>
+          <el-col
+            :span="8"
+            v-for="(domain, index) in ruleForm.post_code"
+            :key="domain.key"
+          >
+            <el-form-item
+              :label="'物流单号' + (index + 1)"
+              :key="domain.key"
+              :prop="'post_code.' + index + '.value'"
+              :rules="const_post"
+            >
+              <el-input placeholder="物流单号" v-model="domain.value" maxlength="20">
+                <el-button
+                  slot="append"
+                  icon="el-icon-delete"
+                  @click.prevent="removeDomain(index)"
+                ></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-col>
 
-      <el-col :span="8" style="text-align: right">
-        <el-button type="primary" :size="'mini'" @click="submitForm"
+      <el-col :span="24" style="text-align: right; padding: 0 0 16px 0">
+        <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"
           >保 存
         </el-button>
       </el-col>
@@ -77,12 +101,8 @@
 <script>
 import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
 import resToken from "@/mixins/resToken";
-import {
-  isnumber,
-  isnumber2,
-  isAlphanumeric,
-  isChinese,
-} from "@/utils/validate";
+import { isnumber, isAlphanumeric } from "@/utils/validate";
+// import ladderPriceVue from "@/views/goodStore/goodsCost/ladderPrice.vue";
 export default {
   name: "wsmInOrderAdd",
   props: ["id", "sitem", "newTime"],
@@ -97,24 +117,44 @@ export default {
       }
     };
     const validateCode = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("不能为空!"));
-      } else {
-        if (isChinese(value)) {
-          callback(new Error("仅支持字母和数字及特殊符号!"));
+      const { required } = rule;
+      const l = value.length;
+      if (required) {
+        if (value === "") {
+          callback(new Error("物流单号不能为空!"));
+        } else if (value === "0") {
+          callback();
+        } else if (l < 10 || l > 20) {
+          callback(new Error("仅支持0;纯数字或字母数字组合(10~20位)!"));
+        } else if (isnumber(value)) {
+          callback();
+        } else if (isAlphanumeric(value)) {
+          callback(new Error("仅支持0;纯数字或字母数字组合(10~20位)!"));
         } else {
           callback();
         }
+      } else {
+        callback();
       }
     };
 
     return {
       loading: true,
+      const_post: {
+        required: true,
+        validator: validateCode,
+        trigger: "blur",
+      },
       ruleForm: {
         outCode: "",
         send_num: "",
         post_name: [],
-        post_code: "",
+        post_code: [
+          {
+            value: "",
+            key: Date.now(),
+          },
+        ],
         post_fee: "",
         remark: "",
         // sendtime: "",
@@ -160,7 +200,21 @@ export default {
       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(() => {
@@ -168,13 +222,24 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
 
-          const { outCode, send_num, post_code, post_name, post_fee, remark } =
-            this.sitem;
+          const {
+            outCode,
+            send_num,
+            post_code,
+            post_name,
+            post_fee,
+            remark,
+          } = this.sitem;
           this.ruleForm = {
             outCode: outCode || "",
             send_num: send_num || "",
             post_name: post_name ? [post_name] : [],
-            post_code: post_code || "",
+            post_code: [
+              {
+                value: post_code || "",
+                key: Date.now(),
+              },
+            ],
             post_fee: post_fee || "",
             remark: remark || "",
             // sendtime: "",
@@ -190,22 +255,51 @@ export default {
             return;
           }
           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}`;
+            if (si.value === "0") {
+              is_has++;
+              if (postName !== "其他") {
+                isok = false;
+              }
+            }
+          });
+          if (!isok) {
+            this.$message.warning("快递单号填零，物流公司必须选择其他！");
+            this.loading = false;
+            return;
+          }
+          if (is_has > 0 && post_code.length > 2) {
+            this.$message.warning("多物流单号不允许填零！");
+            this.loading = false;
+            return;
+          }
+
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.post_name = model.post_name.toString();
+          model.post_name = postName;
+          model.post_code = post_list;
+
           delete model["send_num"];
           delete model["page"];
-          const res = await asyncRequest.saleoutsend(model);
+          console.log(model);
+
+          const { code, message } = await asyncRequest.saleoutsend(model);
           this.loading = false;
-          if (res && res.code === 0) {
+          if (code === 0) {
             this.$notify.success({
               title: "添加成功",
               message: "",
             });
-            this.$emit("refresh"); //抛出事件给详情页。
-          } else if (res && res.code >= 100 && res.code <= 104) {
+            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!!");
@@ -226,7 +320,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .account {
 }
 </style>

src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="orderImport pagePadding" v-loading="loading">
-    <div
-      v-if="tableData && tableData.length > 0"
-      class="tr"
-      style="padding: 10px 0 0 0"
-    >
+    <div v-if="tableData && tableData.length > 0" class="tr" style="padding: 10px 0 0 0">
       <el-button @click="cancel" :size="'mini'">取消</el-button>
       <el-button type="primary" @click="submit" :size="'mini'">提交</el-button>
     </div>
@@ -25,12 +21,13 @@
 import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
 import resToken from "@/mixins/resToken";
 import { sendOutOrderColumns, head } from "./columns";
-
+import { isnumber, isAlphanumeric } from "@/utils/validate";
 export default {
   mixins: [resToken],
   name: "orderImport",
   data() {
     return {
+      code_msg: "仅支持0;纯数字或字母数字组合(10~20位)!",
       ruleForm: {
         order_addr: [], //收货地址
       },
@@ -93,7 +90,6 @@ export default {
         }
         let hederOk = true;
         this.head.forEach((v1, i1) => {
-          
           if (v1 !== header[i1].replace(/\s*/g, "")) {
             console.log(v1 + "----" + header[i1]);
             hederOk = false;
@@ -113,12 +109,15 @@ export default {
             let model = {};
             let arr = Object.values(obj);
             arr.forEach((key, ii) => {
+              let key_n = key ?? "";
+              const s = /\\|\/|\?|\?|\*|\"|\“|\”|\'|\‘|\’|\，|\；|\？|\<|\>|\{|\}|\[|\]|\[|\]|\:|\:|\.|\^|\$|\!|\~|\`|\|/g;
+
               Object.defineProperty(model, `value${ii}`, {
-                value: key !== null && key !== undefined ? key + "" : "",
+                value: ii === 28 ? key_n.replace(s, ",") : key_n,
               });
             });
             this.tableData.push(model);
-            console.log(this.tableData)
+            console.log(this.tableData);
           });
         } catch (e) {
           console.log(e);
@@ -130,6 +129,29 @@ export default {
     cancel() {
       this.tableData = [];
     },
+    validateCode(str) {
+      let arr = str.split(",");
+      let isok = true;
+      arr.forEach((value) => {
+        const l = value.length;
+        let res = true;
+        if (value === "0") {
+          res = true;
+        } else if (l < 10 || l > 20) {
+          res = false;
+        } else if (isnumber(value)) {
+          res = true;
+        } else if (isAlphanumeric(value)) {
+          res = false;
+        } else {
+          res = true;
+        }
+        if (!res) {
+          isok = false;
+        }
+      });
+      return isok;
+    },
 
     //提交
     async submit() {
@@ -142,7 +164,8 @@ export default {
         }
 
         let isok = true,
-          list = [];
+          list = [],
+          is_codeok = true;
 
         this.tableData.forEach((key, index) => {
           if (
@@ -159,6 +182,9 @@ export default {
             post_fee: key["value29"],
             remark: key["value30"],
           };
+          if (!this.validateCode(key["value28"])) {
+            is_codeok = false;
+          }
 
           console.log(ketitem);
           list.push(ketitem);
@@ -166,8 +192,15 @@ export default {
         if (!isok) {
           this.$notify.warning({
             title: "以下单号不能为空!",
-            message:
-              "发货申请单号/发货申请单物流单号/发货申请单物流费用/发货申请单备注",
+            message: "发货申请单号/发货申请单物流单号/发货申请单物流费用/发货申请单备注",
+          });
+          this.loading = false;
+          return;
+        }
+        if (!is_codeok) {
+          this.$notify.warning({
+            title: "部分物流单号不符合规则!",
+            message: code_msg,
           });
           this.loading = false;
           return;