From d8e56efdca484288eba06d25cf6509d9d514f960 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 10 十一月 2025 16:54:47 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/erpMaterialuse/materialuse.html |   68 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/views/erpMaterialuse/materialuse.html b/src/main/webapp/views/erpMaterialuse/materialuse.html
index 087b7d0..bda3ef1 100644
--- a/src/main/webapp/views/erpMaterialuse/materialuse.html
+++ b/src/main/webapp/views/erpMaterialuse/materialuse.html
@@ -83,11 +83,11 @@
             </el-table-column>
             <el-table-column prop="invCode" label="鐗╂枡缂栫爜">
             </el-table-column>
-            <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="300" :show-overflow-tooltip="true">
+            <el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="250" :show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column prop="invStd" label="瑙勬牸" width="200" :show-overflow-tooltip="true">
+            <el-table-column prop="invStd" label="瑙勬牸" width="150" :show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column prop="depName" label="杞﹂棿">
+            <el-table-column prop="depName" label="杞﹂棿" width="70">
             </el-table-column>
             <el-table-column prop="fauxqty" label="鏁伴噺" width="90">
             </el-table-column>
@@ -95,9 +95,9 @@
             </el-table-column>
             <el-table-column prop="fplanfinishdate" label="璁″垝瀹屽伐鏃堕棿">
             </el-table-column>
-            <el-table-column prop="izSyncReceive" label="鏄惁鍚屾" width="90">
+            <el-table-column prop="izPrint" label="鏄惁鎵撳嵃" width="90">
             </el-table-column>
-            <el-table-column prop="izSyncReceiveReturn" label="鏄惁閫�鏂�" width="90">
+            <el-table-column prop="izPrintReturn" label="鏄惁鎵撳嵃(绾㈠瓧)" width="90">
             </el-table-column>
         </el-table>
 <!--            <div style="margin-top: 10px">-->
@@ -174,6 +174,11 @@
                         data.datetime = null
                         data.create_time = tableSearchParam.value.datetime[0] + " - " + tableSearchParam.value.datetime[1]
                     }
+                    const loading = ElementPlus.ElLoading.service({
+                        lock: true,
+                        text: 'Loading',
+                        background: 'rgba(0, 0, 0, 0.7)',
+                    })
                     $.ajax({
                         url: "http://127.0.0.1:9090/mo/materialreceive/getList",
                         headers: {
@@ -184,9 +189,13 @@
                         contentType: 'application/json;charset=UTF-8',
                         method: 'GET',
                         success: function(res) {
+                            loading.close()
                             if (res.code == 200) {
                                 tableData.value = res.data
-
+                                ElementPlus.ElMessage({
+                                    message: "鎷夊彇鏁版嵁瀹屾垚",
+                                    type: 'success'
+                                });
                             } else if (res.code === 403) {
                                 top.location.href = baseUrl + "/";
                             } else {
@@ -200,6 +209,13 @@
                 }
 
                 function fnCanelPrint(){
+                    if (selectList.value.length === 0){
+                        ElementPlus.ElMessage({
+                            message: "璇峰厛閫夋嫨",
+                            type: 'error'
+                        });
+                        return ;
+                    }
                     const loading = ElementPlus.ElLoading.service({
                         lock: true,
                         text: 'Loading',
@@ -221,6 +237,7 @@
                                     message: "鎾ら攢鎴愬姛",
                                     type: 'success'
                                 });
+                                page()
                             } else if (res.code === 403) {
                                 top.location.href = baseUrl + "/";
                             } else {
@@ -234,6 +251,13 @@
                 }
 
                 function fnCanelPrintRed(){
+                    if (selectList.value.length === 0){
+                        ElementPlus.ElMessage({
+                            message: "璇峰厛閫夋嫨",
+                            type: 'error'
+                        });
+                        return ;
+                    }
                     const loading = ElementPlus.ElLoading.service({
                         lock: true,
                         text: 'Loading',
@@ -252,9 +276,10 @@
                             loading.close();
                             if (res.code == 200) {
                                 ElementPlus.ElMessage({
-                                    message: "鎾ら攢鎴愬姛",
+                                    message: "鎾ら攢绾㈠瓧鎴愬姛",
                                     type: 'success'
                                 });
+                                page()
                             } else if (res.code === 403) {
                                 top.location.href = baseUrl + "/";
                             } else {
@@ -289,6 +314,13 @@
                     });
                 }
                 function fnPrint(izPrint) {
+                    if (selectList.value.length === 0){
+                        ElementPlus.ElMessage({
+                            message: "璇峰厛閫夋嫨",
+                            type: 'error'
+                        });
+                        return ;
+                    }
                     ElementPlus.ElMessageBox.confirm('纭畾鎵撳嵃鍚�?')
                         .then(() => {
                             print(izPrint,0)
@@ -300,14 +332,35 @@
                 }
 
                 function fnPrintView(izPrint){
+                    if (selectList.value.length === 0){
+                        ElementPlus.ElMessage({
+                            message: "璇峰厛閫夋嫨",
+                            type: 'error'
+                        });
+                        return ;
+                    }
                     print(izPrint,0)
                 }
 
                 function fnPrintRedView(izPrint) {
+                    if (selectList.value.length === 0){
+                        ElementPlus.ElMessage({
+                            message: "璇峰厛閫夋嫨",
+                            type: 'error'
+                        });
+                        return ;
+                    }
                     print(izPrint,1);
                 }
 
                 function fnPrintRed(izPrint) {
+                    if (selectList.value.length === 0){
+                        ElementPlus.ElMessage({
+                            message: "璇峰厛閫夋嫨",
+                            type: 'error'
+                        });
+                        return ;
+                    }
                     ElementPlus.ElMessageBox.confirm('纭畾绾㈠瓧鎵撳嵃鍚�?')
                         .then(() => {
                             print(izPrint,1);
@@ -345,6 +398,7 @@
                                     message: "鑾峰彇鏁版嵁瀹屾垚,绛夊緟鍞よ捣鎵撳嵃",
                                     type: 'success'
                                 });
+                                page()
                                 LODOP.PRINT_INITA(0,0,800,1100,"鐢熶骇棰嗘枡鍗�");
                                 LODOP.SET_PRINT_PAGESIZE(1,0,0,"A4");
                                 LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);

--
Gitblit v1.9.1