Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
commit
e8893c5255
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
  4. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  5. 61
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue
  6. 61
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue
  7. 63
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
  8. 20
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue
  9. 8
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue
  10. 20
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue
  11. 20
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue
  12. 63
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
  13. 12
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue
  14. 8
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue
  15. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java
  16. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java
  17. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  18. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java
  19. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
  20. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@ -201,7 +201,7 @@ public interface BaseDistributorFeign {
@ApiOperation("移动端查询经销商和客户信息")
@GetMapping("/invoiceName")
ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search);
ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search,@RequestParam("invoiceKey") String invoiceKey);
@ApiOperation("移动端查询经销商和客户信息")
@GetMapping("/invoiceName2")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@ -220,7 +220,7 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
}
@Override
public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search,String invoiceKey) {
return null;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@ -354,8 +354,8 @@ public class BaseDistributorRest implements BaseDistributorFeign {
}
@Override
public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
return baseDistributorService.invoiceName(userSid, orgPath, search);
public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search,String invoiceKey) {
return baseDistributorService.invoiceName(userSid, orgPath, search,invoiceKey);
}
@Override

15
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -1320,14 +1320,23 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
return rb.success().setData(baseDistributorListVo);
}
public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search,String invoiceKey) {
ResultBean rb = ResultBean.fireFail();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = new ArrayList<>();
if (StringUtils.isBlank(search)) {
finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(useOrgSid);
if("01".equals(invoiceKey)){
finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSidTwo(useOrgSid);
}else{
finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid3(useOrgSid,invoiceKey);
}
} else {
finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid(useOrgSid, search);
if("01".equals(invoiceKey)){
finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSidTwo(useOrgSid, search,"");
}else{
finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSidTwo(useOrgSid, search,invoiceKey);
}
}
List<AppDisAndCustm> appDisAndCustms = new ArrayList<>();
for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) {

61
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue

@ -346,33 +346,66 @@ export default {
},
changeOpenTickType(val) {
const choose = this.openTickType_list.filter((item) => item.dictValue === val)
this.formobj.openTickTypeKey = choose[0].dictKey
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
if (choose !== null && choose.length > 0) {
this.formobj.openTickTypeKey = choose[0].dictKey
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
}
}
} else {
this.formobj.openTickTypeKey = ''
}
},
changeOpenTick(val) {
if (this.formobj.openTickTypeValue === '') {
this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
return
}
const choose = this.openTick_list.filter((item) => item.name === val)
this.formobj.openTickSid = choose[0].sid
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].openTickName = choose[0].name
this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
if (choose !== null && choose.length > 0) {
if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符,请维护开票信息' })
} else {
this.formobj.openTickSid = choose[0].sid
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].openTickName = choose[0].name
this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
}
}
}
} else {
this.formobj.openTickSid = ''
}
},
changeBillType(val, row) {
const choose = this.openTickType_list.filter((item) => item.dictValue === val)
row.billTypeKey = choose[0].dictKey
if (choose !== null && choose.length > 0) {
row.billTypeKey = choose[0].dictKey
} else {
row.billTypeKey = ''
}
},
changeOpenTickName(val, row) {
if (row.billTypeValue === '') {
this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
return
}
const choose = this.openTick_list.filter((item) => item.name === val)
row.openTickSid = choose[0].sid
row.openTickRemarks = choose[0].openTickRemarks
if (choose !== null && choose.length > 0) {
if (choose[0].openTickTypeValue !== row.billTypeValue) {
this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符,请维护开票信息' })
} else {
row.openTickSid = choose[0].sid
row.openTickRemarks = choose[0].openTickRemarks
}
} else {
row.openTickSid = ''
row.openTickRemarks = ''
}
},
handleLookByDingDan() {
this.viewState = 2

61
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue

@ -346,33 +346,66 @@ export default {
},
changeOpenTickType(val) {
const choose = this.openTickType_list.filter((item) => item.dictValue === val)
this.formobj.openTickTypeKey = choose[0].dictKey
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
if (choose !== null && choose.length > 0) {
this.formobj.openTickTypeKey = choose[0].dictKey
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
}
}
} else {
this.formobj.openTickTypeKey = ''
}
},
changeOpenTick(val) {
if (this.formobj.openTickTypeValue === '') {
this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
return
}
const choose = this.openTick_list.filter((item) => item.name === val)
this.formobj.openTickSid = choose[0].sid
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].openTickName = choose[0].name
this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
if (choose !== null && choose.length > 0) {
if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符,请维护开票信息' })
} else {
this.formobj.openTickSid = choose[0].sid
if (this.formobj.finBillVehicles.length > 0) {
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
this.formobj.finBillVehicles[i].openTickName = choose[0].name
this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
}
}
}
} else {
this.formobj.openTickSid = ''
}
},
changeBillType(val, row) {
const choose = this.openTickType_list.filter((item) => item.dictValue === val)
row.billTypeKey = choose[0].dictKey
if (choose !== null && choose.length > 0) {
row.billTypeKey = choose[0].dictKey
} else {
row.billTypeKey = ''
}
},
changeOpenTickName(val, row) {
if (row.billTypeValue === '') {
this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
return
}
const choose = this.openTick_list.filter((item) => item.name === val)
row.openTickSid = choose[0].sid
row.openTickRemarks = choose[0].openTickRemarks
if (choose !== null && choose.length > 0) {
if (choose[0].openTickTypeValue !== row.billTypeValue) {
this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符,请维护开票信息' })
} else {
row.openTickSid = choose[0].sid
row.openTickRemarks = choose[0].openTickRemarks
}
} else {
row.openTickSid = ''
row.openTickRemarks = ''
}
},
handleLookByDingDan() {
this.viewState = 2

63
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@ -186,21 +186,15 @@
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload ref="uploadImg" v-model="formobj.zjApplicationAppendxs" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title">客户开票申请书</div>
<div class="title">车辆买卖合同</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title">款项确认书(贷款业务上传)</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
<el-row>
<el-col :span="24">
@ -277,7 +271,6 @@ export default {
openTickType_list: [],
openTick_list: [],
arrearsOpenYY_list: [],
image_list1: [],
image_list2: [],
image_list3: [],
image_list4: [],
@ -293,6 +286,7 @@ export default {
billNo: '',
billStateKey: '',
billStateValue: '',
carBuyContractImages: [],
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',
@ -428,14 +422,6 @@ export default {
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.instanceId = res.data.procInstSid
this.formobj.userSid = window.sessionStorage.getItem('userSid')
if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
this.image_list3.push({
name: e.fileName,
url: e.fileUrl
})
})
}
if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
this.image_list4.push({
@ -452,8 +438,8 @@ export default {
})
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
if (this.formobj.carBuyContractImages.length > 0) {
this.formobj.carBuyContractImages.forEach((e) => {
this.image_list2.push({
name: e.fileName,
url: e.fileUrl
@ -633,7 +619,6 @@ export default {
handleSubmit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
if (this.formobj.finBillVehicles.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
return
@ -648,6 +633,21 @@ export default {
return
}
}
if (this.formobj.isLQOrigInvoice === '是') {
if (this.image_list2.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传车辆买卖合同' })
return
}
if (this.image_list5.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' })
return
}
if (this.image_list7.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' })
return
}
}
this.getUrl()
this.submitdisabled = true
submit(this.formobj).then((res) => {
if (res.success) {
@ -695,27 +695,9 @@ export default {
sid: ''
})
}
this.formobj.khkpsqsApplicationAppendxs = bb
} else {
this.formobj.khkpsqsApplicationAppendxs = []
}
if (this.image_list3.length > 0) {
const cc = []
for (var m = 0; m < this.image_list3.length; m++) {
cc.push({
attachType: '',
billAppSid: '',
createByName: window.sessionStorage.getItem('name'),
fileSid: '',
fileName: this.image_list3[m].name,
fileType: this.image_list3[m].name.substr(this.image_list3[m].name.lastIndexOf('.')),
fileUrl: this.image_list3[m].url,
sid: ''
})
}
this.formobj.kpxxqrsApplicationAppendxs = cc
this.formobj.carBuyContractImages = bb
} else {
this.formobj.kpxxqrsApplicationAppendxs = []
this.formobj.carBuyContractImages = []
}
if (this.image_list4.length > 0) {
const cc = []
@ -829,6 +811,7 @@ export default {
billNo: '',
billStateKey: '',
billStateValue: '',
carBuyContractImages: [],
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',

20
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue

@ -148,20 +148,12 @@
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
</el-col>
</el-row>
<div class="title">客户开票申请书</div>
<div class="title">车辆买卖合同</div>
<el-row>
<el-col :span="24">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
</el-col>
</el-row>
<div class="title">款项确认书(贷款业务上传)</div>
<el-row>
<el-col :span="24">
<el-form-item>
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
</el-form-item>
</el-col>
</el-row>
<div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
<el-row>
<el-col :span="24">
@ -237,6 +229,7 @@ export default {
billNo: '',
billStateKey: '',
billStateValue: '',
carBuyContractImages: [],
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',
@ -299,16 +292,11 @@ export default {
this.image_list1.push(e.fileUrl)
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
if (this.formobj.carBuyContractImages.length > 0) {
this.formobj.carBuyContractImages.forEach((e) => {
this.image_list2.push(e.fileUrl)
})
}
if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
this.image_list3.push(e.fileUrl)
})
}
if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
this.image_list4.push(e.fileUrl)

8
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue

@ -377,6 +377,14 @@ export default {
})
},
handleSubmit() {
if (this.image_list1.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' })
return
}
if (this.image_list3.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()

20
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue

@ -180,20 +180,12 @@
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
</el-col>
</el-row>
<div class="title">客户开票申请书</div>
<div class="title">车辆买卖合同</div>
<el-row>
<el-col :span="24">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
</el-col>
</el-row>
<div class="title">款项确认书(贷款业务上传)</div>
<el-row>
<el-col :span="24">
<el-form-item>
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
</el-form-item>
</el-col>
</el-row>
<div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
<el-row>
<el-col :span="24">
@ -312,6 +304,7 @@ export default {
billNo: '',
billStateKey: '',
billStateValue: '',
carBuyContractImages: [],
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',
@ -427,16 +420,11 @@ export default {
this.image_list1.push(e.fileUrl)
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
if (this.formobj.carBuyContractImages.length > 0) {
this.formobj.carBuyContractImages.forEach((e) => {
this.image_list2.push(e.fileUrl)
})
}
if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
this.image_list3.push(e.fileUrl)
})
}
if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
this.image_list4.push(e.fileUrl)

20
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue

@ -180,20 +180,12 @@
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
</el-col>
</el-row>
<div class="title">客户开票申请书</div>
<div class="title">车辆买卖合同</div>
<el-row>
<el-col :span="24">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
</el-col>
</el-row>
<div class="title">款项确认书(贷款业务上传)</div>
<el-row>
<el-col :span="24">
<el-form-item>
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
</el-form-item>
</el-col>
</el-row>
<div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
<el-row>
<el-col :span="24">
@ -311,6 +303,7 @@ export default {
billNo: '',
billStateKey: '',
billStateValue: '',
carBuyContractImages: [],
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',
@ -427,16 +420,11 @@ export default {
this.image_list1.push(e.fileUrl)
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
if (this.formobj.carBuyContractImages.length > 0) {
this.formobj.carBuyContractImages.forEach((e) => {
this.image_list2.push(e.fileUrl)
})
}
if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
this.image_list3.push(e.fileUrl)
})
}
if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
this.image_list4.push(e.fileUrl)

63
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@ -186,18 +186,12 @@
<upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title">客户开票申请书</div>
<div class="title">车辆买卖合同</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title">款项确认书(贷款业务上传)</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
<el-row>
<el-col :span="24">
@ -291,6 +285,7 @@ export default {
billNo: '',
billStateKey: '',
billStateValue: '',
carBuyContractImages: [],
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',
@ -400,14 +395,6 @@ export default {
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.instanceId = res.data.procInstSid
this.formobj.userSid = window.sessionStorage.getItem('userSid')
if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
this.image_list3.push({
name: e.fileName,
url: e.fileUrl
})
})
}
if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
this.image_list4.push({
@ -416,8 +403,8 @@ export default {
})
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
if (this.formobj.carBuyContractImages.length > 0) {
this.formobj.carBuyContractImages.forEach((e) => {
this.image_list2.push({
name: e.fileName,
url: e.fileUrl
@ -611,7 +598,10 @@ export default {
handleSubmit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
if (this.formobj.finBillVehicles.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
return
}
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
if (this.formobj.finBillVehicles[i].openTickName === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
@ -622,6 +612,21 @@ export default {
return
}
}
if (this.formobj.isLQOrigInvoice === '是') {
if (this.image_list2.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传车辆买卖合同' })
return
}
if (this.image_list5.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' })
return
}
if (this.image_list7.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' })
return
}
}
this.getUrl()
this.submitdisabled = true
submit(this.formobj).then((res) => {
if (res.success) {
@ -675,27 +680,9 @@ export default {
sid: ''
})
}
this.formobj.khkpsqsApplicationAppendxs = bb
} else {
this.formobj.khkpsqsApplicationAppendxs = []
}
if (this.image_list3.length > 0) {
const cc = []
for (var m = 0; m < this.image_list3.length; m++) {
cc.push({
attachType: '',
billAppSid: '',
createByName: window.sessionStorage.getItem('name'),
fileSid: '',
fileName: this.image_list3[m].name,
fileType: this.image_list3[m].name.substr(this.image_list3[m].name.lastIndexOf('.')),
fileUrl: this.image_list3[m].url,
sid: ''
})
}
this.formobj.kpxxqrsApplicationAppendxs = cc
this.formobj.carBuyContractImages = bb
} else {
this.formobj.kpxxqrsApplicationAppendxs = []
this.formobj.carBuyContractImages = []
}
if (this.image_list4.length > 0) {
const cc = []

12
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue

@ -179,7 +179,7 @@
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
</el-col>
</el-row>
<div class="title">客户开票申请书</div>
<div class="title">车辆买卖合同</div>
<el-row>
<el-col :span="24">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
@ -286,6 +286,7 @@ export default {
billNo: '',
billStateKey: '',
billStateValue: '',
carBuyContractImages: [],
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',
@ -387,16 +388,11 @@ export default {
this.image_list1.push(e.fileUrl)
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
if (this.formobj.carBuyContractImages.length > 0) {
this.formobj.carBuyContractImages.forEach((e) => {
this.image_list2.push(e.fileUrl)
})
}
if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
this.image_list3.push(e.fileUrl)
})
}
if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
this.image_list4.push(e.fileUrl)

8
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue

@ -385,6 +385,14 @@ export default {
})
},
handleSubmit() {
if (this.image_list1.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' })
return
}
if (this.image_list3.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@ -131,11 +131,21 @@ public interface FinCompanyInvoicingFeign {
@ResponseBody
List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(@RequestParam("orgSid") String orgSid);
@ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qySelByUseOrgSid3")
@ResponseBody
List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid,@RequestParam("invoiceKey") String invoiceKey);
@ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qyAppSelByUseOrgSid")
@ResponseBody
List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search);
@ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qyAppSelByUseOrgSidTwo")
@ResponseBody
List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search,@RequestParam(value = "invoiceKey",required = false)String invoiceKey);
@ApiOperation("企业开票信息管理移动端维护初始化")
@GetMapping("/qyAppFetchDetailsBySid/{sid}")
@ResponseBody

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@ -125,11 +125,21 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
return null;
}
@Override
public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(String orgSid, String invoiceKey) {
return null;
}
@Override
public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
return null;
}
@Override
public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(String useOrgSid, String search,String invoiceKey) {
return null;
}
@Override
public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
return null;

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -4461,6 +4461,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
ResultBean<BusSalesOrderDetailsVo> resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid());
BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData();
billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
if("1".equals(busSalesOrder.getPayTypeKey())){
billApplicationIInfoVoss.setIsCanEdit(true);
}else{
billApplicationIInfoVoss.setIsCanEdit(false);
}
//开票单位
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@ -156,11 +156,21 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
return finCompanyInvoicingService.qySelByUseOrgSidTwo(orgSid);
}
@Override
public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(String orgSid, String invoiceKey) {
return finCompanyInvoicingService.qySelByUseOrgSid3(orgSid,invoiceKey);
}
@Override
public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search);
}
@Override
public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(String useOrgSid, String search,String invoiceKey) {
return finCompanyInvoicingService.qyAppSelByUseOrgSidTwo(useOrgSid,search,invoiceKey);
}
@Override
public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
return finCompanyInvoicingService.qyAppFetchDetailsBySid(sid);

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@ -536,4 +536,25 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
}
return rb.success().setData(voList);
}
public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(String orgSid, String invoiceKey) {
QueryWrapper qw = new QueryWrapper<>();
qw.eq("useOrgSid", orgSid);
qw.eq("isDelete", 0);
qw.eq("invoiceTypeKey",invoiceKey);
List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
return finCompanyInvoicingBillListVos;
}
public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(String useOrgSid, String search, String invoiceKey) {
QueryWrapper qw = new QueryWrapper<>();
qw.eq("useOrgSid", useOrgSid);
qw.eq("isDelete", 0);
qw.like("name", search);
if(StringUtils.isNotBlank(invoiceKey)){
qw.eq("invoiceTypeKey",invoiceKey);
}
List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
return finCompanyInvoicingBillListVos;
}
}

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -189,10 +189,9 @@ public class InvoicedService {
String userSid = query.getUserSid();
String orgPath = query.getOrgPath();
List<String> vins = query.getVins();
/*if(vins.size() == 0){
if(vins.size() == 0){
return rb.setMsg("请选择车辆");
}*/
vins.add("84c5dfbd-935b-45a2-a7da-7aa3ff30e408");
}
ResultBean<BillApplicationIInfoVoss> billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins);
if(billApplicationIInfoVoResultBean.getData() != null){
BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData();
@ -231,6 +230,9 @@ public class InvoicedService {
vo.setContractId(finBillApplicationDetailsVo.getContractNo());
vo.setDate(finBillApplicationDetailsVo.getApplyDate());
vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
if("1".equals(finBillApplicationDetailsVo.getShowBtnStr())){
vo.setShowBtn(true);
}
vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
//根据合同查询销售订单
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();

Loading…
Cancel
Save