From 2d43a1df3f5ba42710e6d21c27d1e13bdb8dfd56 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 24 三月 2025 09:23:08 +0800
Subject: [PATCH] -
---
src/pages/delivergoods/clockInDetail.vue | 108 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 47 deletions(-)
diff --git a/src/pages/delivergoods/clockInDetail.vue b/src/pages/delivergoods/clockInDetail.vue
index a9d9981..73cce41 100644
--- a/src/pages/delivergoods/clockInDetail.vue
+++ b/src/pages/delivergoods/clockInDetail.vue
@@ -3,57 +3,67 @@
<view class="list">
<up-form labelPosition="left" :model="state.publicJob" ref="formRef" labelWidth='140rpx'>
<view class="c-p-b-134">
- <view class="content c-p-l-24 c-p-b-24">
- <up-form-item label="鏃ユ湡" prop="planStartTime" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.deliverTime" border="none"
- readonly></up-input>
+ <view class="content c-p-l-24 c-p-r-24 c-p-b-24">
+ <up-form-item label="鏃堕棿" prop="planStartTime" :borderBottom='false' ref="item1">
+ <up-input v-model="state.publicJob.creatTime" border="none" readonly></up-input>
</up-form-item>
- <up-form-item label="鍙告満" prop="name" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.driver.name" border="none" v-if="state.publicJob.driver"
- readonly></up-input>
+ <up-form-item label="鍙告満" prop="name" :borderBottom='false' ref="item1" v-if="isAdmin=='true'">
+ <up-input v-model="state.publicJob.creater" border="none" readonly></up-input>
</up-form-item>
- <up-form-item label="瀹㈡埛鍚嶇О" prop="companyName" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.companyName" border="none" readonly></up-input>
+ <up-form-item label="杞︾墝鍙�" prop="name" :borderBottom='false' ref="item1" v-if="isAdmin=='true'">
+ <up-input v-model="state.publicJob.car.carNumber" border="none" readonly v-if="state.publicJob.car"></up-input>
</up-form-item>
- <up-form-item label="鑱旂郴浜�" prop="lianxiren" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.lianxiren" border="none" readonly></up-input>
+ <up-form-item label="鎵撳崱绫诲瀷" prop="deliveredstatus" :borderBottom='false' ref="item1">
+ <up-input v-model="state.publicJob.clockTypeText" border="none" readonly></up-input>
</up-form-item>
- <up-form-item label="鑱旂郴鐢佃瘽" prop="dianhua" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.dianhua" border="none" readonly></up-input>
- </up-form-item>
- <up-form-item label="閫佽揣鍦板潃" prop="dizhi" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.dizhi" border="none" readonly></up-input>
- </up-form-item>
- <up-form-item label="閫佽揣浜嬬敱" prop="remark" :borderBottom='false' ref="item1">
- <up-textarea v-model="state.publicJob.remark" border="none" autoHeight></up-textarea>
- </up-form-item>
- <!-- <up-form-item label="閫佽揣鎯呭喌" prop="deliveredstatus" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.deliveredstatus" border="none" readonly></up-input>
- </up-form-item> -->
- <up-form-item label="鎰忚鍙嶉" prop="wentifankui" :borderBottom='false' ref="item1">
- <up-textarea v-model="state.publicJob.wentifankui" border="none" autoHeight></up-textarea>
- </up-form-item>
- <!-- <up-form-item label="閲戦" prop="planMoney" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.planMoney" border="none" readonly placeholder="璇峰～鍐欓噾棰�"
- type="digit"></up-input>
- </up-form-item>
- <up-form-item label="绉戠洰" prop="rewardContent" :borderBottom='false' ref="item1">
- <up-input v-model="state.publicJob.rewardContent" border="none" placeholder="璇风偣鍑婚�夋嫨绉戠洰"
- readonly></up-input>
- </up-form-item> -->
- <up-form-item label="閫佽揣鍗�" prop="idCardFace">
+ <up-form-item label="杞﹁締妫�鏌�" prop="idCardFace" v-if="state.publicJob.clockType == 'ClockIn'">
<view class="fui-upload__wrap"
- v-if="state.publicJob.attachments&&state.publicJob.attachments.length>0">
- <view class="fui-upload__item" v-for="(item,index) in state.publicJob.attachments"
- :key="item.keyid">
+ v-if="state.publicJob.carConditionAttachments&&state.publicJob.carConditionAttachments.length>0">
+ <view class="fui-upload__item"
+ v-for="(item,index) in state.publicJob.carConditionAttachments" :key="item.keyid">
<image class="fui-upload__img" :style="{width:200+'rpx',height:200+'rpx'}"
- :src="item.planAttachment" mode="aspectFill" @tap.stop="previewImage(index)">
+ :src="item.planAttachment" mode="aspectFill" @tap.stop="previewImage(index,'car')">
</image>
</view>
</view>
<view class="" v-else>
{{'鏆傛棤'}}
</view>
+ </up-form-item>
+ <up-form-item label="瑁呰揣鐓х墖" prop="idCardFace" v-else>
+ <view class="fui-upload__wrap"
+ v-if="state.publicJob.attachments&&state.publicJob.attachments.length>0">
+ <view class="fui-upload__item" v-for="(item,index) in state.publicJob.attachments"
+ :key="item.keyid">
+ <image class="fui-upload__img" :style="{width:200+'rpx',height:200+'rpx'}"
+ :src="item.planAttachment" mode="aspectFill" @tap.stop="previewImage(index,'huo')">
+ </image>
+ </view>
+ </view>
+ <view class="" v-else>
+ {{state.publicJob.emptyCause}}
+ </view>
+ </up-form-item>
+ <up-form-item label="閲岀▼琛�" prop="rewardContent" :borderBottom='false' ref="item1">
+ <up-input v-model="state.publicJob.mileage" border="none" readonly>
+ <template #suffix>
+ <text>km</text>
+ </template></up-input>
+ </up-form-item>
+ <up-form-item label="閲岀▼鐓х墖" prop="idCardFace">
+ <view class="fui-upload__wrap" v-if="state.publicJob.mileageImg">
+ <image class="fui-upload__img" :style="{width:200+'rpx',height:200+'rpx'}"
+ :src="state.publicJob.mileageImg" mode="aspectFill" @tap.stop="previewImage(0,'licheng',[state.publicJob.mileageImg])">
+ </image>
+ </view>
+ <view class="" v-else>
+ '鏆傛棤'
+ </view>
+ </up-form-item>
+ <up-form-item label="杞﹀喌澶囨敞" labelPosition='top' prop="wentifankui" :borderBottom='false'
+ ref="item1">
+ <up-input v-model="state.publicJob.carCondition" border="none" readonly>
+ </up-input>
</up-form-item>
<!-- <up-form-item label="闄勪欢" prop="idCardFace">
<view class="fui-upload__wrap" v-if="state.file&&state.file.length>0">
@@ -173,7 +183,7 @@
workPlanAttachments: [], //闄勪欢&鍙戠エ
firmAccountId: '',
accountType: '',
- driver:{}
+ driver: {}
},
invoice: [],
file: [],
@@ -204,7 +214,7 @@
onLoad((options) => {
keyid.value = options.KeyId
isAdmin.value = options.isAdmin
- console.log(options,'options鈥�');
+ console.log(options, 'options鈥�');
GetDeliverPlanInfo()
})
@@ -218,11 +228,11 @@
// });
let isLoading = ref(false)
- const previewImage = (item) => {
+ const previewImage = (item,text,arr) => {
uni.previewImage({
current: item,
loop: true,
- urls: state.publicJob.imageList
+ urls: text == 'car' ? state.publicJob.imageList1 :text == 'huo'?state.publicJob.imageList:arr
})
}
const confirmzhanghuPicker = (arr) => {
@@ -255,18 +265,22 @@
const GetDeliverPlanInfo = () => {
let getList = null
if (isAdmin.value == 'true') {
- getList = $api.manageGetDeliverPlanInfo
- } else {
getList = $api.GetDriverRecordInfo
+ } else {
+ getList = $api.driverGetDriverRecordInfo
}
getList(keyid.value).then(res => {
state.publicJob = res.data
- state.publicJob.deliverTime = $util.formatDate(state.publicJob.deliverTime)
- state.publicJob.deliveredstatus = state.publicJob.deliveredstatus == 'Delivered' ? '宸插畬鎴�' : '鏈畬鎴�'
+ state.publicJob.creatTime = $util.formatDate(state.publicJob.creatTime, true)
+ state.publicJob.clockTypeText = state.publicJob.clockType == 'ClockIn' ? '鍑鸿溅鎵撳崱' : '涓嬬彮鎵撳崱'
state.publicJob.imageList = []
+ state.publicJob.imageList1 = []
state.publicJob.attachments.forEach(item => {
state.publicJob.imageList.push(item.planAttachment)
})
+ state.publicJob.carConditionAttachments.forEach(item => {
+ state.publicJob.imageList1.push(item.planAttachment)
+ })
})
}
const confirmKemuPicker = (arr) => {
--
Gitblit v1.9.1