diff --git a/src/api/emis/emisWaybillProblemFaq.js b/src/api/emis/emisWaybillProblemFaq.js new file mode 100644 index 00000000..37616f86 --- /dev/null +++ b/src/api/emis/emisWaybillProblemFaq.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询问题件FAG列表 +export function listEmisWaybillProblemFaq(query) { + return request({ + url: '/emis/emisWaybillProblemFaq/list', + method: 'get', + params: query + }) +} + +// 查询问题件FAG详细 +export function getEmisWaybillProblemFaq(id) { + return request({ + url: '/emis/emisWaybillProblemFaq/' + id, + method: 'get' + }) +} + +// 新增问题件FAG +export function addEmisWaybillProblemFaq(data) { + return request({ + url: '/emis/emisWaybillProblemFaq', + method: 'post', + data: data + }) +} + +// 修改问题件FAG +export function updateEmisWaybillProblemFaq(data) { + return request({ + url: '/emis/emisWaybillProblemFaq', + method: 'put', + data: data + }) +} + +// 删除问题件FAG +export function delEmisWaybillProblemFaq(id) { + return request({ + url: '/emis/emisWaybillProblemFaq/' + id, + method: 'delete' + }) +} diff --git a/src/views/emis/emisTransLine/emisTransLineForm.vue b/src/views/emis/emisTransLine/emisTransLineForm.vue index 403fab53..4f854d87 100644 --- a/src/views/emis/emisTransLine/emisTransLineForm.vue +++ b/src/views/emis/emisTransLine/emisTransLineForm.vue @@ -310,7 +310,7 @@ export default { }); } else { addEmisTransLine(this.form).then(response => { - this.$modal.msgSuccess("修改成功"); + this.$modal.msgSuccess("新增成功"); this.$emit("on-changed"); }); } diff --git a/src/views/emis/emisWaybill/emisWaybillModify copy.vue b/src/views/emis/emisWaybill/emisWaybillModify copy.vue new file mode 100644 index 00000000..d8835fee --- /dev/null +++ b/src/views/emis/emisWaybill/emisWaybillModify copy.vue @@ -0,0 +1,1492 @@ + + + + + + + {{ $t('发货信息') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{dict.label}} + + + + + + + + + + + + + + + {{dict.label}} + + + + + + + + + + + + + + {{ $t('收寄件信息') }} + + + + + + + 寄件信息 + + + + 寄件地址薄 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 寄件/签收短信 + + + + + + + + + + + 收件信息 + + + 收件地址薄 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 派件短信 + + + + + + + + + + {{ $t('重量收费信息') }} + + + + + + + 货物信息 + + + + + + + + + handleCalcQty(val,scope.row)" size="mini" placeholder=""> + + + + + + handleCalcVolume(val,scope.row)" size="mini" placeholder=""> + + + + + handleCalcVolume(val,scope.row)" size="mini" placeholder=""> + + + + + handleCalcVolume(val,scope.row)" size="mini" placeholder=""> + + + + + + + + + + handleCalcQty(val,scope.row)" size="mini" placeholder=""> + + + + + + + deleteGoodsItem(scope.row)"> + + + + + + + + + + + + + (kg) + + + + + + + + (m³) + + + + + + + + + + + + + + (kg) + + + + + + + + (kg) + + + + + + + + + + + + + 是否超重 + + + + + + + + + + + 是 + 否 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{dict.label}} + + + + + + + + + + + + + {{ scope.row.feeName }} + + + + + {{ scope.row.fee }} + + + + + + handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""> + + + + + handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""> + + + + + handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""> + + + + + + + + + + deleteFeeItem(scope.row)"> + + + + + + + + 增加自定义费用 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确 定 + 重置 + + + + + + + + + + + + + diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue index 50374ce8..e30ed565 100644 --- a/src/views/emis/emisWaybill/emisWaybillRecord.vue +++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue @@ -1466,7 +1466,7 @@ methods: { if(row!=null){ if(row.calcExp){ - let expr=row.calcExp+""; + let expr=row.calcExp+"s+w*d"; expr=expr.replace("s",row.initialWeightFee); expr=expr.replace("d",row.addWeightPrice); expr=expr.replace("w",this.form.settlementWeight); diff --git a/src/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm.vue b/src/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm.vue new file mode 100644 index 00000000..1d5b3e65 --- /dev/null +++ b/src/views/emis/emisWaybillProblemFaq/emisWaybillProblemFaqForm.vue @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确 定 + 取 消 + + + + + + diff --git a/src/views/emis/emisWaybillProblemFaq/index.vue b/src/views/emis/emisWaybillProblemFaq/index.vue new file mode 100644 index 00000000..3ab1abed --- /dev/null +++ b/src/views/emis/emisWaybillProblemFaq/index.vue @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新增 + + + + 删除 + + + + + + + + + + + + + + + + + 修改 + + + + + + + + + + + + + + + + + +