From 8b12a179c518d69df74e5298a7cfed5187ca081b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 22 Mar 2023 16:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AE=A1=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2=E5=8C=BA=E5=88=86=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvSupPreInSerach.vue     | 63 ++++++++++++-------
 src/views/inventory/InvSupPreProducts.vue     |  8 ++-
 src/views/inventory/InvSupProuducts.vue       | 40 ++++++++++--
 src/views/inventory/supInoutSearchOrder.vue   | 15 +++--
 .../purchase/purOrder/purOrderSearch.vue      |  2 +-
 5 files changed, 95 insertions(+), 33 deletions(-)

diff --git a/src/views/inventory/InvSupPreInSerach.vue b/src/views/inventory/InvSupPreInSerach.vue
index 049249c..ab90c1e 100644
--- a/src/views/inventory/InvSupPreInSerach.vue
+++ b/src/views/inventory/InvSupPreInSerach.vue
@@ -22,7 +22,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="状态:">
+            <el-form-item label="余量状态:">
               <el-select v-model="codeQuery.status" style="width: 90%" placeholder="请选择状态" clearable>
                 <el-option label="在库" value="1"></el-option>
                 <el-option label="已使用" value="2"></el-option>
@@ -136,7 +136,8 @@
                 row-key="id"
       >
         <el-table-column label="序号" type="index"></el-table-column>
-
+        <el-table-column label="供应商" prop="fromName" v-if="showSup" show-overflow-tooltip
+                         width="160"></el-table-column>
         <el-table-column
           label="收货时间"
           prop="auditTime"
@@ -150,25 +151,7 @@
           show-overflow-tooltip
         ></el-table-column>
 
-        <el-table-column
-          label="预验收单号"
-          prop="orderId"
-          width="160"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column label="状态" prop="status">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status)">
-              {{ statusMap[scope.row.status] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="收货仓库"
-          prop="invName"
-          width="120"
-          show-overflow-tooltip
-        ></el-table-column>
+
         <el-table-column
           label="物资名称"
           prop="productName"
@@ -191,11 +174,41 @@
           label="入库数量"
           prop="originReCount" width="100"
         ></el-table-column>
-
+        <el-table-column
+          label="使用数量"
+          width="100"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.originReCount - scope.row.reCount }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="剩余数量"
           prop="reCount" width="100"
         ></el-table-column>
+
+        <el-table-column
+          label="退回数量"
+          prop="returnCount" width="100"
+        ></el-table-column>
+
+        <el-table-column
+          label="计量单位"
+          prop="measname" width="100"
+        ></el-table-column>
+        <el-table-column label="余量状态" prop="status">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status)">
+              {{ statusMap[scope.row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="收货仓库"
+          prop="invName"
+          width="120"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column
           label="生产日期"
           prop="produceDate"
@@ -348,6 +361,7 @@ export default {
       codeDetailList: [],
       fromOptions: [],
       auditDateRange: [],
+      showSup: false,
       statusMap: {
         1: "在库",
         2: "已使用",
@@ -538,6 +552,11 @@ export default {
     };
   },
   created() {
+
+    let supId = this.$store.getters.customerId;
+    if (supId == "110") {
+      this.showSup = true;
+    }
     this.getList();
   },
 };
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index bb8247f..dba5341 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -94,6 +94,8 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
         <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
@@ -105,8 +107,6 @@
                          show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="仓库" prop="invName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
         <el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
@@ -349,6 +349,10 @@ export default {
     };
   },
   created() {
+    let supId = this.$store.getters.customerId;
+    if (supId == "110") {
+      this.showSup = true;
+    }
     this.findMethod();
     this.getInvList();
     this.getList();
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index 43a6670..cf071f5 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -73,6 +73,34 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="供应商名称:">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                @change="corpChange"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -84,7 +112,7 @@
             @click="onReset"
           >重置
           </el-button>
-          <el-button type="primary"  icon="el-icon-search" @click="onSubmit"
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
           >查询
           </el-button
           >
@@ -94,6 +122,8 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
         <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
@@ -105,8 +135,6 @@
                          show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="仓库" prop="invName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
         <el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
@@ -246,7 +274,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.filterQuery.supId = this.$store.getters.customerId;
+
       getProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
@@ -349,6 +377,10 @@ export default {
     };
   },
   created() {
+    let supId = this.$store.getters.customerId;
+    if (supId == "110") {
+      this.showSup = true;
+    }
     this.findMethod();
     this.getInvList();
     this.getList();
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index fe5c82c..b680a18 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -84,6 +84,7 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="供应商" prop="fromCorpName" width="160" v-if="showSup"></el-table-column>
         <el-table-column label="出入库单号" prop="orderIdFk" width="160"></el-table-column>
         <el-table-column label="DI/物资编码" prop="nameCode" width="160"></el-table-column>
         <el-table-column label="物资名称" prop="coName" width="160" show-overflow-tooltip></el-table-column>
@@ -130,13 +131,14 @@ export default {
         limit: 10,
         startAduditTime: null,
         endAduditTime: null,
-        vueType: null,
+        actionType: "norDetail",
       },
       loading: false,
       total: 0,
+      showSup: false,
       customerId: this.$store.getters.customerId,
       actDateRange: [],
-      vueType: "normal",
+      actionType: "norDetail",
       auditDateRange: [],
       pickerOptions: {
         shortcuts: [
@@ -203,6 +205,7 @@ export default {
         this.filterQuery.endAduditTime = null;
       }
       this.filterQuery.page = 1;
+
       this.getList();
     },
     hideSearch() {
@@ -210,7 +213,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.filterQuery.vueType = this.vueType;
+      this.filterQuery.actionType = this.actionType;
       getResultOrderList(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {
@@ -237,7 +240,11 @@ export default {
   }
   ,
   created() {
-    this.vueType = this.$route.query.name;
+    let supId = this.$store.getters.customerId;
+    if (supId == "110") {
+      this.showSup = true;
+    }
+    this.actionType = this.$route.query.name;
     this.getList();
   }
   ,
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index c0afe40..2766fb4 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -167,7 +167,7 @@ export default {
       formName: null,
       formMap: {
         add: "新增采购订单",
-        update: "采购订单审核",
+        update: "采购订单处理",
       },
       statusMap: {
         1: "草稿",