diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index e5061458..b7a5a551 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -42,13 +42,13 @@
-
+
-
+
@@ -57,7 +57,7 @@
-
+
@@ -508,9 +508,6 @@ export default {
currentSettleBillNo:null,
selectBillList:[],
-
- storageName:null,
-
queryStatInfoMap:null,
currentId:null,
@@ -716,31 +713,69 @@ export default {
watch: {
$route () {
if(this.$route.query.custNo!=null){
- this.queryParams.blConfirmCenter='0';
- this.queryParams.blConfirmSite=this.$route.query.blConfirmSite;
this.actionType=this.$route.query.actionType;
+
+ this.queryParams.blConfirmCenter=this.$route.query.blConfirmCenter;
+ this.queryParams.blConfirmSite=this.$route.query.blConfirmSite;
this.queryParams.custNo=this.$route.query.custNo;
let startTime=this.$route.query.startTime;
let endTime=this.$route.query.endTime;
this.dateTimeRange=[startTime, endTime]
+
+ if(this.queryParams.blConfirmCenter=="0"){
+ this.activeTab="waitConfirm";
+ }
+ else if(this.queryParams.blConfirmCenter=="1"){
+ this.activeTab="hasConfirm";
+ }
+ else if(this.queryParams.blConfirmCenter=="2"){
+ this.activeTab="confirmNotBill";
+ }
+ else if(this.queryParams.blConfirmCenter=="3"){
+ this.activeTab="billError";
+ }else{
+ this.activeTab="all";
+ }
+
this.initData();
}
}
},
created() {
- this.queryParams.blConfirmCenter='0';
- const end = new Date()
- const start = new Date()
- start.setDate(1)
- start.setHours(0,0,0,0)
- end.setHours(23,59,59,0)
- this.dateTimeRange=[timeFormat(start), timeFormat(end)]
+ if(this.$route.query.custNo!=null){
+ this.actionType=this.$route.query.actionType;
+ this.queryParams.blConfirmCenter=this.$route.query.blConfirmCenter;
+ this.queryParams.blConfirmSite=this.$route.query.blConfirmSite;
+ this.queryParams.custNo=this.$route.query.custNo;
+ let startTime=this.$route.query.startTime;
+ let endTime=this.$route.query.endTime;
+ this.dateTimeRange=[startTime, endTime]
- // this.queryParams.blConfirmSite='1';
- this.actionType=this.$route.query.actionType;
- this.queryParams.custNo=this.$route.query.custNo;
- this.queryParams.blConfirmSite=this.$route.query.blConfirmSite;
+ if(this.queryParams.blConfirmCenter=="0"){
+ this.activeTab="waitConfirm";
+ }
+ else if(this.queryParams.blConfirmCenter=="1"){
+ this.activeTab="hasConfirm";
+ }
+ else if(this.queryParams.blConfirmCenter=="2"){
+ this.activeTab="confirmNotBill";
+ }
+ else if(this.queryParams.blConfirmCenter=="3"){
+ this.activeTab="billError";
+ }
+ else{
+ this.activeTab="all";
+ }
+ }else{
+ this.queryParams.blConfirmCenter='0';
+ const end = new Date()
+ const start = new Date()
+ start.setDate(1)
+ start.setHours(0,0,0,0)
+ end.setHours(23,59,59,0)
+ this.dateTimeRange=[timeFormat(start), timeFormat(end)]
+ }
this.initData();
@@ -748,8 +783,6 @@ export default {
methods: {
initData(){
- this.storageName="SubBillConfirmByMonthList_main";
- this.queryParams.blConfirmCenter=0;
this.getList();
},
handleClick(tab, event) {
diff --git a/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue b/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
index 091ea7cc..4e39e5bc 100644
--- a/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
@@ -22,6 +22,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -382,10 +392,9 @@ export default {
};
},
created() {
- this.queryParams.blConfirmCenter='0';
this.queryParams.blConfirmSite='1';
+ this.queryParams.blConfirmCenter='0';
this.actionType=this.$route.query.actionType;
-
const end = new Date()
const start = new Date()
start.setDate(1)
@@ -399,8 +408,6 @@ export default {
methods: {
initData(){
-
- this.queryParams.blConfirmCenter=0;
},
tableRowClassName({row, rowIndex}) {
@@ -433,6 +440,7 @@ export default {
actionType: "2",
custNo: row.custNo,
blConfirmSite:this.queryParams.blConfirmSite,
+ blConfirmCenter:this.queryParams.blConfirmCenter,
startTime:this.dateTimeRange[0],
endTime:this.dateTimeRange[1],
}
@@ -484,110 +492,6 @@ export default {
},
- /** 修改按钮操作 */
- handleUpdate(row) {
- this.currentId= row.id;
- this.openForm = true;
- this.titleForm = "修改";
- },
- handleConfirmByCenter(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('是否确认').then(function() {
- return confirmBillByCenter(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("操作成功");
- }).catch(() => {});
- },
- handleCancelConfirmByCenter(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('是否取消确认').then(function() {
- return cancelConfirmBillByCenter(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("操作成功");
- }).catch(() => {});
- },
- handleConfirmNoBillByCenter(row) {
- const ids = row.id || this.ids;
- this.$prompt('请输入不出账原因', "操作确认", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- closeOnClickModal: false,
- inputPattern: /^.{1,30}$/,
- inputErrorMessage: "原因长度必须介于 1 和 30 之间"
- }).then(({ value }) => {
- confirmNoBillByCenter(ids,value).then(response => {
- this.$modal.msgSuccess("操作成功" );
- this.getList();
- });
- }).catch(() => {});
- },
- handleSetBillErrorByCenter(row) {
- const ids = row.id || this.ids;
- this.$prompt('请输入账单异常原因', "操作确认", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- closeOnClickModal: false,
- inputPattern: /^.{1,30}$/,
- inputErrorMessage: "原因长度必须介于 1 和 30 之间"
- }).then(({ value }) => {
- setBillErrorByCenter(ids,value).then(response => {
- this.$modal.msgSuccess("操作成功" );
- this.getList();
- });
- }).catch(() => {});
- },
-
- handleConfirmBySite(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('是否确认').then(function() {
- return confirmBillBySite(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("操作成功");
- }).catch(() => {});
- },
- handleCancelConfirmBySite(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('是否取消确认').then(function() {
- return cancelConfirmBillBySite(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("操作成功");
- }).catch(() => {});
- },
- handleConfirmNoBillBySite(row) {
- const ids = row.id || this.ids;
- this.$prompt('请输入不出账原因', "操作确认", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- closeOnClickModal: false,
- inputPattern: /^.{1,30}$/,
- inputErrorMessage: "原因长度必须介于 1 和 30 之间"
- }).then(({ value }) => {
- confirmNoBillBySite(ids,value).then(response => {
- this.$modal.msgSuccess("操作成功" );
- this.getList();
- });
- }).catch(() => {});
- },
- handleSetBillErrorBySite(row) {
- const ids = row.id || this.ids;
- this.$prompt('请输入账单异常原因', "操作确认", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- closeOnClickModal: false,
- inputPattern: /^.{1,30}$/,
- inputErrorMessage: "原因长度必须介于 1 和 30 之间"
- }).then(({ value }) => {
- setBillErrorBySite(ids,value).then(response => {
- this.$modal.msgSuccess("操作成功" );
- this.getList();
- });
- }).catch(() => {});
- },
-
handleFormChanged(){
this.openForm = false;
this.getList();