暂存

src/views/stock/allot/index.vue

@@ -57,7 +57,7 @@
                   />
                 </el-col>
 
-                <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
+                <el-col :span="4" style="width: 235px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"
                     v-model="parmValue.allot_code"
@@ -70,7 +70,7 @@
                   <el-button
                     :size="searchSize"
                     type="primary"
-                    style="float: right; margin-left: 5px"
+                    style="float: right"
                     @click="searchList"
                   >
                     刷新
@@ -78,19 +78,30 @@
                 </el-col>
                 <el-col :span="4" style="width: 66px; float: right">
                   <el-button
-                    style="width: 100%"
                     type="warning"
                     class="mr5"
+                    style="float: right"
                     :size="searchSize"
                     @click="restSearch"
                   >
                     重置
                   </el-button>
                 </el-col>
+                <el-col :span="4" style="width: 66px; float: right">
+                  <el-button
+                    type="success"
+                    class="fr"
+                    style="float: right"
+                    :size="searchSize"
+                    @click="openModal('add', false)"
+                  >
+                    新建
+                  </el-button>
+                </el-col>
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
-              <el-col :span="4" style="width: 165px">
+              <el-col :span="4" style="width: 125px">
                 <el-dropdown @command="handleClick($event)" :size="searchSize">
                   <el-button :size="searchSize">
                     {{ sselect }}
@@ -109,8 +120,17 @@
                   </el-dropdown-menu>
                 </el-dropdown>
               </el-col>
-
-              <el-col :span="4" style="width: 379px; padding: 0 0 0 10px">
+              <el-col :span="12" style="width: 280px; padding: 0 0 0 10px">
+                <search-work-company
+                  :value="parmValue.companyNo"
+                  :names="''"
+                  :size="searchSize"
+                  :is-detail="id !== 'add'"
+                  :placeholder="'业务公司'"
+                  @searchChange="companyNoChange"
+                />
+              </el-col>
+              <el-col :span="4" style="width: 300px; padding: 0 0 0 10px">
                 <search-supplier
                   :size="searchSize"
                   :value="parmValue.supplierNo"
@@ -120,7 +140,7 @@
                   @searchChange="supplierChange"
                 />
               </el-col>
-              <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 272px; padding: 0 0 0 10px">
                 <search-stock
                   :size="searchSize"
                   :value="parmValue.stockNo"
@@ -132,20 +152,6 @@
                   @searchChange="stockChange"
                 />
               </el-col>
-              <el-col
-                :span="4"
-                style="width: 66px; padding-left: 10px; float: right"
-              >
-                <el-button
-                  style="width: 100%"
-                  type="success"
-                  class="fr"
-                  :size="searchSize"
-                  @click="openModal('add', false)"
-                >
-                  新建
-                </el-button>
-              </el-col>
             </el-row>
           </div>
         </template>
@@ -234,13 +240,14 @@ export default {
         { id: "5", label: "调拨已完成" },
       ],
       statusList: statusList,
-      options: ["按出库公司/仓库筛选", "按入库公司/仓库筛选"],
+      options: ["按出库方筛选", "按入库方筛选"],
       loading: true,
-      sselect: "按出库公司/仓库筛选",
+      sselect: "按出库方筛选",
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
+        companyNo: "",
         start: "", //开始日期
         end: "", //结束日期
         allot_code: "", //调拨编号
@@ -267,35 +274,25 @@ export default {
     };
   },
   mounted() {
-    this.sselect = "按出库公司/仓库筛选";
+    this.sselect = "按出库方筛选";
     this.searchList();
   },
 
   methods: {
     // 时间选择
     async handleTime(val) {
-      if (val.startTime !== "") {
-        this.parmValue.start = val.startTime;
-      } else {
-        this.parmValue.start = "";
-      }
-      if (val.endTime !== "") {
-        this.parmValue.end = val.endTime;
-      } else {
-        this.parmValue.end = "";
-      }
-      if (this.parmValue.start !== "" && this.parmValue.end !== "") {
-        this.parmValue.page = 1;
-        this.pageInfo.curr = 1;
-        await this.searchList();
-      }
+      this.parmValue.start = val.startTime || "";
+      this.parmValue.end = val.endTime || "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
     },
     handleClick(e) {
       this.sselect = e;
     },
     // 重置搜索框
     restSearch() {
-      this.sselect = "按出库公司/仓库筛选";
+      this.sselect = "按出库方筛选";
       this.supplierNo = "";
       // 表格 - 分页
       this.pageInfo = {
@@ -304,6 +301,7 @@ export default {
         total: 0,
       };
       this.parmValue = {
+        companyNo: "",
         start: "", //开始日期
         end: "", //结束日期
         allot_code: "", //调拨编号
@@ -314,27 +312,24 @@ export default {
       };
       this.searchList();
     },
+    //业务公司选择
+    async companyNoChange(e) {
+      const { code } = e;
+      this.parmValue.companyNo = code || ""; //业务公司编码
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
+    },
     async supplierChange(e) {
-      if (e && e.id) {
-        this.parmValue.supplierNo = [e.code];
-        this.supplierNo = e.code;
-      } else {
-        this.parmValue.supplierNo = [];
-        this.supplierNo = "";
-      }
-      this.parmValue.stockNo = [];
+      const { code } = e;
+      this.parmValue.supplierNo = code ? [code] : []; //供应商编码
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
       await this.searchList();
     },
     async stockChange(e) {
-      if (e && e.id) {
-        this.parmValue.stockNo = [e.code];
-      } else {
-        this.parmValue.stockNo = [];
-      }
-
-      console.log(e);
+      const { code } = e;
+      this.parmValue.stockNo = code ? [code] : [];
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
       await this.searchList();
@@ -346,26 +341,18 @@ export default {
     },
     // 获取调拨列表
     async searchList() {
-      if (
-        (this.parmValue.start !== "" && this.parmValue.end === "") ||
-        (this.parmValue.start === "" && this.parmValue.end !== "")
-      ) {
-        this.$message.warning("时间区间不完整！");
-        return;
-      }
       this.loading = true;
-
       let model = JSON.parse(JSON.stringify(this.parmValue));
       let supplierNo = model.supplierNo.length == 1 ? model.supplierNo[0] : "",
         stockNo = model.stockNo.length == 1 ? model.stockNo[0] : "";
       delete model["supplierNo"];
       delete model["stockNo"];
-      model.wsm_out = this.sselect == "按出库公司/仓库筛选" ? stockNo : "";
-      model.wsm_in = this.sselect != "按出库公司/仓库筛选" ? stockNo : "";
+      model.wsm_out = this.sselect == "按出库方筛选" ? stockNo : "";
+      model.wsm_in = this.sselect != "按出库方筛选" ? stockNo : "";
       model.wsm_out_supplierNo =
-        this.sselect == "按出库公司/仓库筛选" ? supplierNo : "";
+        this.sselect == "按出库方筛选" ? supplierNo : "";
       model.wsm_in_supplierNo =
-        this.sselect != "按出库公司/仓库筛选" ? supplierNo : "";
+        this.sselect != "按出库方筛选" ? supplierNo : "";
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/stock/stockCount/components/dataWeido/index.vue

@@ -27,10 +27,21 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
-                <el-col :span="12" style="width: 300px; padding: 0">
+                <el-col :span="12" style="width: 300px">
+                  <search-work-company
+                    :value="parmValue.companyNo"
+                    :names="''"
+                    :size="searchSize"
+                    :is-detail="id !== 'add'"
+                    :placeholder="'业务公司'"
+                    @searchChange="supplierChange"
+                  />
+                </el-col>
+                <el-col :span="12" style="width: 300px; padding: 0 0 0 10px">
                   <search-supplier
                     :size="searchSize"
                     :placeholder="'供应商公司'"
+                    :disabled="parmValue.companyNo === ''"
                     :value="parmValue.supplier_code"
                     @searchChange="selectSupplier"
                   />
@@ -40,7 +51,7 @@
                     :isDetail="true"
                     :size="searchSize"
                     :value="parmValue.stock_code"
-                    :disabled="isDisabled"
+                    :disabled="supplier_code === ''"
                     :placeholder="'出库仓库'"
                     :isRelation="true"
                     :companyCode="supplier_code"
@@ -77,62 +88,51 @@
             </el-row>
           </div>
         </template>
-               
         <template #expand="{ scope }">
-                   
           <el-table
             :data="scope.row.child"
             style="width: 100%; paddind: 20px"
             border
             size="small"
           >
-                       
             <el-table-column
               label="商品编码"
               prop="good_code"
               width="150"
             ></el-table-column>
-                       
             <el-table-column
               label="属性编码"
               prop="good_type_code"
               width="130"
             ></el-table-column>
-                       
             <el-table-column
               label="商品名称"
               prop="good_name"
               min-width="150"
               :show-overflow-tooltip="true"
             ></el-table-column>
-                       
             <el-table-column
               label="商品属性"
               prop="attribute"
               min-width="120"
               :show-overflow-tooltip="true"
             ></el-table-column>
-                       
             <el-table-column
               label="分类"
               prop="sort_f"
               width="100"
             ></el-table-column>
-                       
             <el-table-column
               label="可用库存"
               prop="usable_stock"
               width="80"
             ></el-table-column>
-                       
             <el-table-column
               label="在途库存"
               prop="intra_stock"
               width="80"
             ></el-table-column>
-                     
           </el-table>
-                 
         </template>
       </ex-table>
       <add-edit
@@ -176,10 +176,11 @@ export default {
   },
   data() {
     return {
-      loading:false,
+      loading: false,
       stock_code: "",
       supplier_code: "",
       parmValue: {
+        companyNo: "",
         supplier_code: [],
         stock_code: [],
         page: 1, // 页码
@@ -209,35 +210,39 @@ export default {
   },
 
   methods: {
+    //业务公司选择
+    async supplierChange(e) {
+      const { code } = e;
+      this.parmValue.companyNo = code || ""; //业务公司编码
+      this.parmValue.supplier_code = [];
+      this.supplier_code = "";
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
+    },
     // 选择供应商仓库
-    selectStock(e) {
-      if (e && e.id) {
-        this.parmValue.stock_code = [e.code];
-        this.stock_code = e.code;
-      } else {
-        this.parmValue.stock_code = [];
-        this.stock_code = "";
-      }
-      if (this.parmValue.stock_code) {
-        this.searchList();
-      }
+    async selectStock(e) {
+      const { code } = e;
+      this.parmValue.stock_code = code ? [code] : [];
+      this.stock_code = code || "";
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
     },
     // 选择供应商
-    selectSupplier(e) {
-      if (e && e.id) {
-        this.parmValue.supplier_code = [e.code];
-        this.supplier_code = e.code;
-        this.isDisabled = false;
-      } else {
-        this.parmValue.stock_code = [];
-        this.parmValue.supplier_code = [];
-        this.stock_code = "";
-        this.supplier_code = "";
-        this.isDisabled = true;
-      }
-      if (this.parmValue.supplier_code) {
-        this.searchList();
-      }
+    async selectSupplier(e) {
+      const { code } = e;
+      this.parmValue.supplier_code = code ? [code] : [];
+      this.supplier_code = code || "";
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
     },
     restSearch() {
       // 表格 - 分页
@@ -247,6 +252,7 @@ export default {
         total: 0,
       };
       this.parmValue = {
+        companyNo: "",
         supplier_code: [],
         stock_code: [], //仓库编码
         page: 1, // 页码
@@ -256,13 +262,11 @@ export default {
     },
     async searchList() {
       this.loading = true;
-      let { page, size, stock_code, supplier_code } = this.parmValue;
-      let model = {
-        page,
-        size,
-        wsm_code: stock_code != [] ? stock_code.toString() : "",
-        supplier_code: supplier_code != "" ? supplier_code.toString() : "",
-      };
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.supplierNo = model.supplier_code.toString() || "";
+      model.wsm_code = model.stock_code.toString() || "";
+      delete model["supplier_code"];
+      delete model["stock_code"];
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/stock/stockCount/components/spaceCount/index.vue

@@ -26,58 +26,7 @@
         <template #table-header="{}">
           <div style="width: 100%" class="min">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="24">
-                <el-col :span="24">
-                  <el-col :span="12" style="width: 300px; padding: 0">
-                    <search-supplier
-                      :size="searchSize"
-                      :placeholder="'供应商公司'"
-                      :value="parmValue.supplier_code"
-                      @searchChange="selectSupplier"
-                    />
-                  </el-col>
-                  <el-col :span="12" style="width: 200px; padding-left: 10px">
-                    <search-stock
-                      :isDetail="true"
-                      :size="searchSize"
-                      :value="parmValue.stock_code"
-                      :disabled="isDisabled"
-                      :placeholder="'出库仓库'"
-                      :isRelation="true"
-                      :companyCode="supplier_code"
-                      :names="''"
-                      @searchChange="selectStock"
-                    />
-                  </el-col>
-                  <!-- 重置 -->
-                  <el-col :span="4" style="width: 54px; margin-left: 10px">
-                    <el-button
-                      :size="searchSize"
-                      class="fl"
-                      type="warning"
-                      @click="restSearch"
-                      >重置</el-button
-                    >
-                  </el-col>
-                  <!-- 刷新 -->
-                  <el-col
-                    :span="4"
-                    style="width: 54px; margin-left: 10px"
-                    class="fr"
-                  >
-                    <el-button
-                      :size="searchSize"
-                      type="primary"
-                      label=""
-                      @click="searchList"
-                      >刷新</el-button
-                    >
-                  </el-col>
-                </el-col>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6" style="width: 303px; padding: 10px 0 0 0">
+              <el-col :span="6" style="width: 303px; padding: 0 0 0 0">
                 <period-date-picker
                   :start="parmValue.start"
                   :end="parmValue.end"
@@ -86,23 +35,67 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col :span="10" style="width: 290px; padding-top: 10px">
+              <el-col :span="10" style="width: 290px">
                 <el-input
                   v-model="parmValue.type_code"
                   :size="searchSize"
                   placeholder="商品属性编码"
                 />
               </el-col>
-              <!-- 搜索 -->
-              <el-col :span="4" style="width: 54px; padding: 10px 0 0 0px">
+
+              <!-- 刷新 -->
+              <el-col :span="4" style="width: 66px" class="fr">
                 <el-button
                   :size="searchSize"
                   type="primary"
-                  class="fr"
-                  icon="el-icon-search"
                   label=""
                   @click="searchList"
-                ></el-button>
+                  >刷新</el-button
+                >
+              </el-col>
+              <!-- 重置 -->
+              <el-col :span="4" style="width: 66px" class="fr">
+                <el-button
+                  :size="searchSize"
+                  class="fl"
+                  type="warning"
+                  @click="restSearch"
+                  >重置</el-button
+                >
+              </el-col>
+            </el-row>
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="12" style="width: 280px">
+                <search-work-company
+                  :value="parmValue.companyNo"
+                  :names="''"
+                  :size="searchSize"
+                  :is-detail="id !== 'add'"
+                  :placeholder="'业务公司'"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+              <el-col :span="12" style="width: 310px; padding: 0 0 0 10px">
+                <search-supplier
+                  :size="searchSize"
+                  :placeholder="'供应商公司'"
+                  :disabled="parmValue.companyNo === ''"
+                  :value="parmValue.supplier_code"
+                  @searchChange="selectSupplier"
+                />
+              </el-col>
+              <el-col :span="12" style="width: 310px; padding-left: 10px">
+                <search-stock
+                  :isDetail="true"
+                  :size="searchSize"
+                  :value="parmValue.stock_code"
+                  :disabled="supplier_code === ''"
+                  :placeholder="'出库仓库'"
+                  :isRelation="true"
+                  :companyCode="supplier_code"
+                  :names="''"
+                  @searchChange="selectStock"
+                />
               </el-col>
             </el-row>
           </div>
@@ -155,6 +148,7 @@ export default {
       parmValue: {
         supplier_code: [], //供应商编码
         stock_code: [], //仓库编码
+        companyNo: "",
         start: "",
         end: "",
         type_code: "", //商品编码
@@ -185,48 +179,47 @@ export default {
   },
 
   methods: {
+    //业务公司选择
+    async supplierChange(e) {
+      const { code } = e;
+      this.parmValue.companyNo = code || ""; //业务公司编码
+      this.parmValue.supplier_code = [];
+      this.supplier_code = "";
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
+    },
     // 选择时间操作
-    handleTime(e) {
-      if (e && e.startTime && e.endTime) {
-        this.parmValue.start = e.startTime;
-        this.parmValue.end = e.endTime;
-      } else {
-        this.parmValue.start = "";
-        this.parmValue.end = "";
-      }
-      if (this.parmValue.start != "" && this.parmValue.end) {
-        this.searchList();
-      }
+    async handleTime(e) {
+      this.parmValue.start = e.startTime || "";
+      this.parmValue.end = e.endTime || "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
     },
     // 选择供应商仓库
-    selectStock(e) {
-      if (e && e.id) {
-        this.parmValue.stock_code = [e.code];
-        this.stock_code = e.code;
-      } else {
-        this.parmValue.stock_code = [];
-        this.stock_code = "";
-      }
-      if (this.parmValue.stock_code) {
-        this.searchList();
-      }
+    async selectStock(e) {
+      const { code } = e;
+      this.parmValue.stock_code = code ? [code] : [];
+      this.stock_code = code || "";
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
     },
     // 选择供应商
-    selectSupplier(e) {
-      if (e && e.id) {
-        this.parmValue.supplier_code = [e.code];
-        this.supplier_code = e.code;
-        this.isDisabled = false;
-      } else {
-        this.parmValue.stock_code = [];
-        this.parmValue.supplier_code = [];
-        this.stock_code = "";
-        this.supplier_code = "";
-        this.isDisabled = true;
-      }
-      if (this.parmValue.supplier_code) {
-        this.searchList();
-      }
+    async selectSupplier(e) {
+      const { code } = e;
+      this.parmValue.supplier_code = code ? [code] : [];
+      this.supplier_code = code || "";
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      await this.searchList();
     },
     restSearch() {
       // 表格 - 分页
@@ -238,6 +231,7 @@ export default {
       this.parmValue = {
         start: "",
         end: "",
+        companyNo: "",
         type_code: "", //商品编码
         supplier_code: [],
         stock_code: [], //仓库编码
@@ -249,18 +243,11 @@ export default {
 
     async searchList() {
       this.loading = true;
-      let { page, size, stock_code, supplier_code, type_code, start, end } =
-        this.parmValue;
-      let model = {
-        type_code,
-        page,
-        size,
-        wsm_code: stock_code != [] ? stock_code.toString() : "",
-        suplierNo: supplier_code != "" ? supplier_code.toString() : "",
-        start,
-        end,
-      };
-      console.log(model);
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.supplierNo = model.supplier_code.toString() || "";
+      model.wsm_code = model.stock_code.toString() || "";
+      delete model["supplier_code"];
+      delete model["stock_code"];
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/stock/stockCount/index.vue

@@ -7,16 +7,19 @@
         <el-row>
           <el-col>
             <el-tabs v-model="activeName">
-              <el-tab-pane label="商品维度" name="productWeido" />
-              <el-tab-pane label="仓库维度" name="dataWeido" />
-              <el-tab-pane label="区间统计" name="count" />
+              <el-tab-pane label="商品维度" name="productWeido"
+                ><product-weido
+              /></el-tab-pane>
+              <el-tab-pane label="仓库维度" name="dataWeido">
+                <data-weido
+              /></el-tab-pane>
+              <el-tab-pane label="区间统计" name="count">
+                <space-count
+              /></el-tab-pane>
             </el-tabs>
           </el-col>
         </el-row>
       </div>
-      <product-weido v-if="activeName === 'productWeido'" />
-      <data-weido v-else-if="activeName === 'dataWeido'" />
-      <space-count v-else />
     </div>
     <div v-else>
       <no-auth></no-auth>

src/views/stock/stockWarning/index.vue

@@ -27,49 +27,37 @@
         <template #table-header="{}">
           <div style="width: 100%" class="min">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="12" style="width: 300px">
+              <el-col :span="12" style="width: 280px">
                 <search-work-company
                   :value="parmValue.companyNo"
                   :names="''"
                   :size="searchSize"
                   :is-detail="id !== 'add'"
-                  :disabled="isDetail"
                   :placeholder="'业务公司'"
                   @searchChange="supplierChange"
                 />
               </el-col>
-              <el-col :span="12" style="width: 300px; padding: 0">
-                <search-supplier
+              <el-col :span="6" style="width: 273px; padding: 0 0 0 10px">
+                <number-range
+                  :lower="parmValue.stock_num_low"
+                  :online="parmValue.stock_num_up"
+                  :title="'库存量'"
+                  :width="'120px'"
                   :size="searchSize"
-                  :placeholder="'供应商公司'"
-                  :value="parmValue.supplier_code"
-                  @searchChange="selectSupplier"
+                  @numReturned="numReturned($event, 0)"
                 />
               </el-col>
-              <el-col :span="12" style="width: 200px; padding-left: 10px">
-                <search-stock
-                  :isDetail="true"
+              <el-col :span="6" style="width: 273px; padding: 0 0 0 10px">
+                <number-range
+                  :lower="parmValue.warn_num_low"
+                  :online="parmValue.warn_num_up"
+                  :width="'120px'"
+                  :title="'预警量'"
                   :size="searchSize"
-                  :value="parmValue.stock_code"
-                  :disabled="isDisabled"
-                  :placeholder="'出库仓库'"
-                  :isRelation="true"
-                  :companyCode="supplier_code"
-                  :names="''"
-                  @searchChange="selectStock"
+                  @numReturned="numReturned1($event, 0)"
                 />
               </el-col>
-          
-              <el-col :span="4" style="width: 54px; margin-left: 10px">
-                <el-button
-                  :size="searchSize"
-                  class="fr"
-                  type="warning"
-                  @click="restSearch"
-                  >重置</el-button
-                >
-              </el-col>
-              <el-col :span="3" style="width: 56px; float: right">
+              <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   type="primary"
                   :size="searchSize"
@@ -80,36 +68,38 @@
                 </el-button>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="6" style="width: 273px; padding: 10px 0 0 0px">
-                <number-range
-                  :lower="parmValue.stock_num_low"
-                  :online="parmValue.stock_num_up"
-                  :title="'库存量'"
-                  :width="'120px'"
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="12" style="width: 360px">
+                <search-supplier
                   :size="searchSize"
-                  @numReturned="numReturned($event, 0)"
+                  :disabled="parmValue.companyNo === ''"
+                  :placeholder="'供应商公司'"
+                  :value="parmValue.supplier_code"
+                  @searchChange="selectSupplier"
                 />
               </el-col>
-              <el-col :span="6" style="width: 303px; padding-top: 10px">
-                <number-range
-                  :lower="parmValue.warn_num_low"
-                  :online="parmValue.warn_num_up"
-                  :width="'135px'"
-                  :title="'预警量'"
+              <el-col :span="12" style="width: 380px; padding-left: 10px">
+                <search-stock
+                  :isDetail="true"
                   :size="searchSize"
-                  @numReturned="numReturned1($event, 0)"
+                  :value="parmValue.stock_code"
+                  :disabled="supplier_code === ''"
+                  :placeholder="'出库仓库'"
+                  :isRelation="true"
+                  :companyCode="supplier_code"
+                  :names="''"
+                  @searchChange="selectStock"
                 />
               </el-col>
-              <el-col :span="4" style="width: 44px; padding-top: 10px">
+
+              <el-col :span="4" style="width: 66px; float: right">
                 <el-button
-                  style="width: 100%"
-                  type="primary"
-                  icon="el-icon-search"
                   :size="searchSize"
-                  @click="searchList"
+                  class="fr"
+                  type="warning"
+                  @click="restSearch"
+                  >重置</el-button
                 >
-                </el-button>
               </el-col>
             </el-row>
           </div>
@@ -217,14 +207,16 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        companyNo: "",
         goods_sn: "",
         supplier_code: [],
-        companyNo: "",
         stock_code: [],
         warn_num_low: "",
         warn_num_up: "",
         stock_num_low: "",
         stock_num_up: "",
+        page: 1,
+        size: 15,
       },
       // 表格 - 数据
       tableData: [],
@@ -252,14 +244,13 @@ export default {
     //业务公司选择
     async supplierChange(e) {
       const { code } = e;
-      this.parmValue.companyNo = code || ""; //供应商编码
+      this.parmValue.companyNo = code || ""; //业务公司编码
       this.parmValue.supplier_code = [];
       this.supplier_code = "";
       this.parmValue.stock_code = [];
-
+      this.stock_code = "";
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
-      await this.stockList();
       await this.searchList();
     },
     // 选择供应商仓库
@@ -267,18 +258,21 @@ export default {
       const { code } = e;
       this.parmValue.stock_code = code ? [code] : [];
       this.stock_code = code || "";
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
       await this.searchList();
     },
     // 选择供应商
     async selectSupplier(e) {
       const { code } = e;
-
       this.parmValue.supplier_code = code ? [code] : [];
       this.supplier_code = code || "";
-
+      this.parmValue.stock_code = [];
       this.stock_code = "";
-      this.supplier_code = "";
-
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
       await this.searchList();
     },
     // 预警量范围框
@@ -322,6 +316,7 @@ export default {
         total: 0,
       };
       this.parmValue = {
+        companyNo: "",
         goods_sn: "",
         supplier_code: [],
         stock_code: [],
@@ -329,6 +324,8 @@ export default {
         warn_num_up: "",
         stock_num_low: "",
         stock_num_up: "",
+        page: 1,
+        size: 15,
       };
       await this.searchList();
     },
@@ -342,29 +339,11 @@ export default {
 
     async searchList() {
       this.loading = true;
-      const {
-        supplier_code,
-        stock_code,
-        goods_sn,
-        stock_num_low,
-        stock_num_up,
-        warn_num_low,
-        warn_num_up,
-      } = JSON.parse(JSON.stringify(this.parmValue));
-      let model = {
-        supplierNo: supplier_code.toString() || "",
-        wsm_code: stock_code.toString() || "",
-        page: 1,
-        size: 15,
-        stock_low: stock_num_low,
-        stock_up: stock_num_up,
-        warn_low: warn_num_low,
-        warn_up: warn_num_up,
-        good_code: goods_sn,
-        good_name: "",
-        type_code: "",
-      };
-
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.supplierNo = model.supplier_code.toString() || "";
+      model.wsm_code = model.stock_code.toString() || "";
+      delete model["supplier_code"];
+      delete model["stock_code"];
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         res.data.list.forEach((element) => {