From 2330cde874d1c4ca6763fd9fc1590fc313751df3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 09 九月 2025 08:53:36 +0800
Subject: [PATCH] #erp.生产收料通知单页面查询完成

---
 src/main/webapp/views/erpReceiving/erpReceiving.html |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/erpReceiving/erpReceiving.html b/src/main/webapp/views/erpReceiving/erpReceiving.html
index 22ac6c7..a5f0f63 100644
--- a/src/main/webapp/views/erpReceiving/erpReceiving.html
+++ b/src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -24,10 +24,17 @@
                 />
             </el-form-item>
             <el-form-item label="鐢熶骇鍗曞彿">
-				<el-input v-model="tableSearchParam.produce_no" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"></el-input>
+				<el-input v-model="tableSearchParam.FSourceBillNo" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"></el-input>
 			</el-form-item>
             <el-form-item label="杞﹂棿">
-                <el-input v-model="tableSearchParam.produce_no" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"></el-input>
+                <el-select v-model="tableSearchParam.FWorkShop" placeholder="閫夋嫨杞﹂棿" style="width: 240px" >
+                    <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                    />
+                </el-select>
             </el-form-item>
             <el-form-item label="">
                 <el-button type="primary" @click="page" circle >
@@ -49,7 +56,7 @@
                <el-button type="primary">鎾ら攢閫�鏂�</el-button>
             </el-form-item>
         </el-form>
-        <el-table :data="tableData" border style="width: 100%" row-key="id" @selection-change="handleSelectionChange">
+        <el-table :data="tableData" border style="width: 100%" row-key="finterID" @selection-change="handleSelectionChange">
             <el-table-column type="selection" >
             </el-table-column>
             <el-table-column type="index" width="50" >
@@ -60,21 +67,21 @@
             </el-table-column>
             <el-table-column prop="icitemCore.fnumber" label="鐗╂枡缂栫爜">
             </el-table-column>
-            <el-table-column prop="icitemCore.fname" label="鐗╂枡鍚嶇О">
+            <el-table-column prop="icitemCore.fname" label="鐗╂枡鍚嶇О" width="300" show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column prop="icitemCore.fmodel" label="瑙勬牸">
+            <el-table-column prop="icitemCore.fmodel" label="瑙勬牸" width="200" show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column prop="fworkShop" label="杞﹂棿">
+            <el-table-column prop="department.fname" label="杞﹂棿">
             </el-table-column>
-            <el-table-column prop="fauxQty" label="鏁伴噺">
+            <el-table-column prop="fauxQty" label="鏁伴噺" width="90">
             </el-table-column>
             <el-table-column prop="fplanCommitDate$" label="璁″垝寮�宸ユ椂闂�">
             </el-table-column>
             <el-table-column prop="fplanFinishDate$" label="璁″垝瀹屽伐鏃堕棿">
             </el-table-column>
-            <el-table-column prop="fsourceBillNo" label="鏄惁鍚屾">
+            <el-table-column prop="izSyncReceive" label="鏄惁鍚屾" width="90">
             </el-table-column>
-            <el-table-column prop="fsourceBillNo" label="鏄惁閫�鏂�">
+            <el-table-column prop="izSyncReceiveReturn" label="鏄惁閫�鏂�" width="90">
             </el-table-column>
         </el-table>
             <div style="margin-top: 10px">
@@ -107,11 +114,24 @@
                 const pageSize = ref(15)
                 const pageTotal = ref(0)
                 const tableSearchParam = ref({
-                    produce_no: null,
-                    FPlanCommitDate: new Date()
+                    FSourceBillNo: null,
+                    FPlanCommitDate: new Date(),
+                    FWorkShop:null
                 })
                 const tableData = ref([])
                 const defaultTime = ref(new Date())
+
+                const options = [
+                    {
+                        value: '16979',
+                        label: '鍗楀尯杞﹂棿'
+                    },
+                    {
+                        value: '16980',
+                        label: '鍖楀尯杞﹂棿'
+                    },
+
+                ]
                 
                 function page(){
                     let data = JSON.parse(JSON.stringify(tableSearchParam.value))
@@ -172,6 +192,7 @@
                     pageTotal,
                     tableSearchParam,
                     defaultTime,
+                    options,
                     page,
                     handleSizeChange,
                     handleCurrentChange,

--
Gitblit v1.9.1