build

src/views/stock/stockWarning/index.vue

@@ -24,7 +24,7 @@
         <template #table-header="{}">
           <div style="width: 100%" class="min">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="12" style="width: 280px">
+              <!-- <el-col :span="12" style="width: 280px">
                 <search-work-company
                   :value="parmValue.companyNo"
                   :names="''"
@@ -33,7 +33,7 @@
                   :placeholder="'业务公司'"
                   @searchChange="supplierChange"
                 />
-              </el-col>
+              </el-col> -->
               <el-col :span="6" style="width: 273px; padding: 0 0 0 10px">
                 <number-range
                   :lower="parmValue.stock_low"
@@ -185,12 +185,13 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import { statusList } from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/stockWarning";
+import companyHelper from "@/mixins/companyHelper";
 import colums from "./colums";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 export default {
   name: "survey",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     addEdit,
   },
@@ -268,8 +269,8 @@ export default {
       const { code } = e;
       this.parmValue.stock_code = code ? [code] : [];
       this.stock_code = code || "";
-      this.parmValue.stock_code = [];
-      this.stock_code = "";
+      // this.parmValue.stock_code = [];
+      // this.stock_code = "";
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
       await this.searchList();
@@ -342,6 +343,16 @@ export default {
       this.sitem = sitem;
     },
 
+    onCompanyChangeInner() {
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      this.parmValue.companyNo = this.currentCompany
+      this.searchList()
+    },
+
     async searchList() {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
@@ -349,7 +360,10 @@ export default {
       model.wsm_code = model.stock_code.toString() || "";
       delete model["supplier_code"];
       delete model["stock_code"];
-      const res = await asyncRequest.list(model);
+      const res = await asyncRequest.list({
+        ...model,
+        needRela: true
+      });
       if (res && res.code === 0 && res.data) {
         res.data.list.forEach((element) => {
           if (element.sort_s != "" && element.sort_t != "") {

src/views/stock/survey/index.vue

@@ -3,7 +3,7 @@
     <div v-if="powers.some((i) => i == '001')">
       <div style="width: 100%">
         <el-row style="padding: 15px 0 0 0px">
-          <el-col :span="12" style="width: 290px; margin-right: 10px">
+          <!-- <el-col :span="12" style="width: 290px; margin-right: 10px">
             <search-work-company
               :value="parmValue.companyNo"
               :names="''"
@@ -13,7 +13,7 @@
               :placeholder="'业务公司'"
               @searchChange="supplierChange"
             />
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="12" style="width: 300px; padding-left: 10px">
             <search-supplier
               :size="searchSize"
@@ -162,13 +162,14 @@
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import companyHelper from "@/mixins/companyHelper"
 import asyncRequest from "@/apis/service/stock/survey";
 import countTo from "vue-count-to";
 import { mapGetters } from "vuex";
 
 export default {
   name: "survey",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     countTo,
   },
@@ -347,7 +348,7 @@ export default {
   mounted() {
     this.stock_code = "";
     this.supplier_code = "";
-    this.stockList();
+    this.currentCompany && this.stockList();
     this.searchList();
   },
 
@@ -423,14 +424,37 @@ export default {
       } else {
       }
     },
+    onCompanyChangeInner() {
+      this.parmValue.stock_code = [];
+      this.stock_code = "";
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      this.parmValue.companyNo = this.currentCompany
+      this.searchList()
+    },
     //获取表格数据
     async searchList() {
+      if(!this.currentCompany){
+        this.$message.warning('请选择业务公司');
+        this.tableData = []
+        this.loading = false
+        this.stock_list[0].endVal = 0;
+        this.stock_list[1].endVal = 0;
+        this.stock_list[2].endVal = 0;
+        this.stock_list[3].endVal = 0;
+        this.stock_list[4].endVal = 0;
+        return
+      }
+      
       this.tableData = [];
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.supplier_code = this.supplier_code;
       model.stock_code = this.stock_code;
-      const res = await asyncRequest.list(model);
+      const res = await asyncRequest.list({
+        ...model,
+        needRela: true
+      });
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.tableData.forEach((v) => {