diff --git a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue index 9534d50e..f5f707a8 100644 --- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue +++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue @@ -13,14 +13,7 @@ - - - - - - - - + @@ -28,6 +21,23 @@ + + + + + + + + + + + + + + + + + @@ -126,6 +136,44 @@ 部分收款 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/emis/emisSettleBill/panel/MonthPanel.vue b/src/views/emis/emisSettleBill/panel/MonthPanel.vue index 432072d9..df2bdaf5 100644 --- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue +++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue @@ -13,19 +13,30 @@ + + + + + + + - - + + - - - - - + + + + + @@ -123,6 +134,25 @@ 部分收款 + + + + + + + + + + + diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue deleted file mode 100644 index ff07a232..00000000 --- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue +++ /dev/null @@ -1,2086 +0,0 @@ - - - - - diff --git a/src/views/emis/emisWaybill/orderList.vue b/src/views/emis/emisWaybill/orderList.vue index 3402e451..fb90795f 100644 --- a/src/views/emis/emisWaybill/orderList.vue +++ b/src/views/emis/emisWaybill/orderList.vue @@ -155,6 +155,9 @@ border size="mini" storageName="orderList_main" + + ref="refTable" + :data="emisWaybillList" :showSearch.sync="showSearch" :queryParams="queryParams" @@ -287,7 +290,9 @@ - - + + + @@ -494,7 +499,7 @@ import waybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl export default { name: "WaybillIsPrinted", components: { elDateAdvPicker,CountryPicker0,CountryPicker1 ,EmisSiteSimplePicker1,waybillDetailReadOnly}, - dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', + dicts: ['emis_order_status','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', 'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode' ], @@ -746,7 +751,7 @@ export default { this.selectionList.forEach(item=>{ this.download('emis/emisWaybill/exportWarehouseInTpl', { orderSn:item.orderSn - }, `${new Date().getTime()}.docx`) + }, `${item.intoWarehouseBillCode}.pdf`) }); } @@ -799,7 +804,7 @@ export default { // 跳转到开单界面 if(this.selectionList&&this.selectionList.length>0){ let billCode=this.selectionList[0].billCode; - this.$router.push({ path: '/d24/waybillManagement/WaybillRecord', query: { action: "modify",billCode: billCode,addFrom:"userOrder"}}) + this.$router.push({ path: '/d24/waybillManagement/WaybillRecord', query: { action: "add",billCode: billCode,addFrom:"userOrder"}}) } }, diff --git a/src/views/emis/emisWaybill/orderRecord.vue b/src/views/emis/emisWaybill/orderRecord.vue index b8a1997e..b0f10a5f 100644 --- a/src/views/emis/emisWaybill/orderRecord.vue +++ b/src/views/emis/emisWaybill/orderRecord.vue @@ -902,6 +902,7 @@ data() { deep: true }, + }, activated(){ }, diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 61560e7e..14b78c8f 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -806,6 +806,7 @@ export default { params:{ expireNotSign:null, problemQueryType:null, + queryTabType:"1" } }, }; diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 4a11dce4..9e125f6b 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -29,6 +29,12 @@ + @@ -154,9 +160,10 @@ - -
-
+ +
+ +
@@ -165,16 +172,17 @@
-
+
{{ $t('主单剩余') }}:{{ totalAvailablePag.mainHasCnt }}
-
+
{{ $t('子单剩余') }}:{{ totalAvailablePag.subHasCnt }}
+
{{ $t('主单余量') }}:0，{{ $t('请立即') }}【{{ $t('申购') }}】
-
-
{{ $t('主单余量') }}:0，{{ $t('请立即') }}【{{ $t('申购') }}】
-
+
@@ -1033,6 +1041,13 @@ computed: { // immediate: false, // deep: true // }, + $route () { + if(this.$route.query.addFrom=="userOrder"){ + this.action="add"; + this.billCode=this.$route.query.billCode; + this.initData(); + } + } }, @@ -1395,6 +1410,8 @@ methods: { } if(this.addFrom=="userOrder"){ + // 获取可用运单数 + this.initGetTotalAvailablePag(this.form.sendSiteCode); this.startTimer(); } @@ -1425,7 +1442,7 @@ methods: { this.isNeedSave=true; this.form.printTypeCheckList=[0,1,5], - // 获取可用运单数 + // 获取可用运单数 this.initGetTotalAvailablePag(this.form.sendSiteCode); this.handleInitGenGoods(); @@ -1634,6 +1651,7 @@ methods: { realSubmitOrder(postForm).then(response => { this.$modal.msgSuccess("下单成功"); + this.addFrom=null; // 新开单才需要打印 if(this.action == "add"){ // 做揽收扫描记录