Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
commit
23c3fc665d
  1. 12
      anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
  2. 54
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue
  3. 54
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue
  4. 12
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js
  5. 12
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
  6. 77
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
  7. 75
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
  8. 76
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
  9. 116
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
  10. 3
      anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js
  11. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java
  12. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java
  13. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

12
anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js

@ -253,6 +253,18 @@ export function save(data) {
})
}
// 生成附件并保存数据
export function saveInvoicedApplyInfo2Pdf(data) {
return request({
url: '/buscenter/v1/busbillapplication/saveInvoicedApplyInfo2Pdf',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 维护开票信息(企业) --出库申请开票申请合并
export function saveQiYe(data) {
return request({

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

@ -158,6 +158,13 @@
</el-table-column>
</el-table>
</div>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若开票信息需要修改时请在修改后点击生成合同按钮重新生成相关附件</div>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
</div>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -187,7 +194,7 @@
</template>
<script>
import { fetchDetailByCkSid, save, fetchByContractNo } from '@/api/chukuguanli/chukubanli'
import { fetchDetailByCkSid, save, fetchByContractNo, saveInvoicedApplyInfo2Pdf } from '@/api/chukuguanli/chukubanli'
import { selectAllDisList2, typeValues } from '@/api/dictcommons/dictcommons'
import upload from '@/components/uploadFile/uploadImg'
import xiaoshoudingdanInfo from '@/components/publicPage/dingdanInfo'
@ -216,6 +223,7 @@ export default {
image_list2: [],
image_list4: [],
formobj: {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',
@ -423,6 +431,40 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '出库开票申请')
},
handleCreate() {
if (this.formobj.oneBillMoney === '') {
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 + '的开票名称不能为空' })
return
}
}
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveInvoicedApplyInfo2Pdf(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})
},
handleDownLoad(val) {
if (val !== null && val !== '' && val !== undefined) {
window.open(val, '_blank')
} else {
this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
return
}
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
@ -446,14 +488,23 @@ export default {
return
}
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
save(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn()
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -528,6 +579,7 @@ export default {
},
handleReturn() {
this.formobj = {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',

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

@ -158,6 +158,13 @@
</el-table-column>
</el-table>
</div>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若开票信息需要修改时请在修改后点击生成合同按钮重新生成相关附件</div>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
</div>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -187,7 +194,7 @@
</template>
<script>
import { fetchDetailByCkSid, save, fetchByContractNo } from '@/api/chukuguanli/chukubanli'
import { fetchDetailByCkSid, save, fetchByContractNo, saveInvoicedApplyInfo2Pdf } from '@/api/chukuguanli/chukubanli'
import { selectAllDisList2, typeValues } from '@/api/dictcommons/dictcommons'
import upload from '@/components/uploadFile/uploadImg'
import xiaoshoudingdanInfo from '../../../publicPage/dingdanInfo'
@ -216,6 +223,7 @@ export default {
image_list2: [],
image_list4: [],
formobj: {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',
@ -423,6 +431,40 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '出库开票申请')
},
handleCreate() {
if (this.formobj.oneBillMoney === '') {
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 + '的开票名称不能为空' })
return
}
}
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveInvoicedApplyInfo2Pdf(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})
},
handleDownLoad(val) {
if (val !== null && val !== '' && val !== undefined) {
window.open(val, '_blank')
} else {
this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
return
}
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
@ -446,14 +488,23 @@ export default {
return
}
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
save(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn()
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -528,6 +579,7 @@ export default {
},
handleReturn() {
this.formobj = {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',

12
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js

@ -167,4 +167,14 @@ export function createPdf(data) {
params: data
})
}
// 生成合同
export function saveInvoicedApplyInfoPdfQk(data) {
return request({
url: '/fin/v1/finbillapplication/saveInvoicedApplyInfoPdfQk',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
})
}

12
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js

@ -205,3 +205,15 @@ export function deliveredFinSelect(data) {
})
}
// 生成合同
export function saveInvoicedApplyInfoPdf(data) {
return request({
url: '/fin/v1/finbillapplication/saveInvoicedApplyInfoPdf',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
})
}

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

@ -185,6 +185,13 @@
</el-table-column>
</el-table>
</div>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若开票信息需要修改时请在修改后点击生成合同按钮重新生成相关附件</div>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
</div>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -248,7 +255,7 @@
</template>
<script>
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/arrearsbilling'
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo, saveInvoicedApplyInfoPdfQk } from '@/api/anruifinmanagement/arrearsbilling'
import { selectAllDisList, typeValues, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import selectVehicle from './relation/selectVehicle'
@ -281,6 +288,7 @@ export default {
image_list7: [],
image_list8: [],
formobj: {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',
@ -608,19 +616,76 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '欠款开票申请')
},
handleCreate() {
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 + '的开票名称不能为空' })
return
}
}
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveInvoicedApplyInfoPdfQk(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})
},
handleDownLoad(val) {
if (val !== null && val !== '' && val !== undefined) {
window.open(val, '_blank')
} else {
this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
return
}
},
handleSave() {
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 + '的开票名称不能为空' })
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -659,14 +724,23 @@ export default {
}
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
submit(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '提交成功' })
this.handleReturn('true')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -814,6 +888,7 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',

75
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue

@ -171,6 +171,13 @@
</el-table-column>
</el-table>
</div>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若开票信息需要修改时请在修改后点击生成合同按钮重新生成相关附件</div>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
</div>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -201,7 +208,7 @@
</template>
<script>
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo, saveInvoicedApplyInfoPdf } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList2, typeValues } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import salesOrder from '@/components/publicPage/salesOrder'
@ -232,6 +239,7 @@ export default {
image_list2: [],
image_list4: [],
formobj: {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',
@ -526,23 +534,76 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '开票申请')
},
handleCreate() {
if (this.formobj.oneBillMoney === '') {
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 + '的开票名称不能为空' })
return
}
}
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveInvoicedApplyInfoPdf(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})
},
handleDownLoad(val) {
if (val !== null && val !== '' && val !== undefined) {
window.open(val, '_blank')
} else {
this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
return
}
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })
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 + '的开票名称不能为空' })
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -567,14 +628,23 @@ export default {
if (valid) {
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
submit(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '提交成功' })
this.handleReturn('true')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -650,6 +720,7 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',

76
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@ -170,6 +170,13 @@
</el-table-column>
</el-table>
</div>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若开票信息需要修改时请在修改后点击生成合同按钮重新生成相关附件</div>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
</div>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -201,7 +208,7 @@
</template>
<script>
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo, saveInvoicedApplyInfoPdf } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList2, typeValues } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import salesOrder from '../publicPage/salesOrder'
@ -232,6 +239,7 @@ export default {
image_list2: [],
image_list4: [],
formobj: {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',
@ -543,17 +551,72 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '开票申请')
},
handleCreate() {
if (this.formobj.oneBillMoney === '') {
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 + '的开票名称不能为空' })
return
}
}
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveInvoicedApplyInfoPdf(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})
},
handleDownLoad(val) {
if (val !== null && val !== '' && val !== undefined) {
window.open(val, '_blank')
} else {
this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
return
}
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
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 + '的开票名称不能为空'})
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({
showClose: true,
type: 'error',
message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '保存成功' })
// ()
window.parent.postMessage({
@ -564,9 +627,11 @@ export default {
}
}, '*')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -591,8 +656,15 @@ export default {
if (valid) {
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
submit(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '提交成功' })
// ()
window.parent.postMessage({
@ -603,9 +675,11 @@ export default {
}
}, '*')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}

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

@ -161,25 +161,34 @@
</el-form-item>
</el-col>
</el-row>
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
</template>
</el-table-column>
</el-table>
<div v-show="formobj.finBillTrailers !== null">
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
</template>
</el-table-column>
</el-table>
</div>
<div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
<div style="color: red;font-weight: bold">:若开票信息需要修改时请在修改后点击生成合同按钮重新生成相关附件</div>
<div>
<el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
</div>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -243,7 +252,7 @@
</template>
<script>
import { fetchDetailsBySid, saveOrUpdate, submit } from '@/api/anruifinmanagement/arrearsbilling'
import { fetchDetailsBySid, saveOrUpdate, submit, saveInvoicedApplyInfoPdfQk } from '@/api/anruifinmanagement/arrearsbilling'
import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import selectVehicle from './relation/selectVehicle'
@ -278,6 +287,7 @@ export default {
image_list7: [],
image_list8: [],
formobj: {
allDownloadUrl: '',
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',
@ -579,13 +589,68 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '欠款开票申请')
},
handleCreate() {
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 + '的开票名称不能为空' })
return
}
}
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveInvoicedApplyInfoPdfQk(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.formobj.sid = res.data.sid
this.formobj.allDownloadUrl = res.data.allDownloadUrl
this.$message({ showClose: true, type: 'success', message: res.msg })
}
})
},
handleDownLoad(val) {
if (val !== null && val !== '' && val !== undefined) {
window.open(val, '_blank')
} else {
this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
return
}
},
handleSave() {
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 + '的开票名称不能为空' })
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '保存成功' })
window.parent.postMessage({
cmd: 'returnHeight',
@ -595,9 +660,11 @@ export default {
}
}, '*')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}
@ -636,8 +703,15 @@ export default {
}
this.getUrl()
this.submitdisabled = true
const loading = this.$loading({
lock: true,
text: '附件信息正在生成中,请稍等',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
submit(this.formobj).then((res) => {
if (res.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '提交成功' })
window.parent.postMessage({
cmd: 'returnHeight',
@ -647,9 +721,11 @@ export default {
}
}, '*')
} else {
loading.close()
this.submitdisabled = false
}
}).catch(() => {
loading.close()
this.submitdisabled = false
})
}

3
anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js

@ -29,7 +29,8 @@ export default {
return request({
url: '/riskcenter/v1/loanrepaymenthistory/noImportUpdate',
method: 'post',
params: data
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
deleteBySids: function(data) {

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java

@ -46,4 +46,7 @@ public class LoanMortgageInformationTransactDto implements Dto {
@ApiModelProperty("使用组织全路径")
private String orgSidPath;
private String createBySid;
private String auditName; //审核人
private String auditSid; //审核人sid
private String auditDate; //审核日期
}

18
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java

@ -46,6 +46,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -507,6 +509,7 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
ResultBean rb = ResultBean.fireFail();
LoanMortgageInformationTransact entity = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
// 修改
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != entity) {
if (null != dto.getMortgageDate()) {
entity.setMortgageDate(dto.getMortgageDate());
@ -514,6 +517,19 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
if (StringUtils.isNotBlank(dto.getRemarks())) {
entity.setRemarks(dto.getRemarks());
}
if (StringUtils.isNotBlank(dto.getAuditSid())) {
entity.setAuditSid(dto.getAuditSid());
}
if (StringUtils.isNotBlank(dto.getAuditName())) {
entity.setAuditName(dto.getAuditName());
}
if (StringUtils.isNotBlank(dto.getAuditDate())) {
try {
entity.setAuditDate(sdf.parse(dto.getAuditDate()));
} catch (ParseException e) {
e.printStackTrace();
}
}
baseMapper.updateById(entity);
} else {
// 新增
@ -626,7 +642,7 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
ResultBean<LoanMortgageInformationTransactDetailsVo> rb = ResultBean.fireFail();
LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid);
if (null != vo) {
if (StringUtils.isNotBlank(vo.getAuditSid())) {
if (StringUtils.isBlank(vo.getAuditSid())) {
vo.setAuditDate(DateUtil.today());
vo.setAuditSid(userSid);
SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@ -3,7 +3,7 @@
<mapper namespace="com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryMapper">
<update id="updateTimeByPlanSids">
update loan_repayment_plan_details
set updateTime = #{formatDate},
set updateTime = #{formatDate}
where sid in
<foreach item="sid" collection="stringList" open="(" separator="," close=")">
#{sid}

Loading…
Cancel
Save