From 4578665d0cf051ab02cd6079f6c47f939d34f78e Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Wed, 27 May 2026 16:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/firstOrder/components/inDialog.vue  | 72 ++++++++++---------
 src/views/firstOrder/components/outDialog.vue | 38 +++++-----
 2 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index 8ab8760..f8526fb 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -123,24 +123,7 @@
             </el-table-column>
             <el-table-column prop="model" label="规格"> </el-table-column>
             <el-table-column prop="unit" label="单位"> </el-table-column>
-            <el-table-column prop="type" label="类别">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.type"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  :disabled="inDialogType == 'details'"
-                  @change="handleTypeChange(scope.row)"
-                  v-if="inDialogType != 'details'"
-                >
-                  <el-option label="耐用品" value="NY"></el-option>
-                  <el-option label="易耗品" value="YH"></el-option>
-                </el-select>
-                <span v-else>{{
-                  scope.row.type == "NY" ? "耐用品" : "易耗品"
-                }}</span>
-              </template>
-            </el-table-column>
+            
             <el-table-column
               prop="requiredQuantity"
               label="计划采购数量"
@@ -173,6 +156,24 @@
                 }}</span>
               </template>
             </el-table-column>
+            <el-table-column prop="type" label="类别">
+              <template slot-scope="scope">
+                <el-select
+                  v-model="scope.row.type"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  :disabled="inDialogType == 'details'"
+                  @change="handleTypeChange(scope.row)"
+                  v-if="inDialogType != 'details'"
+                >
+                  <el-option label="耐用品" value="NY"></el-option>
+                  <el-option label="易耗品" value="YH"></el-option>
+                </el-select>
+                <span v-else>{{
+                  scope.row.type == "NY" ? "耐用品" : "易耗品"
+                }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="unitPrice" label="单价">
               <template slot-scope="scope">
                 <el-input-number
@@ -237,23 +238,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="model" label="物资规格"></el-table-column>
-            <el-table-column prop="type" label="类别 ">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.type"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  @change="handleTypeChange(scope.row)"
-                  v-if="inDialogType !== 'details'"
-                >
-                  <el-option label="耐用品" value="NY"></el-option>
-                  <el-option label="易耗品" value="YH"></el-option>
-                </el-select>
-                <span v-else>{{
-                  scope.row.type == "NY" ? "耐用品" : "易耗品"
-                }}</span>
-              </template>
-            </el-table-column>
+            
             <el-table-column prop="unit" label="单位"></el-table-column>
             <el-table-column
               prop="requiredQuantity"
@@ -286,6 +271,23 @@
                 <span v-else>{{ scope.row.theInboundQuantity || 0 }}</span>
               </template>
             </el-table-column>
+            <el-table-column prop="type" label="类别 ">
+              <template slot-scope="scope">
+                <el-select
+                  v-model="scope.row.type"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  @change="handleTypeChange(scope.row)"
+                  v-if="inDialogType !== 'details'"
+                >
+                  <el-option label="耐用品" value="NY"></el-option>
+                  <el-option label="易耗品" value="YH"></el-option>
+                </el-select>
+                <span v-else>{{
+                  scope.row.type == "NY" ? "耐用品" : "易耗品"
+                }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="unitPrice" label="单价">
               <template slot-scope="scope">
                 <el-input-number
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index 512b6f3..639468b 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -135,17 +135,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="model" label="规格"> </el-table-column>
-            <el-table-column prop="type" label="类别">
-              <template slot-scope="scope">
-                {{
-                  scope.row.type === "NY"
-                    ? "耐用品"
-                    : scope.row.type === "YH"
-                    ? "易耗品"
-                    : ""
-                }}
-              </template>
-            </el-table-column>
+            
 
             <el-table-column prop="unit" label="单位"> </el-table-column>
             <el-table-column
@@ -212,6 +202,17 @@
                 <span v-else>{{ scope.row.outboundQuantity }}</span>
               </template>
             </el-table-column>
+            <el-table-column prop="type" label="类别">
+              <template slot-scope="scope">
+                {{
+                  scope.row.type === "NY"
+                    ? "耐用品"
+                    : scope.row.type === "YH"
+                    ? "易耗品"
+                    : ""
+                }}
+              </template>
+            </el-table-column>
             <el-table-column
               label="操作"
               style="text-align: center"
@@ -517,13 +518,14 @@ export default {
     },
   },
   mounted() {
+    this.getDetailedItems();
     this.outDialogVisible = this.repairVisible;
     if (this.outDialogType == "add") {
       this.addInit();
     } else {
       this.inInit();
     }
-    this.getDetailedItems();
+    
     this.sizeForm.userInfoVO = this.userInfo;
     // this.getMaterialList()
   },
@@ -782,20 +784,17 @@ export default {
           const selectedDept = this.departmentList.find(
             (dept) => dept.departmentId === this.inBatchForm.department
           );
-          const deptName = selectedDept ? selectedDept.department : "";
 
-          // this.sizeForm.inTableData = res.data.result.map((item) => ({
-          //   ...item,
-          //   IdDemandEndld: this.inBatchForm.batchType,
-          //   department: deptName,
-          // }));
           const processedData = res.data.result.map((item) => {
             // 计算剩余可出库数量：申请数量 - 已出库数量
             // 如果字段不存在，默认为 0
             const appQty = Number(item.applicationQuantity || 0);
             const outQty = Number(item.outboundQuantity || 0);
             const defaultQty = appQty - outQty;
-
+             if (this.inBatchForm.optionType === "YH"){
+              item.department = selectedDept.departmentId
+              item.departmentName = selectedDept.department
+             }
             return {
               ...item,
               IdDemandEndld: this.inBatchForm.batchType,
@@ -823,6 +822,7 @@ export default {
             this.dialogVisible = true;
             this.batchTableData = res.data.result;
           } else {
+
             this.getStatistics();
           }