wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

发票毛重净重列

java8
han\hanst 3 months ago
parent
0158a10fd8
commit
7165f215a2
4 changed files with 86 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/views/modules/ecss/codelnotify.vue
  2. 47
      src/views/modules/ecss/codelnotifyConfirm.vue
  3. 12
      src/views/modules/ecss/declaration.vue
  4. 10
      src/views/modules/ecss/ecssTemplate.vue

13
src/views/modules/ecss/codelnotify.vue
View File

@ -509,9 +509,9 @@
<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-col :span="12">
<el-form-item :label="' '" >
<el-checkbox v-model="exportInvoice.showWeight">显示毛净重</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
@ -534,6 +534,11 @@
<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>
@ -1700,6 +1705,7 @@
overseasShipper:'',
overseasAddress:'',
fpremark:'',
showWeight:false
},
exportGoodsFlag:false,
exportGoods:{
@ -2600,6 +2606,7 @@
this.exportInvoice.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType
this.exportInvoice.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
this.exportInvoice.fpremark=row.remark
this.exportInvoice.showWeight = row.showWeight
} else if (this.templateData.type=='出口货物委托书'){
this.exportGoods.salesMethod = row.salesMethod
this.exportGoods.currency = row.currency

47
src/views/modules/ecss/codelnotifyConfirm.vue
View File

@ -2633,10 +2633,22 @@
},
updateCodelPalletHeaderPalletQty(row){
// 显示页面loading
const loading = this.$loading({
lock: true,
text: '保存中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.3)'
});
updateCodelPalletHeaderPalletQty(this.palletModelData).then(({data}) => {
loading.close();
if (data && data.code === 0) {
this.palletEditFlag = false
// 刷新当前tab表格
this.refreshCurrentTabTable()
// 刷新上方的发货通知单列表
this.searchTable()
this.$message({
message: '操作成功',
type: 'success',
@ -2648,14 +2660,28 @@
confirmButtonText: '确定'
})
}
}).catch(error => {
loading.close();
this.$message.error('保存失败: ' + (error.message || '未知错误'))
})
},
deletePallet(row){
this.$confirm('确认删除此明细？', '提示').then(() => {
// 显示页面loading
const loading = this.$loading({
lock: true,
text: '删除中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.3)'
});
deletePalletHeader(row).then(({data}) => {
loading.close();
if (data && data.code === 0) {
this.refreshCurrentTabTable()
// 刷新上方的发货通知单列表
this.searchTable()
this.$message({
message: '操作成功',
type: 'success',
@ -2667,6 +2693,9 @@
confirmButtonText: '确定'
})
}
}).catch(error => {
loading.close();
this.$message.error('删除失败: ' + (error.message || '未知错误'))
})
})
},
@ -2757,10 +2786,23 @@
delNo: this.currentRow.delNo,
boxRemnant: this.oneClickPackingModelData.boxRemnant,
}
// 显示页面loading
const loading = this.$loading({
lock: true,
text: '一键装箱计算中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.3)'
});
saveOneClickPacking(saveData).then(({data}) => {
loading.close();
if (data && data.code === 0) {
this.refreshCurrentTabTable()
this.oneClickPackingModelFlag=false;
// 刷新当前tab表格
this.refreshCurrentTabTable()
// 刷新上方的发货通知单列表
this.searchTable()
this.$message({
message: '操作成功',
type: 'success',
@ -2772,6 +2814,9 @@
confirmButtonText: '确定'
})
}
}).catch(error => {
loading.close();
this.$message.error('一键装箱失败: ' + (error.message || '未知错误'))
})
},

12
src/views/modules/ecss/declaration.vue
View File

@ -539,9 +539,9 @@
<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-col :span="12">
<el-form-item :label="' '" >
<el-checkbox v-model="exportInvoice.showWeight">显示毛净重</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
@ -564,6 +564,11 @@
<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>
@ -2606,6 +2611,7 @@
this.exportInvoice.hsCodeFlag=row.hsCodeFlag
this.exportInvoice.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
this.exportInvoice.fpremark = row.remark
this.exportInvoice.showWeight = row.showWeight
} else if (this.templateData.type=='箱单'){
this.exportPaking.templateName=row.name
this.exportPaking.upc=row.upc

10
src/views/modules/ecss/ecssTemplate.vue
View File

@ -220,6 +220,11 @@
<el-input v-model="addModel.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-show="addModel.type=='发票'">
<el-form-item :label="' '" >
<el-checkbox v-model="addModel.showWeight">显示毛净重</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12" v-show="addModel.type=='出口货物委托书'">
<el-form-item :label="'贸易方式'" >
<el-input v-model="addModel.salesMethod"></el-input>
@ -406,6 +411,7 @@
remark:'',
boxChange:'',
salesMethod :'EXW',
showWeight:false,
currency:'USD',
madeArea:'Shanghai, China',
sendPort:'Shanghai, China',
@ -731,7 +737,8 @@
shipper:'Checkpoint Commercial (Shanghai) Co., Ltd. 保点贸易（上海）有限公司\t\t\t\t\t\t\n' +
'Room 1411, No. 31, Lane 2419, Hunan Road, Pudong New Area, Shanghai\t\t\t\t\t\t\n' +
'电话/Tel: (86-21)38112888 传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' +
'上海市浦东新区沪南路2419弄31号1411室\t\t\t\t\t\t\n'
'上海市浦东新区沪南路2419弄31号1411室\t\t\t\t\t\t\n',
showWeight:false
}
this.addModelFlag=true
@ -774,6 +781,7 @@
shippingDate:row.shippingDate,
shipper:row.shipper,
highPalletFlag:row.highPalletFlag,
showWeight:row.showWeight,
}
this.addModelFlag=true
},

Write Preview
Loading…
Cancel
Save