From daba9ddcfb89a11fc5b56aeef7896d42b09de48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Wed, 14 May 2025 09:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E3=80=81=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=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 | 27 +++++++++++-
 src/views/Query/StockQuery/StockIn/index.vue | 43 ++++++++++++++++----
 2 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/views/Query/StockQuery/Invoice/index.vue b/src/views/Query/StockQuery/Invoice/index.vue
index 196a86a..f6c3e00 100644
--- a/src/views/Query/StockQuery/Invoice/index.vue
+++ b/src/views/Query/StockQuery/Invoice/index.vue
@@ -9,7 +9,11 @@
                 <el-row :gutter="24" class="form-row">
                     <el-col :span="6">
                         <el-form-item label="组织" prop="ERPFACTORY">
-                            <el-Input v-model="queryParams.ERPFACTORY" clearable />
+                            <!-- <el-Input v-model="queryParams.ERPFACTORY" clearable /> -->
+                             <el-select v-model="queryParams.ERPFACTORY" placeholder="下拉选择" style="width: 160px">
+                                <el-option v-for="item in state.formDataRefData" :key="item.ERPFACTORY" :label="item.DESCRIPTION"
+                                    :value="item.ERPFACTORY" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
 <!--                    <el-col :span="4">-->
@@ -73,8 +77,9 @@
                     <el-button type="primary" @click="exportExcel">导出</el-button>
                 </div>
             </div>
-            <el-table :height="tableHeight" border v-loading="loading" :data="list" highlight-current-row row-key="id"
+            <el-table :height="100" border v-loading="loading" :data="list" highlight-current-row row-key="id"
                 style="width: 100%;" @row-click="selectRow">
+                <el-table-column type="index" width="50" label="序号"></el-table-column>
                 <template v-for="(col, index) in column" :key="index">
                     <el-table-column v-if="!col.hide" :label="col.header" :width="col.width" show-overflow-tooltip>
                         <template #default="scope">
@@ -127,6 +132,7 @@ import { ElForm, ElMessageBox, ElTable } from 'element-plus'
 import { getQueryPageList, getQueryList } from '@/api/common';
 import exportDataToExcel from '@/utils/export-excel';
 import { bTableHeight } from "../../../../composables/calcTableHeight";
+import { getORG } from '@/api/auth';
 
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(525);
 
@@ -135,6 +141,7 @@ const { proxy }: any = getCurrentInstance();
 const queryFormRef = ref(ElForm);
 
 const state = reactive({
+    formDataRefData: [] as any,
     queryParams: {
         ERPLOCATION: '',
         ERPRECEIVELOCATION: '',
@@ -186,6 +193,7 @@ onMounted(() => {
         { header: "客户编号", field: "CUSTOMERNO", hide: false },
         {header: "供应商编号", field: "SUPPLIERNO", hide: true},
         {header: "单据日期", field: "ORDERDATE", hide: false},
+        {header: "备注", field: "REMARK", hide: false},
         { header: "料号", field: "MATERIALSPECNAME", hide: true },
         { header: "品名", field: "DESC_CN", hide: true },
         { header: "工厂", field: "SITENAME", hide: true },
@@ -203,7 +211,9 @@ onMounted(() => {
     state.column_d = [
         { header: "发货单", field: "SHIPREQUESTNAME", hide: false },
         { header: "行号", field: "SHIPREQUESTDETAILNAME", hide: false },
+        { header: "发出组织", field: "OUTERPFACTORY", hide: false },
         { header: "发出仓库", field: "ERPLOCATION", hide: false },
+        { header: "接收组织", field: "ERPRECEIVEFACTORY", hide: false },
         { header: "接收仓库", field: "ERPRECEIVELOCATIONNAME", hide: false },
         { header: "料号", field: "MATERIALSPECNAME", hide: false },
         { header: "品名", field: "DESC_CN", hide: false },
@@ -214,6 +224,12 @@ onMounted(() => {
         { header: "绑定数量", field: "ASSIGNEDQUANTITY", hide: false },
         { header: "已出库数量", field: "SALEOUTQUANTITY", hide: false },
         { header: "剩余数量", field: "REALQUANTITY", hide: false },
+        { header: "单位", field: "UNIT", hide: false },
+        { header: "生产订单", field: "PRODUCTORDER", hide: false },
+        { header: "销售订单号", field: "DN", hide: false },
+        { header: "发出销售订单行号", field: "SENDSALESORDERDETAILNO", hide: false, width:120 },
+        { header: "接收销售订单行号", field: "RECEIVESALESORDERDETAILNO", hide: false, width:120 },
+        { header: "备注", field: "REMARK", hide: false},
         { header: "生产订单类型", field: "PRODUCTORDERTYPE", hide: false, width:100 },
         { header: "客户编码", field: "CUSTOMERNO", hide: false },
         { header: "是否通用料", field: "COMMONMATERIALFLAG", hide: false },
@@ -223,8 +239,15 @@ onMounted(() => {
     ]
     handleQuery()
     updateTableHeight();
+    hangERPFactoryQuery()
     window.addEventListener('resize', handleResize);
 });
+function hangERPFactoryQuery() {
+    getORG({ orgNo: null}).then((res: any) => {
+        state.formDataRefData = res.resultObj
+    })
+
+}
 function handleQueryInfo() {
   state.page.pageNum = 1
   state.page_d.pageNum = 1
diff --git a/src/views/Query/StockQuery/StockIn/index.vue b/src/views/Query/StockQuery/StockIn/index.vue
index 30c7d8a..040b538 100644
--- a/src/views/Query/StockQuery/StockIn/index.vue
+++ b/src/views/Query/StockQuery/StockIn/index.vue
@@ -7,7 +7,7 @@
         <el-row class="page-search" justify="space-between" align="bottom">
             <el-form ref="queryFormRef" :model="queryParams" label-width="60px" label-position="left">
                 <el-row :gutter="24" class="form-row">
-                    <el-col :span="4">
+                    <el-col :span="6">
                         <el-form-item label="组织" prop="ERPFACTORY">
                             <el-select v-model="queryParams.ERPFACTORY" placeholder="下拉选择" style="width: 160px">
                                 <el-option v-for="item in state.formDataRefData" :key="item.ERPFACTORY" :label="item.DESCRIPTION"
@@ -15,12 +15,20 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="6">
+                        <el-form-item label="单据类型" prop="RECEIVEREQUESTDETAILTYPE">
+                            <el-select v-model="queryParams.RECEIVEREQUESTDETAILTYPE" placeholder="下拉选择" style="width: 160px">
+                                <el-option v-for="item in state.documentType" :key="item.LABEL" :label="item.LABEL"
+                                    :value="item.VALUE" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
                         <el-form-item label="订单号" prop="RECEIVEREQUESTNAME">
                             <el-Input v-model="queryParams.RECEIVEREQUESTNAME" clearable />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="6">
                         <el-form-item label="订单状态" prop="RECEIVEREQUESTSTATE">
                             <el-select v-model="queryParams.RECEIVEREQUESTSTATE" placeholder="下拉选择" style="width: 160px">
                                 <el-option v-for="item in state.orderStatus" :key="item.LABEL" :label="item.LABEL"
@@ -28,17 +36,19 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+                </el-row>
+                <el-row :gutter="24" class="form-row">
 <!--                    <el-col :span="4">-->
 <!--                      <el-form-item label="仓库" prop="ERPLOCATION">-->
 <!--                        <el-Input v-model="queryParams.ERPLOCATION" clearable />-->
 <!--                      </el-form-item>-->
 <!--                    </el-col>-->
-                    <el-col :span="4">
+                    <el-col :span="6">
                       <el-form-item label="料号" prop="MATERIALSPECNAME">
                         <el-Input v-model="queryParams.MATERIALSPECNAME" clearable />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="6">
                       <el-form-item label="品名" prop="DESC_CN">
                         <el-Input v-model="queryParams.DESC_CN" clearable />
                       </el-form-item>
@@ -73,8 +83,9 @@
                     <el-button type="primary" @click="exportExcel">导出</el-button>
                 </div>
             </div>
-            <el-table :height="tableHeight" border v-loading="loading" :data="list" highlight-current-row row-key="id"
+            <el-table :height="100" border v-loading="loading" :data="list" highlight-current-row row-key="id"
                 style="width: 100%;" @row-click="selectRow">
+                <el-table-column type="index" width="50" label="序号"></el-table-column>
                 <template v-for="(col, index) in column" :key="index">
                     <el-table-column v-if="!col.hide" :label="col.header" :width="col.width" show-overflow-tooltip>
                         <template #default="scope">
@@ -139,6 +150,13 @@ const state = reactive({
         LABEL:"完成",
         VALUE:"Completed"
     }],
+    documentType: [{
+        LABEL:"1",
+        VALUE:"1"
+    },{
+        LABEL:"2",
+        VALUE:"2"
+    }],
     queryParams: {
         RECEIVEREQUESTNAME: '',
         ERPFACTORY: '',
@@ -147,7 +165,8 @@ const state = reactive({
         FROMDATE : '',
         TODATE : '',
         DESC_CN: "",
-        MATERIALSPECNAME: ""
+        MATERIALSPECNAME: "",
+        RECEIVEREQUESTDETAILTYPE: ''
     },
     page: {
         pageNum: 1,
@@ -177,13 +196,15 @@ onMounted(() => {
         { header: "组织", field: "ERPFACTORY", hide: false },
         { header: "组织(CN)", field: "ORGNAME", hide: false },
         { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false },
+        { header: "单据类型", field: "RECEIVEREQUESTDETAILTYPE", hide: false },
         { header: "料号", field: "MATERIALSPECNAME", hide: true },
         { header: "品名", field: "DESC_CN", hide: true },
         { header: "出入库类型编码", field: "RECEIVEREQUESTTYPE", hide: false },
         { header: "订单状态", field: "RECEIVEREQUESTSTATE", hide: false },
         { header: "供应商编号", field: "SUPPLIERNO", hide: false },
+        { header: "供应商名称", field: "SUPPLIERNAME", hide: false },
         { header: "单据日期" , field: "ORDERDATE", hide: false},
-        { header: "供应商名称", field: "SUPPLIERNAME", hide: true },
+        { header: "备注" , field: "REMARK", hide: false},
         { header: "创建日期", field: "CREATETIME", hide: true },
         { header: "最后操作名称", field: "LASTEVENTNAME", hide: true },
         { header: "最后操作时间", field: "LASTEVENTTIME", hide: true },
@@ -195,7 +216,7 @@ onMounted(() => {
         { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false },
         { header: "行号", field: "RECEIVEREQUESTDETAILNAME", hide: false },
         { header: "发出仓库", field: "ERPLOCATION", hide: false },
-        { header: "接收仓库", field: "ERPRECEIVELOCATION", hide: true },
+        { header: "接收仓库", field: "ERPRECEIVELOCATION", hide: false },
         { header: "料号", field: "MATERIALSPECNAME", hide: false },
         { header: "品名", field: "DESC_CN", hide: false },
         { header: "物料规格", field: "DESCRIPTION ", hide: false },
@@ -203,6 +224,10 @@ onMounted(() => {
         { header: "阶段", field: "ms.PHASE", hide: false },
         { header: "请求数量", field: "REQUESTQUANTITY", hide: false },
         { header: "接受数量", field: "RECEIVEDQUANTITY", hide: false },
+        { header: "单位", field: "MATERIALUNIT", hide: false },
+        { header: "采购单申请号", field: "PURCHASEREQUESTNO", hide: false },
+        { header: "采购申请行号", field: "PURCHASEREQUESTDETAILNO", hide: false },
+        { header: "备注", field: "PURCHASEREQUESTNOTE", hide: false },
 
         { header: "组织", field: "ERPFACTORY", hide: true },
         { header: "退货标识", field: "RETURNFLAG", hide: true },