diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js
index 1580b21..b18c96b 100644
--- a/src/api/ecss/ecss.js
+++ b/src/api/ecss/ecss.js
@@ -10,6 +10,7 @@ export const updateEcssDelHeader = data => createAPI(`/ecss/coDel/updateEcssDelH
export const deleteEcssDelHeader = data => createAPI(`/ecss/coDel/deleteEcssDelHeader`,'post',data)
+export const cancelEcssDelHeader = data => createAPI(`/ecss/coDel/cancelEcssDelHeader`,'post',data)
export const changeEcssDelStatus = data => createAPI(`/ecss/coDel/changeEcssDelStatus`,'post',data)
diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index 6d8fae1..d5783d9 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -25,6 +25,7 @@
+
@@ -47,6 +48,9 @@
placeholder="选择日期">
+
+
+
{{'查询'}}
@@ -74,21 +78,22 @@
highlight-current-row
:height="height"
:data="dataList"
- ref="mainTable"
- border
+ ref="mainTable" :cell-style="cellStyle"
+ border :row-class-name="tableRowClassName"
v-loading="dataListLoading"
style="width: 100%;">
- 修改
- 下达
- 取消下达
- 删除
+ 修改
+ 下达
+ 取消下达
+ 废弃
+ 删除
+ {{'新增'}}
- 修改
- 删除
+ 修改
+ 取消
@@ -210,7 +216,7 @@
0){
this.$refs.mainTable.setCurrentRow(this.dataList[0]);
this.changeData(this.dataList[0])
+ this.dataList.forEach(o => {
+ o.modifyLabel = !!o.modifyFlag?'是':'';
+ });
}else {
this.changeData(null)
}
@@ -1706,9 +1736,47 @@
this.xiadaEcssDel()
}
},
+ cancelDelHeader(row){
+ this.$confirm('确认废弃吗？', '提示').then(() => {
+ cancelEcssDelHeader(row).then(({data}) => {
+ if (data && data.code === 0) {
+ this.searchTable()
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {}
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ })
+ },
+ tableRowClassName({row}) {
+ if (row.notifyStatus==='订单取消') {
+ return 'warning-row';
+ }
+ },
+ cellStyle({row, column }) {
+ if (column.property === 'modifyLabel' && row.modifyLabel==='是') { // 根据列属性判断
+ return { color: '#ff5d03' };
+ }
+ return {};
+ },
+ cellStyleDetail({row, column }) {
+ if ((column.property === 'pn' || column.property === 'qty') && row.modifyFlag===true) { // 根据列属性判断
+ return { color: '#ff5d03' };
+ }
+ return {};
+ },
xiadaEcssDel(){
let inData={
site:this.currentRow.site,
+ buNo:this.currentRow.buNo,
+ createBy:this.currentRow.createBy,
delNo:this.currentRow.delNo,
notifyStatus:'已下达',
walMartOrderFlag:this.walMartOrderFlag
@@ -1847,12 +1915,45 @@
}
})
},
+
+ openCreateDetailModel(){
+ this.updateDetailModel.site=this.currentRow.site;
+ this.updateDetailModel.buNo=this.currentRow.buNo;
+ this.updateDetailModel.delNo=this.currentRow.delNo;
+ this.updateDetailModel.partNo=''
+ this.updateDetailModel.qty=''
+ this.updateDetailModel.partDescription=''
+ this.updateDetailModel.itemNo=''
+ this.updateDetailModel.salesOrder=''
+ this.updateDetailModel.line=''
+ this.updateDetailModel.customerPO=''
+ this.updateDetailModel.version=''
+ this.updateDetailModel.status=''
+ this.updateDetailModel.family=''
+ this.updateDetailModel.lt=''
+ this.updateDetailModel.cmcComment=''
+ this.updateDetailModel.saleType=''
+ this.updateDetailModel.awbBl=''
+ this.updateDetailModel.shippingNumber=''
+ this.updateDetailModel.forwarderInfo=''
+ this.updateDetailModel.currency=''
+ this.updateDetailModel.tp=''
+ this.updateDetailModel.ttlAmount=''
+ this.updateDetailModel.sumPrice=''
+ this.updateDetailModel.so=''
+ this.updateDetailModel.upc=''
+ this.updateDetailModel.remark=''
+ this.updateDetailModel.pn=''
+ this.updateDetailModel.addFlag=0
+ this.updateDetailModelFlag=true
+ },
openUpdateDetailModel(row){
this.updateDetailModel=JSON.parse(JSON.stringify(row));
+ this.updateDetailModel.addFlag=1
this.updateDetailModelFlag=true
},
deleteDelDetail(row){
- this.$confirm('确认删除此明细？', '提示').then(() => {
+ this.$confirm('确认取消此明细？', '提示').then(() => {
deleteEcssDelDetail(row).then(({data}) => {
if (data && data.code === 0) {
this.refreshCurrentTabTable()
@@ -1925,10 +2026,10 @@
sums[index] = `${values.reduce((a, b) => a + b, 0)}`;
break;
case 'ttlAmount':
- sums[index] = `${values.reduce((a, b) => a + b, 0)}`;
+ sums[index] = `${values.reduce((a, b) => a + b, 0).toFixed(2)}`;
break;
case 'sumPrice':
- sums[index] = `${values.reduce((a, b) => a + b, 0)}`;
+ sums[index] = `${values.reduce((a, b) => a + b, 0).toFixed(2)}`;
break;
default:
sums[index] = '';
@@ -1947,7 +2048,8 @@
}
-
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 1d54e1b..68aabf7 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -46,6 +46,9 @@
placeholder="选择日期">
+
+
+
{{'查询'}}
@@ -57,13 +60,13 @@
:height="height"
:data="dataList"
ref="mainTable"
- border
+ border :cell-style="cellStyle"
v-loading="dataListLoading"
style="width: 100%;">
@@ -103,7 +106,7 @@
- {{'一键装箱'}}
- {{'导入装箱单'}}
+ {{'一键装箱'}}
+ {{'导入装箱单'}}
{{'装箱'}}
+ {{'导出模版'}}
-
+
-
+
+
+
+
+
+
+
@@ -622,6 +638,8 @@
searchPalletList
}from "@/api/ecss/ecss.js"
import {getBuList}from '@/api/factory/site.js'
+ import excel from "@/utils/excel-util.js";
+ import excelOpts from '@/utils/export-options.js'
export default {
name: "null",
components:{
@@ -746,7 +764,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 60
},
{
userId: this.$store.state.user.name,
@@ -874,6 +892,24 @@
fixed: '',
columnWidth: 100
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 801001,
+ serialNumber: '801001Table1NotifyStatus',
+ tableId: "801001Table1",
+ tableName: "关务系统发货通知单",
+ columnProp: "modifyLabel",
+ headerAlign: "center",
+ align: "left",
+ columnLabel: "改单",
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 50
+ },
{
userId: this.$store.state.user.name,
functionId: 801002,
@@ -1975,6 +2011,14 @@
if(this.dataList.length>0){
this.$refs.mainTable.setCurrentRow(this.dataList[0]);
this.changeData(this.dataList[0])
+ this.dataList.forEach(o => {
+ if (o.notifyStatus==='仓库已确认'&&!o.notifyDate) {
+ o.notifyDate='发货日期不确定'
+ }
+ this.dataList.forEach(o => {
+ o.modifyLabel = !!o.modifyFlag?'是':'';
+ });
+ });
}else {
this.changeData(null)
}
@@ -1983,6 +2027,21 @@
}
});
},
+ cellStyle({row, column }) {
+ if (column.property === 'notifyDate' && row.notifyDate==='发货日期不确定') { // 根据列属性判断
+ return { color: '#ff5d03' };
+ }
+ if (column.property === 'modifyLabel' && row.modifyLabel==='是') { // 根据列属性判断
+ return { color: '#ff5d03' };
+ }
+ return {};
+ },
+ cellStyleDetail({row, column }) {
+ if ((column.property === 'pn' || column.property === 'qty') && row.modifyFlag===true) { // 根据列属性判断
+ return { color: '#ff5d03' };
+ }
+ return {};
+ },
changeData(row){
this.currentRow = JSON.parse(JSON.stringify(row));
this.headerData=row;
@@ -2035,12 +2094,12 @@
},
confirmDo(){
- if (!this.confirmModel.notifyDate) {
+ /* if (!this.confirmModel.notifyDate) {
this.$alert('请选择预计发货日期！', '错误', {
confirmButtonText: '确定'
})
return false
- }
+ } */
confirmEcssDel(this.confirmModel).then(({data}) => {
if (data && data.code === 0) {
this.searchTable()
@@ -2120,12 +2179,12 @@
})
},
upLoadPallet(){
- if(this.dataList3.length>0){
+ /* if(this.dataList3.length>0){
this.$alert('已经有明细无法再次导入请去手工装箱全部删除！', '错误', {
confirmButtonText: '确定'
})
return false
- }
+ } */
if(this.currentRow.site===''||this.currentRow.site==null){
this.$alert('请先选择发货通知单！', '错误', {
confirmButtonText: '确定'
@@ -2149,6 +2208,25 @@
this.$refs.palletUploadExcel.init(inData)
})
},
+ async exportExcel() {
+ let searchData={
+ site: this.currentRow.site,
+ buNo: this.currentRow.buNo,
+ delNo: this.currentRow.delNo,
+ cmcInvoice: this.currentRow.cmcInvoice,
+ createBy: this.$store.state.user.name,
+ }
+ excel.exportTable({
+ url: "/select/ecssMapper/searchEcssCoDelNotifyDetail/list",
+ columnMapping: excelOpts.PalletSku.columnMapping,//可以直接用table，不需要的列就剔除
+ mergeSetting: [],//需要合并的列
+ params: searchData,
+ fileName: "装箱数据导入模版.xlsx",
+ rowFetcher: res => res.data,
+ columnFormatter: [],
+ dropColumns: [],//需要剔除的列，例如dropColumns: ["netWeight"]，即剔除净重列
+ });
+ },
searchPalletTable(){
this.refreshCurrentTabTable();
},
@@ -2417,12 +2495,12 @@
})
return false
}
- if(this.dataList4.length>0){
+ /* if(this.dataList4.length>0){
this.$alert('已存在装箱数据，不可一键装箱！', '错误', {
confirmButtonText: '确定'
})
return false
- }
+ } */
this.oneClickPackingModelData={
addFlag:0,
site:this.currentRow.site,
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index 2acd919..1bc0f03 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -63,7 +63,7 @@
:height="height"
:data="dataList"
ref="mainTable"
- border
+ border :cell-style="cellStyle"
v-loading="dataListLoading"
style="width: 100%;">
0){
this.$refs.mainTable.setCurrentRow(this.dataList[0]);
this.changeData(this.dataList[0])
+ this.dataList.forEach(o => {
+ if (o.notifyStatus==='仓库已确认'&&!o.notifyDate) {
+ o.notifyDate='发货日期不确定'
+ }
+ });
}else {
this.changeData(null)
}
@@ -1559,6 +1564,12 @@
}
});
},
+ cellStyle({row, column }) {
+ if (column.property === 'notifyDate' && row.notifyDate==='发货日期不确定') { // 根据列属性判断
+ return { color: '#ff5d03' };
+ }
+ return {};
+ },
changeData(row){
this.currentRow = JSON.parse(JSON.stringify(row));
this.headerData=row;
diff --git a/src/views/modules/ecss/ecssWalMartOrder.vue b/src/views/modules/ecss/ecssWalMartOrder.vue
index 595ec3b..b0e3a92 100644
--- a/src/views/modules/ecss/ecssWalMartOrder.vue
+++ b/src/views/modules/ecss/ecssWalMartOrder.vue
@@ -10,6 +10,7 @@
{{'查询'}}
{{'导入'}}
+ {{'新增'}}
@@ -61,7 +62,7 @@
layout="total, sizes, prev, pager, next, jumper">
-
+
@@ -422,6 +423,21 @@ import walUploadExcel from "./walmart_upload_excel.vue";
}
})
},
+ newModelOpen(){
+ this.addDisabledFlag=false
+ this.addModel={
+ addFlag:0,
+ site:'',
+ buNo:'03-RFID',
+ sku:'',
+ so:'',
+ qty:'',
+ rolls:'',
+ grossWeight:'',
+ verificationSheet:'',
+ }
+ this.addModelFlag=true
+ },
updateModelOpen(row){
this.addDisabledFlag=false
this.addModel={
diff --git a/src/views/modules/ecss/pallet_upload_excel.vue b/src/views/modules/ecss/pallet_upload_excel.vue
index 80e1655..48956c8 100644
--- a/src/views/modules/ecss/pallet_upload_excel.vue
+++ b/src/views/modules/ecss/pallet_upload_excel.vue
@@ -155,7 +155,7 @@
}
excel.exportTable({
url: "/select/ecssMapper/searchEcssCoDelNotifyDetail/list",
- columnMapping: this.columnList1,//可以直接用table，不需要的列就剔除
+ columnMapping: excelOpts.PalletSku.columnMapping,//可以直接用table，不需要的列就剔除
mergeSetting: [],//需要合并的列
params: searchData,
fileName: this.exportName+".xlsx",