From 222b8a5e6241a16ff4603a4323a57ffcac61bbc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Wed, 21 May 2025 15:33:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Query/StockQuery/Invoice/index.vue | 11 +++++------
 src/views/Query/StockQuery/StockIn/index.vue |  5 ++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/Query/StockQuery/Invoice/index.vue b/src/views/Query/StockQuery/Invoice/index.vue
index 2517bb9..e5dd8d8 100644
--- a/src/views/Query/StockQuery/Invoice/index.vue
+++ b/src/views/Query/StockQuery/Invoice/index.vue
@@ -115,7 +115,8 @@
                 <template v-for="(col, index) in column_d" :key="index">
                     <el-table-column v-if="!col.hide" :label="col.header" :width="col.width" show-overflow-tooltip>
                         <template #default="scope">
-                            <span v-if="col.field == 'REALQUANTITY'" >{{ Number(scope.row.REQUESTQUANTITY) - Number(scope.row.SALEOUTQUANTITY)}}</span>
+                            <span v-if="col.field == 'REALQUANTITY'" >{{ (Number(scope.row.REQUESTQUANTITY) - Number(scope.row.SALEOUTQUANTITY)) >= 0 
+                                ? (Number(scope.row.REQUESTQUANTITY) - Number(scope.row.SALEOUTQUANTITY)) : 0 }}</span>
                             <span v-else>{{ scope.row[col.field] }}</span>
                         </template>
                     </el-table-column>
@@ -152,12 +153,10 @@ const state = reactive({
     formDataRefData: [] as any,
     documentType: [
         {LABEL:"全部", VALUE:""},
-        {LABEL:"采购退货订单", VALUE:"采购退货订单"},
         {LABEL:"销售发货单", VALUE:"销售发货单"},
         {LABEL:"生产领料单", VALUE:"生产领料单"},
         {LABEL:"生产补料单", VALUE:"生产补料单"},
         {LABEL:"成本中心领料单", VALUE:"成本中心领料单"},
-        {LABEL:"成本中心补料单", VALUE:"成本中心补料单"},
         {LABEL:"调拨单", VALUE:"调拨单"},
     ],
     queryParams: {
@@ -205,10 +204,10 @@ const { loading, list, column, queryParams, page, page_d, loading_d, list_d, col
 onMounted(() => {
     state.column = [
 
-        { header: "组织", field: "ERPFACTORYNAME", hide: false, width: 70 },
+        { header: "组织", field: "ERPFACTORY", hide: false, width: 70 },
         { header: "发货单", field: "SHIPREQUESTNAME", hide: false, width: 120 },
-        { header: "发货单类型", field: "SHIPREQUESTTYPE", hide: false, width: 100},
-        { header: "发货单状态", field: "SHIPREQUESTSTATE", hide: false, width: 100 },
+        { header: "单据类型", field: "SHIPREQUESTTYPE", hide: false, width: 100},
+        { header: "单据状态", field: "SHIPREQUESTSTATE", hide: false, width: 100 },
         { header: "客户编号", field: "CUSTOMERNO", hide: false, width: 100 },
         {header: "供应商编号", field: "SUPPLIERNO", hide: true},
         {header: "单据日期", field: "ORDERDATE", hide: false, width: 150},
diff --git a/src/views/Query/StockQuery/StockIn/index.vue b/src/views/Query/StockQuery/StockIn/index.vue
index 6838571..55d95c0 100644
--- a/src/views/Query/StockQuery/StockIn/index.vue
+++ b/src/views/Query/StockQuery/StockIn/index.vue
@@ -160,6 +160,9 @@ const state = reactive({
     documentType: [
         {LABEL:"全部", VALUE:""},
         {LABEL:"采购订单", VALUE:"采购订单" },
+        {LABEL:"采购退货订单", VALUE:"采购退货订单" },
+        {LABEL:"销售退货单", VALUE:"销售退货单"},
+        {LABEL:"成本中心退料单", VALUE:"成本中心退料单"},
         {LABEL:"调拨单", VALUE:"调拨单"},
     ],
     queryParams: {
@@ -203,7 +206,7 @@ onMounted(() => {
         { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false, width: 100 },
         { header: "料号", field: "MATERIALSPECNAME", hide: true },
         { header: "品名", field: "DESC_CN", hide: true },
-        { header: "出入库类型编码", field: "RECEIVEREQUESTTYPE", hide: false, width: 110 },
+        { header: "单据类型", field: "RECEIVEREQUESTTYPE", hide: false, width: 110 },
         { header: "订单状态", field: "RECEIVEREQUESTSTATE", hide: false, width: 80 },
         { header: "供应商编号", field: "SUPPLIERNO", hide: false, width: 80 },
         { header: "供应商名称", field: "SUPPLIERNAME", hide: true },