调整

ygtx-ui/src/views/gxt/orderScore/index.vue

@@ -206,9 +206,21 @@
                 <span>{{ scope.row.nickName }}<span v-if="scope.row.isLeader == 1"> (工作负责人)</span></span>
               </template>
             </el-table-column>
-            <el-table-column label="自评得分" align="center" prop="selfScore" />
-            <el-table-column label="复评得分" align="center" prop="reviewScore" />
-            <el-table-column label="终评得分" align="center" prop="finalScore" />
+            <el-table-column label="自评得分" align="center" prop="selfScore">
+              <template #default="scope">
+                <span>{{ scope.row.selfScore !== null && scope.row.selfScore !== undefined ? parseFloat(scope.row.selfScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="复评得分" align="center" prop="reviewScore">
+              <template #default="scope">
+                <span>{{ scope.row.reviewScore !== null && scope.row.reviewScore !== undefined ? parseFloat(scope.row.reviewScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="终评得分" align="center" prop="finalScore">
+              <template #default="scope">
+                <span>{{ scope.row.finalScore !== null && scope.row.finalScore !== undefined ? parseFloat(scope.row.finalScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form-item>
       </el-form>
@@ -434,7 +446,16 @@
         <el-form-item v-if="feedbackList && feedbackList.length > 0" label="反馈信息">
           <el-table :data="feedbackList" border style="width: 100%;">
             <el-table-column label="反馈人员" align="center" prop="nickName" width="150" />
-            <el-table-column label="反馈理由" align="left" prop="feedbackReason" />
+            <el-table-column label="反馈理由" align="left" prop="feedbackReason">
+              <template #default="scope">
+                <el-input
+                  v-model="scope.row.feedbackReason"
+                  type="textarea"
+                  :rows="3"
+                  disabled
+                />
+              </template>
+            </el-table-column>
           </el-table>
         </el-form-item>
         
@@ -445,8 +466,12 @@
                 <span>{{ scope.row.nickName }}<span v-if="scope.row.isLeader == 1"> (工作负责人)</span></span>
               </template>
             </el-table-column>
-            <el-table-column label="自评得分" align="center" prop="selfScore"  style="width: 50%;" />
-            <el-table-column label="复评得分" align="center" prop="selfScore"  style="width: 50%;">
+            <el-table-column label="自评得分" align="center" prop="selfScore"  style="width: 50%;">
+              <template #default="scope">
+                <span>{{ scope.row.selfScore !== null && scope.row.selfScore !== undefined ? parseFloat(scope.row.selfScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="复评得分" align="center" prop="reviewScore"  style="width: 50%;">
               <template #default="scope">
                 <el-input v-model="scope.row.reviewScore" style="width: 100%;" readonly/>
               </template>
@@ -540,8 +565,16 @@
                 <span>{{ scope.row.nickName }}<span v-if="scope.row.isLeader == 1"> (工作负责人)</span></span>
               </template>
             </el-table-column>
-            <el-table-column label="自评得分" align="center" prop="selfScore" />
-            <el-table-column label="复评得分" align="center" prop="reviewScore" />
+            <el-table-column label="自评得分" align="center" prop="selfScore">
+              <template #default="scope">
+                <span>{{ scope.row.selfScore !== null && scope.row.selfScore !== undefined ? parseFloat(scope.row.selfScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="复评得分" align="center" prop="reviewScore">
+              <template #default="scope">
+                <span>{{ scope.row.reviewScore !== null && scope.row.reviewScore !== undefined ? parseFloat(scope.row.reviewScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="终评得分" align="center" prop="finalScore">
               <template #default="scope">
                 <el-input v-model="scope.row.finalScore"
@@ -662,6 +695,19 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="confirmForm.modifyReason">
+            <el-form-item label="修改理由" prop="modifyReason">
+              <el-input
+                  v-model="confirmForm.modifyReason"
+                  type="textarea"
+                  placeholder="请输入修改理由"
+                  maxlength="200"
+                  show-word-limit
+                  :rows="3"
+                  disabled
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-form-item label="反馈理由" v-if="showMaintenanceFeedback || showCompletionFactorFeedback" prop="feedbackReason">
@@ -682,8 +728,16 @@
                 <span>{{ scope.row.nickName }}<span v-if="scope.row.isLeader == 1"> (工作负责人)</span></span>
               </template>
             </el-table-column>
-            <el-table-column label="自评得分" align="center" prop="selfScore" />
-            <el-table-column label="复评得分" align="center" prop="reviewScore" />
+            <el-table-column label="自评得分" align="center" prop="selfScore">
+              <template #default="scope">
+                <span>{{ scope.row.selfScore !== null && scope.row.selfScore !== undefined ? parseFloat(scope.row.selfScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="复评得分" align="center" prop="reviewScore">
+              <template #default="scope">
+                <span>{{ scope.row.reviewScore !== null && scope.row.reviewScore !== undefined ? parseFloat(scope.row.reviewScore).toFixed(2) : '' }}</span>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form-item>
       </el-form>
@@ -1065,9 +1119,9 @@ function calculateRepairScores() {
   selfEvaluationForm.value.scorePersonList.forEach(person => {
     if (person.isLeader == 1) {
       // 工作负责人额外加0.5分
-      person.selfScore = (baseScore + 0.5).toFixed(1);
+      person.selfScore = (baseScore + 0.5).toFixed(2);
     } else {
-      person.selfScore = baseScore.toFixed(1);
+      person.selfScore = baseScore.toFixed(2);
     }
   });
 }
@@ -1099,9 +1153,9 @@ function calculateMaintenanceScores() {
   selfEvaluationForm.value.scorePersonList.forEach(person => {
     if (person.isLeader == 1) {
       // 工作负责人额外加0.5分
-      person.selfScore = (baseScore + 0.5).toFixed(1);
+      person.selfScore = (baseScore + 0.5).toFixed(2);
     } else {
-      person.selfScore = baseScore.toFixed(1);
+      person.selfScore = baseScore.toFixed(2);
     }
   });
 }
@@ -1167,7 +1221,7 @@ function handleReview(row) {
       inspectionType: row.orderType === 2 ? data.inspectionType : null,
       itemCompletionFactor: row.orderType === 2 ? data.itemCompletionFactor : null,
       itemCompletionFactorSum: row.orderType === 2 ? data.itemCompletionFactorSum : null,
-      modifyReason: null,
+      modifyReason: data.modifyReason,
       reviewScoreNum: row.reviewScoreNum,
       scorePersonList: row.orderType === 1 ? (data.repairOrderPersonList || []) : (data.workOrderPersonList || [])
     };
@@ -1227,6 +1281,7 @@ function handleConfirm(row) {
       scorePersonList: row.orderType === 1 ? (data.repairOrderPersonList || []) : (data.workOrderPersonList || []),
       itemCompletionFactor: row.orderType === 2 ? data.itemCompletionFactor : null,
       itemCompletionFactorSum: row.orderType === 2 ? data.itemCompletionFactorSum : null,
+      modifyReason: data.modifyReason,
     };
     
     // 设置人员列表
@@ -1317,9 +1372,9 @@ function calculateRepairReviewScores() {
   reviewForm.value.scorePersonList.forEach(person => {
     if (person.isLeader == 1) {
       // 工作负责人额外加0.5分
-      person.reviewScore = (baseScore + 0.5).toFixed(1);
+      person.reviewScore = (baseScore + 0.5).toFixed(2);
     } else {
-      person.reviewScore = baseScore.toFixed(1);
+      person.reviewScore = baseScore.toFixed(2);
     }
   });
 }
@@ -1359,9 +1414,9 @@ function calculateMaintenanceReviewScores() {
   reviewForm.value.scorePersonList.forEach(person => {
     if (person.isLeader == 1) {
       // 工作负责人额外加0.5分
-      person.reviewScore = (baseScore + 0.5).toFixed(1);
+      person.reviewScore = (baseScore + 0.5).toFixed(2);
     } else {
-      person.reviewScore = baseScore.toFixed(1);
+      person.reviewScore = baseScore.toFixed(2);
     }
   });
 }
@@ -1535,7 +1590,7 @@ function closeFinalEvaluationDialog() {
 /** 计算终评得分 */
 function calculateFinalScore(reviewScore, finalCoefficient) {
   if (reviewScore && finalCoefficient) {
-    return (reviewScore * finalCoefficient).toFixed(2);
+    return (parseFloat(reviewScore) * parseFloat(finalCoefficient)).toFixed(2);
   }
   return 0;
 }