From 5413b1a3102ccec865ea2318b30cbcbdbe03a317 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Thu, 26 Dec 2024 18:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/arrivalConfirmation/index.vue | 13 +- .../components/PlanAuditDetails.vue | 9 +- pages/sendACarSystem/details.vue | 6 +- pages/sendACarSystem/index.vue | 174 +++++++++--------- 4 files changed, 107 insertions(+), 95 deletions(-) diff --git a/pages/arrivalConfirmation/index.vue b/pages/arrivalConfirmation/index.vue index 02f78be..accbc14 100644 --- a/pages/arrivalConfirmation/index.vue +++ b/pages/arrivalConfirmation/index.vue @@ -35,10 +35,13 @@ {{ item.pcNum }}
- - 查看到货确认单 - - 上传到货确认单 + +
@@ -200,7 +203,7 @@ export default { isDetail: true, // 到货 isArrival: true, - active: 1, + active: 1 } uni.navigateTo({ url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}` diff --git a/pages/sendACarSystem/components/PlanAuditDetails.vue b/pages/sendACarSystem/components/PlanAuditDetails.vue index 5154024..9190eb8 100644 --- a/pages/sendACarSystem/components/PlanAuditDetails.vue +++ b/pages/sendACarSystem/components/PlanAuditDetails.vue @@ -82,7 +82,7 @@
{{ imgList && imgList.length > 0 ? imgList[current].title : '' }}
- + item.url) + }) + }, submit() { console.log('🚀 ~ 提交 ~ submit ~ this.isPass', this.isPass) console.log('🚀 ~ 提交 ~ submit ~ this.opinion', this.opinion) diff --git a/pages/sendACarSystem/details.vue b/pages/sendACarSystem/details.vue index df78dda..637deac 100644 --- a/pages/sendACarSystem/details.vue +++ b/pages/sendACarSystem/details.vue @@ -6,7 +6,7 @@
派车详情
审核记录
-
+ @@ -56,9 +56,9 @@ page { } .tabs { width: 100%; - position: fixed; + /* position: fixed; top: 44px; - left: 0; + left: 0; */ background-color: #fff; z-index: 99; display: flex; diff --git a/pages/sendACarSystem/index.vue b/pages/sendACarSystem/index.vue index e40baee..6479893 100644 --- a/pages/sendACarSystem/index.vue +++ b/pages/sendACarSystem/index.vue @@ -4,7 +4,7 @@
派车分配
派车审核
-
+
@@ -51,12 +51,8 @@ {{ item.plan }}
- - 派车分配 - - - 审核 - + +
@@ -82,10 +78,16 @@
-
通过
-
不通过
+
通过
+
不通过
- +
@@ -160,8 +162,8 @@ export default { } ], radioValue: '', // 选中的值 - opinion: '', // 审批意见 - isPass: true // 是否通过 + opinion: '', // 审批意见 + isPass: true // 是否通过 } }, computed: { @@ -253,11 +255,11 @@ export default { this.showModal = true if (this.active == 1) { this.modalTitle = '指定派车供应商' - this.radioValue = '' + this.radioValue = '' } else { this.modalTitle = '派车审核' - this.isPass = true - this.opinion = '' + this.isPass = true + this.opinion = '' } }, confirm(e) { @@ -267,58 +269,58 @@ export default { this.showPicker = false }, groupChange() { - console.log('🚀 ~ radioValue', this.radioValue) + console.log('🚀 ~ radioValue', this.radioValue) }, - // 查看详情 - handleDetail(item) { - console.log('查看详情', item) - let isPlan = false - let isAudit = false - let isDetail = false - let active = null - if (this.active == 1 && !item.isSend) { - isPlan = true - active = 1 - } else if (this.active == 2 && item.status == 0) { - isAudit = true - active = 2 - } else if (item.isSend || item.status == 1) { - isDetail = true - active = 1 - } - const params = { - ...item, - isPlan, - isAudit, - isDetail, - active - } - uni.navigateTo({ - url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}` - }) - }, - // 提交 + // 查看详情 + handleDetail(item) { + console.log('查看详情', item) + let isPlan = false + let isAudit = false + let isDetail = false + let active = null + if (this.active == 1 && !item.isSend) { + isPlan = true + active = 1 + } else if (this.active == 2 && item.status == 0) { + isAudit = true + active = 2 + } else if (item.isSend || item.status == 1) { + isDetail = true + active = 1 + } + const params = { + ...item, + isPlan, + isAudit, + isDetail, + active + } + uni.navigateTo({ + url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}` + }) + }, + // 提交 submit() { console.log('提交') - if (this.active == 1) { - console.log('派车分配', this.radioValue) - if (!this.radioValue) { - uni.showToast({ - title: '请选择派车供应商', - icon: 'none' - }) - return - } - } else { - console.log('派车审核', this.isPass, this.opinion) - if (!this.isPass && !this.opinion) { - uni.showToast({ - title: '请填写审核不通过意见', - icon: 'none' - }) - return - } - } + if (this.active == 1) { + console.log('派车分配', this.radioValue) + if (!this.radioValue) { + uni.showToast({ + title: '请选择派车供应商', + icon: 'none' + }) + return + } + } else { + console.log('派车审核', this.isPass, this.opinion) + if (!this.isPass && !this.opinion) { + uni.showToast({ + title: '请填写审核不通过意见', + icon: 'none' + }) + return + } + } this.showModal = false } } @@ -383,33 +385,33 @@ page { width: 100%; height: 100%; .item-wrap { - margin-bottom: 15px; + margin-bottom: 15px; width: 100%; height: 100%; display: flex; justify-content: space-between; align-items: center; - - .item { - width: 45%; - height: 30px; - display: flex; - justify-content: center; - align-items: center; - border: 1px solid #e8e8e8; - border-radius: 30px; - background-color: #f8f8f8; - color: #666; - font-size: 16px; - font-weight: 500; - transition: color 0.3s ease, background-color 0.3s ease, border 0.3s ease; - - &.active { - color: $u-primary; - background-color: #f8f8f8; - border: 1px solid $u-primary; - } - } + + .item { + width: 45%; + height: 30px; + display: flex; + justify-content: center; + align-items: center; + border: 1px solid #e8e8e8; + border-radius: 30px; + background-color: #f8f8f8; + color: #666; + font-size: 16px; + font-weight: 500; + transition: color 0.3s ease, background-color 0.3s ease, border 0.3s ease; + + &.active { + color: $u-primary; + background-color: #f8f8f8; + border: 1px solid $u-primary; + } + } } }