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/reimbursement/approve.vue |  156 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 87 insertions(+), 69 deletions(-)

diff --git a/src/pages/reimbursement/approve.vue b/src/pages/reimbursement/approve.vue
index 96739f8..ea5b9a8 100644
--- a/src/pages/reimbursement/approve.vue
+++ b/src/pages/reimbursement/approve.vue
@@ -2,73 +2,91 @@
 	<view class="full-page ">
 		<view class="list">
 			<up-form labelPosition="left" :model="state.publicJob" ref="formRef" labelWidth='140rpx'>
-				<view class="content c-p-l-24 c-p-b-120">
-					<up-form-item label="鐢宠鏃ユ湡" prop="planStartTime" :borderBottom='false' ref="item1">
-						<up-input v-model="state.publicJob.planStartTime" border="none" placeholder="璇风偣鍑婚�夋嫨閮ㄩ棬"
-							readonly></up-input>
-					</up-form-item>
-					<up-form-item label="閮ㄩ棬" prop="departmentId" :borderBottom='false' ref="item1">
-						<up-input v-model="state.publicJob.depart.name" border="none" placeholder="璇风偣鍑婚�夋嫨閮ㄩ棬"
-							readonly></up-input>
-					</up-form-item>
-					<up-form-item label="濮撳悕" prop="name" :borderBottom='false' ref="item1">
-						<up-input v-model="state.publicJob.planPeople" border="none" placeholder="璇峰~鍐欏鍚�"
-							readonly></up-input>
-					</up-form-item>
-					<up-form-item label="璇风ず绫诲埆" prop="name" :borderBottom='false' ref="item1">
-						<up-input v-model="leibie" border="none" placeholder="璇峰~鍐欏鍚�" readonly></up-input>
-					</up-form-item>
-					<up-form-item label="閲戦" prop="planMoney" :borderBottom='false' ref="item1">
-						<up-input v-model="state.publicJob.planMoney" border="none" placeholder="璇峰~鍐欓噾棰�"
-							type="digit"></up-input>
-					</up-form-item>
-					<up-form-item label="绉戠洰" prop="rewardContent" required :borderBottom='false' ref="item1"
-						@click='openKemuPicker'>
-						<up-input v-model="state.publicJob.rewardContent" border="none" placeholder="璇风偣鍑婚�夋嫨绉戠洰"
-							readonly></up-input>
-					</up-form-item>
-					<up-form-item label="鎽樿" prop="planContent" :borderBottom='false' ref="item1">
-						<!-- <view class="c-p-b-20"> -->
-						<up-textarea v-model="state.publicJob.planContent" border="none" autoHeight
-							placeholder="璇峰~鍐欐憳瑕�"></up-textarea>
-						<!-- </view> -->
-					</up-form-item>
-					<up-form-item label="瀹℃壒鍐呭" prop="approvalContent" :borderBottom='false' ref="item1">
-						<!-- <view class="c-p-b-20"> -->
-						<up-textarea v-model="state.publicJob.approvalContent" border="none" autoHeight
-							placeholder="璇峰~鍐欏鎵瑰唴瀹�"></up-textarea>
-						<!-- </view> -->
-					</up-form-item>
-					<up-form-item label="鍙戠エ" prop="idCardFace" v-if='state.publicJob.houbufapiaoStatus!=="Wu"'>
-						<view class="fui-upload__wrap" v-if="state.invoice&&state.invoice.length>0">
-							<view class="fui-upload__item" v-for="(item,index) in state.invoice" :key="item.keyid">
-								<u-tag :text="item.match(/\/([^\/]*)$/)[1]" size="mini"
-									@click="$util.previewWechat(item)" v-if="$util.checkFileExtensions(item)"></u-tag>
-								<image class="fui-upload__img" :style="{width:200+'rpx',height:200+'rpx'}" v-else
-									:src="item" mode="aspectFill" @tap.stop="previewImage(index,'invoice')"></image>
+				<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.planStartTime" border="none" placeholder="璇风偣鍑婚�夋嫨鏃ユ湡"
+								readonly></up-input>
+						</up-form-item>
+						<up-form-item label="閮ㄩ棬" prop="departmentId" :borderBottom='false' ref="item1">
+							<up-input v-model="state.publicJob.depart.name" border="none" placeholder="璇风偣鍑婚�夋嫨閮ㄩ棬"
+								readonly></up-input>
+						</up-form-item>
+						<up-form-item label="濮撳悕" prop="name" :borderBottom='false' ref="item1">
+							<up-input v-model="state.publicJob.planPeople" border="none" placeholder="璇峰~鍐欏鍚�"
+								readonly></up-input>
+						</up-form-item>
+						<up-form-item label="璇风ず绫诲埆" prop="name" :borderBottom='false' ref="item1">
+							<up-input v-model="leibie" border="none" placeholder="璇峰~鍐欏鍚�" readonly></up-input>
+						</up-form-item>
+						<up-form-item label="閲戦" prop="planMoney" :borderBottom='false' ref="item1">
+							<up-input v-model="state.publicJob.planMoney" border="none" placeholder="璇峰~鍐欓噾棰�"
+								type="digit"></up-input>
+						</up-form-item>
+						<up-form-item label="绉戠洰" prop="rewardContent" required :borderBottom='false' ref="item1"
+							@click='openKemuPicker'>
+							<up-input v-model="state.publicJob.rewardContent" border="none" placeholder="璇风偣鍑婚�夋嫨绉戠洰"
+								readonly></up-input>
+						</up-form-item>
+						<up-form-item label="鎽樿" prop="planContent" :borderBottom='false' ref="item1">
+							<!-- <view class="c-p-b-20"> -->
+							<up-textarea v-model="state.publicJob.planContent" border="none" autoHeight
+								placeholder="璇峰~鍐欐憳瑕�"></up-textarea>
+							<!-- </view> -->
+						</up-form-item>
+						<up-form-item label="瀹℃壒鎰忚" prop="approvalContent" :borderBottom='false' ref="item1"
+							v-if="state.publicJob.approvalStatus == 'unApproval'">
+							<!-- <view class="c-p-b-20"> -->
+							<up-textarea v-model="state.publicJob.approvalContent" border="none" autoHeight
+								placeholder="璇峰~鍐欏鎵规剰瑙�"></up-textarea>
+							<!-- </view> -->
+						</up-form-item>
+						<up-form-item label="鍙戠エ" prop="idCardFace" v-if='state.publicJob.houbufapiaoStatus!=="Wu"'>
+							<view class="fui-upload__wrap" v-if="state.invoice&&state.invoice.length>0">
+								<view class="fui-upload__item" v-for="(item,index) in state.invoice" :key="item.keyid">
+									<u-tag :text="item.match(/\/([^\/]*)$/)[1]" size="mini"
+										@click="$util.previewWechat(item)"
+										v-if="$util.checkFileExtensions(item)"></u-tag>
+									<image class="fui-upload__img" :style="{width:200+'rpx',height:200+'rpx'}" v-else
+										:src="item" mode="aspectFill" @tap.stop="previewImage(index,'invoice')"></image>
+								</view>
 							</view>
-						</view>
-						<view class="" v-else>
-							{{state.publicJob.houbufapiaoStatus=="Wu"?'鏃犲彂绁�':null}}
-						</view>
-					</up-form-item>
-					<up-form-item label="闄勪欢" prop="idCardFace">
-						<view class="fui-upload__wrap" v-if="state.file&&state.file.length>0">
-							<view class="fui-upload__item" v-for="(item,index) in state.file" :key="item.keyid">
-								<u-tag :text="item.match(/\/([^\/]*)$/)[1]" size="mini"
-									@click="$util.previewWechat(item)" v-if="$util.checkFileExtensions(item)"></u-tag>
-								<image class="fui-upload__img" v-else :style="{width:200+'rpx',height:200+'rpx'}"
-									:src="item" mode="aspectFill" @tap.stop="previewImage(index)"></image>
+							<view class="" v-else>
+								{{state.publicJob.houbufapiaoStatus=="Wu"?'鏃犲彂绁�':null}}
 							</view>
-						</view>
-						<view class="" v-else>
-							鏈笂浼犻檮浠�
-						</view>
-					</up-form-item>
-					<template v-if="state.publicJob.approvalStatus !== 'unApproval'">
-						<u--text :type="state.publicJob.approvalStatus=='Yes'?'success':'warning'"
-							:text="state.publicJob.approvalStatus=='Yes'?'鎵瑰噯':'涓嶆壒鍑�'"></u--text>
-					</template>
+						</up-form-item>
+						<up-form-item label="闄勪欢" prop="idCardFace">
+							<view class="fui-upload__wrap" v-if="state.file&&state.file.length>0">
+								<view class="fui-upload__item" v-for="(item,index) in state.file" :key="item.keyid">
+									<u-tag :text="item.match(/\/([^\/]*)$/)[1]" size="mini"
+										@click="$util.previewWechat(item)"
+										v-if="$util.checkFileExtensions(item)"></u-tag>
+									<image class="fui-upload__img" v-else :style="{width:200+'rpx',height:200+'rpx'}"
+										:src="item" mode="aspectFill" @tap.stop="previewImage(index)"></image>
+								</view>
+							</view>
+							<view class="" v-else>
+								鏈笂浼犻檮浠�
+							</view>
+						</up-form-item>
+						<template v-if="state.publicJob.approvalStatus !== 'unApproval'">
+							<view v-for="(item,index) in state.publicJob.oaWorkPlanShenpis" :key="item.index"
+								class="chuany-flex c-p-t-20">
+								<view class="chuany-flex chuany-width36">
+									<u-text :text='item.approvalStaff.name'></u-text>
+									<u--text :type="item.approvalStatus=='Yes'?'success':'warning'"
+										:text="item.approvalStatus=='Yes'?'鎵瑰噯':'涓嶆壒鍑�'"></u--text>
+								</view>
+								<view class="chuany-width64">
+									<u-text :text='item.approvalContent'></u-text>
+								</view>
+							</view>
+							<!-- <view class="c-p-t-20">
+							<u--text :type="state.publicJob.approvalStatus=='Yes'?'success':'warning'"
+								:text="state.publicJob.approvalStatus=='Yes'?'鎵瑰噯':'涓嶆壒鍑�'"></u--text>
+						</view> -->
+						</template>
+					</view>
 				</view>
 			</up-form>
 		</view>
@@ -209,10 +227,10 @@
 		let obj = {
 			oA_WorkPlanId: state.publicJob.keyid,
 			approvalStatus,
-			rewardResult:state.publicJob.rewardResult,
-			planContent:state.publicJob.planContent,
-			planMoney:state.publicJob.planMoney,
-			approvalContent:state.publicJob.approvalContent
+			rewardResult: state.publicJob.rewardResult,
+			planContent: state.publicJob.planContent,
+			planMoney: state.publicJob.planMoney,
+			approvalContent: state.publicJob.approvalContent
 		}
 		functionOrder(obj).then(res => {
 			if (res.code == 1) {

--
Gitblit v1.9.1