From de5e674a5655cd5c8d5457d1be8182519625d265 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Wed, 12 Mar 2025 15:35:47 +0800
Subject: [PATCH] 修改
---
src/views/analyse/plan/index.vue | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/views/analyse/plan/index.vue b/src/views/analyse/plan/index.vue
index 8b4814d..dce8efe 100644
--- a/src/views/analyse/plan/index.vue
+++ b/src/views/analyse/plan/index.vue
@@ -68,11 +68,11 @@
<el-button size="small" text type="primary" v-if="scope.row.planSellStatus === 1" @click="accessPlan(scope.row)">派发</el-button>
<el-button size="small" text type="primary" :icon="View" @click="openPlanDialog('查看', scope.row)">查看</el-button>
<el-button v-if="scope.row.planSellStatus === 1" size="small" text type="primary" :icon="Edit" @click="openPlanDialog('修改', scope.row)">编辑</el-button>
- <el-button v-if="scope.row.identificationUserId == planState.user" size="small" text type="primary" :icon="Edit" @click="refuseIdentify(scope.row)">拒绝辨识</el-button>
- <el-button v-if="scope.row.evaluateUserId == planState.user" size="small" text type="primary" :icon="Edit" @click="refuseEvaluate(scope.row)">拒绝评价</el-button>
+ <el-button v-if="scope.row.identityUsers?.find(i=>i.identificationUserId == planState.user)" size="small" text type="primary" :icon="Edit" @click="refuseIdentify(scope.row)">拒绝辨识</el-button>
+ <el-button v-if="scope.row.evaluateUsers?.find(i=>i.evaluateUserId== planState.user)" size="small" text type="primary" :icon="Edit" @click="refuseEvaluate(scope.row)">拒绝评价</el-button>
<!-- <el-button v-if="scope.row.sceneUserId == planState.user" size="small" text type="primary" :icon="Edit" @click="refuseScene(scope.row)">拒绝现场</el-button>-->
- <el-button v-if="scope.row.identificationUserId == null" size="small" text type="primary" :icon="Edit" @click="reSendJob(scope.row,'identification')">重新指派辨识</el-button>
- <el-button v-if="scope.row.evaluateUserId == null" size="small" text type="primary" :icon="Edit" @click="reSendJob(scope.row,'evaluate')">重新指派评价</el-button>
+ <el-button v-if="!scope.row.identityUsers" size="small" text type="primary" :icon="Edit" @click="reSendJob(scope.row,1)">重新指派辨识</el-button>
+ <el-button v-if="!scope.row.evaluateUsers" size="small" text type="primary" :icon="Edit" @click="reSendJob(scope.row,2)">重新指派评价</el-button>
<el-button v-if="scope.row.planSellStatus === 1" size="small" text type="danger" :icon="Delete" @click="onDelPlan(scope.row)">删除</el-button>
</template>
</el-table-column>
@@ -88,7 +88,7 @@
<el-dialog class="chooseExpert" :title="planState.reSendTitle" v-model="planState.reSendDialogVisible" width="50%">
<el-form ref="ruleFormRef" :rules="planState.rules" :model="planState.reSendForm" label-width="120px">
<el-form-item v-if="planState.reSendTitle == '指派辨识专家'" label="选择辨识专家" prop="identificationUserId" class="valueSelect">
- <el-select v-model="planState.reSendForm.identificationUserId" style="width:100%" :teleported="false" placeholder="辨识专家" clearable>
+ <el-select v-model="planState.reSendForm.userIds" multiple style="width:100%" :teleported="false" placeholder="辨识专家" clearable>
<el-option v-for="item in planState.bsExperts" :key="item.id" :label="item.realName" :value="item.id">
<div class="valueTable">
<div><div>姓名：</div><span>{{item.realName}}</span></div>
@@ -98,7 +98,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="planState.reSendTitle == '指派评价专家'" label="选择评价专家" prop="evaluateUserId" class="valueSelect">
- <el-select v-model="planState.reSendForm.evaluateUserId" style="width:100%" :teleported="false" placeholder="评价专家" clearable>
+ <el-select v-model="planState.reSendForm.userIds" multiple style="width:100%" :teleported="false" placeholder="评价专家" clearable>
<el-option v-for="item in planState.pjExperts" :key="item.id" :label="item.realName" :value="item.id">
<div class="valueTable">
<div><div>姓名：</div><span>{{item.realName}}</span></div>
@@ -168,13 +168,12 @@
reSendTitle:'',
reSendDialogVisible: false,
reSendForm: {
- id: null,
- identificationUserId: null,
- evaluateUserId: null
+ riskAssessPlanId: null,
+ userIds: [],
+ userType: null
},
rules: {
- identificationUserId: [{ required: true, message: '请选择辨识专家', trigger: 'blur' }],
- evaluateUserId: [{ required: true, message: '请选择评价专家', trigger: 'blur' }]
+ userIds: [{ required: true, message: '请选择专家', trigger: 'blur' }]
}
// deviceUnitList: [
// {id:1, name: '台'},
@@ -284,13 +283,13 @@
});
}
-const reSendJob= async(val: PlanType,type:string)=>{
+const reSendJob= async(val: PlanType,type:number | null)=>{
planState.reSendForm = {
- id: val.id,
- identificationUserId: null,
- evaluateUserId: null
+ riskAssessPlanId: val.id,
+ userIds: [],
+ userType: type
}
- if(type=='identification'){
+ if(type==1){
planState.reSendTitle = '指派辨识专家'
}else{
planState.reSendTitle = '指派评价专家'
@@ -316,9 +315,9 @@
}
planState.reSendForm = {
- id: null,
- identificationUserId: null,
- evaluateUserId: null
+ riskAssessPlanId: null,
+ userIds: [],
+ userType: null
},
planState.reSendDialogVisible = false
getPlanData()
--
Gitblit v1.9.2