From e5a77d6a551d13e4cf74624b31b0fa3e328b304d Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期四, 23 一月 2025 17:23:39 +0800
Subject: [PATCH] -
---
src/pages/reimbursement/index.vue | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/src/pages/reimbursement/index.vue b/src/pages/reimbursement/index.vue
index ce75a5f..ff5d259 100644
--- a/src/pages/reimbursement/index.vue
+++ b/src/pages/reimbursement/index.vue
@@ -21,8 +21,8 @@
</up-form-item>
<up-form-item label="鎽樿" prop="planContent" required :borderBottom='false' ref="item1">
<!-- <view class="c-p-b-20"> -->
- <up-textarea v-model="state.publicJob.planContent" border="none" placeholder="璇峰～鍐欐憳瑕�" count
- maxlength='200'></up-textarea>
+ <up-textarea v-model="state.publicJob.planContent" border="none" height='35'
+ placeholder="璇峰～鍐欐憳瑕�"></up-textarea>
<!-- </view> -->
</up-form-item>
<up-form-item label="鍙戠エ" prop="houbufapiaoStatus" required :borderBottom='false' ref="item1">
@@ -36,15 +36,15 @@
</u-radio-group>
</up-form-item>
<up-form-item label="涓婁紶鍙戠エ" prop="idCardFace" required
- v-if='state.publicJob.houbufapiaoStatus!=="Wu"'>
- <tem-upload-file immediate :url="`${apiBaseUrl}/api/UpFile/UpdateFile`" ref="uploadF" fileType='image'
- @success="success('Invoice',$event)" @error="errorInvoice"
+ v-if='state.publicJob.houbufapiaoStatus=="You"'>
+ <tem-upload-file immediate :url="`${apiBaseUrl}/api/UpFile/UpdateFile`" ref="uploadF"
+ fileType='all' @success="success('Invoice',$event)" @error="errorInvoice"
@complete="completeInvoice('Invoice',$event)">
</tem-upload-file>
</up-form-item>
<up-form-item label="涓婁紶闄勪欢" prop="idCardFace">
<tem-upload-file immediate :url="`${apiBaseUrl}/api/UpFile/UpdateFile`" ref="uploadB"
- @success="success('File',$event)" @error="errorInvoice"
+ fileType="all" @success="success('File',$event)" @error="errorInvoice"
@complete="completeInvoice('',$event)">
</tem-upload-file>
</up-form-item>
@@ -53,10 +53,10 @@
</view>
<view class="tabbtns">
<view class="chuany-flex">
- <up-button color='#fece01' class="text-69" :text="'缁х画鎶ラ攢'" :loading='isLoading' :loadingText="'鎻愪氦涓�'"
- @click="saveOrder('continue')"></up-button>
- <up-button color='#fece01' class="text-69" :text="planId?'淇敼鎶ラ攢':'鎻愪氦鎶ラ攢'" :loading='isLoading'
- :loadingText="planId?'淇敼涓�':'鎻愪氦涓�'" @click="saveOrder"></up-button>
+ <up-button type="primary" :text="'淇濆瓨鎶ラ攢'" :loading='isLoading' :loadingText="'淇濆瓨涓�'"
+ @click="saveOrder('Uncommitted')" v-if='state.publicJob.approvalStatus=="Uncommitted"'></up-button>
+ <up-button color='#fece01' :text="state.publicJob.approvalStatus!=='Uncommitted'?'淇敼鎶ラ攢':'鎻愪氦鎶ラ攢'" :loading='isLoading'
+ :loadingText="state.publicJob.approvalStatus!=='Uncommitted'?'淇敼涓�':'鎻愪氦涓�'" @click="saveOrder('unApproval')"></up-button>
</view>
</view>
@@ -109,7 +109,8 @@
planMoney: '', //閲戦
planContent: '', //鎽樿
houbufapiaoStatus: 'You', //鏈夋棤鍙戠エ
- workPlanAttachments: [] //闄勪欢&鍙戠エ
+ workPlanAttachments: [], //闄勪欢&鍙戠エ
+ approvalStatus:'Uncommitted'
},
})
onLoad((options) => {
@@ -129,6 +130,11 @@
// })
$api.getKeMuList().then(res => {
kemuList = [res.data]
+ let obj = kemuList[0].find(item => {
+ return item.subjectName == '宸梾璐�'
+ })
+ state.publicJob.rewardResult = String(obj.keyid)
+ state.publicJob.rewardContent = obj.subjectName
dataPlan(planId.value)
})
})
@@ -205,7 +211,8 @@
planMoney: String(res.data.planMoney), //閲戦
planContent: res.data.planContent, //鎽樿
houbufapiaoStatus: res.data.houbufapiaoStatus, //鏈夋棤鍙戠エ
- workPlanAttachments: res.data.workPlanAttachments //闄勪欢&鍙戠エ
+ workPlanAttachments: res.data.workPlanAttachments ,//闄勪欢&鍙戠エ
+ approvalStatus:res.data.approvalStatus
}
state.publicJob.workPlanAttachments.forEach(item => {
if (item.attachmentType == 1) {
@@ -274,35 +281,38 @@
} else {
functionOrder = $api.CreatOder
}
+ val ? state.publicJob.approvalStatus = val : ''
functionOrder(state.publicJob).then(res => {
if (res.code == 1) {
- if (editItem) {
- uni.navigateBack()
- } else if (val == 'continue') {
- state.publicJob = {
- departmentId: $db.get('userInfo').oaPermissions.departId, //閮ㄩ棬Id
- departmentName: $db.get('userInfo').oaPermissions.departmentName,
- name: $db.get('userInfo').oaPermissions.name, //濮撳悕
- rewardResult: '', //绉戠洰id
- rewardContent: '', //绉戠洰鍚嶇О
- planMoney: '', //閲戦
- planContent: '', //鎽樿
- houbufapiaoStatus: 'You', //鏈夋棤鍙戠エ
- workPlanAttachments: [], //闄勪欢&鍙戠エ
- }
- uploadB.value.urls = []
- uploadB.value.status = []
- uploadF.value.urls = []
- uploadF.value.status = []
- } else {
- uni.redirectTo({
- url: '/pages/reimbursement/myreim'
- })
- }
$util.showToast({
- title: editItem ? '淇敼鎴愬姛锛�' : "淇濆瓨鎴愬姛锛�",
+ title: state.publicJob.approvalStatus=='Uncommitted' ? '淇濆瓨鎴愬姛锛�' : "鎻愪氦鎴愬姛锛�",
icon: "success"
})
+ // if (editItem) {
+ // uni.navigateBack()
+ // } else if (val == 'continue') {
+ state.publicJob = {
+ departmentId: $db.get('userInfo').oaPermissions.departId, //閮ㄩ棬Id
+ departmentName: $db.get('userInfo').oaPermissions.departmentName,
+ name: $db.get('userInfo').oaPermissions.name, //濮撳悕
+ rewardResult: '', //绉戠洰id
+ rewardContent: '', //绉戠洰鍚嶇О
+ planMoney: '', //閲戦
+ planContent: '', //鎽樿
+ houbufapiaoStatus: 'You', //鏈夋棤鍙戠エ
+ workPlanAttachments: [], //闄勪欢&鍙戠エ
+ approvalStatus:'Uncommitted',
+ }
+ uploadB.value.urls = []
+ uploadB.value.status = []
+ uploadF.value.urls = []
+ uploadF.value.status = []
+ // } else {
+ // uni.redirectTo({
+ // url: '/pages/reimbursement/myreim'
+ // })
+ // }
+
} else {
$util.showToast({
title: res.error
@@ -362,6 +372,7 @@
uploadB.value.status.length = uploadB.value.urls.length
}
state.publicJob.workPlanAttachments.push(obj)
+ console.log(state.publicJob.workPlanAttachments);
} else {
uni.$u.toast(res.error)
if (text == 'Invoice') {
@@ -391,6 +402,7 @@
.u-textarea {
padding: 0 !important;
}
+
.u-form-item__body {
padding: 5px 0 !important;
}
--
Gitblit v1.9.1