From 3ec8507146f8f7534436b75ad55c631deba9cbe7 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 15 Sep 2023 10:48:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/examined/examined_popup.vue | 140 ++++++++++++++++---------- src/views/examined/index_list.vue | 13 ++- 2 files changed, 100 insertions(+), 53 deletions(-) diff --git a/src/views/examined/examined_popup.vue b/src/views/examined/examined_popup.vue index 22e70c8..31a11b3 100644 --- a/src/views/examined/examined_popup.vue +++ b/src/views/examined/examined_popup.vue @@ -7,6 +7,8 @@ width="800px" @confirm="handleSubmit" @close="handleClose" + :button="mode == 'edit'" + :clickModalClose="mode == 'details'" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -84,7 +107,10 @@ clearable :style="{ width: '100%' }" > - + 通过 驳回 @@ -93,7 +119,12 @@ - + @@ -122,7 +153,7 @@ const mode = ref("add"); // 弹窗标题 const popupTitle = computed(() => { - return mode.value == "edit" ? "审核" : "新增"; + return mode.value == "edit" ? "审核" : "详情"; }); const activities = ref([ @@ -211,4 +242,11 @@ defineExpose({ :deep(.el-timeline-item__wrapper) { top: -8px !important; } +.attachment { + width: 150px; + height: 150px; + /* background-color: red; */ + margin-right: 10px; + margin-bottom: 10px; +} \ No newline at end of file diff --git a/src/views/examined/index_list.vue b/src/views/examined/index_list.vue index 371cf39..a49c8c1 100644 --- a/src/views/examined/index_list.vue +++ b/src/views/examined/index_list.vue @@ -72,10 +72,19 @@ v-perms="['flow/edit']" type="primary" link + v-if="row.status == 0" @click="handleEdit(row)" > 审核 + + 详情 + +
+
+ +
+ {{ + item.content }} + +
{{ item.content }}
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ {{ + item.content }} + +
{{ item.content }}
+
+ +
+ +
+ +
+ +
+
+
+ + + +
+ + +
+
+ + +
+ +
+ +
+ + +
+
+ + + + + + + +
+ +
发送
+
+ + + + + + + + \ No newline at end of file From 085cc1254229079d7736ee5b2b5d8e1b50832344 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Thu, 19 Oct 2023 14:20:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E4=B8=89=E8=BD=AE?= =?UTF-8?q?=E8=BD=A6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/contract/vehicle_detail.vue | 32 +++++++++++++++++++-------- src/views/contract/vehicle_list.vue | 10 ++++----- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/views/contract/vehicle_detail.vue b/src/views/contract/vehicle_detail.vue index fcb4228..2ed5bcd 100644 --- a/src/views/contract/vehicle_detail.vue +++ b/src/views/contract/vehicle_detail.vue @@ -99,15 +99,15 @@
租赁信息
- + - - @@ -117,7 +117,7 @@ - @@ -127,9 +127,9 @@ -
+ +
租赁信息
-
@@ -176,10 +176,16 @@ const formData = reactive({ company_b_code: "", company_b_email: "@service.ebaoquan.org", num: "", - cars_info: { + cars_info: + [ + { id: "", license: "", - }, + type:"", + rent_time:"" + } + ] + , car_list: [], type: 0, status: 0, @@ -204,6 +210,11 @@ const handChangeFn = (e) => { }); }); }; +const typeFn=(type)=>{ +if(type==0)return"租赁车辆" +if(type==1)return"自有车辆" +if(type==2)return"购买车辆" +} const test = () => { window.open(formData.file, "_blank"); }; @@ -211,7 +222,10 @@ leaseContractDetail({ id: route.query.id }).then((res) => { for (let key in formData) { formData[key] = res[key]; } - formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆"); + // formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆"); + formData.cars_info.forEach(item=>{ + item.type=typeFn(item.type) + }) }); const handleAvatarSuccess_three = (response, uploadFile) => { diff --git a/src/views/contract/vehicle_list.vue b/src/views/contract/vehicle_list.vue index e6bab53..2a14864 100644 --- a/src/views/contract/vehicle_list.vue +++ b/src/views/contract/vehicle_list.vue @@ -60,7 +60,7 @@ }, }">详情 - 发送合同 重新发送{{ row.nums ? row.nums + "s" : "" }} @@ -125,7 +125,7 @@ const timeFn = (i: number) => { }, 1000); }; const sendContractPopFn = (id: number) => { - (showPop.value = true), (sendAgainPop.value = true), (contractId = id); + (showPop.value = true), (sendAgainPop.value = false), (contractId = id); }; const sendAgaintPopFn = (id: number) => { (showPop.value = true), (contractId = id); @@ -173,12 +173,12 @@ const typeFn = (status: number) => { switch (status) { case 0: return "租赁合同"; - case 1: - return "自由车辆合同"; - + return "自有车辆合同"; case 2: return "解除合同"; + case 3: + return "购买合同"; default: } }; From 61046a45d1bbd4485f6cb1447da154736ac8dcfb Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Thu, 19 Oct 2023 14:33:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/config/index.ts b/src/config/index.ts index b6d5725..efe50ec 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -2,19 +2,11 @@ const config = { terminal: 1, //终端 title: "后台管理系统", //网站默认标题 version: "1.6.0", //版本号 - baseUrl: `${import.meta.env.VITE_APP_BASE_URL}/`, //请求接口域名 + baseUrl: `${ + import.meta.env.VITE_APP_BASE_URL + }/`, //请求接口域名 urlPrefix: "adminapi", //请求默认前缀 timeout: 20 * 1000, //请求超时时长 }; export default config; -// const config = { -// terminal: 1, //终端 -// title: "后台管理系统", //网站默认标题 -// version: "1.6.0", //版本号 -// baseUrl: `https://worker-task.lihaink.cn`, //请求接口域名 -// urlPrefix: "adminapi", //请求默认前缀 -// timeout: 20 * 1000, //请求超时时长 -// }; - -// export default config;