Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
09d07707e0
  1. 9
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  2. 11
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
  3. 7
      anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js
  4. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue
  5. 584
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue
  6. 20
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByFileDaiBanInfo.vue

9
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -760,8 +760,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
BaseVehicleZSOutApplyDto baseVehicleZSOutApplyDto = new BaseVehicleZSOutApplyDto();
baseVehicleZSOutApplyDto.setCreateBySid(busDeliveredApply.getApplySid());
baseVehicleZSOutApplyDto.setCreateByName(busDeliveredApply.getApplyName());
baseVehicleZSOutApplyDto.setSaleTypeKey(busDeliveredApply.getPaymentMethodKey());
baseVehicleZSOutApplyDto.setSaleTypeValue(busDeliveredApply.getPaymentMethod());
if("1".equals(busDeliveredApply.getPaymentMethodKey())){
baseVehicleZSOutApplyDto.setSaleTypeKey("001");
baseVehicleZSOutApplyDto.setSaleTypeValue("全款车");
}else{
baseVehicleZSOutApplyDto.setSaleTypeKey("002");
baseVehicleZSOutApplyDto.setSaleTypeValue("贷款车");
}
baseVehicleZSOutApplyDto.setSaleDate(DateUtil.today());
baseVehicleZSOutApplyDto.setOrgSid(busDeliveredApply.getStaffDeptSid());
baseVehicleZSOutApplyDto.setOrgName(busDeliveredApply.getStaffDeptName());

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

@ -1,4 +1,5 @@
import request from '@/utils/request'
import {completeBy} from "@/api/anruifinmanagement/arrearsbilling";
// 待开票车辆条件查询 (已改)
export function listPage(data) {
@ -61,6 +62,16 @@ export function complete(data) {
})
}
// 流程审批(同意)
export function completeByKP(data) {
return request({
url: '/fin/v1/finbillapplication/completeByKP',
data: data,
method: 'post'
})
}
// 流程审批(驳回)
export function reject(data) {
return request({

7
anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@ -265,6 +265,13 @@ const codemenu = [
import('@/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue'),
name: 'finginvoiceapplyEdit'
},
// 开票申请管理待办详情--销售内勤环节上传附件
{
path: '/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo',
component: () =>
import('@/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue'),
name: 'finginvoiceapplyByFileDaiBanInfo'
},
// 开票申请管理待办详情
{
path: '/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo',

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@ -466,7 +466,7 @@ export default {
},
changeStaff(value) {
const choose = this.staff_list.filter((item) => item.staffName === value)
this.formobj.staffUserSid = choose[0].staffSid
this.formobj.staffUserSid = choose[0].userSid
this.listQuery.createBySid = choose[0].userSid
},
changeCollectionBankNum(value) {

584
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue

@ -0,0 +1,584 @@
<template>
<div class="app-container">
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 新增修改按钮-->
<div>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
<!--end 添加修改按钮-->
</div>
<!--按钮部分结束-->
<div class="">
<div class="titwu">公司开票申请单</div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="8">
<div class="span-sty">发起人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">发起部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">发起日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">销售专员</div>
<el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">销售部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">销售类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">主车开票信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单台开票金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票类型默认</div>
<el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票名称默认</div>
<el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.finBillVehicles" :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.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="合格证状态" align="center">
<template slot-scope="scope">
<span>{{ scope.row.certificateStateValue }}</span>
</template>
</el-table-column>
<el-table-column label="开票类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.billTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickName }}</span>
</template>
</el-table-column>
<el-table-column label="开票信息" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
</template>
</el-table-column>
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">开票金额合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.totalBillMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">开票状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></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">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
</el-table>
<div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
<upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-col>
</el-row>
<div class="title"><span class="icon">*</span>客户开票申请书</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">
<el-form-item>
<upload ref="uploadImg" v-model="image_list4" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>当前环节:</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{rowClass:!currentLink}">
<el-col :span="4" class="tleftb">
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { fetchDetailsBySid, completeByKP, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import upload from '@/components/uploadFile/upload'
export default {
name: 'finginvoiceapplyByFileDaiBanInfo',
components: {
upload
},
data() {
return {
viewTitle: '',
tableKey: 0,
billingKey: 1,
index: 0,
image_list1: [],
image_list2: [],
image_list3: [],
image_list4: [],
formobj: {
applyDate: '',
arrearsMoney: '',
arrearsOpenYYKey: '',
arrearsOpenYYValue: '',
billNo: '',
billStateKey: '',
billStateValue: '',
cldjhtApplicationAppendxs: [],
contractNo: '',
contractSid: '',
createByName: '',
customerName: '',
customerSid: '',
deptName: '',
deptSid: '',
finBillTrailers: [],
finBillVehicles: [],
isDelayBill: '',
isHighAndLowOpen: '',
isLQOrigInvoice: '',
khkpsqsApplicationAppendxs: [],
kpxxqrsApplicationAppendxs: [],
modelName: '',
modelSid: '',
nodeSid: '',
nodeState: '',
oneBillMoney: '',
openTickName: '',
openTickSid: '',
openTickTypeKey: '',
openTickTypeValue: '',
openTickUnitName: '',
openTickUnitSid: '',
orgSidPath: '',
procDefId: '',
procInstSid: '',
remarks: '',
returnedMoneyDate: '',
saleDeptName: '',
saleDeptSid: '',
saleTypeKey: '',
saleTypeValue: '',
sid: '',
staffName: '',
staffSid: '',
totalBillMoney: '',
useOrgSid: '',
createBySid: '',
zjApplicationAppendxs: []
},
rules: {},
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: '',
cldjhtApplicationAppendxs: [],
khkpsqsApplicationAppendxs: [],
kpxxqrsApplicationAppendxs: [],
zjApplicationAppendxs: []
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 450 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '公司开票详情'
fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.zjApplicationAppendxs.length > 0) {
this.formobj.zjApplicationAppendxs.forEach((e) => {
this.image_list1.push({
name: e.fileName,
url: e.fileUrl
})
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
this.image_list2.push({
name: e.fileName,
url: e.fileUrl
})
})
}
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({
name: e.fileName,
url: e.fileUrl
})
})
}
}
})
},
getUrl() {
if (this.image_list1.length > 0) {
const aa = []
for (var i = 0; i < this.image_list1.length; i++) {
aa.push({
attachType: '',
billAppSid: '',
createByName: window.sessionStorage.getItem('name'),
fileSid: '',
fileName: this.image_list1[i].name,
fileType: this.image_list1[i].name.substr(this.image_list1[i].name.lastIndexOf('.')),
fileUrl: this.image_list1[i].url,
sid: ''
})
}
this.linkByParameter.zjApplicationAppendxs = aa
} else {
this.linkByParameter.zjApplicationAppendxs = []
}
if (this.image_list2.length > 0) {
const bb = []
for (var k = 0; k < this.image_list2.length; k++) {
bb.push({
attachType: '',
billAppSid: '',
createByName: window.sessionStorage.getItem('name'),
fileSid: '',
fileName: this.image_list2[k].name,
fileType: this.image_list2[k].name.substr(this.image_list2[k].name.lastIndexOf('.')),
fileUrl: this.image_list2[k].url,
sid: ''
})
}
this.linkByParameter.khkpsqsApplicationAppendxs = bb
} else {
this.linkByParameter.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.linkByParameter.kpxxqrsApplicationAppendxs = cc
} else {
this.linkByParameter.kpxxqrsApplicationAppendxs = []
}
if (this.image_list4.length > 0) {
const cc = []
for (var n = 0; n < this.image_list3.length; n++) {
cc.push({
attachType: '',
billAppSid: '',
createByName: window.sessionStorage.getItem('name'),
fileSid: '',
fileName: this.image_list3[n].name,
fileType: this.image_list3[n].name.substr(this.image_list3[n].name.lastIndexOf('.')),
fileUrl: this.image_list3[n].url,
sid: ''
})
}
this.linkByParameter.cldjhtApplicationAppendxs = cc
} else {
this.linkByParameter.cldjhtApplicationAppendxs = []
}
},
//
openAgree(val) {
this.getUrl()
if (this.linkByParameter.zjApplicationAppendxs.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传证件(营业执照或身份证)' })
return
}
if (this.linkByParameter.khkpsqsApplicationAppendxs.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传客户开票申请书' })
return
}
this.operation = val
this.currentLink = true
this.dialogList.comment = '同意'
getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleStop()
}
}
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
completeByKP(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.titwu {
font-size: 28px;
text-align: center;
padding: 30px 0 20px 0;
}
.span-sty {
width: 100px !important;
}
.addinputInfo {
margin-left: 90px !important;
}
</style>

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

@ -330,22 +330,34 @@ export default {
this.formobj = res.data
if (this.formobj.zjApplicationAppendxs.length > 0) {
this.formobj.zjApplicationAppendxs.forEach((e) => {
this.image_list1.push(e.fileUrl)
this.image_list1.push({
name: e.fileName,
url: e.fileUrl
})
})
}
if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
this.image_list2.push(e.fileUrl)
this.image_list2.push({
name: e.fileName,
url: e.fileUrl
})
})
}
if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
this.image_list3.push(e.fileUrl)
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(e.fileUrl)
this.image_list4.push({
name: e.fileName,
url: e.fileUrl
})
})
}
}

Loading…
Cancel
Save