diff --git a/src/views/emis/EmisBaseTools/SalesSupportPicker.vue b/src/views/emis/EmisBaseTools/SalesSupportPicker.vue index de0ef562..1282143a 100644 --- a/src/views/emis/EmisBaseTools/SalesSupportPicker.vue +++ b/src/views/emis/EmisBaseTools/SalesSupportPicker.vue @@ -40,7 +40,11 @@ salesmen:{ type: [String], required: false - } + }, + sendDate:{ + type: [String], + required: false + }, }, data() { return { @@ -49,7 +53,12 @@ queryParams:{ pageNum: 1, pageSize: 100, + status: 1, salesmen: null, + params: { + userStatus: 1, + sendDate: null, + }, } }; }, @@ -57,6 +66,12 @@ value(newVal) { this.svalue = newVal; }, + sendDate(newVal) { + this.queryParams.params.sendDate = newVal; + }, + salesmen(newVal) { + this.queryParams.salesmen = newVal; + }, }, created() { // this.queryData(); @@ -81,9 +96,17 @@ this.$emit("onChange",this.svalue); this.dispatch('ElFormItem', 'el.form.change', [this.svalue]); } - }, + }, queryData(val) { - this.queryParams.salesmen = this.salesmen; + if (this.salesmen) { + this.queryParams.salesmen = this.salesmen; + } + if (!this.sendDate) { + //获取系统当前时间 格式为yyyy-MM-dd HH:mm:ss + this.queryParams.params.sendDate = new Date().toLocaleString().replace(/\//g, "-"); + }else { + this.queryParams.params.sendDate = this.sendDate; + } if (this.salesmen) { getSalesmanSupportList(this.queryParams).then(response => { this.optionItems = response.rows; diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue index 32689de2..e49bb4dc 100644 --- a/src/views/emis/emisWaybill/waybillGot.vue +++ b/src/views/emis/emisWaybill/waybillGot.vue @@ -1606,6 +1606,7 @@ methods: { this.form.paymentType= '1'; this.form.payee=null; this.form.salesmen=null; + this.form.salesSupport=null; this.onPaymentTypeChange(); } this.calcBillFee(); diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index a6187902..82371ad7 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -157,8 +157,8 @@ - - + + @@ -1611,6 +1611,7 @@ methods: { this.form.paymentType= '1'; this.form.payee=null; this.form.salesmen=null; + this.form.salesSupport=null; this.onPaymentTypeChange(); } this.calcBillFee(); diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 9a8c17bf..83dc06ff 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -1624,6 +1624,7 @@ methods: { this.form.paymentType= '1'; this.form.payee=null; this.form.salesmen=null; + this.form.salesSupport=null; this.onPaymentTypeChange(); } this.calcBillFee(); diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index 3b5e1319..5b1e40fd 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -368,7 +368,11 @@ - + + + + + @@ -377,7 +381,7 @@ - + 销售联系人 @@ -387,7 +391,7 @@ - + @@ -409,7 +413,7 @@ - + 销售支持 @@ -419,7 +423,7 @@ - + @@ -1689,6 +1693,7 @@ export default { if(item!=null){ this.form.payee=item.payee; this.form.salesmen=item.salesmen; + this.form.salesSupport=item.salesSupport; // 企业名称 this.form.sender.enterpriseName=item.enterpriseName; // 企业税号 @@ -2545,7 +2550,11 @@ export default { prop: field.prop, // 字段名(如 'name'、'age') message: field.validateMessage // 错误提示信息 })) - } + }, + // 销售支持选择器改变事件 + onSalesmenChange(val){ + this.form.salesSupport = null; + }, } };