From 61074f587c21d36bcfee3311544db03364a279f4 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 9 Feb 2026 17:15:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E6=95=B0=E7=BB=B4=E6=8A=A4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/declareAdd.vue                 | 24 ++++++++++++-------
 .../shortageApplication.vue                   | 11 +++++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/views/procurementManagement/components/declareAdd.vue b/src/views/procurementManagement/components/declareAdd.vue
index 7f04737..14420f1 100644
--- a/src/views/procurementManagement/components/declareAdd.vue
+++ b/src/views/procurementManagement/components/declareAdd.vue
@@ -53,11 +53,11 @@
           </template>
         </el-table-column>
         <!-- 零件号 -->
-        <el-table-column align="center" prop="partCode" label="零件号"> </el-table-column>
+        <el-table-column align="center" prop="prtno" label="零件号"> </el-table-column>
         <!-- 批次号 -->
-        <el-table-column align="center" prop="batchNo" label="批次号"> </el-table-column>
+        <el-table-column align="center" prop="splcode" label="批次号"> </el-table-column>
         <!--生产标识 -->
-        <el-table-column align="center" prop="quaLevel" label="生产标识"> </el-table-column>
+        <el-table-column align="center" prop="prtlotno" label="生产标识"> </el-table-column>
         <!--数量 -->
         <el-table-column align="center" prop="quantity" label="数量">
           <template #header>
@@ -74,9 +74,9 @@
           </template>
         </el-table-column>
         <!--保管员 -->
-        <el-table-column align="center" prop="keeper" label="保管员"> </el-table-column>
+        <el-table-column align="center" prop="warctlr" label="保管员"> </el-table-column>
         <!--计划员 -->
-        <el-table-column align="center" prop="planMan" label="计划员"> </el-table-column>
+        <el-table-column align="center" prop="schemer" label="计划员"> </el-table-column>
         <!--备注 -->
         <el-table-column align="center" prop="remark" label="备注">
           <template #default="scope">
@@ -93,7 +93,7 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submitForm">申 报</el-button>
+        <el-button type="primary" @click="submitForm" :loading="saveLoading">申 报</el-button>
       </span>
     </template>
   </el-dialog>
@@ -112,6 +112,7 @@ export default {
   },
   data() {
     return {
+      saveLoading:false,
       batchLoading:false,
       openShow: false,
       wcData: [],
@@ -154,9 +155,7 @@ export default {
     this.openShow = this.showDialog;
     this.getWorkCenterList();
     // 初始添加一行（可选）
-    if (this.moldAddMore && this.form.tableData.length === 0) {
-      this.addTable();
-    }
+   
   },
   methods: {
     // 根据零件查询批次号
@@ -165,6 +164,8 @@ export default {
       queryBatch({partCode: this.form.partCode}).then(res=>{
         this.form.tableData = res.data.data || [];
         this.batchLoading = false;
+      }).catch(err=>{ 
+        this.batchLoading = false;
       })
     },
     getWorkCenterList() {
@@ -220,11 +221,16 @@ export default {
           });
           return;
         }
+        this.saveLoading = true
 
         // 调用接口提交（实际项目替换）
          saveDeclare(this.form.tableData).then(res=>{
            this.$message.success('操作成功');
+            this.saveLoading = false
+
             this.closeDialog();
+         }).catch(err=>{
+           this.saveLoading = false
          })
       //   try {
       //     const res = saveDeclare(this.form.tableData);
diff --git a/src/views/procurementManagement/shortageApplication.vue b/src/views/procurementManagement/shortageApplication.vue
index 9bd5d1d..fde96a6 100644
--- a/src/views/procurementManagement/shortageApplication.vue
+++ b/src/views/procurementManagement/shortageApplication.vue
@@ -20,8 +20,8 @@
         <el-button type="primary" @click="handleAdd">申报 </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary" plain @click="handleImport">已申报 </el-button>
-        <el-button type="primary" plain @click="handleImport">已完成 </el-button>
+        <el-button type="primary" plain @click="statusOnLoad(1)">已申报 </el-button>
+        <el-button type="primary" plain @click="statusOnLoad(2)">已完成 </el-button>
       </template>
       <template #menu="scope">
         <el-button type="text" @click="handleImport">打印 </el-button>
@@ -218,9 +218,16 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      query:{
+        podStatus:''
+      }
     };
   },
   methods: {
+    statusOnLoad(status){
+      this.query.podStatus = status;
+      this.onLoad(this.page,this.query)
+    },
     // 导入
     handleImport() {
       this.isShowImport = true;