feat

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

@@ -544,6 +544,8 @@ export default {
           this.$router.push("/dataCorrection/customerCorrection");
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
+        } else {
+          this.$message.warning(res.message);
         }
       } catch (e) {
         console.log(e);

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

@@ -43,7 +43,6 @@
                   v-model="parmValue.status"
                   filterable
                   clearable
-                  disabled
                   placeholder="采购单状态"
                   style="width: 100%"
                   @change="
@@ -85,7 +84,7 @@
                 </el-select>
               </el-col>
 
-              <el-col :span="4" style="width: 130px; padding: 0 10px">
+              <!-- <el-col :span="4" style="width: 130px; padding: 0 10px">
                 <el-dropdown @command="handleClick($event)" :size="searchSize">
                   <el-button :size="searchSize" style="width: 120px">
                     {{ sselect }}
@@ -95,7 +94,7 @@
                     <el-dropdown-item v-for="item in options" :key="item" :command="item">{{ item }}</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-              </el-col>
+              </el-col>-->
 
               <el-col :span="4" style="width: 300px; padding: 0 0 10px 10px">
                 <period-date-picker
@@ -118,7 +117,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="6" style="width: 500px; padding: 0 0 0 0px">
+              <el-col :span="4" style="width: 380px; padding: 0 0 0 0px">
                 <el-input
                   clearable
                   placeholder="关键字"
@@ -147,11 +146,24 @@
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
                     <el-option label="供应商负责人" value="6"></el-option>
-                    <el-option label="采购供应商编号" value="7"></el-option>
+                    <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
                     <el-option label="订单编号" value="8"></el-option>
                   </el-select>
                 </el-input>
               </el-col>
+              <el-col :span="4" style="width: 300px;margin-left:10px">
+                <search-supplier
+                  :size="'mini'"
+                  :value="parmValue.supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="parmValue.supplierName"
+                  :isDetail="true"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
               </el-col>
@@ -254,7 +266,7 @@ export default {
         apply_name: "", // 申请人
         good_name: "", // 产品名称
         good_code: "", // 产品属性编号
-        status: "0", //状态
+        status: "", //状态
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
         end: "", // 新建结束时间
@@ -262,8 +274,9 @@ export default {
         last_end: "", //最后入库时间结束
         page: 1, // 页码
         size: 15, // 每页显示条数
-        supplierNo: "",
-        wsm_supplierNo: ""
+        supplierNo: [],
+        wsm_supplierNo: "",
+        supplierName: []
       },
       tableData: [],
       // 表格 - 数据
@@ -313,6 +326,8 @@ export default {
         end: "" // 结束时间
       };
       this.parmValue = {
+        supplierNo: [],
+        supplierName: [],
         order_type: "3",
         bk_code: "", // 备库编码
         orderCode: "", // 订单编号
@@ -321,7 +336,7 @@ export default {
         apply_name: "", // 申请人
         good_name: "", // 产品名称
         good_code: "", // 产品属性编号
-        status: "0", //状态
+        status: "", //状态
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
         end: "", // 新建结束时间
@@ -338,6 +353,12 @@ export default {
       };
       this.searchList();
     },
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.parmValue.supplierNo = code ? [code] : [];
+      this.parmValue.supplierName = label ? [label] : [];
+      this.searchList();
+    },
     async handleClick(e) {
       this.sselect = e;
       this.parmValue.start = e === "创建时间" ? this.timeOBJ.start : "";
@@ -372,10 +393,20 @@ export default {
       this.parmValue.good_code = this.select === "4" ? this.input : ""; // 产品属性编号
       this.parmValue.good_name = this.select === "5" ? this.input : ""; // 产品名称
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
-      this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 订单编号
+
+      // this.parmValue.supplierNo = Array.isArray(this.parmValue.supplierNo)
+      //   ? this.parmValue.supplierNo[0]
+      //   : "";
+
       // this.wsm_supplierNo = [];
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.list({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo)
+          ? this.parmValue.supplierNo[0]
+          : this.parmValue.supplierNo
+      });
+
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);

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

@@ -483,8 +483,7 @@ export default {
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
         } else {
-          this.tableData = [];
-          this.pageInfo.total = 0;
+          this.$message.warning(res.message);
         }
       } catch (e) {
         console.log(e);
@@ -541,8 +540,8 @@ export default {
           } = this.sitem;
           this.order_type = order_type || "";
           this.supplierNo = supplierNo || "";
-          this.ruleForm.supplierName = supplier_name || "";
-          this.ruleForm.supplierNo = supplierNo ? [supplierNo] : [];
+          // this.ruleForm.supplierName = supplier_name || "";
+          // this.ruleForm.supplierNo = supplierNo ? [supplierNo] : [];
           if (this.order_type === "1") {
             this.wsm_supplier = wsm_supplier || "";
             this.wsm_supplierNo = wsm_supplierNo || "";

src/views/dataCorrection/vendorCorrection/index.vue

@@ -77,6 +77,15 @@
                   @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 +101,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>