|
@@ -111,9 +111,9 @@
|
|
|
|
|
|
<HcCardItem title="操作任务" class="mt-4" v-if="dataType !== '1' && authType">
|
|
<HcCardItem title="操作任务" class="mt-4" v-if="dataType !== '1' && authType">
|
|
<HcListItem ui="items-center" title="支付状态:">
|
|
<HcListItem ui="items-center" title="支付状态:">
|
|
- <el-radio-group v-model="formPay" size="large">
|
|
|
|
|
|
+ <el-radio-group v-model="taskBasicsInfo.payStatus" size="large">
|
|
<el-radio label="1">已支付</el-radio>
|
|
<el-radio label="1">已支付</el-radio>
|
|
- <el-radio label="2" class="ml-4">待支付</el-radio>
|
|
|
|
|
|
+ <el-radio label="0" class="ml-4">待支付</el-radio>
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</HcListItem>
|
|
</HcListItem>
|
|
</HcCardItem>
|
|
</HcCardItem>
|
|
@@ -124,11 +124,11 @@
|
|
<span v-if="tabsKey === 'to-do'">取消并返回</span>
|
|
<span v-if="tabsKey === 'to-do'">取消并返回</span>
|
|
<span v-else>返回</span>
|
|
<span v-else>返回</span>
|
|
</el-button>
|
|
</el-button>
|
|
- <el-button size="large" type="danger" hc-btn @click="groundsShow" v-if="tabsKey === 'to-do'">
|
|
|
|
|
|
+ <el-button size="large" type="danger" hc-btn @click="groundsShow" v-if="tabsKey === 1">
|
|
<HcIcon name="arrow-go-forward"/>
|
|
<HcIcon name="arrow-go-forward"/>
|
|
<span>驳回申请</span>
|
|
<span>驳回申请</span>
|
|
</el-button>
|
|
</el-button>
|
|
- <el-button size="large" type="primary" hc-btn @click="doubleClick" v-if="tabsKey === 'to-do'">
|
|
|
|
|
|
+ <el-button size="large" type="primary" hc-btn @click="doubleClick" v-if="tabsKey === 1">
|
|
<HcIcon name="check-double"/>
|
|
<HcIcon name="check-double"/>
|
|
<span>审核通过</span>
|
|
<span>审核通过</span>
|
|
</el-button>
|
|
</el-button>
|
|
@@ -152,8 +152,8 @@
|
|
|
|
|
|
<HcDialog bgColor="#ffffff" isToBody :loading="groundsLoading" :show="groundsModal" title="请填写驳回理由" widths="600px" @close="closeGroundsClick" @save="saveGroundsClick">
|
|
<HcDialog bgColor="#ffffff" isToBody :loading="groundsLoading" :show="groundsModal" title="请填写驳回理由" widths="600px" @close="closeGroundsClick" @save="saveGroundsClick">
|
|
<el-form ref="formGroundsRef" :model="formGroundsModel" :rules="formGroundsRules" label-width="0" size="large">
|
|
<el-form ref="formGroundsRef" :model="formGroundsModel" :rules="formGroundsRules" label-width="0" size="large">
|
|
- <el-form-item prop="grounds">
|
|
|
|
- <el-input v-model="formGroundsModel.grounds" :autosize="{ minRows: 6, maxRows: 10 }" placeholder="请输入驳回理由" type="textarea"/>
|
|
|
|
|
|
+ <el-form-item prop="rejectDesc">
|
|
|
|
+ <el-input v-model="formGroundsModel.rejectDesc" :autosize="{ minRows: 6, maxRows: 10 }" placeholder="请输入驳回理由" type="textarea"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</HcDialog>
|
|
</HcDialog>
|
|
@@ -165,7 +165,7 @@
|
|
import {onActivated, ref} from "vue";
|
|
import {onActivated, ref} from "vue";
|
|
import {useRouter, useRoute} from 'vue-router'
|
|
import {useRouter, useRoute} from 'vue-router'
|
|
import taskApi from '~api/home/task.js';
|
|
import taskApi from '~api/home/task.js';
|
|
-import {getArrValue,getObjValue} from "js-fast-way"
|
|
|
|
|
|
+import {getArrValue,getObjValue,formValidate} from "js-fast-way"
|
|
import tripInfo from './components/trip-info.vue'//出差申请
|
|
import tripInfo from './components/trip-info.vue'//出差申请
|
|
import paymentRequest from './components/pay-request.vue'
|
|
import paymentRequest from './components/pay-request.vue'
|
|
import loanRequest from './components/loan-request.vue'
|
|
import loanRequest from './components/loan-request.vue'
|
|
@@ -242,9 +242,9 @@ const groundsModal = ref(false)
|
|
|
|
|
|
//驳回表单
|
|
//驳回表单
|
|
const formGroundsRef = ref(null)
|
|
const formGroundsRef = ref(null)
|
|
-const formGroundsModel = ref({grounds: ''})
|
|
|
|
|
|
+const formGroundsModel = ref({rejectDesc: ''})
|
|
const formGroundsRules = {
|
|
const formGroundsRules = {
|
|
- grounds: {
|
|
|
|
|
|
+ rejectDesc: {
|
|
required: true,
|
|
required: true,
|
|
trigger: 'blur',
|
|
trigger: 'blur',
|
|
message: "请输入驳回理由"
|
|
message: "请输入驳回理由"
|
|
@@ -252,20 +252,50 @@ const formGroundsRules = {
|
|
}
|
|
}
|
|
|
|
|
|
//确认驳回
|
|
//确认驳回
|
|
-const saveGroundsClick = () => {
|
|
|
|
- closeGroundsClick()
|
|
|
|
- window?.$message.warning('驳回成功!')
|
|
|
|
|
|
+const saveGroundsClick = async() => {
|
|
|
|
+
|
|
|
|
+ const res = await formValidate(formGroundsRef.value)
|
|
|
|
+ if(res){
|
|
|
|
+ const {error, code, data} = await taskApi.rejectTask(
|
|
|
|
+ {
|
|
|
|
+ id: taskDetail.value.basicsInfo.taskId,
|
|
|
|
+ rejectDesc:formGroundsModel.value?.rejectDesc
|
|
|
|
+ }
|
|
|
|
+ )
|
|
|
|
+ if (!error && code === 200) {
|
|
|
|
+ window?.$message.warning('驳回成功!')
|
|
|
|
+ }
|
|
|
|
+ closeGroundsClick()
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
//取消驳回
|
|
//取消驳回
|
|
-const closeGroundsClick = () => {
|
|
|
|
|
|
+const closeGroundsClick = async() => {
|
|
groundsModal.value = false
|
|
groundsModal.value = false
|
|
groundsLoading.value = false
|
|
groundsLoading.value = false
|
|
|
|
+ console.log(formGroundsModel.value,'formGroundsModel');
|
|
|
|
+ console.log(taskDetail.value,'renwu');
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
//审核通过
|
|
//审核通过
|
|
-const doubleClick = () => {
|
|
|
|
- window?.$message.success('审核通过!')
|
|
|
|
|
|
+const doubleClick = async() => {
|
|
|
|
+
|
|
|
|
+ console.log(formGroundsModel.value,'formGroundsModel');
|
|
|
|
+ console.log(taskDetail.value,'renwu');
|
|
|
|
+ const {error, code, data} = await taskApi.submitTask(
|
|
|
|
+ {
|
|
|
|
+ id: taskDetail.value.basicsInfo.taskId,
|
|
|
|
+ payStatus:taskBasicsInfo.value?.payStatus
|
|
|
|
+ }
|
|
|
|
+ )
|
|
|
|
+ if (!error && code === 200) {
|
|
|
|
+ window?.$message.success('审核通过!')
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
//返回
|
|
//返回
|