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 @@
+
+
+
{{'查询'}}
@@ -406,17 +409,23 @@
-
+
是
否
-
+
是
否
+
+
+ 是
+ 否
+
+
@@ -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 @@
+
+
+
+
+