diff --git a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
index d5438a9e..7ca48036 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
@@ -412,32 +412,7 @@ export default {
}
});
},
- // /** 转换菜单数据结构 */
- // normalizer(node) {
- // if (node.children && !node.children.length) {
- // delete node.children;
- // }
- // return {
- // id: node.id,
- // label: node.idName,
- // children: node.children
- // };
- // },
- // /** 查询菜单下拉树结构 */
- // getTreeselect() {
- // const queryParams = {}
- // listEmisSettleInvoiceChRecord(queryParams).then(response => {
- // this.emisSettleInvoiceChRecordOptions = [];
- // const rootItem = { idId: 0, emisSettleInvoiceChRecordName: '-', children: [] };
- // rootItem.children = this.handleTree(response.data, "id");
- // this.emisSettleInvoiceChRecordOptions.push(rootItem);
- // if(this.parentId != undefined) {
- // this.form.parentId = this.parentId;
- // }
-
- // });
- // },
}
};
diff --git a/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue b/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue
index 1a80070b..dcf74116 100644
--- a/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/OpenBillForm.vue
@@ -14,6 +14,7 @@
{{ emisSettleInvoiceRecord.bankName }} {{ emisSettleInvoiceRecord.bankAccNo }}
增值税电子普通发票
+ 增值税电子专用发票
增值税普通发票(纸质发票)
增值税专用发票(纸质发票)
其它手工开票
diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index 3b391b73..71554fb9 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -146,6 +146,7 @@
+
@@ -156,6 +157,8 @@
+
+
diff --git a/src/views/emis/emisSettleInvoiceRecord/index.vue b/src/views/emis/emisSettleInvoiceRecord/index.vue
index 8db6f16c..5e0ab444 100644
--- a/src/views/emis/emisSettleInvoiceRecord/index.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/index.vue
@@ -47,6 +47,7 @@
+
@@ -220,6 +221,7 @@
增值税电子普通发票
+ 增值税电子专用发票
增值税普通发票(纸质发票)
增值税专用发票(纸质发票)
其它手工开票
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
index bd88a801..a6f642c6 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue
@@ -47,6 +47,7 @@
+
@@ -191,6 +192,7 @@
增值税电子普通发票
+ 增值税电子专用发票
增值税普通发票
增值税专用发票
其它手工发票
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
index e12eb49b..bb66e1bc 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue
@@ -46,6 +46,7 @@
+
@@ -190,6 +191,7 @@
增值税电子普通发票
+ 增值税电子专用发票
增值税普通发票
增值税专用发票
其它手工发票
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
index f69781e4..5ec83ca1 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
@@ -18,6 +18,7 @@
增值税电子普通发票
+ 增值税电子专用发票
增值税普通发票
增值税专用发票
其它手工发票
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
index d5a43b90..76b87180 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
@@ -47,6 +47,7 @@
+
@@ -186,6 +187,7 @@
增值税电子普通发票
+ 增值税电子专用发票
增值税普通发票(纸质发票)
增值税专用发票(纸质发票)
其它手工开票
@@ -628,6 +630,9 @@ export default {
if(v['invoiceType'] == 1){
return '增值税电子普通发票';
}
+ else if(v['invoiceType'] == 4){
+ return '增值税电子专用发票';
+ }
else if(v['invoiceType'] == 2){
return '增值税普通发票(纸质发票)';
}
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
index c3a8b482..8397c129 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
@@ -54,6 +54,7 @@
增值税电子普通发票
+ 增值税电子专用发票
增值税普通发票(纸质发票)
增值税专用发票(纸质发票)
其它手工发票
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 70fb0a3e..2c95e3e7 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -1966,13 +1966,13 @@ methods: {
calcSetteldWeight(postData).then(response => {
// 结算重量发生改变才计算费用
- if(this.form.settlementWeight != response.data.settlementWeight ){
+ // if(this.form.settlementWeight != response.data.settlementWeight ){
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
// 计算费用
this.calcBillFee();
- }
+ // }
});
}
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 97c4799a..262228d3 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1966,13 +1966,13 @@ methods: {
calcSetteldWeight(postData).then(response => {
// 结算重量发生改变才计算费用
- if(this.form.settlementWeight != response.data.settlementWeight ){
+ // if(this.form.settlementWeight != response.data.settlementWeight ){
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
// 计算费用
this.calcBillFee();
- }
+ // }
});
}
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 8609d176..66a5c489 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -1789,13 +1789,13 @@ export default {
calcSetteldWeight(postData).then(response => {
// 结算重量发生改变才计算费用
- if(this.form.settlementWeight != response.data.settlementWeight ){
+ // if(this.form.settlementWeight != response.data.settlementWeight ){
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
// 计算费用
this.calcBillFee();
- }
+ // }
});
}