bonus
/
Dining_Hall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
binbin_pan 2024-12-26 18:00:44 +08:00
parent 371597113a
commit 5413b1a310
4 changed files with 107 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pages/arrivalConfirmation/index.vue
View File

@ -35,10 +35,13 @@
<span style="color: #5ae725">{{ item.pcNum }}</span> <span style="color: #5ae725">{{ item.pcNum }}</span>
</div> </div>
<div> <div>
<u-button v-if="item.imgList && item.imgList.length > 0" size="small" @click="openImgModal(item)"> <u-tag
查看到货确认单 v-if="item.imgList && item.imgList.length > 0"
</u-button> text="查看到货确认单"
<u-button v-else type="primary" size="small" @click="openImgModal">上传到货确认单</u-button> type="info"
@click="openImgModal(item)"
></u-tag>
<u-tag v-else type="primary" text="上传到货确认单" @click="openImgModal"></u-tag>
</div> </div>
</div> </div>
<div class="list-item"> <div class="list-item">
@ -200,7 +203,7 @@ export default {
isDetail: true, isDetail: true,
// 到货 // 到货
isArrival: true, isArrival: true,
active: 1, active: 1
} }
uni.navigateTo({ uni.navigateTo({
url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}` url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}`

9
pages/sendACarSystem/components/PlanAuditDetails.vue
View File

@ -82,7 +82,7 @@
<div class="uPopup"> <div class="uPopup">
<div class="pop-title">{{ imgList && imgList.length > 0 ? imgList[current].title : '' }}</div> <div class="pop-title">{{ imgList && imgList.length > 0 ? imgList[current].title : '' }}</div>
<div class="content"> <div class="content">
<u-swiper v-if="imgList.length > 0" :list="imgList" @change="e => (current = e.current)" :autoplay="false"> <u-swiper v-if="imgList.length > 0" :list="imgList" @change="e => (current = e.current)" :autoplay="false" @click="handleSwiper">
<view slot="indicator" class="indicator"> <view slot="indicator" class="indicator">
<view <view
class="indicator__dot" class="indicator__dot"
@ -202,6 +202,13 @@ export default {
this.current = 0 this.current = 0
console.log('🚀 ~ 查看附件 ~ item', item) console.log('🚀 ~ 查看附件 ~ item', item)
}, },
handleSwiper() {
// 预览当前图片
uni.previewImage({
current: this.imgList[this.current].url,
urls: this.imgList.map((item) => item.url)
})
},
submit() { submit() {
console.log('🚀 ~ 提交 ~ submit ~ this.isPass', this.isPass) console.log('🚀 ~ 提交 ~ submit ~ this.isPass', this.isPass)
console.log('🚀 ~ 提交 ~ submit ~ this.opinion', this.opinion) console.log('🚀 ~ 提交 ~ submit ~ this.opinion', this.opinion)

6
pages/sendACarSystem/details.vue
View File

@ -6,7 +6,7 @@
<div class="item" :class="{ active: active == 2 }" @click="handleTab(2)">派车详情</div> <div class="item" :class="{ active: active == 2 }" @click="handleTab(2)">派车详情</div>
<div class="item" :class="{ active: active == 3 }" @click="handleTab(3)" v-if="!opt.isArrival">审核记录</div> <div class="item" :class="{ active: active == 3 }" @click="handleTab(3)" v-if="!opt.isArrival">审核记录</div>
</div> </div>
<div v-if="opt.isDetail" style="height: 45px"></div> <!-- <div v-if="opt.isDetail" style="height: 45px"></div> -->
<PlanDetails v-if="active == 1" :opt="opt" /> <PlanDetails v-if="active == 1" :opt="opt" />
<PlanAuditDetails v-if="active == 2" :opt="opt" /> <PlanAuditDetails v-if="active == 2" :opt="opt" />
@ -56,9 +56,9 @@ page {
} }
.tabs { .tabs {
width: 100%; width: 100%;
position: fixed; /* position: fixed;
top: 44px; top: 44px;
left: 0; left: 0; */
background-color: #fff; background-color: #fff;
z-index: 99; z-index: 99;
display: flex; display: flex;

174
pages/sendACarSystem/index.vue
View File

@ -4,7 +4,7 @@
<div class="item" :class="{ active: active == 1 }" @click="handleTab(1)">派车分配</div> <div class="item" :class="{ active: active == 1 }" @click="handleTab(1)">派车分配</div>
<div class="item" :class="{ active: active == 2 }" @click="handleTab(2)">派车审核</div> <div class="item" :class="{ active: active == 2 }" @click="handleTab(2)">派车审核</div>
</div> </div>
<div style="height: 45px;"></div> <div style="height: 45px"></div>
<!-- 搜索 --> <!-- 搜索 -->
<div class="search"> <div class="search">
<div v-if="active == 2" style="width: 30%"> <div v-if="active == 2" style="width: 30%">
@ -51,12 +51,8 @@
<span>{{ item.plan }}</span> <span>{{ item.plan }}</span>
</div> </div>
<div> <div>
<u-button v-if="active == 1 && !item.isSend" type="primary" size="small" @click="openModal"> <u-tag v-if="active == 1 && !item.isSend" type="primary" text="派车分配" @click="openModal"></u-tag>
派车分配 <u-tag v-else-if="active == 2 && item.status == 0" type="warning" text="审核" @click="openModal"></u-tag>
</u-button>
<u-button v-else-if="active == 2 && item.status == 0" type="warning" size="small" @click="openModal">
审核
</u-button>
<u-tag text="已通过" type="success" v-else-if="active == 2 && item.status == 1"></u-tag> <u-tag text="已通过" type="success" v-else-if="active == 2 && item.status == 1"></u-tag>
</div> </div>
</div> </div>
@ -82,10 +78,16 @@
</div> </div>
<div v-else> <div v-else>
<div class="item-wrap"> <div class="item-wrap">
<div class="item" :class="{active: isPass}" @click="isPass = true">通过</div> <div class="item" :class="{ active: isPass }" @click="isPass = true">通过</div>
<div class="item" :class="{active: !isPass}" @click="isPass = false">不通过</div> <div class="item" :class="{ active: !isPass }" @click="isPass = false">不通过</div>
</div> </div>
<u-textarea v-model="opinion" placeholder="不通过必须填写审核不通过意见" :rows="5" maxlength="200" count></u-textarea> <u-textarea
v-model="opinion"
placeholder="不通过必须填写审核不通过意见"
:rows="5"
maxlength="200"
count
></u-textarea>
</div> </div>
</view> </view>
</u-modal> </u-modal>
@ -160,8 +162,8 @@ export default {
} }
], ],
radioValue: '', // 选中的值 radioValue: '', // 选中的值
opinion: '', // 审批意见 opinion: '', // 审批意见
isPass: true // 是否通过 isPass: true // 是否通过
} }
}, },
computed: { computed: {
@ -253,11 +255,11 @@ export default {
this.showModal = true this.showModal = true
if (this.active == 1) { if (this.active == 1) {
this.modalTitle = '指定派车供应商' this.modalTitle = '指定派车供应商'
this.radioValue = '' this.radioValue = ''
} else { } else {
this.modalTitle = '派车审核' this.modalTitle = '派车审核'
this.isPass = true this.isPass = true
this.opinion = '' this.opinion = ''
} }
}, },
confirm(e) { confirm(e) {
@ -267,58 +269,58 @@ export default {
this.showPicker = false this.showPicker = false
}, },
groupChange() { groupChange() {
console.log('🚀 ~ radioValue', this.radioValue) console.log('🚀 ~ radioValue', this.radioValue)
}, },
// 查看详情 // 查看详情
handleDetail(item) { handleDetail(item) {
console.log('查看详情', item) console.log('查看详情', item)
let isPlan = false let isPlan = false
let isAudit = false let isAudit = false
let isDetail = false let isDetail = false
let active = null let active = null
if (this.active == 1 && !item.isSend) { if (this.active == 1 && !item.isSend) {
isPlan = true isPlan = true
active = 1 active = 1
} else if (this.active == 2 && item.status == 0) { } else if (this.active == 2 && item.status == 0) {
isAudit = true isAudit = true
active = 2 active = 2
} else if (item.isSend || item.status == 1) { } else if (item.isSend || item.status == 1) {
isDetail = true isDetail = true
active = 1 active = 1
} }
const params = { const params = {
...item, ...item,
isPlan, isPlan,
isAudit, isAudit,
isDetail, isDetail,
active active
} }
uni.navigateTo({ uni.navigateTo({
url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}` url: `/pages/sendACarSystem/details?params=${JSON.stringify(params)}`
}) })
}, },
// 提交 // 提交
submit() { submit() {
console.log('提交') console.log('提交')
if (this.active == 1) { if (this.active == 1) {
console.log('派车分配', this.radioValue) console.log('派车分配', this.radioValue)
if (!this.radioValue) { if (!this.radioValue) {
uni.showToast({ uni.showToast({
title: '请选择派车供应商', title: '请选择派车供应商',
icon: 'none' icon: 'none'
}) })
return return
} }
} else { } else {
console.log('派车审核', this.isPass, this.opinion) console.log('派车审核', this.isPass, this.opinion)
if (!this.isPass && !this.opinion) { if (!this.isPass && !this.opinion) {
uni.showToast({ uni.showToast({
title: '请填写审核不通过意见', title: '请填写审核不通过意见',
icon: 'none' icon: 'none'
}) })
return return
} }
} }
this.showModal = false this.showModal = false
} }
} }
@ -383,33 +385,33 @@ page {
width: 100%; width: 100%;
height: 100%; height: 100%;
.item-wrap { .item-wrap {
margin-bottom: 15px; margin-bottom: 15px;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.item { .item {
width: 45%; width: 45%;
height: 30px; height: 30px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border: 1px solid #e8e8e8; border: 1px solid #e8e8e8;
border-radius: 30px; border-radius: 30px;
background-color: #f8f8f8; background-color: #f8f8f8;
color: #666; color: #666;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
transition: color 0.3s ease, background-color 0.3s ease, border 0.3s ease; transition: color 0.3s ease, background-color 0.3s ease, border 0.3s ease;
&.active { &.active {
color: $u-primary; color: $u-primary;
background-color: #f8f8f8; background-color: #f8f8f8;
border: 1px solid $u-primary; border: 1px solid $u-primary;
} }
} }
} }
} }
</style> </style>