优化

ygtx-ui/src/components/gxtOrder/view.vue

@@ -68,7 +68,7 @@
                 <el-col :span="24" v-if="formData.infoEntry == '1'">
                   <el-form-item label="MIS工单编码">{{ formData.misNo || '-' }}</el-form-item>
                 </el-col>
-                <el-col :span="24" v-if="formData.infoEntry == '2'">
+                <el-col :span="24">
                   <el-form-item label="工作票编号">{{ formData.workPermitNum|| '-' }}</el-form-item>
                 </el-col>
                 <el-col :span="24">

ygtx-ui/src/components/repairOrder/finalize.vue

@@ -566,7 +566,6 @@ watch(() => props.data, (newData) => {
     // 只有在对话框打开时才更新数据
     formData.value = { ...newData, selectedMembers: [] }
     flowList.value = formData.value.repairOrderFlowList || []
-    debugger
     if (formData.value.suspendReason && flowList.value.length > 0) {
       // 获取最后一个 actionType 等于 'resume' 的项
       const lastResumeItem = flowList.value.findLast(item => item.actionType === 'resume')

ygtx-ui/src/components/repairOrder/view.vue

@@ -100,8 +100,8 @@
                   <el-col :span="24" v-if="formData.infoEntry == 1">
                     <el-form-item label="MIS工单编码">{{ formData.misOrderNo || '-' }}</el-form-item>
                   </el-col>
-                  <el-col :span="24" v-if="formData.infoEntry == 2">
-                    <el-form-item label="工票编号">{{ formData.workPermitNum || '-' }}</el-form-item>
+                  <el-col :span="24">
+                    <el-form-item label="工票编编号">{{ formData.workPermitNum || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="开始时间">{{ parseTime(formData.realStartTime, '{y}-{m}-{d} {h}:{i}') || '-' }}</el-form-item>

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

@@ -174,13 +174,13 @@
                 @click="handleRepairSuspend(scope.row)"
                 v-hasPermi="['gxt:repairOrder:suspend']"
             ><i class="fa fa-stop"></i>挂起</el-button>
-<!--            <el-button-->
-<!--                v-if="(scope.row.workOrderStatus === 'to_finish') && (scope.row.teamLeaderId == userStore.id || userStore.roles.includes('admin'))"-->
-<!--                type="warning"-->
-<!--                link-->
-<!--                @click="handleReturn(scope.row)"-->
-<!--                v-hasPermi="['gxt:repairOrder:return']"-->
-<!--            ><i class="fa fa-sign-in"></i>退回</el-button> &lt;!&ndash;结单退回，负责人退回至班长 &ndash;&gt;-->
+            <el-button
+                v-if="(scope.row.workOrderStatus === 'to_finish') && (scope.row.teamLeaderId == userStore.id || userStore.roles.includes('admin'))"
+                type="warning"
+                link
+                @click="handleReturn(scope.row)"
+                v-hasPermi="['gxt:repairOrder:return']"
+            ><i class="fa fa-sign-in"></i>退回</el-button> <!--结单退回，负责人退回至班长 -->
             <el-button
                 v-if="scope.row.workOrderStatus === 'return'|| scope.row.workOrderStatus === 'assigned'"
                 type="warning"
@@ -1267,7 +1267,8 @@
         v-model="returnDialogVisible"
         :data="returnForm"
         :work-order-status-options="gxt_work_order_status"
-        :return-type-options="returnForm.workOrderStatus == 'to_finish' ? gxt_return_type : gxt_accept_return_type"
+        :return-type-options="gxt_return_type"
+        :accept-return-type-options="gxt_accept_return_type"
         :on-submit="submitReturnFromParent"
         @success="handleReturnSuccess"
     />
@@ -2728,12 +2729,13 @@ async function submitFinalizeFromParent(data) {
 function handleReturn(row) {
   getRepairOrder(row.id).then(response => {
     returnForm.value = response.data
-    // if (row.workOrderStatus != 'return') {
-      returnForm.value.returnType = undefined
+    if (row.workOrderStatus == 'to_finish') {
+      returnForm.value.returnType = '1'
       returnForm.value.returnReason = undefined
+    } else {
       returnForm.value.acceptReturnType = undefined
       returnForm.value.acceptReturnReason = undefined
-    // }
+    }
     returnDialogVisible.value = true
   })
 }