Browse Source

关务:模板维护按照客户+运输方式维护

java8
han\hanst 5 months ago
parent
commit
01a128b6e4
  1. 2
      src/api/ecss/ecss.js
  2. 25
      src/views/modules/ecss/codelnotify.vue
  3. 80
      src/views/modules/ecss/codelnotifyConfirm.vue
  4. 25
      src/views/modules/ecss/declaration.vue
  5. 16
      src/views/modules/ecss/ecssTemplate.vue

2
src/api/ecss/ecss.js

@ -104,6 +104,8 @@ export const deleteWalMartOrder= data => createAPI(`/ecss/coDel/deleteWalMartOrd
export const saveWalMartOrderByExcel = data => createAPI(`/ecss/coDel/saveWalMartOrderByExcel`,'post',data)
export const updateExportFlag = data => createAPI(`/ecss/coDel/updateExportFlag`,'post',data)
export const getPropertiesListByDeclaration = data => createAPI(`/ecss/coDel/getPropertiesListByDeclaration`,'post',data)
export const queryPartListAll = data => createAPI(`/ecss/coDel/queryPartListAll`,'post',data)

25
src/views/modules/ecss/codelnotify.vue

@ -496,10 +496,9 @@
<el-checkbox v-model="exportInvoice.hsCodeDesc">品名</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'品名类型'" >
<el-radio v-model="exportInvoice.hsCodeDescType" label="Y">中文</el-radio>
<el-radio v-model="exportInvoice.hsCodeDescType" label="N">英文</el-radio>
<el-col :span="12" >
<el-form-item :label="''" >
<el-checkbox v-model="exportInvoice.hsCodeFlag">Hs Code</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12" >
@ -512,6 +511,17 @@
<el-checkbox v-model="exportInvoice.goodsLabel">货物明细</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'品名类型'" >
<el-radio v-model="exportInvoice.hsCodeDescType" label="Y">中文</el-radio>
<el-radio v-model="exportInvoice.hsCodeDescType" label="N">英文</el-radio>
</el-form-item>
</el-col>
<el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportInvoice.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'RFID Base Material'" >
<el-checkbox v-model="exportInvoice.material"></el-checkbox>
@ -532,11 +542,6 @@
<el-input :disabled="!exportInvoice.packaging" v-model="exportInvoice.kgs"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportInvoice.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="">
<el-form-item :label="'备注'" >
<el-input type="textarea" :rows="3" v-model="exportInvoice.fpremark"></el-input>
@ -1882,6 +1887,7 @@
material:'',
hsCodeDescType:'',
goodsLabel:true,
hsCodeFlag:true,
overseasShipper:'',
overseasAddress:'',
fpremark:'',
@ -2452,6 +2458,7 @@
searchTemplateOne() {
this.templateData.buNo = this.currentRow.buNo
this.templateData.customName = this.currentRow.customerName
this.templateData.shippingMode = this.currentRow.shippingMode
searchTemplateList(this.templateData).then(({data}) => {
if (data && data.code === 0){
if (data.rows && data.rows.length > 0) {

80
src/views/modules/ecss/codelnotifyConfirm.vue

@ -46,6 +46,13 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'是否导出:'">
<el-select v-model="searchData.exportFlag" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="已导出" value="Y"></el-option>
<el-option label="未导出" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item label="改单">
<el-checkbox v-model="searchData.modifyData" true-label="true" false-label="false" @change="searchTable()"></el-checkbox>
</el-form-item>
@ -640,7 +647,8 @@
deletePalletDetail,
saveOneClickPacking,
getNotifyPartDetail,
searchPalletList
searchPalletList,
updateExportFlag
}from "@/api/ecss/ecss.js"
import {getBuList}from '@/api/factory/site.js'
import excel from "@/utils/excel-util.js";
@ -691,6 +699,7 @@
notifyStatus:'',
startDate:'',
endDate:'',
exportFlag:'',
username:this.$store.state.user.name,
},
oneClickPackingModelFlag:false,
@ -915,6 +924,24 @@
fixed: '',
columnWidth: 50
},
{
userId: this.$store.state.user.name,
functionId: 801002,
serialNumber: '801002Table1ExportFlag',
tableId: "801002Table1",
tableName: "关务系统发货通知单",
columnProp: "exportFlag",
headerAlign: "center",
align: "center",
columnLabel: "是否导出",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 801002,
@ -2234,16 +2261,47 @@
destination : this.currentRow.destination,
createBy: this.$store.state.user.name,
}
excel.exportTable({
url: "/ecss/coDel/searchCoDelPalletList",
columnMapping: excelOpts.PalletSku.columnMapping,//table
mergeSetting: [],//
params: searchData,
fileName: "装箱数据导入模版.xlsx",
rowFetcher: res => res.data,
columnFormatter: [],
dropColumns: [],//dropColumns: ["netWeight"]
});
try {
// Excel
await excel.exportTable({
url: "/ecss/coDel/searchCoDelPalletList",
columnMapping: excelOpts.PalletSku.columnMapping,//table
mergeSetting: [],//
params: searchData,
fileName: "装箱数据导入模版.xlsx",
rowFetcher: res => res.data,
columnFormatter: [],
dropColumns: [],//dropColumns: ["netWeight"]
});
// export_flag
let updateData = {
site: this.currentRow.site,
buNo: this.currentRow.buNo,
delNo: this.currentRow.delNo,
exportFlag: 'Y',
updateBy: this.$store.state.user.name
}
updateExportFlag(updateData).then(({data}) => {
if (data.code === 0) {
//
this.currentRow.exportFlag = 'Y';
//
this.searchTable();
} else {
this.$message.warning('导出成功,但更新导出状态失败:' + data.msg);
}
}).catch(error => {
this.$message.warning('导出成功,但更新导出状态失败');
console.error('更新导出状态失败:', error);
});
} catch (error) {
this.$message.error('导出失败');
console.error('导出失败:', error);
}
},
searchPalletTable(){
this.refreshCurrentTabTable();

25
src/views/modules/ecss/declaration.vue

@ -450,10 +450,9 @@
<el-checkbox v-model="exportInvoice.hsCodeDesc">品名</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'品名类型'" >
<el-radio v-model="exportInvoice.hsCodeDescType" label="Y">中文</el-radio>
<el-radio v-model="exportInvoice.hsCodeDescType" label="N">英文</el-radio>
<el-col :span="12" >
<el-form-item :label="''" >
<el-checkbox v-model="exportInvoice.hsCodeFlag">Hs Code</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12" >
@ -466,6 +465,17 @@
<el-checkbox v-model="exportInvoice.goodsLabel">货物明细</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'品名类型'" >
<el-radio v-model="exportInvoice.hsCodeDescType" label="Y">中文</el-radio>
<el-radio v-model="exportInvoice.hsCodeDescType" label="N">英文</el-radio>
</el-form-item>
</el-col>
<el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportInvoice.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'RFID Base Material'" >
<el-checkbox v-model="exportInvoice.material"></el-checkbox>
@ -486,11 +496,6 @@
<el-input :disabled="!exportInvoice.packaging" v-model="exportInvoice.kgs"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportInvoice.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="">
<el-form-item :label="'备注'" >
<el-input type="textarea" :rows="3" v-model="exportInvoice.fpremark"></el-input>
@ -816,6 +821,7 @@
material:'',
hsCodeDescType:'',
goodsLabel:true,
hsCodeFlag:true,
fpremark:''
},
exportPakingFlag:false,
@ -1874,6 +1880,7 @@
searchTemplateOne() {
this.templateData.buNo = this.currentRow.buNo
this.templateData.customName = this.currentRow.customName
this.templateData.shippingMode = this.currentRow.shippingMode
searchTemplateList(this.templateData).then(({data}) => {
if (data && data.code === 0){
if (data.rows && data.rows.length > 0) {

16
src/views/modules/ecss/ecssTemplate.vue

@ -100,6 +100,11 @@
<el-input v-model="addModel.customName" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'运输方式'" >
<el-input v-model="addModel.shippingMode"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'模版类型'" >
<el-select filterable v-model="addModel.type" placeholder="请选择" :disabled="addModel.addFlag!==0" style="width:100%;">
@ -138,6 +143,11 @@
<el-checkbox v-model="addModel.goodsLabel">货物明细</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
<el-form-item :label="''" >
<el-checkbox v-model="addModel.hsCodeFlag">Hs Code</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
<el-form-item :label="''" >
<el-checkbox v-model="addModel.fscWeight">是否维护纯FSC纸重量损耗</el-checkbox>
@ -343,6 +353,8 @@
contractFlag:'',
hsCodeDescType:'',
goodsLabel:'',
hsCodeFlag:'',
shippingMode:'',
remark:'',
boxChange:'',
salesMethod :'EXW',
@ -632,6 +644,8 @@
contractFlag:'',
hsCodeDescType:'',
goodsLabel:true,
hsCodeFlag:false,
shippingMode:'',
remark:'',
boxChange:'',
salesMethod :'EXW',
@ -673,6 +687,8 @@
contractFlag:row.contractFlag,
hsCodeDescType:row.hsCodeDescType,
goodsLabel:row.goodsLabel,
hsCodeFlag:row.hsCodeFlag,
shippingMode:row.shippingMode,
remark:row.remark,
boxChange:row.boxChange,
customName: row.customName,

Loading…
Cancel
Save