耗材领用拉取产品库存作区分

src/views/inout/DialogSelectInvProduct.vue

@@ -65,6 +65,8 @@ import {
 } from "@/api/inventory/invPorduct";
 import {addDetail} from "@/api/inout/receiveOrder";
 import {addBizProduct} from "@/api/inout/orderDetailCode";
+import {getInvPreInProduct} from "@/api/inventory/invPreInSearch";
+import {getInvPreProduct} from "@/api/inventory/invPreProduct";
 
 
 export default {
@@ -162,19 +164,51 @@ export default {
     },
 
     getList() {
+      debugger
       this.loading = true;
-      getInvProduct(this.filterQuery)
-        .then((response) => {
-          this.showSup = response.data.showSup;
-          this.loading = false;
-          this.list = response.data.list || [];
-          this.total = response.data.total || 0;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+      //寄售
+      if(this.invQueryData.advanceType==3){
+        getInvPreProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+      //预验收
+      }else if(this.invQueryData.advanceType==2){
+        getInvPreInProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+
+      }else{
+        getInvProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+      }
     },
     hideSearch() {
       this.showSearch = !this.showSearch;

src/views/inout/receive/DialogNewReceive.vue

@@ -59,7 +59,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
-              <el-select v-model="formData.targetInvCode"  placeholder="请选择往来信息"
+              <el-select v-model="formData.targetInvCode"  placeholder="请选择往来信息" @change="getTargerType"
                          clearable="true"
                          style="width: 100%"
               >
@@ -277,6 +277,7 @@ export default {
     findFromInv() {
       let cQuery = {
         locInvCode: this.formData.invCode,
+        type:1,
       };
       findByFrom(cQuery)
         .then((response) => {
@@ -301,7 +302,10 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-
+    getTargerType(){
+      this.formData.advanceType= this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
+      console.log(this.formData)
+    },
     saveOrder(status) {
       this.code = "";
       this.$refs.multipleTable.setCurrentRow();

src/views/inout/receive/receiveAdd.vue

@@ -22,7 +22,14 @@
           </el-col>
           <el-col :span="8">
           <el-form-item label="往来信息:">
-            <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
+            <el-select v-model="filterQuery.corpName"  placeholder="请输入往来信息" style="width: 100%;">
+              <el-option
+                v-for="item in corpList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code">
+              </el-option>
+            </el-select>
           </el-form-item>
           </el-col>
 <!--          <el-col :span="6">-->
@@ -147,7 +154,7 @@ import {selectIp} from "@/api/param/systemParamConfig";
 import thrOrderNew from "./DialogNewReceive";
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 import {getBusChange} from "@/api/basic/busTypeChange";
-import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -178,6 +185,7 @@ export default {
         4: "已拒绝"
       },
       idQuery: {},
+      corpList: [],
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -373,6 +381,15 @@ export default {
         .catch(() => {
         });
     },
+    finCorpList(){
+      filterSubAll({})
+        .then((response) => {
+          this.corpList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
   },
   components: {
     thrOrderNew,
@@ -382,6 +399,7 @@ export default {
   created() {
     this.finCurInv();
     this.getBusType();
+    this.finCorpList();
   },
 };
 </script>