From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 17 十月 2023 15:10:13 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style --- src/views/sales/salesReturn/index.vue | 2 +- src/views/other/payment/receipt/index.vue | 6 +++--- src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 2 +- src/views/other/payment/saleInvoice/index.vue | 2 +- src/views/sales/refundForm/index.vue | 2 +- src/views/service/clientServiceOrder/mixin/codeMixin.js | 4 ++++ 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue index 98d506c..ec12224 100644 --- a/src/views/other/payment/receipt/index.vue +++ b/src/views/other/payment/receipt/index.vue @@ -180,10 +180,10 @@ // console.log() this.loading = true let params = {} - let sourceTyle = (this.addConfig.keywordType === "閿�鍞槑缁嗗崟"||this.addConfig.keywordType ==='瀹㈡埛鍚嶇О') ? 1 : 2 + let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" || this.addConfig.keywordType === "瀹㈡埛鍚嶇О" ? 1 : 2 if (this.addConfig.id) { params = { - sourceID: this.addConfig.id, + sourceId: this.addConfig.id, sourceType: sourceTyle, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize, @@ -246,7 +246,7 @@ addBtnClick() { this.editConfig.visible = true this.editConfig.title = "鏂板缓" - this.editConfig.sourceType = this.addConfig.keywordType ==='瀹㈡埛鍚嶇О'?1:this.sourceType + this.editConfig.sourceType = this.addConfig.keywordType === "瀹㈡埛鍚嶇О" ? 1 : this.sourceType this.editConfig.infomation = { ...this.addConfig, saleDetailNumber: "" } } } diff --git a/src/views/other/payment/saleInvoice/index.vue b/src/views/other/payment/saleInvoice/index.vue index b430c93..bd13fb7 100644 --- a/src/views/other/payment/saleInvoice/index.vue +++ b/src/views/other/payment/saleInvoice/index.vue @@ -174,7 +174,7 @@ let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2 if (this.addConfig.id) { params = { - sourceID: this.addConfig.id, + sourceId: this.addConfig.id, sourceType: sourceTyle, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue index 77593ed..c4f7515 100644 --- a/src/views/sales/refundForm/index.vue +++ b/src/views/sales/refundForm/index.vue @@ -185,7 +185,7 @@ let params = {} if (this.addConfig.id) { params = { - sourceID: this.addConfig.id, + sourceId: this.addConfig.id, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize } diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue index 11ad76e..53cf0eb 100644 --- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue +++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue @@ -497,7 +497,7 @@ infomation: {} }, clientId: this.editCommonConfig.infomation.client_id, - saleChanceId: this.editCommonConfig.infomation.saleChanceId, + saleChanceId: this.editCommonConfig.infomation.sale_chance_id, subbillId: this.editCommonConfig.infomation.subbillId, productId: 1, isNoProduct: true, diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue index 930d4b8..ef076cd 100644 --- a/src/views/sales/salesReturn/index.vue +++ b/src/views/sales/salesReturn/index.vue @@ -190,7 +190,7 @@ let params = {} if (this.addConfig.id) { params = { - sourceID: this.addConfig.id, + sourceId: this.addConfig.id, sourceType: 1, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize diff --git a/src/views/service/clientServiceOrder/mixin/codeMixin.js b/src/views/service/clientServiceOrder/mixin/codeMixin.js index db2034f..22a1625 100644 --- a/src/views/service/clientServiceOrder/mixin/codeMixin.js +++ b/src/views/service/clientServiceOrder/mixin/codeMixin.js @@ -89,6 +89,10 @@ this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : "" console.log(this.codenumberList.replace(/,/g, "")) }, + validateFormNumber(){ + this.$set(this.editConfig.infomation,'serviceNumber',this.editConfig.infomation.serviceNumber) + this.$refs.form.validateField('serviceNumber') + }, // 閰嶇疆缂栫爜瑙勮寖鐨勮烦杞� numberClick() { window.open("http://www.fai365.com:9080/facilty", "_blank") -- Gitblit v1.8.0