Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

# Conflicts:
#	.env.base

src/views/Kpi/Appraise/Components/DialogAppraise.vue

@@ -11,6 +11,7 @@
           <el-form-item label="生效日期" prop="effectiveDate">
             <el-date-picker
               v-model="form.effectiveDate"
+              :disabled="form.id"
               type="date"
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
@@ -150,15 +151,17 @@ async function open(type, val) {
     }
   }
   getOptions()
-  const checkedCount = form.value.examinedUserIdList?.length || 0
-  isIndeterminate.value = checkedCount > 0 && checkedCount < employeeOptions.value.length
 }
 
 function getOptions() {
   KpiApi.getKpiEmployees().then((data) => {
     employeeOptions.value = data
-    handleCheckAllChange(true)
+    if (formType.value == 'update') {
-    checkAll.value = true
+      handleCheckedChange(form.value.examinedUserIdList)
+    } else {
+      handleCheckAllChange(true)
+      checkAll.value = true
+    }
   })
 }
 

src/views/Kpi/Score/index.vue

@@ -198,7 +198,8 @@ function getSummaries({ columns, data }) {
     const values = data.map((item) => Number(item[column.property]))
     if (!values.every((value) => Number.isNaN(value))) {
       if (column.property == 'weightSocre') {
-        sums[index] = 5.6
+        const employee = employeeOptions.value.find((it) => it.examinedUser == employeeId.value)
+        sums[index] = employee.scoreTotal + '分'
       } else {
         sums[index] = ''
       }