From 68e1f081a721dbfe74795978bfbf90aad23c3e38 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 14 Jul 2023 18:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseWarehouseingAddReceipt.vue       | 53 +++++++++++++++----
 .../warehouseWarehousingEntry.vue             | 18 ++++---
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index b1ae4c8c..87c07574 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -87,9 +87,10 @@
               <el-select
                 v-model="form.warehouseId"
                 filterable
-                allow-create
-                default-first-option
-                :reserve-keyword="false"
+                remote
+                reserve-keyword
+                remote-show-suffix
+                :remote-method="remoteWareHouse"
                 @change="getMen($event,2)"
                 placeholder="请输入所在仓库"
               >
@@ -292,8 +293,9 @@ import {mapGetters} from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getListUser } from '@/api/distribution/distributionStockup';
 import { getListClient } from '@/api/basicdata/basicClient';
-import { getDept,getList } from '@/api/system/dept';
+import { getDept } from '@/api/system/dept';
 import { getListMaterial } from '@/api/basic/basicMaterial';
+import { getListCopy } from '@/api/basicdata/basicdataWarehouse';
 import dayjs from 'dayjs';
 
 
@@ -589,8 +591,31 @@ export default {
       });
 
     },
-
-      //客户查询
+      //仓库查询
+   async remoteWareHouse(query){
+      if (query) {
+        // this.loading = true;
+        let cl = await getListCopy(this.page.currentPage, this.page.pageSize,{name:query});
+        // console.log(">>>>",cl.data.data.records);
+        this.store = [];
+        cl.data.data.records.forEach(i =>{
+          let st= {
+            label: i.name,
+            value: i.id
+          }
+          this.store.push(st);
+        });
+        // setTimeout(() => {
+        //   this.loading = false
+        //   this.loading = this.list.filter((item) => {
+        //     return item.label.toLowerCase().includes(query.toLowerCase())
+        //   })
+        // }, 200)
+      } else {
+        this.store = []
+      }
+    },
+    //客户查询
    async remoteMethod(query){
       if (query) {
         // this.loading = true;
@@ -843,6 +868,12 @@ export default {
 
 
     },*/
+    /**
+     * 查询仓库信息
+     * @param page
+     * @param params
+     * @returns {Promise<void>}
+     */
     async getWareHoust(page, params = {}){
       let a = await getListUser();
       let b = await getDept(a.data.data.deptId);
@@ -855,16 +886,16 @@ export default {
           value: b.data.data.deptName
         }
         this.store.push(st);
-        this.form.warehouse = b.data.data.id;
+        this.form.warehouseId = b.data.data.id;
       }else{
         //查询全部仓库
 
-        let li = await getList(page.currentPage, page.pageSize,{deptCategory:4});
-        // console.log("li>>>>",li.data.data);
+        let li = await getListCopy(page.currentPage, page.pageSize,{});
+        console.log("li>>>>",li.data.data);
         this.store = [];
-        li.data.data.forEach(i =>{
+        li.data.data.records.forEach(i =>{
           let st= {
-            label: i.deptName,
+            label: i.name,
             value: i.id
           }
           this.store.push(st);
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index c3c1abe4..1a16cbf5 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -300,6 +300,9 @@ export default {
           },
             {
               value: '2',
+              label: '部分确定',
+            },{
+              value: '3',
               label: '已确定',
             },],
           fixed: false,
@@ -756,18 +759,21 @@ export default {
         const data = res.data.data;
         this.page.total = data.total;
         data.records.forEach(i =>{
-          this.distributionType.forEach(a =>{
-            // console.log("aa",a,i.serviceType);
-            if(i.serviceType == a.dictKey){
-              i.serviceType = a.dictValue;
-            }
-          })
           if(i.conditions == '1'){
             i.conditions = "待确定";
           }
           if(i.conditions == '2'){
+            i.conditions = "部分确定";
+          }
+          if(i.conditions == '3'){
             i.conditions = "已确定";
           }
+          this.distributionType.forEach(a =>{
+            // console.log("aa",a,i.serviceType);
+            if(i.serviceType == a.dictKey){
+              i.serviceType = a.dictValue;
+            }
+          })
         });
         this.data = data.records;
         this.loading = false;