From 5b30f59eb5116fb86d49f144b63f3b9b5460805c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 16 Oct 2025 14:49:19 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-16=20=E9=A2=86=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=20=E6=9D=90=E6=96=99=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=E7=AD=BE=E5=A2=9E=E5=8A=A0=E8=A1=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../soIssueNotify/searchIssureNotify.vue      | 196 +++++++++---------
 1 file changed, 101 insertions(+), 95 deletions(-)

diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index 84d42c1..0445c58 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -265,10 +265,11 @@
             fixed="right"
             header-align="center"
             align="center"
-            width="80"
+            width="100"
             label="操作">
             <template slot-scope="scope">
               <el-link style="cursor: pointer" @click="getAlternativePart(scope.row)">替代料</el-link>
+              <el-link style="cursor: pointer;margin-left: 5px;" type="danger" @click="deleteNotifyMaterial(scope.row)">删除</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -317,76 +318,76 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="删除记录" name="change">
-        <el-table
-          :data="dataList5"
-          :height="height"
-          border
-          v-loading="dataListLoading"
-          style="width: 100%; ">
-          <!--          <el-table-column-->
-          <!--            header-align="center"-->
-          <!--            align="center"-->
-          <!--            width="80"-->
-          <!--            fixed="left"-->
-          <!--            label="操作">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column
-            v-for="(item,index) in columnList5" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :min-width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="关闭记录" name="close">
-        <el-table
-          :data="dataList6"
-          :height="height"
-          border
-          v-loading="dataListLoading"
-          style="width: 100%; ">
-          <!--          <el-table-column-->
-          <!--            header-align="center"-->
-          <!--            align="center"-->
-          <!--            width="80"-->
-          <!--            fixed="left"-->
-          <!--            label="操作">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column
-            v-for="(item,index) in columnList6" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :min-width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
+<!--      <el-tab-pane label="删除记录" name="change">-->
+<!--        <el-table-->
+<!--          :data="dataList5"-->
+<!--          :height="height"-->
+<!--          border-->
+<!--          v-loading="dataListLoading"-->
+<!--          style="width: 100%; ">-->
+<!--          &lt;!&ndash;          <el-table-column&ndash;&gt;-->
+<!--          &lt;!&ndash;            header-align="center"&ndash;&gt;-->
+<!--          &lt;!&ndash;            align="center"&ndash;&gt;-->
+<!--          &lt;!&ndash;            width="80"&ndash;&gt;-->
+<!--          &lt;!&ndash;            fixed="left"&ndash;&gt;-->
+<!--          &lt;!&ndash;            label="操作">&ndash;&gt;-->
+<!--          &lt;!&ndash;            <template slot-scope="scope">&ndash;&gt;-->
+<!--          &lt;!&ndash;              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>&ndash;&gt;-->
+<!--          &lt;!&ndash;            </template>&ndash;&gt;-->
+<!--          &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+<!--          <el-table-column-->
+<!--            v-for="(item,index) in columnList5" :key="index"-->
+<!--            :sortable="item.columnSortable"-->
+<!--            :prop="item.columnProp"-->
+<!--            :header-align="item.headerAlign"-->
+<!--            :show-overflow-tooltip="item.showOverflowTooltip"-->
+<!--            :align="item.align"-->
+<!--            :fixed="item.fixed==''?false:item.fixed"-->
+<!--            :min-width="item.columnWidth"-->
+<!--            :label="item.columnLabel">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>-->
+<!--              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
+<!--                                                 style="width: 100px; height: 80px"/></span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="关闭记录" name="close">-->
+<!--        <el-table-->
+<!--          :data="dataList6"-->
+<!--          :height="height"-->
+<!--          border-->
+<!--          v-loading="dataListLoading"-->
+<!--          style="width: 100%; ">-->
+<!--          &lt;!&ndash;          <el-table-column&ndash;&gt;-->
+<!--          &lt;!&ndash;            header-align="center"&ndash;&gt;-->
+<!--          &lt;!&ndash;            align="center"&ndash;&gt;-->
+<!--          &lt;!&ndash;            width="80"&ndash;&gt;-->
+<!--          &lt;!&ndash;            fixed="left"&ndash;&gt;-->
+<!--          &lt;!&ndash;            label="操作">&ndash;&gt;-->
+<!--          &lt;!&ndash;            <template slot-scope="scope">&ndash;&gt;-->
+<!--          &lt;!&ndash;              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>&ndash;&gt;-->
+<!--          &lt;!&ndash;            </template>&ndash;&gt;-->
+<!--          &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+<!--          <el-table-column-->
+<!--            v-for="(item,index) in columnList6" :key="index"-->
+<!--            :sortable="item.columnSortable"-->
+<!--            :prop="item.columnProp"-->
+<!--            :header-align="item.headerAlign"-->
+<!--            :show-overflow-tooltip="item.showOverflowTooltip"-->
+<!--            :align="item.align"-->
+<!--            :fixed="item.fixed==''?false:item.fixed"-->
+<!--            :min-width="item.columnWidth"-->
+<!--            :label="item.columnLabel">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>-->
+<!--              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
+<!--                                                 style="width: 100px; height: 80px"/></span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--      </el-tab-pane>-->
     </el-tabs>
 
     <el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px">
@@ -976,7 +977,7 @@
     <el-dialog title="新增材料明细" :close-on-click-modal="false" v-drag :visible.sync="addMaterialModalFlag" width="525px">
       <el-form :inline="true" label-position="top" :model="newMaterialData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item>
-          <span style="cursor: pointer" slot="label" @click="getBaseList(508)"><a href="#">材料</a></span>
+          <span style="cursor: pointer" slot="label" @click="getBaseList(508)"><a href="#">物料信息</a></span>
           <el-input v-model="newMaterialData.componentPartNo" @change="partBlur(508)" style="width: 120px"></el-input>
           <el-input v-model="newMaterialData.partDesc" disabled style="width: 362px"></el-input>
         </el-form-item>
@@ -1124,7 +1125,8 @@
           firstInspectionQty: 0,
           standardDosage: 0,
           bomSeqNo: '',
-          warehouseId: ''
+          warehouseId: '',
+          qtyToIssueOriginal: ''
         },
         alternativePartsModalFlag: false,
         alternativePartsList: [],
@@ -2706,27 +2708,30 @@
               this.dataList3 = [];
             }
           });
-        }else if(this.activeName==='change'){
-          searchNotifyLog(this.currentRow).then(({data}) => {
-            //区分请求成功和失败的状况
-            if (data && data.code == 0) {
-              this.dataList5 = data.rows
-
-            } else {
-              this.dataList5 = [];
-            }
-          });
-        }else if(this.activeName==='close'){
-          searchNotifyLogClose(this.currentRow).then(({data}) => {
-            //区分请求成功和失败的状况
-            if (data && data.code == 0) {
-              this.dataList6 = data.rows
-
-            } else {
-              this.dataList6 = [];
-            }
-          });
-        }else {
+        }
+        // else if(this.activeName==='change'){
+        //   searchNotifyLog(this.currentRow).then(({data}) => {
+        //     //区分请求成功和失败的状况
+        //     if (data && data.code == 0) {
+        //       this.dataList5 = data.rows
+        //
+        //     } else {
+        //       this.dataList5 = [];
+        //     }
+        //   });
+        // }
+        // else if(this.activeName==='close'){
+        //   searchNotifyLogClose(this.currentRow).then(({data}) => {
+        //     //区分请求成功和失败的状况
+        //     if (data && data.code == 0) {
+        //       this.dataList6 = data.rows
+        //
+        //     } else {
+        //       this.dataList6 = [];
+        //     }
+        //   });
+        // }
+        else {
           searchSumNotifyMaterialList(this.currentRow).then(({data}) => {
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
@@ -3701,7 +3706,8 @@
           firstInspectionQty: 0,
           standardDosage: 0,
           bomSeqNo: '',
-          warehouseId: ''
+          warehouseId: '',
+          qtyToIssueOriginal: 0
         };
         // 加载生产订单选项
         this.loadOrderOptions();