diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiAdd.vue index 6eb2e5110e..e2f58790b3 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiAdd.vue @@ -51,11 +51,7 @@ 开户行 - - - - - + 银行账号 @@ -73,7 +69,7 @@ + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue index 609feb20e1..d662da11d1 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue @@ -62,11 +62,11 @@
查看销售订单
- +
*单台开票金额
- +
开票类型默认
@@ -74,7 +74,7 @@
- +
开票名称默认
@@ -82,6 +82,11 @@
+ + + 维护开票信息 + +
@@ -185,6 +190,7 @@ + @@ -193,12 +199,14 @@ import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/ap import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons' import upload from '@/components/uploadFile/upload' import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo' +import weihukaipiaoxinxi from './relation/weihukaipiaoxinxi' export default { name: '', components: { upload, - xiaoshoudingdanInfo + xiaoshoudingdanInfo, + weihukaipiaoxinxi }, data() { return { @@ -372,6 +380,14 @@ export default { resetState() { this.viewState = 1 }, + resetData() { + this.viewState = 1 + selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => { + if (resp.success) { + this.openTick_list = resp.data + } + }) + }, // 开票金额合计 totalBillMoney() { if (this.formobj.oneBillMoney !== '' && this.formobj.finBillVehicles.length > 0) { @@ -409,6 +425,10 @@ export default { row.openTickSid = choose[0].sid row.openTickRemarks = choose[0].openTickRemarks }, + handlePreserve() { + this.viewState = 3 + this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid) + }, handleSave() { if (this.formobj.oneBillMoney === '') { this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' }) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/weihukaipiaoxinxi.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/weihukaipiaoxinxi.vue new file mode 100644 index 0000000000..b7c2ca8442 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/weihukaipiaoxinxi.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java index 9df8db6451..1f737f1c47 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java @@ -108,7 +108,9 @@ public class CrmCustomerTempUpdateDto implements Dto { @ApiModelProperty(value = "备注") private String remarks; + private String orgPath; + //运营信息 @ApiModelProperty(value = "运营信息") - private CrmBusinessDto crmBusinessDto; + private CrmBusinessDto crmBusinessDto = new CrmBusinessDto(); } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 72ed1cfb42..124ef025c5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -1104,9 +1104,6 @@ public class CrmCustomerTempService extends MybatisBaseService