工单评分

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

@@ -116,11 +116,12 @@
       </el-table-column>
       <el-table-column label="风机编号" align="center" prop="pcsDeviceName" :show-overflow-tooltip="true" />
       <el-table-column label="场站" align="center" prop="pcsStationName" :show-overflow-tooltip="true" />
-      <el-table-column label="工作结束时间" align="center" prop="realEndTime" width="180">
+<!--      <el-table-column label="工作结束时间" align="center" prop="realEndTime" width="180">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ scope.row.realEndTime ? parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
+      <el-table-column label="工作结束时间" align="center" prop="realEndTime" width="180" />
       <el-table-column label="工作负责人" align="center" prop="teamLeaderName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -596,125 +597,6 @@
     <!-- 终评对话框 -->
     <el-dialog :title="finalEvaluationForm.orderType === 1 ? '维修工单终评' : '维保工单终评'" v-model="finalEvaluationDialogVisible" width="800px" append-to-body>
       <el-form ref="finalEvaluationRef" :model="finalEvaluationForm" :rules="finalEvaluationRules" label-width="120px" label-position="top">
-<!--
-        <template v-if="finalEvaluationForm.orderType === 2" >
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="工单编码">
-                <el-input v-model="finalEvaluationForm.workOrderProjectNo" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="风机编号">
-                <el-input v-model="finalEvaluationForm.pcsDeviceName" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="场站">
-                <el-input v-model="finalEvaluationForm.pcsStationName" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-form-item :label="finalEvaluationForm.orderType === 1 ? '维修总结' : '维保总结'">
-            <el-input
-                v-model="finalEvaluationForm.workSummary"
-                type="textarea"
-                disabled
-                :rows="4"
-            />
-          </el-form-item>
-
-          <el-row :gutter="20">
-            <el-col :span="12" v-if="finalEvaluationForm.orderType === 1">
-              <el-form-item label="检修类型">
-                <el-select v-model="finalEvaluationForm.maintenanceType" disabled style="width: 100%">
-                  <el-option
-                      v-for="item in maintenanceTypeOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="finalEvaluationForm.orderType === 2">
-              <el-form-item label="维保类型">
-                <el-select v-model="finalEvaluationForm.inspectionType" disabled style="width: 100%">
-                  <el-option
-                      v-for="item in inspectionTypeOptions"
-                      :key="item.inspectionTypeId"
-                      :label="getDictLabel(gxt_inspection_type, item.inspectionTypeId)"
-                      :value="item.inspectionTypeId.toString()">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="系数" prop="finalCoefficient">
-                <el-input-number
-                    v-model="finalEvaluationForm.finalCoefficient"
-                    :min="finalEvaluationForm.orderType === 1 ? 0.5 : 0.8"
-                    :max="finalEvaluationForm.orderType === 1 ? 1.5 : 1.2"
-                    :step="0.01"
-                    style="width: 100%"
-                    controls-position="right"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="外委人员数（人）">
-                <el-input v-model="finalEvaluationForm.wwryNum" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="外来人员数（人）">
-                <el-input v-model="finalEvaluationForm.wlryNum" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          &lt;!&ndash; 维保工单保持原有样式 &ndash;&gt;
-          <el-form-item label="得分明细">
-            <el-table :data="finalEvaluationForm.scorePersonList" border style="width: 100%;">
-              <el-table-column label="检修员" align="center" prop="nickName"  style="width: 50%;">
-                <template #default="scope">
-                  <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">
-                <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"
-                            :value="calculateFinalScore(scope.row.reviewScore, finalEvaluationForm.finalCoefficient)"
-                            readonly
-                            style="width: 100%;"
-                  />
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form-item>
-        </template>
--->
-
-<!--        <el-form-item v-if="finalEvaluationForm.orderType === 1 && finalEvaluationForm.feedbackReason" label="反馈理由" prop="feedbackReason">
-          <el-input
-              v-model="finalEvaluationForm.feedbackReason"
-              type="textarea"
-              :rows="3"
-              disabled
-          />
-        </el-form-item>-->
         <!-- 工单终评界面添加标签页 -->
         <el-tabs v-model="activeFinalEvalTab">
           <el-tab-pane label="终评信息" name="evaluation">
@@ -823,6 +705,10 @@
                 </el-table-column>
               </el-table>
             </el-form-item>
+            <div class="dialog-footer" style="text-align: right;">
+              <el-button @click="closeFinalEvaluationDialog">取 消</el-button>
+              <el-button type="primary" @click="submitFinalEvaluation">提交终评</el-button>
+            </div>
           </el-tab-pane>
           <el-tab-pane label="申诉信息" name="appeal">
             <el-form-item label="申诉理由">
@@ -849,13 +735,11 @@
         </el-tabs>
 
       </el-form>
-      
-      <template #footer>
+
+<!--      <template #footer>
         <div class="dialog-footer">
-          <el-button @click="closeFinalEvaluationDialog">取 消</el-button>
-          <el-button type="primary" @click="submitFinalEvaluation">提交终评</el-button>
         </div>
-      </template>
+      </template>-->
     </el-dialog>
 
     <!-- 确认对话框 -->
@@ -2092,12 +1976,11 @@ function handleAppeal() {
       workOrderProjectNo: selectedOrder.workOrderProjectNo,
       pcsDeviceName: selectedOrder.pcsDeviceName,
       pcsStationName: selectedOrder.pcsStationName,
-      occurTime: selectedOrder.orderType === 1 ? 
+     /* occurTime: selectedOrder.orderType === 1 ?
         proxy.parseTime(selectedOrder.occurTime, '{y}-{m}-{d} {h}:{i}') : 
-        undefined,
-      createTime: selectedOrder.orderType === 2 ? 
-        proxy.parseTime(selectedOrder.createTime, '{y}-{m}-{d} {h}:{i}') : 
-        undefined,
+        undefined,*/
+      occurTime: selectedOrder.orderType === 1 ? selectedOrder.occurTime : undefined,
+      createTime: selectedOrder.createTime,
       originalScore: getReviewerScore(data),
       appealReason: '',
       wwryNum: data.wwryNum,