chore(pnpm): upgrade pnpm version

src/api/assessment.ts

@@ -40,6 +40,17 @@ export const postUpdateAssessmentQuotaDetails = data => {
     }
   );
 };
+// 公式设置修改(考核指标)
+export const postUpdateAssessmentFormulas = data => {
+  return http.request<addDeptList>(
+    "post",
+    "/assessment/updateAssessmentFormulas",
+    {
+      data
+    }
+  );
+};
+
 // 考核详情
 export const getAssessmentDetails = params => {
   return http.request<addDept>("get", "/assessment/getAssessmentDetails", {

src/views/evaluate/children/change/components/settingIndexDrawer.vue

@@ -272,6 +272,7 @@ function calculateScore(inputString) {
 }
 
 const countComputed = async () => {
+  console.log("params", params.formulaType);
   try {
     if (params.formulaType == 0) {
       const formula = JSON.stringify(params.formula);
@@ -328,10 +329,19 @@ const countComputed = async () => {
         formula: formulaPar
       });
       if (res.code == 200) {
-        if (oldValue.outerConditionValue) {
-          oldValue.outerConditionValue = calculateScore(
-            oldValue.outerConditionValue
-          );
+        // if (oldValue.outerConditionValue) {
+        //   oldValue.outerConditionValue = calculateScore(
+        //     oldValue.outerConditionValue
+        //   );
+        // }
+        // 暂时注释上面代码，不知道会不会影响到其他业务逻辑，待验证
+        if (formulaForm.value && Array.isArray(formulaForm.value) && oldValue) {
+          for (const item of formulaForm.value) {
+            if (oldValue.outerConditionValueExpress === item.name) {
+              oldValue.outerConditionValue = item.value;
+              break;
+            }
+          }
         }
         if (oldValue.innerConditionExpression.length > 0) {
           oldValue.innerConditionExpression.map(itEx => {

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

@@ -6,7 +6,10 @@ import { editListApi } from "@/api/indexData";
 import dayjs from "dayjs";
 // getIndexInfo,
 // postUpdate,
-import { postUpdateAssessmentQuotaDetails } from "@/api/assessment";
+import {
+  postUpdateAssessmentQuotaDetails,
+  postUpdateAssessmentFormulas
+} from "@/api/assessment";
 import { conditionVerify } from "@/api/formula";
 import jishuanqi from "@/views/evaluate/children/change/components/jishuanqi.vue";
 import manyFormula from "@/components/formula/manyFormula.vue";
@@ -190,7 +193,8 @@ const postUpdateApi = async () => {
   // }
   // else if (formLabelAlign.formulaType == 1) {
   // }
-  const { code, msg } = await postUpdateAssessmentQuotaDetails(params);
+  // const { code, msg } = await postUpdateAssessmentQuotaDetails(params);
+  const { code, msg } = await postUpdateAssessmentFormulas(params);
   if (code === 200) {
     ElMessage.success("修改成功");
     drawer.value = false;

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

@@ -144,6 +144,7 @@ onMounted(async () => {
   await getAssessmentQuotaDetailsApi();
   await getTemplateInfoListApi();
   await getAssessmentObjectDetailsApi();
+  await alterFinishValueApi();
 });
 const treeDeptList = ref([]);
 const assessmentTypeApi = async value => {
@@ -179,10 +180,8 @@ const alterFinishValueApi = async () => {
 const getAssessmentQuotaDetailsApi = async () => {
   const res = await getAssessmentQuotaDetails(initParams.indexParams);
   if (res.code === 200) {
-    console.log("指标分页查询", res);
     initParams.Indexlist = res.data.records;
     initParams.total1 = res.data.totalRow;
-    alterFinishValueApi();
     getAssessmentDetailsApi(); // 获取考核指标详情表头信息
   }
 };
@@ -531,7 +530,8 @@ const editVxe = reactive({
   challengeValue: null,
   upperValue: null,
   agupperValue: null,
-  assessmentId: null
+  assessmentId: null,
+  remark: null
 });
 // 编辑前面
 const editOpenEvent = data => {
@@ -553,7 +553,8 @@ const hangdleOpenClick = row => {
     agupperValue: null,
     id: null,
     dimId: null,
-    assessmentId: null
+    assessmentId: null,
+    remark: null
   });
   console.log("hangdleOpenClick", row);
   editVxe.finalValue = row?.finalValue;
@@ -586,6 +587,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
           // }
         }
@@ -604,6 +606,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
         // }
@@ -624,6 +627,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
         // }
@@ -642,6 +646,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
         // }
@@ -659,6 +664,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -675,6 +681,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.agupperValue = null;
           editVxe.targetValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -691,6 +698,7 @@ const editClosedEvent = row => {
           editVxe.decValue = null;
           editVxe.agupperValue = null;
           editVxe.targetValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -709,6 +717,7 @@ const editClosedEvent = row => {
           editVxe.decValue = null;
           editVxe.upperValue = null;
           editVxe.targetValue = null;
+          editVxe.remark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -727,6 +736,24 @@ const editClosedEvent = row => {
           editVxe.addValue = null;
           editVxe.decValue = null;
           editVxe.upperValue = null;
+          editVxe.remark = null;
+          updateAssessmentQuotaDetailsApi(editVxe);
+        }
+      }
+    }
+    if (row.column.title == "备注") {
+      if (row.row?.remark) {
+        if (editVxe.remark != row.row?.remark) {
+          editVxe.remark = convertToNumberIfPercentage(row.row?.remark);
+          editVxe.startValue = null;
+          editVxe.agupperValue = null;
+          editVxe.score = null;
+          editVxe.finalValue = null;
+          editVxe.challengeValue = null;
+          editVxe.addValue = null;
+          editVxe.decValue = null;
+          editVxe.upperValue = null;
+          editVxe.targetValue = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -773,6 +800,8 @@ const addPerson = () => {
         ElMessage.success("添加成功");
         dialogVisibleAdd.value = false;
         getAssessmentObjectDetailsApi();
+        // 考核指标接口调用
+        // getAssessmentQuotaDetailsApi();
         closePerson();
       }
     }
@@ -813,7 +842,8 @@ const assessmentHeader = reactive({
   showAddValue: 0,
   showDecValue: 0,
   showUpperValue: 0,
-  showAgupperValue: 0
+  showAgupperValue: 0,
+  showRemark: 0
 });
 const showAssessmentHeader = reactive({
   showTargetValue: 1,
@@ -822,7 +852,8 @@ const showAssessmentHeader = reactive({
   showAddValue: 0,
   showDecValue: 0,
   showUpperValue: 0,
-  showAgupperValue: 0
+  showAgupperValue: 0,
+  showRemark: 0
 });
 // 开关状态
 // 目标值
@@ -874,6 +905,13 @@ const showAgupperValueSwitch = computed({
     assessmentHeader.showAgupperValue = value ? 1 : 0;
   }
 });
+// 备注
+const remarkValueValue = computed({
+  get: () => assessmentHeader.showRemark === 1,
+  set: value => {
+    assessmentHeader.showRemark = value ? 1 : 0;
+  }
+});
 const setTableHeaderApi = async () => {
   Object.assign(assessmentHeader, {
     id: $props.message.id,
@@ -912,6 +950,8 @@ const setTableHeaderApi = async () => {
     aa.showAgupperValue == 1
       ? showColEvent("agupperValue")
       : hideColEvent("agupperValue");
+    // 备注
+    aa.showRemark == 1 ? showColEvent("remark") : hideColEvent("remark");
     Object.assign(showAssessmentHeader, aa);
     ElMessage.success("表头设置成功");
   } else {
@@ -930,6 +970,7 @@ const getAssessmentDetailsApi = async () => {
     assessmentHeader.showDecValue = data.showDecValue;
     assessmentHeader.showUpperValue = data.showUpperValue;
     assessmentHeader.showAgupperValue = data.showAgupperValue;
+    assessmentHeader.showRemark = data.showRemark;
     let aa = JSON.parse(JSON.stringify(assessmentHeader));
     console.log(111111, aa);
     // 目标值
@@ -956,6 +997,8 @@ const getAssessmentDetailsApi = async () => {
     aa.showAgupperValue == 1
       ? showColEvent("agupperValue")
       : hideColEvent("agupperValue");
+    // 备注
+    aa.showRemark == 1 ? showColEvent("remark") : hideColEvent("remark");
     Object.assign(showAssessmentHeader, aa);
   }
 };
@@ -1627,6 +1670,21 @@ const selectAllChangeEvent = row => {
               </div>
             </template>
           </vxe-column>
+          <vxe-column
+            field="remark"
+            fixed
+            title="备注"
+            :edit-render="{
+              name: 'textarea'
+            }"
+            width="180"
+          >
+            <template #default="{ row }">
+              <div @click="hangdleOpenClick(row)">
+                {{ row.remark }}
+              </div>
+            </template>
+          </vxe-column>
           <vxe-column field="updateTime" title="更新时间" sortable width="180">
             <template #default="{ row }">
               {{ dayjs(row.updateTime).format("YYYY-MM-DD HH:mm:ss") }}
@@ -1722,6 +1780,16 @@ const selectAllChangeEvent = row => {
                             class="ml-2"
                           />
                         </div>
+                        <div class="w-full flex justify-evenly items-center">
+                          <div class="w-24">
+                            <el-text type="info" size="small">备注</el-text>
+                            <el-switch
+                              v-model="remarkValueValue"
+                              size="small"
+                              class="ml-2"
+                            />
+                          </div>
+                        </div>
                       </div>
                     </div>
                     <el-dropdown-item>

src/views/indexData/components/indexImport.vue

@@ -64,7 +64,7 @@ const handleUploadChange = async (file: File) => {
         </el-button>
       </div>
       <div class="w-full mt-4 bg p-3">
-        <h5>2.上传完善后的模板</h5>
+        <h5>2.上传完善后的模板1</h5>
         <p class="text-xs mt-2 text mb-2">
           更新信息的模板中，如有空的数据列，则相应字段信息会被清空，请谨慎填写
         </p>