From 137910cf4fc73a3a2787a3a02718f1e1f637c368 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 14 六月 2024 16:01:17 +0800
Subject: [PATCH] bug修改

---
 src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue |  129 ++++++++++++------------------------------
 1 files changed, 37 insertions(+), 92 deletions(-)

diff --git a/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue b/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue
index ce56b11..4ce3651 100644
--- a/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue
+++ b/src/views/safetyReview/projectManage/components/evaluateTaskNotice.vue
@@ -3,11 +3,12 @@
     <el-form ref="formRef" :model="state.formData" :rules="state.rules" class="register-form" label-position="top">
       <el-row :gutter="30">
         <el-col :span="6">
-          <el-form-item prop="project.leader" label="项目负责人">
+          <el-form-item prop="leader.name" label="项目负责人">
             <el-input
-                v-model="state.formData.project.leader"
+                v-model="state.formData.leader.name"
                 size="large"
                 placeholder="请选择项目负责人"
+                @focus="openExperts('项目负责人')"
             >
               <template #append>
                 <el-button :icon="Search" @click="openExperts('项目负责人')"/>
@@ -16,9 +17,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item prop="project.contactor" label="联系人">
+          <el-form-item prop="linkMan" label="联系人">
             <el-input
-                v-model="state.formData.project.contactor"
+                v-model="state.formData.linkMan"
                 size="large"
                 placeholder="请选择联系人"
             >
@@ -26,9 +27,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item prop="project.phone" label="联系电话">
+          <el-form-item prop="linkPhone" label="联系电话">
             <el-input
-                v-model="state.formData.project.phone"
+                v-model="state.formData.linkPhone"
                 size="large"
                 placeholder="请选择联系电话"
             >
@@ -38,7 +39,7 @@
         <el-col :span="6">
           <el-form-item label="传真">
             <el-input
-                v-model="state.formData.project.fax"
+                v-model="state.formData.fax"
                 size="large"
                 placeholder="请选择传真"
             >
@@ -48,11 +49,12 @@
       </el-row>
       <el-row :gutter="30">
         <el-col :span="6">
-          <el-form-item prop="deliver" label="任务下达人">
+          <el-form-item label="任务下达人">
             <el-input
-                v-model="state.formData.deliver"
+                v-model="state.formData.transmitPerson"
                 size="large"
                 placeholder="请选择任务下达人"
+                @focus="openExperts('任务下达人')"
             >
               <template #append>
                 <el-button :icon="Search" @click="openExperts('任务下达人')"/>
@@ -61,10 +63,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item prop="deliverDate" label="任务下达时间">
+          <el-form-item prop="transmitDate" label="任务下达时间">
             <el-date-picker
                 style="width: 100%"
-                v-model="state.formData.deliverDate"
+                v-model="state.formData.transmitDate"
                 type="date"
                 value-format="YYYY-MM-DD 00:00:00"
                 placeholder="选择日期"
@@ -82,7 +84,7 @@
 import {defineEmits, onMounted, reactive, ref} from "vue";
 import {ElMessage} from "element-plus";
 import {Search} from '@element-plus/icons-vue'
-import {addRisk, editRisk, getRiskDetail} from "@/api/projectManage/riskAnalysis";
+import {addRecord, editRecord, getDetail} from "@/api/projectManage/evaTaskNotice";
 import Cookies from "js-cookie"
 import ExpertsList from "./expertsList";
 const emit = defineEmits(["getNextStatus"]);
@@ -90,56 +92,22 @@
 const state = reactive({
   formData: {
     id: '',
-    deliver: '',
-    deliverDate: '',
-    project: {
-      id: '',
-      leader: '',
-      contactor: '',
-      phone: ''
-    }
+    projectId: null,
+    leader: {
+      name: ''
+    },
+    fax: '',
+    leaderId: null,
+    linkMan: '',
+    transmitPerson: '',
+    transmitDate: ''
   },
   rules: {
-    "project.leader": [{required: true, message: '请选择项目负责人', trigger: 'blur'}],
-    "project.contactor": [{required: true, message: '请输入联系人', trigger: 'blur'}],
-    "project.phone": [{required: true, message: '请输入联系电话', trigger: 'blur'}],
-    deliverDate: [{required: true, message: '请选择任务下达时间', trigger: 'blur'}]
-  },
-  estimateTypeList: [],
-  addressList: [],
-  businessList: [],
-  tableData: [
-    {
-      id: '1',
-      content: '评价项目是否在本机构资质业务范围内',
-      status: 1
-    },
-    {
-      id: '2',
-      content: '评价人员专业构成是否满足评价项目需要',
-      status: 1
-    },
-    {
-      id: '3',
-      content: '是否需要聘请相关专业的技术专家',
-      status: 1
-    },
-    {
-      id: '4',
-      content: '是否能在约定的时间内完成评价报告',
-      status: 1
-    },
-    {
-      id: '5',
-      content: '评价费用是否在本机构所接受的范围内',
-      status: 1
-    },
-    {
-      id: '6',
-      content: '项目的可行性(风险分析结论)',
-      status: 1
-    },
-  ]
+    "leader.name": [{required: true, message: '请选择项目负责人', trigger: 'change'}],
+    linkMan: [{required: true, message: '请输入联系人', trigger: 'blur'}],
+    linkPhone: [{required: true, message: '请输入联系电话', trigger: 'blur'}],
+    transmitDate: [{required: true, message: '请选择任务下达时间', trigger: 'blur'}]
+  }
 })
 const props = {
   expandTrigger: 'hover',
@@ -157,19 +125,11 @@
 })
 
 const riskOpen = async (type,val) => {
-  console.log("type",type,val)
+  state.formData.projectId = val
   if(type === 'detail' || type === 'edit' ){
-    const res = await getRiskDetail({projectId: val});
+    const res = await getDetail({projectId: val});
     if(res.code == 200){
       state.formData = res.data;
-      state.formData.project.business = parseInt(res.data.project.business);
-      state.formData.project.area = [res.data.project.province,res.data.project.city];
-      state.tableData[0].status = res.data.isInBusiness ? 1 : 0;
-      state.tableData[1].status = res.data.isSatisfyNeed ? 1 : 0;
-      state.tableData[2].status = res.data.isNeedExpert ? 1 : 0;
-      state.tableData[3].status = res.data.isFinishReport ? 1 : 0;
-      state.tableData[4].status = res.data.isAcceptChargess ? 1 : 0;
-      state.tableData[5].status = res.data.isFeasibility ? 1 : 0;
     }else {
       ElMessage.warning(res.message)
     }
@@ -183,34 +143,18 @@
       }
       if(type === 'add'){
         const {id, ...data} = JSON.parse(JSON.stringify(state.formData))
-        delete data.project.area;
-        delete data.project.id;
-        data.isInBusiness = state.tableData[0].status === 1;
-        data.isSatisfyNeed = state.tableData[1].status === 1;
-        data.isNeedExpert = state.tableData[2].status === 1;
-        data.isFinishReport = state.tableData[3].status === 1;
-        data.isAcceptChargess = state.tableData[4].status === 1;
-        data.isFeasibility = state.tableData[5].status === 1;
-        console.log('data', data)
-        const res = await addRisk(data);
+        const res = await addRecord(data);
         if (res.code == 200) {
           ElMessage.success('保存成功')
           formRef.value.clearValidate();
-          emit('getNextStatus', res.data);
+          emit('getNextStatus', state.formData.projectId);
 
         } else {
           ElMessage.warning(res.message)
         }
-      }else if(type === 'clickEdit'){
+      }else{
         const { ...data} = JSON.parse(JSON.stringify(state.formData))
-        delete data.project.area;
-        data.isInBusiness = state.tableData[0].status === 1;
-        data.isSatisfyNeed = state.tableData[1].status === 1;
-        data.isNeedExpert = state.tableData[2].status === 1;
-        data.isFinishReport = state.tableData[3].status === 1;
-        data.isAcceptChargess = state.tableData[4].status === 1;
-        data.isFeasibility = state.tableData[5].status === 1;
-        const res = await editRisk(data);
+        const res = await editRecord(data);
         if (res.code == 200) {
           ElMessage.success('变更成功')
           formRef.value.clearValidate();
@@ -229,10 +173,11 @@
 
 const getSelected = (type,obj)=>{
   if(type == '项目负责人'){
-    state.formData.project.leader = obj.name
+    state.formData.leader.name = obj.name
+    state.formData.leaderId = obj.id
   }
   if(type == '任务下达人'){
-    state.formData.deliver = obj.name
+    state.formData.transmitPerson = obj.name
   }
 }
 

--
Gitblit v1.9.2