From a1a264a06845ca99c959ebf75aaaa9095172e707 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 19 Dec 2025 13:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=AE=B1=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotify.vue        | 80 ++++++++++---------
 .../ecss/components/PackingDetailTab.vue      | 20 ++++-
 2 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index ec63ecc..b093de5 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -57,6 +57,9 @@
       <el-form-item label="沃尔玛订单">
         <el-checkbox v-model="searchData.walMartOrderFlag" true-label="true" false-label="false" @change="searchTable()"></el-checkbox>
       </el-form-item>
+      <el-form-item label="维护箱尺寸">
+        <el-checkbox v-model="searchData.boxSizeFlag" true-label="true" false-label="false" @change="searchTable()"></el-checkbox>
+      </el-form-item>
       <el-form-item :label="' '" >
         <el-button @click="searchTable()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'查询'}}</el-button>
       </el-form-item>
@@ -406,17 +409,23 @@
       <el-form label-position="top"  style="margin-left: 36px;margin-top: 10px;">
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item :label="'沃尔玛订单'" >
+            <el-form-item v-if="currentRow.buNo=='03-RFID'" :label="'沃尔玛订单'" >
               <el-radio v-model="walMartOrderFlag" label="Y">是</el-radio>
               <el-radio v-model="walMartOrderFlag" label="N">否</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="'FSC'" >
+            <el-form-item v-if="currentRow.buNo=='03-RFID'" :label="'FSC'" >
               <el-radio v-model="fscFlag" label="Y">是</el-radio>
               <el-radio v-model="fscFlag" label="N">否</el-radio>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item :label="'维护箱尺寸'" >
+              <el-radio v-model="boxSizeFlag" label="Y">是</el-radio>
+              <el-radio v-model="boxSizeFlag" label="N">否</el-radio>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -795,6 +804,7 @@
 
         walMartOrderFlag: 'N',
         fscFlag: 'N',
+        boxSizeFlag: 'N',
         walMartOrderDialog:false,
         buList:[],
         dataList:[],
@@ -815,6 +825,7 @@
           modifyData:'',
           fscFlag:'',
           walMartOrderFlag:'',
+          boxSizeFlag:'',
         },
         buttons:{
           search:'查询',
@@ -2064,11 +2075,8 @@
         }
         this.walMartOrderFlag='N';
         this.fscFlag='N';
-        if (this.currentRow.buNo=='03-RFID') {
-          this.walMartOrderDialog=true;
-        } else {
-          this.xiadaEcssDel()
-        }
+        this.boxSizeFlag = 'N';
+        this.walMartOrderDialog=true;
       },
       cancelDelHeader(row){
         this.$confirm('确认废弃吗？', '提示').then(() => {
@@ -2160,43 +2168,39 @@
           cmcInvoice:this.currentRow.cmcInvoice,
           notifyStatus:'已下达',
           walMartOrderFlag:this.walMartOrderFlag,
-          fscFlag:this.fscFlag
+          fscFlag:this.fscFlag,
+          boxSizeFlag:this.boxSizeFlag
         }
-        this.$confirm('确认下达吗？', '提示').then(() => {
-          // 开始加载
-          this.dataListLoading = true;
+        // 开始加载
+        this.dataListLoading = true;
 
-          changeEcssDelStatus(inData).then(({data}) => {
-            if (data && data.code === 0) {
-              // 保存当前选中行的标识，以便刷新后恢复
-              const currentSelectedKey = this.currentRow ? this.currentRow.delNo : null;
-              if (currentSelectedKey) {
-                this.selectedRowKey = currentSelectedKey;
-                this.saveSelectedRowToStorage();
-              }
-              this.searchTable()
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
+        changeEcssDelStatus(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            // 保存当前选中行的标识，以便刷新后恢复
+            const currentSelectedKey = this.currentRow ? this.currentRow.delNo : null;
+            if (currentSelectedKey) {
+              this.selectedRowKey = currentSelectedKey;
+              this.saveSelectedRowToStorage();
             }
-          }).catch((error) => {
-            // 处理错误情况
-            this.$alert('操作失败，请重试', '错误', {
+            this.searchTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
-          }).finally(() => {
-            // 无论成功还是失败都要恢复加载状态
-            this.dataListLoading = false;
+          }
+        }).catch((error) => {
+          // 处理错误情况
+          this.$alert('操作失败，请重试', '错误', {
+            confirmButtonText: '确定'
           })
-        }).catch(() => {
-          // 用户取消确认时也要确保加载状态正常
+        }).finally(() => {
+          // 无论成功还是失败都要恢复加载状态
           this.dataListLoading = false;
         })
         this.walMartOrderDialog=false;
diff --git a/src/views/modules/ecss/components/PackingDetailTab.vue b/src/views/modules/ecss/components/PackingDetailTab.vue
index e9559c1..1c6eb85 100644
--- a/src/views/modules/ecss/components/PackingDetailTab.vue
+++ b/src/views/modules/ecss/components/PackingDetailTab.vue
@@ -160,6 +160,11 @@
               <el-input v-model="editBoxForm.rolls" :min="0" :precision="2" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
+          <el-col v-if="currentRow.boxSizeFlag==='Y'" :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="editBoxForm.remark" :min="0" :precision="2" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -300,6 +305,13 @@
             </template>
           </el-table-column>
 
+          <el-table-column v-if="currentRow.boxSizeFlag==='Y'" label="备注" prop="remark" width="100" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" size="mini" :class="{'modified-input': isBoxFieldModified(scope.row, 'remark')}"
+                        @change="onBatchBoxFieldChange(scope.row, 'remark')"></el-input>
+            </template>
+          </el-table-column>
+
           <!-- 明细信息列（不合并） -->
           <el-table-column label="PO" prop="poNo" min-width="120" align="left">
             <template slot-scope="scope">
@@ -446,6 +458,7 @@ export default {
         grossWeight: 0,
         netWeight: 0,
         rolls: 0,
+        remark: '',
         boxWeight: 0  // 物料的箱重量(BOXWEIGHT)
       },
       editBoxSubmitting: false,
@@ -880,6 +893,7 @@ export default {
       this.editBoxForm.grossWeight = boxRow.grossWeight;
       this.editBoxForm.netWeight = boxRow.netWeight;
       this.editBoxForm.rolls = boxRow.rolls;
+      this.editBoxForm.remark = boxRow.remark;
       this.editBoxForm.boxWeight = boxRow.boxWeight || 0; // 保存物料的箱重量
       this.editBoxDialogVisible = true;
     },
@@ -1043,6 +1057,7 @@ export default {
             grossWeight: this.editBoxForm.grossWeight,
             netWeight: this.editBoxForm.netWeight,
             rolls: this.editBoxForm.rolls,
+            remark: this.editBoxForm.remark,
             updateBy: this.$store.state.user.name
           };
 
@@ -1285,6 +1300,7 @@ export default {
                 grossWeight: box.grossWeight,
                 netWeight: box.netWeight,
                 rolls: box.rolls, // Box的总Rolls
+                remark: box.remark,
                 // 明细信息
                 _detailKey: `${detail.seqNo}_${detail.itemNo}_${detail.notifyDetailItemNo}`,
                 _hasDetail: true,
@@ -1325,6 +1341,7 @@ export default {
               grossWeight: box.grossWeight,
               netWeight: box.netWeight,
               rolls: box.rolls, // Box的总Rolls
+              remark: box.remark,
               _hasDetail: false,
               poNo: '',
               pn: '',
@@ -1689,7 +1706,8 @@ export default {
             box_qty: row.box_qty,
             grossWeight: row.grossWeight,
             netWeight: row.netWeight,
-            rolls: row.rolls // Box的总Rolls
+            rolls: row.rolls, // Box的总Rolls
+            remark : row.remark
           });
         }