From 94e9ee2ab9c6c43971fcae95bb06c5c4ff08c1a9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 9 Jun 2023 14:13:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A4=E8=BD=A6?=
=?UTF-8?q?=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/jiaochezhunbei/readyfordelivery.js | 128 +++++
.../anrui-buscenter-ui/src/router/index.js | 34 +-
.../jiaochezhunbei/readyfordelivery.vue | 259 +++++++++
.../jiaochezhunbei/readyfordeliveryAdd.vue | 217 ++++++++
.../jiaochezhunbei/readyfordeliveryInfo.vue | 174 ++++++
.../jiaochezhunbei/relation/affirm.vue | 514 ++++++++++++++++++
.../jiaochezhunbei/thecarisready.vue | 255 +++++++++
7 files changed, 1564 insertions(+), 17 deletions(-)
create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/api/jiaochezhunbei/readyfordelivery.js
create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue
create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryAdd.vue
create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryInfo.vue
create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/relation/affirm.vue
create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/thecarisready.vue
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jiaochezhunbei/readyfordelivery.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jiaochezhunbei/readyfordelivery.js
new file mode 100644
index 0000000000..8c0c9fcca5
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jiaochezhunbei/readyfordelivery.js
@@ -0,0 +1,128 @@
+import request from '@/utils/request'
+
+// Pc根据条件分页查询数据的列表
+export function pagerList(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/getDeliveryPlanList',
+ method: 'post',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+}
+
+// 初始化
+export function getDeliveryPlanInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/getDeliveryPlanInfo',
+ method: 'get',
+ params: data
+ })
+}
+
+// 提交
+export function submit(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/submitDeliveryPlanInfo',
+ method: 'post',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+}
+
+// 发票初始化
+export function getInvoiceInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/getInvoiceInfo',
+ method: 'get',
+ params: data
+ })
+}
+
+// 合格证初始化
+export function getCertificateInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/getCertificateInfo',
+ method: 'get',
+ params: data
+ })
+}
+
+// 保单初始化
+export function getPolicyInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/getPolicyInfo',
+ method: 'get',
+ params: data
+ })
+}
+
+// 随车资料初始化
+export function getVehicleInformationInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/getVehicleInformationInfo',
+ method: 'get',
+ params: data
+ })
+}
+
+// 其他资料初始化
+export function getOtherDataInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/getOtherDataInfo',
+ method: 'get',
+ params: data
+ })
+}
+
+// 随车资料确认
+export function saveHandoverMaterials(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/saveHandoverMaterials',
+ method: 'post',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+}
+
+// 合格证、发票确认
+export function saveState(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/saveState',
+ method: 'put',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+}
+
+// 保单确认
+export function savePolicyInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/savePolicyInfo',
+ method: 'put',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+}
+
+// 其他资料确认
+export function saveOtherDataInfo(data) {
+ return request({
+ url: '/buscenter/v1/bushandoverprepare/saveOtherDataInfo',
+ method: 'put',
+ 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 329c65e901..55d1bf5d35 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
@@ -365,23 +365,23 @@ export const constantRoutes = [
]
},
// 交车准备
- // {
- // path: '/xiaoshouguanli/jiaochezhunbei',
- // component: Layout,
- // redirect: '/xiaoshouguanli/jiaochezhunbei',
- // meta: {
- // title: '交车准备'
- // },
- // children: [
- // {
- // path: '/xiaoshouguanli/jiaochezhunbei',
- // component: () =>
- // import('@/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue'),
- // name: 'DaiJiaoCheZhunBei',
- // meta: { title: '交车准备', noCache: true }
- // }
- // ]
- // },
+ {
+ path: '/xiaoshouguanli/jiaochezhunbei',
+ component: Layout,
+ redirect: '/xiaoshouguanli/jiaochezhunbei',
+ meta: {
+ title: '交车准备'
+ },
+ children: [
+ {
+ path: '/xiaoshouguanli/jiaochezhunbei',
+ component: () =>
+ import('@/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue'),
+ name: 'DaiJiaoCheZhunBei',
+ meta: { title: '交车准备', noCache: true }
+ }
+ ]
+ },
{
path: '/fapiaoneibujieshou',
component: Layout,
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue
new file mode 100644
index 0000000000..389210514f
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+ 待准备
+ 已准备
+
+
+
{{ searchxianshitit }}
+
+
+
+
+
+
+
+
+ 办理
+ 查看
+
+
+
+
+ {{ scope.row.contractNo }}
+
+
+
+
+ {{ scope.row.customerName }}
+
+
+
+
+ {{ scope.row.mobile }}
+
+
+
+
+ {{ scope.row.model }}
+
+
+
+
+ {{ scope.row.num }}
+
+
+
+
+ {{ scope.row.payType }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryAdd.vue
new file mode 100644
index 0000000000..9acf71bf49
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryAdd.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+ 合同编号
+ {{ formobj.contractNo }}
+
+
+ 客户名称
+ {{ formobj.customerName }}
+
+
+
+
+ 车型
+ {{ formobj.model }}
+
+
+ 销售类型
+ {{ formobj.payType }}
+
+
+
+
+
+
+ {{ scope.row.vinNo }}
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 上传
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryInfo.vue
new file mode 100644
index 0000000000..8050295841
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/readyfordeliveryInfo.vue
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+ 合同编号
+ {{ formobj.contractNo }}
+
+
+ 客户名称
+ {{ formobj.customerName }}
+
+
+
+
+ 车型
+ {{ formobj.model }}
+
+
+ 销售类型
+ {{ formobj.payType }}
+
+
+
+
+
+
+ {{ scope.row.vinNo }}
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 确认
+ 查看
+
+
+
+
+ 上传
+ 查看
+
+
+
+
+ {{ scope.row.remarks }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/relation/affirm.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/relation/affirm.vue
new file mode 100644
index 0000000000..33731af91b
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/relation/affirm.vue
@@ -0,0 +1,514 @@
+
+
+
+
+
+
+
+
+
+ 车架号
+
+
+ {{ invoiceconfirmation.vinNo }}
+
+
+
+
+ 开票人
+
+
+ {{ invoiceconfirmation.drawer }}
+
+
+ 开票日期
+
+
+ {{ invoiceconfirmation.invoiceDate }}
+
+
+
+
+ 发票号
+
+
+ {{ invoiceconfirmation.invoiceNo }}
+
+
+
+
+ 发票图片
+
+
+
+
+
+
+
+
+
+
+ 接收备注
+
+
+
+
+
+ {{ invoiceconfirmation.remarks }}
+
+
+
+
+
+
+
+
+
+
+
+ 车架号
+
+
+ {{ certification.vinNo }}
+
+
+ 车辆型号
+
+
+ {{ certification.carModel }}
+
+
+
+
+ 合格证编号
+
+
+ {{ certification.certificationNo }}
+
+
+ 发证日期
+
+
+ {{ certification.certificateDate }}
+
+
+
+
+ 合格证图片
+
+
+
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+ {{ certification.remarks }}
+
+
+
+
+
+
+
+
+
+
+
+ 保单照片
+
+
+
+
+
+
+
+
+
+
+ 临时牌照
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车架号
+ {{ vehicleconfirmation.vinNo }}
+
+
+ 车型
+ {{ vehicleconfirmation.model }}
+
+
+
+
+ 合同编号
+ {{ vehicleconfirmation.contractNo }}
+
+
+ 客户名称
+ {{ vehicleconfirmation.customerName }}
+
+
+
+
+
+
+ 确认
+
+
+
+
+ {{ scope.row.transferName }}
+
+
+
+
+ {{ scope.row.recName }}
+
+
+
+
+ {{ scope.row.recTime }}
+
+
+
+
+ {{ scope.row.vehicleHandoverData }}
+
+
+
+
+
+
+ {{ scope.row.remarks }}
+
+
+
+
+
+
+
+
+
+
+
+ 其他资料
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/thecarisready.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/thecarisready.vue
new file mode 100644
index 0000000000..f35972cca3
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/thecarisready.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+ 待准备
+ 已准备
+
+
+
{{ searchxianshitit }}
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+ {{ scope.row.contractNo }}
+
+
+
+
+ {{ scope.row.customerName }}
+
+
+
+
+ {{ scope.row.mobile }}
+
+
+
+
+ {{ scope.row.model }}
+
+
+
+
+ {{ scope.row.num }}
+
+
+
+
+ {{ scope.row.payType }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From a91db1e66b4ac89cb2849ecd653bfa2ef8a352f6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 9 Jun 2023 14:16:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ruzhangguanli/ruzhangEdit.vue | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
index 05a795a140..caa20e7047 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
@@ -328,18 +328,6 @@ export default {
}, '*')
},
methods: {
- init() {
- getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
- if (resp.success) {
- this.formobj.useOrgSid = resp.data
- fetchBySid(this.formobj.useOrgSid).then((res) => {
- if (res.success) {
- this.formobj.useOrgName = res.data.name
- }
- })
- }
- })
- },
// 输入数字正则
oninput(val, limit = 0) {
val = val.replace(/[^\d]/g, '') // 保留数字
@@ -713,9 +701,6 @@ export default {
} else {
this.policyThreeByThreeChecked = false
}
- this.$nextTick(() => {
- this.init()
- })
}).catch(e => {
this.formobj = {}
})
From de0e427b00d5e5808d8a6081d645338523f5bd61 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 9 Jun 2023 14:17:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../suicheziliaojiaojie/cardatatobehandedover.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue
index 4d5ad82c50..f9ad5beab8 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue
@@ -35,7 +35,7 @@
-
+
办理
查看
From cb0a7146a54bc4b2c45287a1c07180f5fb979880 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 9 Jun 2023 14:34:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E5=8C=85=E4=BA=A4=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../discountpackagehandover.vue | 19 ++++++++++++--
.../discountpackagehandoverInfo.vue | 26 ++++++++++++++++---
.../discountpackagetobehandover.vue | 16 ++++++++++--
3 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue
index 2bb71ac498..90ab72db58 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue
@@ -26,6 +26,9 @@
+
+
+
查询
@@ -86,6 +89,16 @@
{{ scope.row.recPhone }}
+
+
+ {{ scope.row.transferName }}
+
+
+
+
+ {{ scope.row.transferPhone }}
+
+
@@ -156,7 +169,8 @@ export default {
createEndTime: '',
contractNo: '',
customerName: '',
- recName: ''
+ recName: '',
+ transferName: ''
},
current: 1,
size: 10,
@@ -247,7 +261,8 @@ export default {
createEndTime: '',
contractNo: '',
customerName: '',
- recName: ''
+ recName: '',
+ transferName: ''
},
current: 1,
size: 10,
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandoverInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandoverInfo.vue
index 7138b19e9a..ce97140baf 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandoverInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandoverInfo.vue
@@ -54,6 +54,14 @@
+
+
+ 移交备注
+
+
+ {{ formobj.transferRemarks }}
+
+
接收人
@@ -74,7 +82,7 @@
- 备注
+ 接收备注
{{ formobj.remarks }}
@@ -111,6 +119,14 @@
+
+
+ 交车确认单
+
+
+
+
+
@@ -134,7 +150,9 @@ export default {
vehCount: '',
vinNo: '',
remarks: '',
- busDiscountpackageHandoverLists: []
+ transferRemarks: '',
+ busDiscountpackageHandoverLists: [],
+ busFiles: []
},
rules: {}
}
@@ -160,7 +178,9 @@ export default {
vehCount: '',
vins: '',
remarks: '',
- busDiscountpackageHandoverListVos: []
+ transferRemarks: '',
+ busDiscountpackageHandoverListVos: [],
+ busFiles: []
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagetobehandover.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagetobehandover.vue
index 354cc8fd03..8bb1fa8cff 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagetobehandover.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagetobehandover.vue
@@ -87,6 +87,16 @@
{{ scope.row.recPhone }}
+
+
+ {{ scope.row.transferName }}
+
+
+
+
+ {{ scope.row.transferPhone }}
+
+
@@ -154,7 +164,8 @@ export default {
createEndTime: '',
contractNo: '',
customerName: '',
- recName: ''
+ recName: '',
+ transferName: ''
},
current: 1,
size: 10,
@@ -238,7 +249,8 @@ export default {
createEndTime: '',
contractNo: '',
customerName: '',
- recName: ''
+ recName: '',
+ transferName: ''
},
current: 1,
size: 10,