From 29028620d8dc1dcfaad7b14b72b5021645a067bf Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Wed, 29 Apr 2026 16:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Copilot <copilot@github.com>
---
 src/views/basicData/components/inventory.vue  | 19 ++++----
 .../otherIssuing/index.vue                    | 20 ++++----
 .../otherIssuing/otherIssuingDailog.vue       | 15 +++---
 .../components/mold/addMoldDailog.vue         |  6 +--
 .../components/mold/detailsInfoDialog.vue     |  8 ++--
 .../components/mold/moldRequire.vue           | 46 +++++++++----------
 .../materialExpiration/matureSubmission.vue   |  1 +
 .../warehouseManagement/teamRequest/index.vue |  2 +-
 8 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/src/views/basicData/components/inventory.vue b/src/views/basicData/components/inventory.vue
index 8e8b2a15..dfb9da1a 100644
--- a/src/views/basicData/components/inventory.vue
+++ b/src/views/basicData/components/inventory.vue
@@ -91,7 +91,7 @@ export default {
         searchShowBtn: false,
         showOverflowTooltip: true,
         searchLabelPosition: 'left',
-        searchLabelWidth:'auto',
+        searchLabelWidth: 'auto',
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: 'left',
@@ -145,6 +145,7 @@ export default {
             span: 12,
             overflow: true,
             search: true,
+            type: 'select',
           },
           {
             label: '物料名称',
@@ -257,18 +258,20 @@ export default {
       }
     },
     onLoad() {
-      this.loading = true
+      this.loading = true;
       getLocationList({
         current: this.page.currentPage,
         size: this.page.pageSize,
         ...this.query,
-      }).then(res => {
-         this.loading = false
-        this.data = res.data.data.records;
-        this.page.total = res.data.data.total;
-      }).catch(err => {
-        this.loading = false
       })
+        .then(res => {
+          this.loading = false;
+          this.data = res.data.data.records;
+          this.page.total = res.data.data.total;
+        })
+        .catch(err => {
+          this.loading = false;
+        });
     },
   },
 };
diff --git a/src/views/inboundOutboundManagement/otherIssuing/index.vue b/src/views/inboundOutboundManagement/otherIssuing/index.vue
index b32cce9d..209bcd0d 100644
--- a/src/views/inboundOutboundManagement/otherIssuing/index.vue
+++ b/src/views/inboundOutboundManagement/otherIssuing/index.vue
@@ -323,16 +323,16 @@ export default {
               // },
             ],
           },
-          {
-            label: '审批意见',
-            prop: 'approvalOpinion',
-            search: false,
-            sortable: true,
-            filter: true,
-            span: 12,
-            display: false,
-            width: 180,
-          },
+          // {
+          //   label: '审批意见',
+          //   prop: 'approvalOpinion',
+          //   search: false,
+          //   sortable: true,
+          //   filter: true,
+          //   span: 12,
+          //   display: false,
+          //   width: 180,
+          // },
           {
             label: '审批人',
             prop: 'approverName',
diff --git a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
index 955a5b3d..72b14d5a 100644
--- a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
+++ b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
@@ -204,7 +204,8 @@
           </template>
         </el-table-column>
         <el-table-column label="到期日期" prop="scrapCycle" align="center">
-          <template #header>
+          <template #default="scope">{{ scope.row.scrapCycle }}</template>
+          <!-- <template #header>
             <span><i style="color: red">*</i>到期日期</span>
           </template>
           <template #default="scope">
@@ -217,10 +218,11 @@
               placeholder="选择日期"
               style="width: 100%"
             />
-          </template>
+          </template> -->
         </el-table-column>
-        <el-table-column label="入库日期" prop="inOutDate" align="center">
-          <template #header>
+        <el-table-column label="入库日期" prop="inDate" align="center">
+          <template #default="scope">{{ scope.row.inDate }}</template>
+          <!-- <template #header>
             <span><i style="color: red">*</i>入库日期</span>
           </template>
           <template #default="scope">
@@ -233,7 +235,7 @@
               placeholder="选择日期"
               style="width: 100%"
             />
-          </template>
+          </template> -->
         </el-table-column>
       </el-table>
     </el-form>
@@ -428,6 +430,7 @@ export default {
       this.outbankList[index].slId = '';
       this.outbankList[index].piNo = '';
       this.outbankList[index].quantity = '';
+     
       }
       getLocationData({
         shId: this.stOtherOutRecord.shId,
@@ -454,7 +457,7 @@ export default {
         this.outbankList[index].stovePiNo = tmp.stovePiNo;
         this.outbankList[index].quantity = tmp.quantity;
         this.outbankList[index].scrapCycle = tmp.scrapCycle;
-        this.outbankList[index].inOutDate = tmp.inOutDate;
+      this.outbankList[index].inDate = tmp.inDate;
         this.outbankList[index].id = tmp.id;
       }
     },
diff --git a/src/views/orderManagement/components/mold/addMoldDailog.vue b/src/views/orderManagement/components/mold/addMoldDailog.vue
index 200239b7..98f59aff 100644
--- a/src/views/orderManagement/components/mold/addMoldDailog.vue
+++ b/src/views/orderManagement/components/mold/addMoldDailog.vue
@@ -19,7 +19,7 @@
 
       <el-table :data="form.moldPlan" @select="selectChange" style="width: 100%" border>
         <el-table-column type="selection" width="55" v-if="moldAddMore"></el-table-column>
-        <el-table-column type="index" width="80" label="序号" align="center"></el-table-column>
+        <!-- <el-table-column type="index" width="80" label="序号" align="center"></el-table-column> -->
         <el-table-column prop="partCode" label="零件编码" align="center"  width="190">
           <template #header>
             <span><i style="color: red">*</i>零件编码</span>
@@ -64,7 +64,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="partName" label="零件名称" align="center">
+        <el-table-column prop="partName" label="零件名称" align="center" show-overflow-tooltip>
           <template #default="scope">
             <span>{{ scope.row.partName }}</span>
           </template>
@@ -383,7 +383,7 @@ export default {
       console.log(val, i,value,item,9090909090)
       this.form.moldPlan[i].partName =item.partName
         // this.partCodeList.find(item => item.partCode === val)?.partName || '';
-      getToolList({partCode:val}).then(res =>{
+      getToolList({partCode:item.partCode}).then(res =>{
         console.log('res-----------',res)
         this.form.moldPlan[i].modeArray = res.data.data
       })
diff --git a/src/views/orderManagement/components/mold/detailsInfoDialog.vue b/src/views/orderManagement/components/mold/detailsInfoDialog.vue
index 96b507b0..7c044239 100644
--- a/src/views/orderManagement/components/mold/detailsInfoDialog.vue
+++ b/src/views/orderManagement/components/mold/detailsInfoDialog.vue
@@ -9,10 +9,10 @@
   >
     <el-descriptions class="margin-top" :column="4" border title="需求信息">
       <el-descriptions-item label="需求编号">{{form.mdCode}}</el-descriptions-item>
-      <el-descriptions-item label="工装编号">{{ form.moCode || "-" }}</el-descriptions-item>
-      <el-descriptions-item label="工装名称">{{ form.moName || "-" }}</el-descriptions-item>
-      <el-descriptions-item label="关联订单数">{{form.linkOrderIds || "-"}}</el-descriptions-item>
-      <el-descriptions-item label="工装需求量">{{ form.quantity || "-" }}</el-descriptions-item>
+      <el-descriptions-item label="工装编号">{{ form.toolCode || "-" }}</el-descriptions-item>
+      <el-descriptions-item label="工装名称">{{ form.toolName || "-" }}</el-descriptions-item>
+      <el-descriptions-item label="关联订单数">{{form.linkOrderNum || "-"}}</el-descriptions-item>
+      <el-descriptions-item label="工装需求量">{{ form.demandNum || "-" }}</el-descriptions-item>
       <el-descriptions-item label="库存数量">{{ form.stockNum || "-" }}</el-descriptions-item>
       <el-descriptions-item label="占用数量">{{ form.occupyNum || "-" }}</el-descriptions-item>
     </el-descriptions>
diff --git a/src/views/orderManagement/components/mold/moldRequire.vue b/src/views/orderManagement/components/mold/moldRequire.vue
index bced5b5a..b537ec31 100644
--- a/src/views/orderManagement/components/mold/moldRequire.vue
+++ b/src/views/orderManagement/components/mold/moldRequire.vue
@@ -221,7 +221,7 @@ export default {
           // },
           {
             label: '订单需求量',
-            prop: 'quantity',
+            prop: 'demandNum',
             search: false,
             sortable: true,
             width:120,
@@ -249,28 +249,28 @@ export default {
           // },
           {
             label: '关联订单个数',
-            prop: 'linkOrderIds',
+            prop: 'linkOrderNum',
             search: false,
             sortable: true,
             span: 12,
             headerAlign: 'center',
             align: 'center',
           },
-          {
-            // STATUS_WAITING("待出库", 10000),
-            // STATUS_OUT_STORE("已出库", 10001),
-            // STATUS_DONE("完成", 10002),
-            // STATUS_CLOSE("关闭", 10003),
-            label:'状态',
-            // type:"select",
-            prop:"statusName",
-            // dicData:[
-            //   {label:'待出库',value:10000},
-            //   {label:'已出库',value:10001},
-            //   {label:'完成',value:10002},
-            //   {label:'关闭',value:10003}
-            // ]
-          }
+          // {
+          //   // STATUS_WAITING("待出库", 10000),
+          //   // STATUS_OUT_STORE("已出库", 10001),
+          //   // STATUS_DONE("完成", 10002),
+          //   // STATUS_CLOSE("关闭", 10003),
+          //   label:'状态',
+          //   // type:"select",
+          //   prop:"statusName",
+          //   // dicData:[
+          //   //   {label:'待出库',value:10000},
+          //   //   {label:'已出库',value:10001},
+          //   //   {label:'完成',value:10002},
+          //   //   {label:'关闭',value:10003}
+          //   // ]
+          // }
         ],
       },
 
@@ -290,11 +290,11 @@ export default {
         this.$message.error('请至少选择一条数据!');
         return;
       }
-      let tmp = this.selectionList.map(item => item.statusName != '待出库');
-      if(tmp){
-        this.$message.error("请选择状态为【待出库】的数据")
-        return
-      }
+      // let tmp = this.selectionList.map(item => item.statusName != '待出库');
+      // if(tmp){
+      //   this.$message.error("请选择状态为【待出库】的数据")
+      //   return
+      // }
       this.$confirm('确定将选择数据批量关闭?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -302,7 +302,7 @@ export default {
       })
         .then(() => {
           const ids = this.selectionList.map(item => item.id).join(',');
-          closeBatchs({ ids }).then(res => {
+          closeBatchs(ids).then(res => {
             if (res.data.code === 200) {
               this.$message({
                 type: 'success',
diff --git a/src/views/warehouseManagement/materialExpiration/matureSubmission.vue b/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
index 60e1ae33..e4c50b43 100644
--- a/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
+++ b/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
@@ -307,6 +307,7 @@ export default {
         item.esDept = '' //送检部门名称
         item.esQty = ''  //送检数量
         item.esDeptId='' //送检部门id
+        item.rlsId = item.id
       });
       this.rowData = this.selectionList
       this.inspectionShow = true
diff --git a/src/views/warehouseManagement/teamRequest/index.vue b/src/views/warehouseManagement/teamRequest/index.vue
index e78c0281..99cd6d9e 100644
--- a/src/views/warehouseManagement/teamRequest/index.vue
+++ b/src/views/warehouseManagement/teamRequest/index.vue
@@ -218,7 +218,7 @@ export default {
                     },
                     {
                         label: '关联订单号',
-                        prop: 'memo',
+                        prop: 'woCode',
                         search: false,
                         sortable: true,
                         filter: true,