4 Commity b5853660a7 ... 0572927c1c

Autor SHA1 Wiadomość Data
  username 0572927c1c Merge branch 'dev' of http://111.2.21.141:33001/ystl_myq/hospital-project into ssjDev 1 tydzień temu
  “ystl_myq” 5beb53e123 fix: bug 1 tydzień temu
  ystl_myq 097e05ce79 Merge branch 'dev' of http://111.2.21.141:33001/ystl_myq/hospital-project into dev 1 tydzień temu
  ystl_myq 9b2fdb7c97 fix: 可视化 1 tydzień temu

+ 8 - 2
src/api/draw.ts

@@ -44,8 +44,14 @@ type quotaList = {
   msg: string;
 };
 // 所有考核
-export const getAssessmentList = () => {
-  return http.request<addDeptList>("get", "/specialPortrait/getAssessmentList");
+export const getAssessmentList = (params?: any) => {
+  return http.request<addDeptList>(
+    "get",
+    "/specialPortrait/getAssessmentList",
+    {
+      params
+    }
+  );
 };
 // 排名专题画像
 export const getChartsList = params => {

+ 3 - 3
src/api/formula.ts

@@ -20,8 +20,8 @@ type templateInfo = {
 //   id: string;
 // };
 // 公式验证
-export const conditionVerify = params => {
-  return http.request<templateInfo>("get", "/assessment/conditionVerify", {
-    params
+export const conditionVerify = data => {
+  return http.request<templateInfo>("post", "/assessment/conditionVerify", {
+    data
   });
 };

+ 52 - 24
src/views/draw/children/department/componements/seach.vue

@@ -4,6 +4,12 @@ import { getTemplateInfoList } from "@/api/templateInfo";
 import { userPageWhitOrganization } from "@/api/userSetting";
 import { getAssessmentPageList } from "@/api/manage";
 import { postListTree } from "@/api/department";
+import {
+  getAssessmentList,
+  getModelListByAssessmentId,
+  getUserListObjectByModelId
+} from "@/api/draw";
+
 const $emit = defineEmits(["handClick"]);
 
 const dataList = reactive({
@@ -19,35 +25,33 @@ const dataList = reactive({
   }
 });
 // 考核模板
-const getTemplateInfoListApi = async () => {
-  const { data, code } = await getTemplateInfoList({
-    pageNumber: 1,
-    pageSize: 1000
-  });
+const getTemplateInfoListApi = async selectedItem => {
+  const { data, code } = await getModelListByAssessmentId(selectedItem);
   if (code === 200) {
-    dataList.teplist = data.records;
+    dataList.teplist = data;
   }
 };
 getTemplateInfoListApi();
 // 员工
-const userPageWhitOrganizationApi = async () => {
-  const { data, code } = await userPageWhitOrganization({
-    pageNumber: 1,
-    pageSize: 1000
+const userPageWhitOrganizationApi = async selectedItem => {
+  const { data, code } = await getUserListObjectByModelId({
+    type: 1,
+    assessmentId: selectedItem.assessmentId,
+    modelId: selectedItem.assessmentModelId
   });
+  console.log("1111", data);
   if (code === 200) {
-    dataList.personList = data.records;
+    dataList.personList = data;
   }
 };
-userPageWhitOrganizationApi();
+// userPageWhitOrganizationApi();
 // 考核活动
 const getAssessmentPageListApi = async () => {
-  const { data, code } = await getAssessmentPageList({
-    pageNumber: 1,
-    pageSize: 1000
+  const { data, code } = await getAssessmentList({
+    type: 1
   });
   if (code === 200) {
-    dataList.magList = data.records;
+    dataList.magList = data;
   }
   console.log("await", data);
 };
@@ -73,6 +77,7 @@ const handClickInit1 = value => {
   if (value) {
     const selectedItem = dataList.magList.find(item => item.id === value);
     init.assessmentName = selectedItem.name;
+    getTemplateInfoListApi(selectedItem);
   }
   $emit("handClick", {
     ...dataList.params,
@@ -81,8 +86,11 @@ const handClickInit1 = value => {
 };
 const handClickInit2 = value => {
   if (value) {
-    const selectedItem = dataList.teplist.find(item => item.id === value);
-    init.assessmentModelName = selectedItem.tpName;
+    const selectedItem = dataList.teplist.find(
+      item => item.assessmentModelId === value
+    );
+    init.assessmentModelName = selectedItem.assessmentModelName;
+    userPageWhitOrganizationApi(selectedItem);
   }
   $emit("handClick", {
     ...dataList.params,
@@ -91,8 +99,13 @@ const handClickInit2 = value => {
 };
 const handClickInit3 = value => {
   if (value) {
+    const selectedItem = dataList.teplist.find(
+      item => item.assessmentObjectId === value
+    );
+    init.assessmentObjectName = selectedItem.assessmentObjectName;
     init.deptName = value.deptName;
   }
+
   $emit("handClick", {
     ...dataList.params,
     ...init
@@ -134,15 +147,15 @@ const handClickInit3 = value => {
           >
             <el-option
               v-for="item in dataList.teplist"
-              :key="item.id"
-              :label="item.tpName"
-              :value="item.id"
+              :key="item.assessmentModelId"
+              :label="item.assessmentModelName"
+              :value="item.assessmentModelId"
             />
           </el-select>
         </div>
         <div class="flex mr-2">
-          <div class="text-sm leading-8 mr-3">科主任</div>
-          <el-tree-select
+          <div class="text-sm leading-8 mr-3">科</div>
+          <!-- <el-tree-select
             v-model="dataList.params.deptCode"
             :data="dataList.deptList"
             check-strictly
@@ -155,7 +168,22 @@ const handClickInit3 = value => {
             }"
             style="width: 200px"
             @change="handClickInit3"
-          />
+          /> -->
+          <el-select
+            v-model="dataList.params.deptCode"
+            clearable
+            filterable
+            placeholder="请选择"
+            style="width: 200px"
+            @change="handClickInit3"
+          >
+            <el-option
+              v-for="item in dataList.deptList"
+              :key="item.assessmentObjectId"
+              :label="item.assessmentObjectName"
+              :value="item.assessmentObjectId"
+            />
+          </el-select>
         </div>
       </div>
     </div>

+ 2 - 2
src/views/draw/children/department/departmentDrank.vue

@@ -22,12 +22,14 @@ const activeName = ref("1");
 // 排行榜
 const rankTableRef = ref();
 const chartList = ref([]);
+const showLength = ref(0);
 const getChartsListApi = async () => {
   const { code, data } = await getChartsList({
     ...seachParams.value,
     type: 0
   });
   if (code == 200) {
+    showLength.value = data.length;
     setTimeout(() => {
       nextTick(() => {
         rankTableRef.value.init(data, "科室", "姓名");
@@ -43,7 +45,6 @@ const dataList = reactive({
   dimName: []
 });
 const seachParams = ref();
-const showLength = ref(0);
 const getPersonDimensionChartsListApi = async (
   dimensionName?: string,
   dimId?: number | string
@@ -57,7 +58,6 @@ const getPersonDimensionChartsListApi = async (
 
   if (code == 200) {
     if (data.length > 0) {
-      showLength.value = data.length;
       data.dimensionList.map(item => {
         dataList.dimName.push({
           name: item.dimName,

+ 49 - 19
src/views/draw/children/head/componements/seach.vue

@@ -1,9 +1,15 @@
 <script setup>
 import { ref, reactive } from "vue";
 import { getTemplateInfoList } from "@/api/templateInfo";
-import { userPageWhitOrganization } from "@/api/userSetting";
+import { userPageWhitOrganization, getLeaderList } from "@/api/userSetting";
 import { getAssessmentPageList } from "@/api/manage";
 import { postListTree } from "@/api/department";
+import {
+  getAssessmentList,
+  getModelListByAssessmentId,
+  getUserListObjectByModelId
+} from "@/api/draw";
+
 const $emit = defineEmits(["handClick"]);
 
 const dataList = reactive({
@@ -11,6 +17,7 @@ const dataList = reactive({
   personList: [],
   magList: [],
   deptList: [],
+  leaderList: [],
   params: {
     assessmentId: "",
     assessmentModelId: "",
@@ -19,11 +26,8 @@ const dataList = reactive({
   }
 });
 // 考核模板
-const getTemplateInfoListApi = async () => {
-  const { data, code } = await getTemplateInfoList({
-    pageNumber: 1,
-    pageSize: 1000
-  });
+const getTemplateInfoListApi = async selectedItem => {
+  const { data, code } = await getModelListByAssessmentId(selectedItem);
   if (code === 200) {
     dataList.teplist = data.records;
   }
@@ -42,12 +46,11 @@ const userPageWhitOrganizationApi = async () => {
 userPageWhitOrganizationApi();
 // 考核活动
 const getAssessmentPageListApi = async () => {
-  const { data, code } = await getAssessmentPageList({
-    pageNumber: 1,
-    pageSize: 1000
+  const { data, code } = await getAssessmentList({
+    type: 3
   });
   if (code === 200) {
-    dataList.magList = data.records;
+    dataList.magList = data;
   }
   console.log("await", data);
 };
@@ -61,6 +64,14 @@ const postListTreeApi = async () => {
   console.log("await", data);
 };
 postListTreeApi();
+// 科主任
+const getLeaderListApi = async () => {
+  const { data, code } = await getLeaderList();
+  if (code === 200) {
+    dataList.leaderList = data;
+  }
+};
+getLeaderListApi();
 // ----------------------------
 const init = reactive({
   assessmentName: "",
@@ -73,6 +84,7 @@ const handClickInit1 = value => {
   if (value) {
     const selectedItem = dataList.magList.find(item => item.id === value);
     init.assessmentName = selectedItem.name;
+    getTemplateInfoListApi(selectedItem);
   }
   $emit("handClick", {
     ...dataList.params,
@@ -81,8 +93,10 @@ const handClickInit1 = value => {
 };
 const handClickInit2 = value => {
   if (value) {
-    const selectedItem = dataList.teplist.find(item => item.id === value);
-    init.assessmentModelName = selectedItem.tpName;
+    const selectedItem = dataList.teplist.find(
+      item => item.assessmentModelId === value
+    );
+    init.assessmentModelName = selectedItem.assessmentModelName;
   }
   $emit("handClick", {
     ...dataList.params,
@@ -91,7 +105,8 @@ const handClickInit2 = value => {
 };
 const handClickInit3 = value => {
   if (value) {
-    init.deptName = value.deptName;
+    const selectedItem = dataList.teplist.find(item => item.userCode === value);
+    init.assessmentObjectName = selectedItem.realName;
   }
   $emit("handClick", {
     ...dataList.params,
@@ -134,15 +149,15 @@ const handClickInit3 = value => {
           >
             <el-option
               v-for="item in dataList.teplist"
-              :key="item.id"
-              :label="item.tpName"
-              :value="item.id"
+              :key="item.assessmentModelId"
+              :label="item.assessmentModelName"
+              :value="item.assessmentModelId"
             />
           </el-select>
         </div>
         <div class="flex mr-2">
-          <div class="text-sm leading-8 mr-3">科</div>
-          <el-tree-select
+          <div class="text-sm leading-8 mr-3">科主任</div>
+          <!-- <el-tree-select
             v-model="dataList.params.deptCode"
             :data="dataList.deptList"
             check-strictly
@@ -155,7 +170,22 @@ const handClickInit3 = value => {
             }"
             style="width: 200px"
             @change="handClickInit3"
-          />
+          /> -->
+          <el-select
+            v-model="dataList.params.assessmentObjectId"
+            clearable
+            filterable
+            placeholder="请选择"
+            style="width: 200px"
+            @change="handClickInit3"
+          >
+            <el-option
+              v-for="item in dataList.leaderList"
+              :key="item.userCode"
+              :label="item.realName"
+              :value="item.userCode"
+            />
+          </el-select>
         </div>
       </div>
     </div>

+ 3 - 1
src/views/draw/children/head/headDrank.vue

@@ -20,6 +20,7 @@ import type { TabsPaneContext } from "element-plus";
 const router = useRouter();
 const activeName = ref("1");
 // 排行榜
+const showLength = ref(0);
 const chartList = ref([]);
 const getChartsListApi = async () => {
   const { code, data } = await getChartsList({
@@ -27,6 +28,7 @@ const getChartsListApi = async () => {
     type: 0
   });
   if (code == 200) {
+    showLength.value = data.length;
     rankTableRef.value.init(data, "科室", "姓名");
   }
 };
@@ -118,7 +120,7 @@ const fullBig = (item: any) => {
   <div class="w-[100%]">
     <div class="w-[100%]">
       <seachData @handClick="init" />
-      <div v-if="dataList.dimName.length > 0">
+      <div v-if="showLength > 0">
         <div class="flex mr-2">
           <radar ref="radarRef" />
         </div>

+ 20 - 16
src/views/draw/children/health/componements/seach.vue

@@ -5,6 +5,11 @@ import { userPageWhitOrganization } from "@/api/userSetting";
 import { getAssessmentPageList } from "@/api/manage";
 import { postListTree } from "@/api/department";
 import { postPageGroup } from "@/api/userGroup";
+import {
+  getAssessmentList,
+  getModelListByAssessmentId,
+  getUserListObjectByModelId
+} from "@/api/draw";
 const $emit = defineEmits(["handClick"]);
 
 const dataList = reactive({
@@ -19,25 +24,21 @@ const dataList = reactive({
   }
 });
 // 考核模板
-const getTemplateInfoListApi = async () => {
-  const { data, code } = await getTemplateInfoList({
-    pageNumber: 1,
-    pageSize: 1000
-  });
+const getTemplateInfoListApi = async selectedItem => {
+  const { data, code } = await getModelListByAssessmentId(selectedItem);
   if (code === 200) {
-    dataList.teplist = data.records;
+    dataList.teplist = data;
   }
 };
 getTemplateInfoListApi();
 
 // 考核活动
 const getAssessmentPageListApi = async () => {
-  const { data, code } = await getAssessmentPageList({
-    pageNumber: 1,
-    pageSize: 1000
+  const { data, code } = await getAssessmentList({
+    type: 2
   });
   if (code === 200) {
-    dataList.magList = data.records;
+    dataList.magList = data;
   }
   console.log("await", data);
 };
@@ -65,6 +66,7 @@ const handClickInit1 = value => {
   if (value) {
     const selectedItem = dataList.magList.find(item => item.id === value);
     init.assessmentName = selectedItem.name;
+    getTemplateInfoListApi(selectedItem);
   }
   $emit("handClick", {
     ...dataList.params,
@@ -73,8 +75,10 @@ const handClickInit1 = value => {
 };
 const handClickInit2 = value => {
   if (value) {
-    const selectedItem = dataList.teplist.find(item => item.id === value);
-    init.assessmentModelName = selectedItem.tpName;
+    const selectedItem = dataList.teplist.find(
+      item => item.assessmentModelId === value
+    );
+    init.assessmentModelName = selectedItem.assessmentModelName;
   }
   $emit("handClick", {
     ...dataList.params,
@@ -83,7 +87,7 @@ const handClickInit2 = value => {
 };
 const handClickInit3 = value => {
   if (value) {
-    const selectedItem = dataList.magList.find(
+    const selectedItem = dataList.userList.find(
       item => item.groupCode === value
     );
     init.deptName = selectedItem.groupName;
@@ -129,9 +133,9 @@ const handClickInit3 = value => {
           >
             <el-option
               v-for="item in dataList.teplist"
-              :key="item.id"
-              :label="item.tpName"
-              :value="item.id"
+              :key="item.assessmentModelId"
+              :label="item.assessmentModelName"
+              :value="item.assessmentModelId"
             />
           </el-select>
         </div>

+ 3 - 1
src/views/draw/children/health/healthDrank.vue

@@ -25,6 +25,7 @@ const barEchartsRef = ref();
 const barDimEchartsRef = ref();
 const seachParams = ref();
 // 排行榜
+const showLength = ref(0);
 const chartList = ref([]);
 const getChartsListApi = async () => {
   const { code, data } = await getChartsList({
@@ -32,6 +33,7 @@ const getChartsListApi = async () => {
     type: 0
   });
   if (code == 200) {
+    showLength.value = data.length;
     rankTableRef.value.init(data, "医疗组");
   }
 };
@@ -120,7 +122,7 @@ const fullBig = (item: any) => {
   <div class="w-[100%]">
     <div class="w-[100%]">
       <seachData @handClick="init" />
-      <div v-if="dataList.dimName.length > 0">
+      <div v-if="showLength.length > 0">
         <div class="flex mr-2">
           <radar ref="radarRef" />
         </div>

+ 21 - 16
src/views/draw/children/worker/componements/seach.vue

@@ -4,6 +4,12 @@ import { getTemplateInfoList } from "@/api/templateInfo";
 import { userPageWhitOrganization } from "@/api/userSetting";
 import { getAssessmentPageList } from "@/api/manage";
 import { postListTree } from "@/api/department";
+import {
+  getAssessmentList,
+  getModelListByAssessmentId,
+  getUserListObjectByModelId
+} from "@/api/draw";
+
 const value = ref("");
 const $emit = defineEmits(["handClick"]);
 const dataList = reactive({
@@ -21,13 +27,11 @@ const dataList = reactive({
 
 // 搜索框----------------------------------------------------
 // 考核模板
-const getTemplateInfoListApi = async () => {
-  const { data, code } = await getTemplateInfoList({
-    pageNumber: 1,
-    pageSize: 1000
-  });
+const getTemplateInfoListApi = async selectedItem => {
+  const { data, code } = await getModelListByAssessmentId(selectedItem);
   if (code === 200) {
-    dataList.teplist = data.records;
+    console.log(111111111, data);
+    dataList.teplist = data;
   }
 };
 getTemplateInfoListApi();
@@ -44,14 +48,12 @@ const userPageWhitOrganizationApi = async () => {
 userPageWhitOrganizationApi();
 // 考核活动
 const getAssessmentPageListApi = async () => {
-  const { data, code } = await getAssessmentPageList({
-    pageNumber: 1,
-    pageSize: 1000
+  const { data, code } = await getAssessmentList({
+    type: 0
   });
   if (code === 200) {
-    dataList.magList = data.records;
+    dataList.magList = data;
   }
-  console.log("await", data);
 };
 getAssessmentPageListApi();
 // 部门
@@ -75,6 +77,7 @@ const handClickInit1 = value => {
   if (value) {
     const selectedItem = dataList.magList.find(item => item.id === value);
     init.assessmentName = selectedItem.name;
+    getTemplateInfoListApi(selectedItem);
   }
   $emit("handClick", {
     ...dataList.params,
@@ -83,8 +86,10 @@ const handClickInit1 = value => {
 };
 const handClickInit2 = value => {
   if (value) {
-    const selectedItem = dataList.teplist.find(item => item.id === value);
-    init.assessmentModelName = selectedItem.tpName;
+    const selectedItem = dataList.teplist.find(
+      item => item.assessmentModelId === value
+    );
+    init.assessmentModelName = selectedItem.assessmentModelName;
   }
   $emit("handClick", {
     ...dataList.params,
@@ -149,9 +154,9 @@ const handClickInit4 = value => {
           >
             <el-option
               v-for="item in dataList.teplist"
-              :key="item.id"
-              :label="item.tpName"
-              :value="item.id"
+              :key="item.assessmentModelId"
+              :label="item.assessmentModelName"
+              :value="item.assessmentModelId"
             />
           </el-select>
         </div>

+ 3 - 1
src/views/draw/children/worker/workerDrak.vue

@@ -26,6 +26,7 @@ const barEchartsRef = ref();
 const barDimEchartsRef = ref();
 const seachParams = ref();
 // 排行榜
+const showLength = ref(0);
 const chartList = ref([]);
 const getChartsListApi = async () => {
   const { code, data } = await getChartsList({
@@ -33,6 +34,7 @@ const getChartsListApi = async () => {
     type: 0
   });
   if (code == 200) {
+    showLength.value = data.length;
     rankTableRef.value.init(data, "科室", "姓名");
   }
 };
@@ -119,7 +121,7 @@ const fullBig = (item: any) => {
   <div class="w-[100%]">
     <div class="w-[100%]">
       <seachData @handClick="init" />
-      <div v-if="dataList.dimName.length > 0">
+      <div v-if="showLength > 0">
         <div class="flex mr-2">
           <radar ref="radarRef" />
         </div>

+ 97 - 26
src/views/evaluate/children/change/components/settingIndexDrawer.vue

@@ -140,11 +140,11 @@ const countComputed = async () => {
   try {
     if (params.formulaType == 0) {
       const formula = JSON.stringify(params.formula);
-      const aa = JSON.stringify(formula);
-      console.log("formula", aa);
+      // const aa = JSON.stringify(formula);
+      // console.log("formula", aa);
       const { code, msg } = await conditionVerify({
         formulaType: params.formulaType,
-        formula: aa
+        formula
       });
       if (code == 200) {
         const keywords = [
@@ -373,6 +373,7 @@ const count = item => {
   ElMessageBox.confirm("配置项确认保存?确认关闭", {
     type: "warning"
   }).then(() => {
+    params.scoreValue = params.formula.noConditionFormula;
     calculatorShow.value = false;
   });
   // try {
@@ -839,6 +840,13 @@ const handleRreeSelect = () => {
                             v-model="item.comparisonEnd"
                             style="width: 60px"
                             placeholder=""
+                            :disabled="
+                              index + 1 ==
+                                addmanyChange.innerConditionExpression.length &&
+                              index >= 1
+                                ? true
+                                : false
+                            "
                           >
                             <el-option label=">" value=">" />
                             <el-option label="≥" value="≥" />
@@ -848,25 +856,44 @@ const handleRreeSelect = () => {
                             class="ml-2"
                             style="width: 80px"
                             placeholder=""
+                            :disabled="
+                              index + 1 ==
+                                addmanyChange.innerConditionExpression.length &&
+                              index >= 1
+                                ? true
+                                : false
+                            "
                           >
                             <el-option label="数值" value="数值" />
                             <el-option label="公式" value="公式" />
                           </el-select>
-                          <jishuanqi
-                            v-if="item.select == '公式'"
-                            ref="jishuanqiRef"
-                            :index="index"
-                            :outerConditionValue="item.endValue"
-                            class="ml-2 mr-5"
-                            style="width: 80px"
-                            @handClick="countNoConditionFormula1"
-                          />
                           <el-input
-                            v-else
-                            v-model="item.endValue"
+                            v-if="
+                              index + 1 ==
+                                addmanyChange.innerConditionExpression.length &&
+                              index >= 1
+                            "
+                            disabled
                             class="ml-2 mr-5"
                             style="width: 80px"
                           />
+                          <div v-else>
+                            <jishuanqi
+                              v-if="item.select == '公式'"
+                              ref="jishuanqiRef"
+                              :index="index"
+                              :outerConditionValue="item.endValue"
+                              class="ml-2 mr-5"
+                              style="width: 80px"
+                              @handClick="countNoConditionFormula1"
+                            />
+                            <el-input
+                              v-else
+                              v-model="item.endValue"
+                              class="ml-2 mr-5"
+                              style="width: 80px"
+                            />
+                          </div>
                           <el-text type="danger" @click="deleteItem(index)">
                             <el-icon>
                               <Delete />
@@ -879,7 +906,18 @@ const handleRreeSelect = () => {
                         >
                           <div class="flex mt-2 ml-20">
                             <div class="mr-2">条件值{{ index + 1 }} =</div>
+                            <el-input
+                              v-if="
+                                index + 1 ==
+                                  addmanyChange.innerConditionExpression
+                                    .length && index >= 1
+                              "
+                              disabled
+                              class="ml-2 mr-6"
+                              style="width: 208px"
+                            />
                             <jishuanqi
+                              v-else
                               ref="jishuanqiRef"
                               :index="index"
                               :outerConditionValue="itemVO.innerConditionValue"
@@ -916,6 +954,12 @@ const handleRreeSelect = () => {
                                 v-model="itemList.comparisonEnd"
                                 style="width: 60px"
                                 placeholder=""
+                                :disabled="
+                                  indexList + 1 == itemVO.scoreRules.length &&
+                                  index >= 1
+                                    ? true
+                                    : false
+                                "
                               >
                                 <el-option label=">" value=">" />
                                 <el-option label="≥" value="≥" />
@@ -925,32 +969,59 @@ const handleRreeSelect = () => {
                                 class="ml-2"
                                 style="width: 80px"
                                 placeholder=""
+                                :disabled="
+                                  indexList + 1 == itemVO.scoreRules.length &&
+                                  index >= 1
+                                    ? true
+                                    : false
+                                "
                               >
                                 <el-option label="数值" value="数值" />
                                 <el-option label="公式" value="公式" />
                               </el-select>
-                              <jishuanqi
-                                v-if="itemList.select == '公式'"
-                                ref="jishuanqiRef"
-                                :index="index"
-                                :indexList="indexList"
-                                :outerConditionValue="itemList.endValue"
-                                class="ml-2"
-                                style="width: 80px"
-                                @handClick="countNoConditionFormula3"
-                              />
                               <el-input
-                                v-else
-                                v-model="itemList.endValue"
+                                v-if="
+                                  indexList + 1 == itemVO.scoreRules.length &&
+                                  index >= 1
+                                "
+                                disabled
                                 class="ml-2"
                                 style="width: 80px"
                               />
+                              <div v-else>
+                                <jishuanqi
+                                  v-if="itemList.select == '公式'"
+                                  ref="jishuanqiRef"
+                                  :index="index"
+                                  :indexList="indexList"
+                                  :outerConditionValue="itemList.endValue"
+                                  class="ml-2"
+                                  style="width: 80px"
+                                  @handClick="countNoConditionFormula3"
+                                />
+                                <el-input
+                                  v-else
+                                  v-model="itemList.endValue"
+                                  class="ml-2"
+                                  style="width: 80px"
+                                />
+                              </div>
                               <div
                                 class="w-[150px] ml-2 mr-2 flex justify-between items-center"
                               >
                                 <div>得分</div>
                                 <div>=</div>
+                                <el-input
+                                  v-if="
+                                    indexList + 1 == itemVO.scoreRules.length &&
+                                    index >= 1
+                                  "
+                                  disabled
+                                  class="ml-2"
+                                  style="width: 80px"
+                                />
                                 <jishuanqi
+                                  v-else
                                   ref="jishuanqiRef"
                                   :index="index"
                                   :indexList="indexList"

+ 0 - 1
src/views/evaluate/children/change/manage.vue

@@ -50,7 +50,6 @@ const manageObjectItme = ref({});
 const setEdit = (row: any) => {
   // router.push({ path: "/evaluate/children/change/mould/manageObject" });\
   manageObjectShow.value = true;
-  console.log("rowrow", row);
   Object.assign(manageObjectItme.value, row);
 };
 // 删除

+ 1 - 0
src/views/evaluate/children/change/mould/manageObject.vue

@@ -363,6 +363,7 @@ const editConfig = ref({
 const editClosedEvent = ({ row, column }) => {
   const $table = tableVxeRef.value;
   if ($table) {
+    console.log(111);
     updateAssessmentQuotaDetailsApi(row);
     // Object.assign(indexOf, row);
     // postUpdateApi();