修改筛选项

src/views/stock/allot/index.vue

@@ -103,24 +103,24 @@
                 </el-select>
               </el-col>
               <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
-                <el-dropdown
-                  @command="handleClick($event)"
+                <el-select
+                  v-model="parmValue.type"
                   :size="searchSize"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                   style="width: 100%"
                 >
-                  <el-button :size="searchSize" style="width: 100%">
-                    {{ sselect }}
-                    <i class="el-icon-arrow-down el-icon--right" :size="searchSize"></i>
-                  </el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item
-                      v-for="item in options"
-                      :key="item"
-                      :command="item"
-                      >{{ item }}</el-dropdown-item
-                    >
-                  </el-dropdown-menu>
-                </el-dropdown>
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-col>
 
               <el-col :span="4" style="width: 262px; padding: 0 0 0 10px">
@@ -131,7 +131,7 @@
                   :disabled="false"
                   :isDetail="false"
                   :isRelation="true"
-                  :companyNo="parmValue.companyNo"
+                  :relaComNo="parmValue.relaComNo"
                   @searchChange="stockChange"
                 />
               </el-col>
@@ -219,11 +219,6 @@ export default {
       return action ?? [];
     },
   },
-  watch: {
-    sselect() {
-      this.searchList();
-    },
-  },
   data() {
     return {
       supplierNo: "",
@@ -238,18 +233,30 @@ export default {
         { id: "6", label: "调拨驳回" },
       ],
       statusList: statusList,
-      options: ["按出库方和入库方公司筛选", "只按出库方公司筛选", "只按入库方公司筛选"],
+      options: [
+        {
+          value: "3",
+          label: "出库方或入库方公司筛选",
+        },
+        {
+          value: "2",
+          label: "只按出库方公司筛选",
+        },
+        {
+          value: "1",
+          label: "只按入库方公司筛选",
+        },
+      ],
       loading: true,
-      sselect: "按出库方和入库方公司筛选",
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
-        companyNo: "",
+        type: "3",
+        relaComNo: "",
         start: "", //开始日期
         end: "", //结束日期
         allot_code: "", //调拨编号
-        supplierNo: [], //供应商code
         company_name: "", //创建人部门
         stockNo: [], //仓库code
         page: 1,
@@ -282,10 +289,6 @@ export default {
         curr: page,
         total: 0,
       };
-      //多选条件
-      this.sselect = this.parmValue.sselect;
-    } else {
-      this.sselect = "按出库方和入库方公司筛选";
     }
 
     this.searchList();
@@ -298,8 +301,6 @@ export default {
           id: queryId,
         };
 
-        //有多选框的条件
-        this.parmValue.sselect = this.sselect;
         //
         let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
@@ -320,12 +321,9 @@ export default {
       this.pageInfo.curr = 1;
       await this.searchList();
     },
-    handleClick(e) {
-      this.sselect = e;
-    },
+
     // 重置搜索框
     restSearch() {
-      this.sselect = "按出库方和入库方公司筛选";
       this.supplierNo = "";
       // 表格 - 分页
       this.pageInfo = {
@@ -334,7 +332,8 @@ export default {
         total: 0,
       };
       this.parmValue = {
-        companyNo: "",
+        type: "3",
+        relaComNo: "",
         company_name: "", //创建人部门
         start: "", //开始日期
         end: "", //结束日期
@@ -347,9 +346,9 @@ export default {
       this.searchList();
     },
     //业务公司选择
-    async companyNoChange(e) {
+    async relaComNoChange(e) {
       const { code } = e;
-      this.parmValue.companyNo = code || ""; //业务公司编码
+      this.parmValue.relaComNo = code || ""; //业务公司编码
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
       await this.searchList();
@@ -382,7 +381,7 @@ export default {
       this.stockNo;
       this.pageInfo.curr = 1;
       this.parmValue.page = 1;
-      this.parmValue.companyNo = this.currentCompany;
+      this.parmValue.relaComNo = this.currentCompany;
       this.searchList();
     },
     // 获取调拨列表
@@ -400,14 +399,9 @@ export default {
       let stockNo = model.stockNo.length == 1 ? model.stockNo[0] : "";
       delete model["supplierNo"];
       delete model["stockNo"];
-      model.out_companyNo =
-        this.sselect !== "只按入库方公司筛选" ? this.currentCompany : "";
-      model.in_companyNo =
-        this.sselect !== "只按出库方公司筛选" ? this.currentCompany : "";
-      model.wsm_out = this.sselect !== "只按入库方公司筛选" ? stockNo : "";
-      model.wsm_in = this.sselect !== "只按出库方公司筛选" ? stockNo : "";
-      // model.wsm_out_supplierNo = this.sselect == "按出库方筛选" ? supplierNo : "";
-      // model.wsm_in_supplierNo = this.sselect != "按出库方筛选" ? supplierNo : "";
+      model.wsm_code = stockNo || "";
+      model.relaComNo = this.currentCompany;
+      model.needRela = true;
       const { code, data } = await asyncRequest.list(model);
       if (Number(code) === 0) {
         const { list, count } = data;