diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/qiankuantiche.js b/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/qiankuantiche.js index ee00279cd3..65017ddd83 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/qiankuantiche.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/qiankuantiche.js @@ -96,7 +96,7 @@ export function delBySids(data) { // 提交 export function submit(data) { return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/submitArrearsCarryVehicle', + url: '/buscenter/v1/busarrearscarryvehicleapply/submitAdvanceArrearsInfo', method: 'post', data: data, headers: { @@ -105,3 +105,80 @@ export function submit(data) { }) } +// 流程审批(同意) +export function complete(params) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/complete', + method: 'post', + data: params + }) +} + +// 流程审批(同意)-- 跨事业部 +export function initiatorToAnswerInfo(params) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/initiatorToAnswerInfo', + method: 'post', + data: params + }) +} + +// 流程审批(同意)--销售内情修改附件 +export function completeBy(params) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/completeBy', + method: 'post', + data: params + }) +} + +// 流程审批(驳回) +export function reject(params) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/reject', + method: 'post', + data: params + }) +} + +// 流程审批(终止) +export function breakProcess(params) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/breakProcess', + method: 'post', + data: params + }) +} + +// 流程审批(撤回) +export function revokeProcess(params) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/revokeProcess', + method: 'post', + data: params + }) +} + +// 审批流程(同意)获取下一环节 +export function getNextNodesForSubmit(data) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/getNextNodesForSubmit', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 审批流程(驳回)获取上一环节 +export function getPreviousNodesForReject(data) { + return request({ + url: '/buscenter/v1/busarrearscarryvehicleapply/getPreviousNodesForReject', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js index 5756ab154d..7ac08d98dc 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js @@ -83,27 +83,7 @@ export const constantRoutes = [ component: () => import('@/views/teshushenpi/qiankuanticheguanli/qiankuanticheguanli.vue'), name: 'qiankuanticheguanli', - meta: { - title: '欠款提车' - } - }, - { - path: '/teshushenpi/qiankuanticheguanli', - component: () => - import('@/views/teshushenpi/qiankuanticheguanli/jiansuocheliang.vue'), - name: 'jiansuocheliang', - meta: { - title: '检索车辆' - } - }, - { - path: '/teshushenpi/qiankuanticheguanli', - component: () => - import('@/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue'), - name: 'qiankuanticheshenqing', - meta: { - title: '欠款提车申请' - } + meta: { title: '欠款提车', noCache: true } } ] }, @@ -375,29 +355,7 @@ export const constantRoutes = [ component: () => import('@/views/discountpackagehandover/discountpackagetobehandover.vue'), name: 'YouHuiBaoDaiJiaoJie', - meta: { - title: '优惠包交接' - } - } - ] - }, - // 优惠包 - { - path: '/discountpackagehandover', - component: Layout, - redirect: '/discountpackagehandover', - meta: { - title: '优惠包交接' - }, - children: [ - { - path: '/discountpackagehandover', - component: () => - import('@/views/discountpackagehandover/discountpackagetobehandover.vue'), - name: 'YouHuiBaoDaiJiaoJie', - meta: { - title: '优惠包交接' - } + meta: { title: '优惠包交接', noCache: true } } ] }, @@ -447,12 +405,12 @@ export const constantRoutes = [ }, // 特殊审批 - // 欠款提车申请详情 + // 欠款提车申请已办详情 { - path: '/teshushenpiFlow/qiankuanticheguanli/qiankuanticheInfo', + path: '/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo', component: () => - import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheInfo.vue'), - name: 'qiankuanticheInfo' + import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue'), + name: 'qiankuanticheYiBanInfo' }, // 欠款提车编辑 { @@ -461,19 +419,33 @@ export const constantRoutes = [ import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue'), name: 'qiankuanticheEdit' }, - // 欠款提车复核 + // 欠款提车待办 + { + path: '/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo', + component: () => + import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue'), + name: 'qiankuanticheDaiBanInfo' + }, + // 欠款提车待办-- 修改附件信息(销售内勤--车辆买卖合同、总经理担保书、欠款提车担保承诺书必须上传) + { + path: '/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo', + component: () => + import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue'), + name: 'qiankuanticheDaiBanByFileInfo' + }, + // 欠款提车待办-- 修改附件信息(销售经理--其他附件(信审截图)必须上传) { - path: '/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuhe', + path: '/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo', component: () => - import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuhe.vue'), - name: 'qiankuantichefuhe' + import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue'), + name: 'qiankuanticheDaiBanByFileAndQiTaInfo' }, - // 欠款提车复核详情 + // 欠款提车待办-- 跨事业部 { - path: '/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuheInfo', + path: '/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo', component: () => - import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuheInfo.vue'), - name: 'qiankuantichefuheInfo' + import('@/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue'), + name: 'qiankuanticheByDivisionDaiBanInfo' }, // 合同管理 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/jiansuocheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/jiansuocheliang.vue deleted file mode 100644 index f83c2d7199..0000000000 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/jiansuocheliang.vue +++ /dev/null @@ -1,273 +0,0 @@ - - - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuantichefuhe.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuantichefuhe.vue deleted file mode 100644 index 871234120d..0000000000 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuantichefuhe.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue index 76a327c85b..bc7b4075b8 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue @@ -143,7 +143,7 @@ - + @@ -333,15 +333,6 @@ export default { } }) }, - UpNumber(e) { - e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符 - e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0 - if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') { - // 以上已经过滤,此处控制的是如果没有小数点,首位不能为类似于 01、02的金额 - console.log(e.target.value) - e.target.value = parseFloat(e.target.value) - } - }, showAdd(row) { this.init() this.viewTitle = '【新增】欠款提车申请' @@ -351,6 +342,7 @@ export default { fetchSid({ contractNo: row.contractId, orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: row.sid, userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { if (resp.success) { this.formobj = resp.data + this.formobj.userSid = window.sessionStorage.getItem('userSid') } }) }, @@ -360,47 +352,47 @@ export default { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - fetchSid({ contractNo: row.contractId, orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: row.sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => { + fetchSid({ contractNo: '', orgPath: '', sid: row.sid, userSid: '' }).then((res) => { if (res.success) { this.formobj = res.data - this.formobj.instanceId = res.data.procInstSid + this.formobj.instanceId = res.data.procInsId if (this.formobj.zjlLetter.length > 0) { this.formobj.zjlLetter.forEach((e) => { - this.image_list3.push({ - name: e.fileName, - url: e.fileUrl + this.image_list4.push({ + name: '', + url: e }) }) } if (this.formobj.gdLetter.length > 0) { this.formobj.gdLetter.forEach((e) => { - this.image_list4.push({ - name: e.fileName, - url: e.fileUrl + this.image_list3.push({ + name: '', + url: e }) }) } if (this.formobj.guaranteeLetter.length > 0) { this.formobj.guaranteeLetter.forEach((e) => { this.image_list2.push({ - name: e.fileName, - url: e.fileUrl + name: '', + url: e }) }) } if (this.formobj.carContract.length > 0) { this.formobj.carContract.forEach((e) => { this.image_list1.push({ - name: e.fileName, - url: e.fileUrl + name: '', + url: e }) }) } if (this.formobj.fileList.length > 0) { this.formobj.fileList.forEach((e) => { this.image_list5.push({ - name: e.fileName, - url: e.fileUrl + name: '', + url: e }) }) } @@ -529,7 +521,6 @@ export default { this.$message({ showClose: true, type: 'error', message: '请选择车辆' }) return } - const tip = '' this.getUrl() this.submitdisabled = true const loading = this.$loading({ @@ -558,16 +549,7 @@ export default { 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: '' - }) + aa.push(this.image_list1[i].url) } this.formobj.carContract = aa } else { @@ -576,16 +558,7 @@ export default { 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: '' - }) + bb.push(this.image_list2[k].url) } this.formobj.guaranteeLetter = bb } else { @@ -594,16 +567,7 @@ export default { 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: '' - }) + cc.push(this.image_list3[m].url) } this.formobj.gdLetter = cc } else { @@ -612,16 +576,7 @@ export default { if (this.image_list4.length > 0) { const cc = [] for (var n = 0; n < this.image_list4.length; n++) { - cc.push({ - attachType: '', - billAppSid: '', - createByName: window.sessionStorage.getItem('name'), - fileSid: '', - fileName: this.image_list4[n].name, - fileType: this.image_list4[n].name.substr(this.image_list4[n].name.lastIndexOf('.')), - fileUrl: this.image_list4[n].url, - sid: '' - }) + cc.push(this.image_list4[n].url) } this.formobj.zjlLetter = cc } else { @@ -630,16 +585,7 @@ export default { if (this.image_list5.length > 0) { const cc = [] for (var p = 0; p < this.image_list5.length; p++) { - cc.push({ - attachType: '', - billAppSid: '', - createByName: window.sessionStorage.getItem('name'), - fileSid: '', - fileName: this.image_list5[p].name, - fileType: this.image_list5[p].name.substr(this.image_list5[p].name.lastIndexOf('.')), - fileUrl: this.image_list5[p].url, - sid: '' - }) + cc.push(this.image_list5[p].url) } this.formobj.fileList = cc } else { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue index c3adfa3483..421c987380 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue @@ -123,7 +123,7 @@ {{ formobj.reasonValue }} - {{ formobj.remarks }} + {{ formobj.reason }} @@ -250,33 +250,33 @@ export default { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - fetchSid({ contractNo: row.contractId, orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: row.sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => { + fetchSid({ contractNo: '', orgPath: '', sid: row.sid, userSid: '' }).then((res) => { if (res.success) { this.formobj = res.data this.formobj.instanceId = res.data.procInstSid if (this.formobj.zjlLetter.length > 0) { this.formobj.zjlLetter.forEach((e) => { - this.image_list3.push(e.fileUrl) + this.image_list4.push(e) }) } if (this.formobj.gdLetter.length > 0) { this.formobj.gdLetter.forEach((e) => { - this.image_list4.push(e.fileUrl) + this.image_list3.push(e) }) } if (this.formobj.guaranteeLetter.length > 0) { this.formobj.guaranteeLetter.forEach((e) => { - this.image_list2.push(e.fileUrl) + this.image_list2.push(e) }) } if (this.formobj.carContract.length > 0) { this.formobj.carContract.forEach((e) => { - this.image_list1.push(e.fileUrl) + this.image_list1.push(e) }) } if (this.formobj.fileList.length > 0) { this.formobj.fileList.forEach((e) => { - this.image_list5.push(e.fileUrl) + this.image_list5.push(e) }) } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/jiansuocheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/jiansuocheliang.vue deleted file mode 100644 index a7c27906cf..0000000000 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/jiansuocheliang.vue +++ /dev/null @@ -1,240 +0,0 @@ - - - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue new file mode 100644 index 0000000000..c681917596 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue @@ -0,0 +1,502 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue new file mode 100644 index 0000000000..15d3e47faf --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue @@ -0,0 +1,548 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue new file mode 100644 index 0000000000..99ffda0c69 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue @@ -0,0 +1,622 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue new file mode 100644 index 0000000000..f107cf35ce --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue @@ -0,0 +1,502 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue index e0b04ab6ce..82a4ff9982 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue @@ -1,303 +1,639 @@ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheInfo.vue deleted file mode 100644 index a3bc6c5bc2..0000000000 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheInfo.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue new file mode 100644 index 0000000000..7ad60d0daf --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuhe.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuhe.vue deleted file mode 100644 index a29b649a56..0000000000 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuhe.vue +++ /dev/null @@ -1,478 +0,0 @@ - - - - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuheInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuheInfo.vue deleted file mode 100644 index 69776fdb9e..0000000000 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuantichefuheInfo.vue +++ /dev/null @@ -1,329 +0,0 @@ - - - - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/relation/selectVehicle.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/relation/selectVehicle.vue new file mode 100644 index 0000000000..a2ab78fbd7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/relation/selectVehicle.vue @@ -0,0 +1,182 @@ + + + +