fix(数据修复)

src/views/dataCorrection/customerCorrection/components/addEdit.vue

@@ -129,7 +129,6 @@
               </el-col>
               <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
                 <el-select
-                  disabled
                   :size="searchSize"
                   v-model="parmValue.order_type"
                   filterable
@@ -344,7 +343,7 @@ export default {
       parmValue: {
         use_type: "",
         order_source: "",
-        order_type: "3", //订单来源
+        order_type: "", //订单来源
         orderCode: "", //销售订单code
         apply_name: "", // 申请人
         good_name: "", // 产品名称
@@ -403,7 +402,7 @@ export default {
       this.input = "";
       this.customerCode = [];
       this.parmValue = {
-        order_type: "3",
+        order_type: "",
         orderCode: "", //销售订单code
         apply_name: "", // 申请人
         good_name: "", // 产品名称

src/views/dataCorrection/customerCorrection/components/correctionForm.vue

@@ -320,18 +320,21 @@ import {
 } from "@/assets/js/statusList";
 import WaitApproval from "./waitApproval.vue";
 import resToken from "../../../../mixins/resToken";
+import { isnumber } from "../../../../utils/validate";
 
-const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
+// const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
 
 const VALID_OA_CODE = function(_1, _2, callback) {
   const { oaCode } = this.ruleForm;
   if (!oaCode) {
     callback(new Error("OA编号不能为空!"));
   } else {
-    if (reg.test(oaCode)) {
-      callback();
+    if (!isnumber(oaCode)) {
+      callback(new Error("OA编号必须为纯数字!"));
+    } else if (oaCode.length !== 12) {
+      callback(new Error("OA编号必须为12位!"));
     } else {
-      callback(new Error("OA编号必须包含数字和字母!"));
+      callback();
     }
   }
 };
@@ -345,7 +348,6 @@ const VALID_SUPPLIER = function(_1, _2, callback) {
   ) {
     callback(new Error("请选择客户公司!"));
   } else {
-    console.log(supplierNo[0], this.sitem.customer_code);
     if (supplierNo[0] === this.sitem.customer_code) {
       callback(new Error("修改的客户公司不能与销售单原客户公司一致!"));
     } else {
@@ -516,7 +518,6 @@ export default {
       try {
         await this.$refs.ruleForm.validate();
         const { supplierName, ...rest } = this.ruleForm;
-
         const apply_name = this.activeOptions.find(
           ({ id }) => id === rest.uid[0]
         ).nickname;
@@ -536,6 +537,8 @@ export default {
           }
         };
 
+        console.log(111);
+
         this.loading = true;
         const res = await asyncRequest.create(payload);
         this.loading = false;
@@ -575,14 +578,6 @@ export default {
         this.sitem = res.data;
         this.ruleForm.cgdNo = this.sitem.orderCode;
 
-        this.ruleForm.supplierName = this.sitem.customerName
-          ? [this.sitem.customerName]
-          : [];
-
-        this.ruleForm.supplierNo = this.sitem.customer_code
-          ? [this.sitem.customer_code]
-          : [];
-
         if (this.mode !== "update") {
           this.$refs.ruleForm && this.$refs.ruleForm.validateField("cgdNo");
         }

src/views/dataCorrection/customerCorrection/index.vue

@@ -67,6 +67,16 @@
                   @click="searchList"
                 >刷新</el-button>
               </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >重置</el-button>
+              </el-col>
+
               <el-col
                 :span="3"
                 class="fr"
@@ -82,15 +92,6 @@
                   })"
                 >添加</el-button>
               </el-col>
-
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  :size="searchSize"
-                  style="float: right"
-                  @click="restSearch"
-                >重置</el-button>
-              </el-col>
             </el-row>
           </div>
         </template>

src/views/dataCorrection/taxCorrection/components/correctionForm.vue

@@ -167,18 +167,20 @@ import asyncRequest from "@/apis/service/dataCorrection/order";
 import { cg_order_type_options } from "@/assets/js/statusList";
 import WaitApproval from "./waitApproval.vue";
 import resToken from "../../../../mixins/resToken";
+import { isnumber } from "../../../../utils/validate";
 
-const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
-
+// const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
 const VALID_OA_CODE = function(_1, _2, callback) {
   const { oaCode } = this.ruleForm;
   if (!oaCode) {
     callback(new Error("OA编号不能为空!"));
   } else {
-    if (reg.test(oaCode)) {
-      callback();
+    if (!isnumber(oaCode)) {
+      callback(new Error("OA编号必须为纯数字!"));
+    } else if (oaCode.length !== 12) {
+      callback(new Error("OA编号必须为12位!"));
     } else {
-      callback(new Error("OA编号必须包含数字和字母!"));
+      callback();
     }
   }
 };
@@ -400,10 +402,9 @@ export default {
       const { data } = result;
       const { spuCode, tax } = data;
       this.sitem = data;
-      this.ruleForm.supplierNo = Number(tax);
-      console.log(this.ruleForm);
+      // this.ruleForm.supplierNo = Number(tax);
       this.ruleForm.cgdNo = spuCode;
-      this.refs.ruleForm.validateField(["supplierNo", "cgdNo"]);
+      this.refs.ruleForm.validateField(["cgdNo"]);
     },
     getNewTime() {
       this.newTime = new Date().valueOf();

src/views/dataCorrection/taxCorrection/index.vue

@@ -77,6 +77,14 @@
                   @click="searchList"
                 >刷新</el-button>
               </el-col>
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >重置</el-button>
+              </el-col>
               <el-col
                 :span="3"
                 class="fr"
@@ -92,15 +100,6 @@
                   })"
                 >添加</el-button>
               </el-col>
-
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  :size="searchSize"
-                  style="float: right"
-                  @click="restSearch"
-                >重置</el-button>
-              </el-col>
             </el-row>
           </div>
         </template>
@@ -117,7 +116,6 @@
         </template>
 
         <template #supplierBefore="{scope}">{{scope.row.before.tax}}%</template>
-
         <template #supplierAfter="{scope}">{{scope.row.after.tax}}%</template>
         <template #operation="{ scope }">
           <el-tooltip effect="dark" content="详情" placement="top">

src/views/dataCorrection/vendorCorrection/components/correctionForm.vue

@@ -12,9 +12,9 @@
     <el-row>
       <el-collapse-item v-if="mode === 'update'" title="业务详情" name="0">
         <show-data-table
+          v-if="detail"
           style="margin: 0; padding: 0"
           :sitem="detail"
-          v-if="detail"
           :columns="mianColumns"
         >
           <template #before>
@@ -123,13 +123,9 @@
                   </template>
 
                   <template slot="wsm">
-                    <span>{{ sitem.wsm_supplier }}/{{ sitem.wsm_name }}</span>
+                    <span>{{ sitem.wsm_name }}</span>
                     <el-popover placement="top" width="300" trigger="hover">
                       <ul>
-                        <li>
-                          <span>仓库公司编号：</span>
-                          <span>{{ sitem.wsm_supplierNo }}</span>
-                        </li>
                         <li>
                           <span>仓库名称编号：</span>
                           <span>{{ sitem.wsm_code }}</span>
@@ -277,18 +273,17 @@ import asyncRequest from "@/apis/service/dataCorrection/order";
 import { cg_order_type_options } from "@/assets/js/statusList";
 import WaitApproval from "./waitApproval.vue";
 import resToken from "../../../../mixins/resToken";
-
-const reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/;
+import { isnumber } from "../../../../utils/validate";
 
 const VALID_OA_CODE = function(_1, _2, callback) {
   const { oaCode } = this.ruleForm;
   if (!oaCode) {
     callback(new Error("OA编号不能为空!"));
   } else {
-    if (reg.test(oaCode)) {
-      callback();
-    } else {
-      callback(new Error("OA编号必须包含数字和字母!"));
+    if (!isnumber(oaCode)) {
+      callback(new Error("OA编号必须为纯数字!"));
+    } else if (oaCode.length !== 12) {
+      callback(new Error("OA编号必须为12位!"));
     }
   }
 };