From 52349cc9239db61470eb22da6223744fc1f532cc Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 3 May 2023 20:19:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E6=AC=BE=E6=8F=90?= =?UTF-8?q?=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/dictcommons/dictcommons.js | 9 + .../src/api/tesheshenpi/qiankuantiche.js | 91 +- .../anrui-buscenter-ui/src/utils/request.js | 2 +- .../views/discountpackage/discountpackage.vue | 346 +++++++ .../discountpackage/discountpackageAdd.vue | 128 +++ .../discountpackage/discountpackageInfo.vue | 110 ++ .../qiankuanticheguanli.vue | 479 +++++---- .../qiankuanticheshenqing.vue | 950 ++++++++++++------ .../qiankuanticheshenqingInfo.vue | 513 +++++----- .../relation/selectVehicle.vue | 182 ++++ 10 files changed, 2038 insertions(+), 772 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackage.vue create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageAdd.vue create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageInfo.vue create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/relation/selectVehicle.vue diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js index 1e833df6d0..9bdbba80d3 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js @@ -62,6 +62,15 @@ export function typeValues(data) { }) } +// 获取金融部人员 +export function selectFinance(data) { + return request({ + url: '/portal/v1/sysorganization/selectFinance', + method: 'get', + params: data + }) +} + // 根据用户sid获取本分公司下的银行账号 export function selAccountByOrgSid(data) { return request({ 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 a4974674af..ee00279cd3 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/qiankuantiche.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/qiankuantiche.js @@ -1,8 +1,6 @@ import request from '@/utils/request' -import qs from 'qs' - -//Pc根据条件分页查询数据的列表(已测试) +// Pc根据条件分页查询数据的列表 export function pagerList(data) { return request({ url: '/buscenter/v1/busarrearscarryvehicleapply/listPage', @@ -13,10 +11,11 @@ export function pagerList(data) { } }) } -//检索车辆--分页列表 -export function getArrearsVehicleList(data) { + +// 选择合同 +export function getApprovalContractList(data) { return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/getArrearsVehicleList', + url: '/base/v1/commoncontract/getApprovalContractList', method: 'post', data: data, headers: { @@ -24,10 +23,11 @@ export function getArrearsVehicleList(data) { } }) } -//欠款提车申请前验证选择的车辆(合同编号必须相同) -export function arrearsVehicleApply(data) { + +// 检索车辆--分页列表 +export function getCanUseCars(data) { return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/arrearsVehicleApply', + url: '/buscenter/v1/bussalesordervehicle/getCanUseCarsPage', method: 'post', data: data, headers: { @@ -35,73 +35,56 @@ export function arrearsVehicleApply(data) { } }) } -// 欠款提车申请--新增保存 -export function save(data) { + +// 欠款提车申请前验证选择的车辆(合同编号必须相同) +export function arrearsVehicleApply(data) { return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/save',data, + url: '/buscenter/v1/busarrearscarryvehicleapply/arrearsVehicleApply', method: 'post', + data: data, headers: { 'Content-Type': 'application/json' } }) } -// -- 修改 -export function update(data) { - return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/update/'+data.sid, - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) -} - -// 回显 -export function fetchSid(data) { - return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/fetchSid/'+ data, - method: 'get' - }) -} -// 删除 -export function delBySids(data) { +// 欠款提车申请--新增保存 +export function saveOrUpdate(data) { return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/deleteBySids', + url: '/buscenter/v1/busarrearscarryvehicleapply/saveArrearsApply', method: 'post', - data:data, + data: data, headers: { 'Content-Type': 'application/json' } }) } -// 提交 -export function submit(data) { + +// 回显 +export function fetchSid(data) { return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/submitArrearsCarryVehicle', - method: 'post', - data:data, - headers: { - 'Content-Type': 'application/json' - } + url: '/buscenter/v1/busarrearscarryvehicleapply/initArrearsApply', + method: 'get', + params: data }) } -// 移除附件接口 -export function removeFile(data) { + +// 生成附件并保存数据 +export function saveArrearsApplyPdf(data) { return request({ - url: '/base/v1/commonappendix/deleteFilesOss', + url: '/buscenter/v1/busarrearscarryvehicleapply/saveArrearsApplyPdf', method: 'post', - params: data, + data: data, headers: { 'Content-Type': 'application/json' } }) } -// 保存附件接口 -export function saveFile(data) { + +// 删除 +export function delBySids(data) { return request({ - url: '/buscenter/v1/busarrearscarryvehicleapply/saveArrearsAppendix', + url: '/buscenter/v1/busarrearscarryvehicleapply/deleteBySids', method: 'post', data: data, headers: { @@ -109,10 +92,11 @@ export function saveFile(data) { } }) } -// 保存附件接口 -export function getPcAppendix(data) { + +// 提交 +export function submit(data) { return request({ - url: '/base/v1/commonappendix/getPcAppendix', + url: '/buscenter/v1/busarrearscarryvehicleapply/submitArrearsCarryVehicle', method: 'post', data: data, headers: { @@ -120,3 +104,4 @@ export function getPcAppendix(data) { } }) } + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/utils/request.js b/anrui-buscenter/anrui-buscenter-ui/src/utils/request.js index 12093fa629..7457e25ad6 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/utils/request.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/utils/request.js @@ -7,7 +7,7 @@ import { getToken, getStorage } from '@/utils/auth' const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 30000 // request timeout + timeout: 60000 // request timeout }) // request interceptor diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackage.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackage.vue new file mode 100644 index 0000000000..2f9e3c59e2 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackage.vue @@ -0,0 +1,346 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageAdd.vue new file mode 100644 index 0000000000..ce07f0deb6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageAdd.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageInfo.vue new file mode 100644 index 0000000000..1423c9673a --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackage/discountpackageInfo.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheguanli.vue index 8f8586fbd3..e86113d1fa 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheguanli.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheguanli.vue @@ -1,18 +1,10 @@ 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 861b92f2aa..76a327c85b 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 @@ -1,402 +1,732 @@ 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 3e26a9e5cc..c3adfa3483 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 @@ -1,150 +1,179 @@ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/relation/selectVehicle.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/relation/selectVehicle.vue new file mode 100644 index 0000000000..ef9b1ea661 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/relation/selectVehicle.vue @@ -0,0 +1,182 @@ + + + +