fix: 优化表头顺序

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

@@ -528,6 +528,7 @@ const hangdleOpenClick = row => {
     dimId: null,
     assessmentId: null
   });
+  console.log("hangdleOpenClick", row);
   editVxe.finalValue = row?.finalValue;
   editVxe.score = row?.score;
 };
@@ -844,15 +845,37 @@ const setTableHeaderApi = async () => {
   if (code === 200) {
     getAssessmentQuotaDetailsApi();
     let aa = JSON.parse(JSON.stringify(assessmentHeader));
+    console.log("表头设置", aa);
+    // 目标值
+    aa.showTargetValue == 1
+      ? showColEvent("targetValue")
+      : hideColEvent("targetValue");
+    // 挑战值
+    aa.showChallengeValue == 1
+      ? showColEvent("challengeValue")
+      : hideColEvent("challengeValue");
+    // 门槛值
+    aa.showStartValue == 1
+      ? showColEvent("startValue")
+      : hideColEvent("startValue");
+    // 增幅
+    aa.showAddValue == 1 ? showColEvent("addValue") : hideColEvent("addValue");
+    // 降幅
+    aa.showDecValue == 1 ? showColEvent("decValue") : hideColEvent("decValue");
+    // 上期完成值
+    aa.showUpperValue == 1
+      ? showColEvent("upperValue")
+      : hideColEvent("upperValue");
+    // 上上期完成值
+    aa.showAgupperValue == 1
+      ? showColEvent("agupperValue")
+      : hideColEvent("agupperValue");
     Object.assign(showAssessmentHeader, aa);
     ElMessage.success("表头设置成功");
   } else {
     ElMessage.error(msg);
   }
 };
-watch(assessmentHeader, (newVal, oldVal) => {
-  console.log(newVal, oldVal);
-});
 const getAssessmentDetailsApi = async () => {
   const { code, data } = await getAssessmentDetails({
     id: messageData.value.id
@@ -866,6 +889,31 @@ const getAssessmentDetailsApi = async () => {
     assessmentHeader.showUpperValue = data.showUpperValue;
     assessmentHeader.showAgupperValue = data.showAgupperValue;
     let aa = JSON.parse(JSON.stringify(assessmentHeader));
+    console.log(111111, aa);
+    // 目标值
+    aa.showTargetValue == 1
+      ? showColEvent("targetValue")
+      : hideColEvent("targetValue");
+    // 挑战值
+    aa.showChallengeValue == 1
+      ? showColEvent("challengeValue")
+      : hideColEvent("challengeValue");
+    // 门槛值
+    aa.showStartValue == 1
+      ? showColEvent("startValue")
+      : hideColEvent("startValue");
+    // 增幅
+    aa.showAddValue == 1 ? showColEvent("addValue") : hideColEvent("addValue");
+    // 降幅
+    aa.showDecValue == 1 ? showColEvent("decValue") : hideColEvent("decValue");
+    // 上期完成值
+    aa.showUpperValue == 1
+      ? showColEvent("upperValue")
+      : hideColEvent("upperValue");
+    // 上上期完成值
+    aa.showAgupperValue == 1
+      ? showColEvent("agupperValue")
+      : hideColEvent("agupperValue");
     Object.assign(showAssessmentHeader, aa);
   }
 };
@@ -1049,6 +1097,20 @@ const validRules = ref({
     }
   ]
 });
+// 固定表头
+// 计算列配置
+const showColEvent = field => {
+  const $table = tableVxeRef.value;
+  if ($table) {
+    $table.showColumn(field);
+  }
+};
+const hideColEvent = field => {
+  const $table = tableVxeRef.value;
+  if ($table) {
+    $table.hideColumn(field);
+  }
+};
 </script>
 
 <template>
@@ -1314,7 +1376,6 @@ const validRules = ref({
           <vxe-column field="scoreRule" fixed title="评价标准" width="180" />
           <vxe-column field="source" fixed title="数据来源" width="180" />
           <vxe-column
-            v-if="showAssessmentHeader.showTargetValue"
             field="targetValue"
             fixed
             title="目标值"
@@ -1324,9 +1385,9 @@ const validRules = ref({
             width="180"
           />
           <vxe-column
-            field="finalValue"
+            field="addValue"
             fixed
-            title="完成值"
+            title="增幅"
             :edit-render="{
               name: 'input'
             }"
@@ -1334,15 +1395,14 @@ const validRules = ref({
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ convertToNumberIfPercentage(row.finalValue) }}
+                {{ row.addValue }}
               </div>
             </template>
           </vxe-column>
           <vxe-column
-            v-if="showAssessmentHeader.showChallengeValue"
-            field="challengeValue"
+            field="decValue"
             fixed
-            title="挑战值"
+            title="降幅"
             :edit-render="{
               name: 'input'
             }"
@@ -1350,15 +1410,14 @@ const validRules = ref({
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ row.challengeValue }}
+                {{ row.decValue }}
               </div>
             </template>
           </vxe-column>
           <vxe-column
-            v-if="showAssessmentHeader.showStartValue"
-            field="startValue"
+            field="challengeValue"
             fixed
-            title="门槛值"
+            title="挑战值"
             :edit-render="{
               name: 'input'
             }"
@@ -1366,15 +1425,14 @@ const validRules = ref({
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ row.startValue }}
+                {{ row.challengeValue }}
               </div>
             </template>
           </vxe-column>
           <vxe-column
-            v-if="showAssessmentHeader.showAddValue"
-            field="addValue"
+            field="startValue"
             fixed
-            title="增幅"
+            title="门槛值"
             :edit-render="{
               name: 'input'
             }"
@@ -1382,15 +1440,14 @@ const validRules = ref({
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ row.addValue }}
+                {{ row.startValue }}
               </div>
             </template>
           </vxe-column>
           <vxe-column
-            v-if="showAssessmentHeader.showDecValue"
-            field="decValue"
+            field="upperValue"
             fixed
-            title="降幅"
+            title="上期完成值"
             :edit-render="{
               name: 'input'
             }"
@@ -1398,15 +1455,14 @@ const validRules = ref({
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ row.decValue }}
+                {{ row.upperValue }}
               </div>
             </template>
           </vxe-column>
           <vxe-column
-            v-if="showAssessmentHeader.showUpperValue"
-            field="upperValue"
+            field="agupperValue"
             fixed
-            title="上期完成值"
+            title="上上期完成值"
             :edit-render="{
               name: 'input'
             }"
@@ -1414,15 +1470,15 @@ const validRules = ref({
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ row.upperValue }}
+                {{ row.agupperValue }}
               </div>
             </template>
           </vxe-column>
+
           <vxe-column
-            v-if="showAssessmentHeader.showAgupperValue"
-            field="agupperValue"
+            field="finalValue"
             fixed
-            title="上上期完成值"
+            title="完成值"
             :edit-render="{
               name: 'input'
             }"
@@ -1430,7 +1486,7 @@ const validRules = ref({
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ row.agupperValue }}
+                {{ convertToNumberIfPercentage(row.finalValue) }}
               </div>
             </template>
           </vxe-column>