From 4474cf3c30e6ad06711d2021be15ff82c36bd75a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 17 九月 2025 14:31:40 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/erpReceiving/erpReceiving.html |   94 +++++++++++++++++++++++++++++++---------------
 1 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/src/main/webapp/views/erpReceiving/erpReceiving.html b/src/main/webapp/views/erpReceiving/erpReceiving.html
index a5f0f63..b09db90 100644
--- a/src/main/webapp/views/erpReceiving/erpReceiving.html
+++ b/src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -16,7 +16,7 @@
         <el-form :inline="true">
             <el-form-item label="寮�宸ユ棩鏈�">
                 <el-date-picker
-                        v-model="tableSearchParam.FPlanCommitDate"
+                        v-model="tableSearchParam.fplancommitdate"
                         type="date"
                         placeholder="閫夋嫨鏃ユ湡"
                         :default-value="defaultTime"
@@ -24,10 +24,10 @@
                 />
             </el-form-item>
             <el-form-item label="鐢熶骇鍗曞彿">
-				<el-input v-model="tableSearchParam.FSourceBillNo" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"></el-input>
+				<el-input v-model="tableSearchParam.soCode" placeholder="璇疯緭鍏ョ敓浜у崟鍙�"></el-input>
 			</el-form-item>
             <el-form-item label="杞﹂棿">
-                <el-select v-model="tableSearchParam.FWorkShop" placeholder="閫夋嫨杞﹂棿" style="width: 240px" >
+                <el-select v-model="tableSearchParam.depName" placeholder="閫夋嫨杞﹂棿" style="width: 240px" >
                     <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -44,7 +44,7 @@
         </el-form>
         <el-form :inline="true">
             <el-form-item label="">
-               <el-button type="primary">鍚屾</el-button>
+               <el-button type="primary" @click="tongbu">鍚屾</el-button>
             </el-form-item>
             <el-form-item label="">
                <el-button type="primary">鎾ら攢鍚屾</el-button>
@@ -56,40 +56,40 @@
                <el-button type="primary">鎾ら攢閫�鏂�</el-button>
             </el-form-item>
         </el-form>
-        <el-table :data="tableData" border style="width: 100%" row-key="finterID" @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" >
             </el-table-column>
-            <el-table-column prop="fsourceBillNo" label="鐢熶骇鍗曞彿" >
+            <el-table-column prop="soCode" label="鐢熶骇鍗曞彿" >
             </el-table-column>
-            <el-table-column prop="fbillNo" label="浠诲姟鍗曞彿">
+            <el-table-column prop="fbillno" label="浠诲姟鍗曞彿">
             </el-table-column>
-            <el-table-column prop="icitemCore.fnumber" label="鐗╂枡缂栫爜">
+            <el-table-column prop="invCode" label="鐗╂枡缂栫爜">
             </el-table-column>
-            <el-table-column prop="icitemCore.fname" label="鐗╂枡鍚嶇О" width="300" show-overflow-tooltip="true">
+            <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="300" show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column prop="icitemCore.fmodel" label="瑙勬牸" width="200" show-overflow-tooltip="true">
+            <el-table-column prop="invStd" label="瑙勬牸" width="200" show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column prop="department.fname" label="杞﹂棿">
+            <el-table-column prop="depName" label="杞﹂棿">
             </el-table-column>
-            <el-table-column prop="fauxQty" label="鏁伴噺" width="90">
+            <el-table-column prop="fauxqty" label="鏁伴噺" width="90">
             </el-table-column>
-            <el-table-column prop="fplanCommitDate$" label="璁″垝寮�宸ユ椂闂�">
+            <el-table-column prop="fplancommitdate" label="璁″垝寮�宸ユ椂闂�">
             </el-table-column>
-            <el-table-column prop="fplanFinishDate$" label="璁″垝瀹屽伐鏃堕棿">
+            <el-table-column prop="fplanfinishdate" label="璁″垝瀹屽伐鏃堕棿">
             </el-table-column>
-            <el-table-column prop="izSyncReceive" label="鏄惁鍚屾" width="90">
+            <el-table-column prop="iz_sync_receive" label="鏄惁鍚屾" width="90">
             </el-table-column>
-            <el-table-column prop="izSyncReceiveReturn" label="鏄惁閫�鏂�" width="90">
+            <el-table-column prop="iz_sync_receive_return" label="鏄惁閫�鏂�" width="90">
             </el-table-column>
         </el-table>
-            <div style="margin-top: 10px">
-                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                               :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"
-                               layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">
-                </el-pagination>
-            </div>
+<!--            <div style="margin-top: 10px">-->
+<!--                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"-->
+<!--                               :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"-->
+<!--                               layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">-->
+<!--                </el-pagination>-->
+<!--            </div>-->
 
             
         </el-card>
@@ -114,24 +114,26 @@
                 const pageSize = ref(15)
                 const pageTotal = ref(0)
                 const tableSearchParam = ref({
-                    FSourceBillNo: null,
-                    FPlanCommitDate: new Date(),
-                    FWorkShop:null
+                    soCode: null,
+                    fplancommitdate: new Date(),
+                    depName:null
                 })
                 const tableData = ref([])
                 const defaultTime = ref(new Date())
 
                 const options = [
                     {
-                        value: '16979',
+                        value: '鍗楀尯杞﹂棿',
                         label: '鍗楀尯杞﹂棿'
                     },
                     {
-                        value: '16980',
+                        value: '鍖楀尯杞﹂棿',
                         label: '鍖楀尯杞﹂棿'
                     },
 
                 ]
+
+                const selectList = ref([])
                 
                 function page(){
                     let data = JSON.parse(JSON.stringify(tableSearchParam.value))
@@ -142,7 +144,7 @@
                         data.create_time = tableSearchParam.value.datetime[0] + " - " + tableSearchParam.value.datetime[1]
                     }
                     $.ajax({
-                        url: baseUrl + "/iCMO/list/auth",
+                        url: baseUrl + "/iCMO/getList/auth",
                         headers: {
                             'token': localStorage.getItem('token')
                         },
@@ -152,8 +154,36 @@
                         method: 'GET',
                         success: function(res) {
                             if (res.code == 200) {
-                                tableData.value = res.data.records
-                                pageTotal.value = res.data.total
+                                tableData.value = res.data
+
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl + "/";
+                            } else {
+                                ElementPlus.ElMessage({
+                                    message: res.msg,
+                                    type: 'error'
+                                });
+                            }
+                        }
+                    });
+                }
+
+                function tongbu(){
+                    $.ajax({
+                        url: baseUrl + "/other/tongbu/v1",
+                        headers: {
+                            'token': localStorage.getItem('token')
+                        },
+                        data: JSON.stringify(selectList.value),
+                        dataType: 'json',
+                        contentType: 'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function(res) {
+                            if (res.code == 200) {
+                                ElementPlus.ElMessage({
+                                    message: res.msg,
+                                    type: 'success'
+                                });
                             } else if (res.code === 403) {
                                 top.location.href = baseUrl + "/";
                             } else {
@@ -176,8 +206,9 @@
                     currentPage.value = val
                     page()
                 }
-                function handleSelectionChange(val) {
+                function handleSelectionChange(val) {                    
                     console.log(val)
+                    selectList.value = val
                 }
 
                 onMounted(() => {
@@ -194,6 +225,7 @@
                     defaultTime,
                     options,
                     page,
+                    tongbu,
                     handleSizeChange,
                     handleCurrentChange,
                     handleSelectionChange

--
Gitblit v1.9.1