fix: bug fixed

src/api/templateInfo.ts

@@ -25,6 +25,12 @@ export const getTemplateInfoList = params => {
     params
   });
 };
+// 考核模版所有数据
+export const getTemplateInfoAllList = (params = {}) => {
+  return http.request<templateInfoList>("get", "/templateInfo/getAllTemplate", {
+    params
+  });
+};
 // 添加
 export const postAddTemplate = data => {
   return http.request<templateInfoData>("post", "/templateInfo/addTemplate", {

src/views/evaluate/children/change/mould/manageObject.vue

@@ -17,7 +17,7 @@ import {
   getAssessmentDetails
 } from "@/api/assessment";
 import editIndex from "./editIndex.vue";
-import { getTemplateInfoList } from "@/api/templateInfo";
+import { getTemplateInfoAllList } from "@/api/templateInfo";
 import { useRouter } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 import {
@@ -188,12 +188,9 @@ const getAssessmentQuotaDetailsApi = async () => {
 // 考核模板
 const modulesList = ref([]);
 const getTemplateInfoListApi = async () => {
-  const { data, code } = await getTemplateInfoList({
-    page: 1,
-    pageSize: 100
-  });
+  const { data = [], code } = await getTemplateInfoAllList();
   if (code == 200) {
-    modulesList.value = data.records || [];
+    modulesList.value = data;
   }
 };
 const handleModulesSelect = val => {
@@ -323,54 +320,43 @@ function flattenTree(data) {
   }
   return result;
 }
-const handleNodeRreeSelect = data => {
-  let dataList;
-  console.log("data", data);
-  if ($props.message.assessmentType == 1) {
-    if (Array.isArray([data])) {
-      dataList = flattenTree([data]);
-      dataList.map(item => {
-        addPersonParams?.objectAddVoList?.push({
+// const handleNodeRreeSelect = data => {
+//   let dataList;
+//   if ($props.message.assessmentType == 1) {
+//     if (Array.isArray([data])) {
+//       dataList = flattenTree([data]);
+//       dataList.map(item => {
+//         addPersonParams?.objectAddVoList?.push({
+//           assessmentObjectId: item.value,
+//           assessmentObjectName: item.label
+//         });
+//       });
+//     }
+//   }
+// };
+const handleRreeSelect = () => {
+  addPersonParams.objectAddVoList = [];
+  const dataList = assessmentTypeRef.value.getCheckedNodes() || [];
+  if ($props.message.assessmentType === 0) {
+    dataList.forEach(item => {
+      if (item.value.substring(0, 4) === "user") {
+        addPersonParams.objectAddVoList.push({
           assessmentObjectId: item.value,
           assessmentObjectName: item.label
         });
+      }
+    });
+  } else {
+    dataList.forEach(item => {
+      addPersonParams.objectAddVoList.push({
+        assessmentObjectId: item.value,
+        assessmentObjectName: item.label
       });
-    }
-  }
-};
-const handleRreeSelect = data => {
-  addPersonParams.objectAddVoList = [];
-  const list = ref({});
-  let dataList;
-  // console.log("data", data);
-  if ($props.message.assessmentType == 0) {
-    if (Array.isArray(data)) {
-      dataList = flattenTree(data);
-      dataList.map(item => {
-        if (item.value.substring(0, 4) == "user") {
-          addPersonParams.objectAddVoList.push({
-            assessmentObjectId: item.value,
-            assessmentObjectName: item.label
-          });
-        }
-      });
-    } else {
-      addPersonParams?.objectAddVoList?.push({
-        assessmentObjectId: data.value,
-        assessmentObjectName: data.label
-      });
-    }
+    });
   }
-  const arr = assessmentTypeRef.value.getCheckedNodes().filter(item => {
-    return item.children.length == 0;
-  });
-  list.value.assessmentObjectId = arr.map(item => item.value);
-  list.value.assessmentObjectName = arr.map(item => item.label);
-  // addPersonParams.objectAddVoList = transformArrayFormat(list);
 };
 // 医疗 --- 医疗主任
 const handChange = data => {
-  console.log("data", data);
   let gropList = [];
   treeDeptList.value.map(it => {
     data.map(id => {
@@ -751,6 +737,7 @@ const closePerson = () => {
   });
   addPersonParams.value1 = [];
   addPersonParams.modulesValue = "";
+  ruleFormRef.value.resetFields();
   dialogVisibleAdd.value = false;
 };
 
@@ -1805,6 +1792,7 @@ const selectAllChangeEvent = row => {
               :data="convertDepartmentDataRecursive_Person(treeDept)"
               multiple
               :render-after-expand="false"
+              check-strictly
               show-checkbox
               style="width: 240px"
               @check-change="handleRreeSelect"
@@ -1821,11 +1809,11 @@ const selectAllChangeEvent = row => {
               v-model="addPersonParams.value1"
               :data="dpetTree"
               multiple
+              check-strictly
               :render-after-expand="false"
               show-checkbox
               style="width: 240px"
               @check-change="handleRreeSelect"
-              @check="handleNodeRreeSelect"
             />
           </el-form-item>
           <el-form-item

src/views/indexData/components/editDrawer.vue

@@ -34,13 +34,13 @@ const rules = reactive<FormProps["rules"]>({
 });
 
 // 抽屉逻辑
-const open = row => {
-  getPageListApi();
-  getIndustryListApi();
-  Object.assign(formLabelAlign, row);
+const open = async row => {
+  await getPageListApi();
+  await getIndustryListApi();
   if (row.deptCode) {
-    handleDept(row.deptCode);
+    await handleDept(row.deptCode);
   }
+  Object.assign(formLabelAlign, row);
   drawer.value = true;
 };
 defineExpose({
@@ -73,15 +73,18 @@ const editClick = () => {
 };
 
 // 确认
+const saveLoading = ref(false);
 const confirmClick = () => {
   formRef.value.validate(async valid => {
     if (valid) {
+      saveLoading.value = true;
       if (formLabelAlign.specificTime) {
         formLabelAlign.specificTime = dayjs(formLabelAlign.specificTime).format(
           "YYYY-MM-DD"
         );
       }
       const { code, msg } = await editListApi(formLabelAlign);
+      saveLoading.value = false;
       if (code === 200) {
         ElMessage({
           message: "修改成功",
@@ -199,7 +202,7 @@ const handleUser = val => {
                 :trigger-on-focus="false"
                 clearable
                 placeholder="请输入"
-                disabled
+                :disabled="disabledShow"
                 style="width: 100%"
               />
             </el-form-item>
@@ -236,7 +239,7 @@ const handleUser = val => {
             <el-form-item label="分子" label-position="top">
               <el-input
                 v-model="formLabelAlign.numerator"
-                disabled
+                :disabled="disabledShow"
                 autocomplete="off"
                 placeholder="请输入"
               />
@@ -244,7 +247,7 @@ const handleUser = val => {
             <el-form-item label="分母" label-position="top">
               <el-input
                 v-model="formLabelAlign.denominator"
-                disabled
+                :disabled="disabledShow"
                 autocomplete="off"
                 placeholder="请输入"
               />
@@ -252,7 +255,7 @@ const handleUser = val => {
             <el-form-item label="值" label-position="top">
               <el-input
                 v-model="formLabelAlign.dataValue"
-                disabled
+                :disabled="disabledShow"
                 autocomplete="off"
                 placeholder="请输入"
               />
@@ -264,7 +267,7 @@ const handleUser = val => {
             >
               <el-date-picker
                 v-model="formLabelAlign.specificTime"
-                disabled
+                :disabled="disabledShow"
                 type="date"
                 placeholder="请选择日期"
               />
@@ -278,7 +281,9 @@ const handleUser = val => {
         >
         <div v-else>
           <el-button @click="cancelClick">取消</el-button>
-          <el-button type="primary" @click="confirmClick">确认</el-button>
+          <el-button type="primary" :loading="saveLoading" @click="confirmClick"
+            >确认</el-button
+          >
         </div>
       </template>
     </el-drawer>