结单方式显示

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -575,6 +575,10 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         order.setSuspendExplain(gxtWorkOrder.getSuspendExplain());
         order.setUpdateTime(DateUtils.getNowDate());
         order.setUpdateBy(SecurityUtils.getUsername());
+        if (null == order.getTeamLeaderName() && StringUtils.isEmpty(order.getTeamLeaderName())) {
+            order.setTeamLeaderId(SecurityUtils.getUserId());
+            order.setTeamLeaderName(SecurityUtils.getLoginUser().getUser().getNickName());
+        }
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
 
@@ -765,6 +769,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
             order.setWorkPermitNum(gxtWorkOrder.getWorkPermitNum());
             order.setMisNo(gxtWorkOrder.getMisNo());
             order.setInfoEntry(gxtWorkOrder.getInfoEntry());
+            order.setFinalizeMethod(gxtWorkOrder.getFinalizeMethod());
 //            if (null != gxtWorkOrder.getTeamLeaderName() && order.getTeamLeaderName() != gxtWorkOrder.getTeamLeaderName()) {
 //                order.setTeamLeaderName(gxtWorkOrder.getTeamLeaderName());
 //            }

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

@@ -89,6 +89,12 @@
                 <el-col :span="24">
                   <el-form-item label="损失电量（kWh）">{{ formData.lostPower || '-' }}</el-form-item>
                 </el-col>
+                <el-col :span="24">
+                  <el-form-item label="结单方式">
+                    <dict-tag :options="finalizeMethodOptions" :value="formData.finalizeMethod" />
+                  </el-form-item>
+                </el-col>
+
               </el-row>
             </el-form>
           </div>
@@ -176,6 +182,10 @@ const props = defineProps({
   inspectionTypeOptions: {
     type: Array,
     default: () => ([])
+  },
+  finalizeMethodOptions: {
+    type: Array,
+    default: () => ([])
   }
 })
 

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

@@ -839,8 +839,8 @@ const handleSubmit = async () => {
     if (valid) {
       const { realStartTime, acceptTime } = formData.value;
       debugger
-      if (realStartTime && acceptTime && (new Date(realStartTime) < new Date(acceptTime))) {
-        formData.value.orderEntryType = '2'
+      // if (realStartTime && acceptTime && (new Date(realStartTime) < new Date(acceptTime))) {
+      //   formData.value.orderEntryType = '2'
         // try {
         //   debugger
         //   await ElMessageBox.confirm(
@@ -860,7 +860,7 @@ const handleSubmit = async () => {
         //   finalizeFormRef.value?.validateField('realStartTime');
         //   return;
         // }
-      }
+      // }
 
       try {
         debugger
@@ -892,7 +892,7 @@ const handleSubmit = async () => {
             flowList.value.push(resumeInfo.value)
           }
           formData.value.repairOrderFlowList = flowList.value
-
+          formData.value.finalizeMethod = '2'
           await props.onSubmit(formData.value)
         } else {
           throw new Error("未提供提交方法")

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

@@ -123,6 +123,11 @@
                 <el-col :span="24">
                   <el-form-item label="损失电量（kWh）">{{ formData.lostPower || '-' }}</el-form-item>
                 </el-col>
+                <el-col :span="24">
+                  <el-form-item label="结单方式">
+                    <dict-tag :options="finalizeMethodOptions" :value="formData.finalizeMethod" />
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </div>
@@ -238,6 +243,10 @@ const props = defineProps({
     type: Array,
     default: () => ([])
   },
+  finalizeMethodOptions: {
+    type: Array,
+    default: () => ([])
+  }
 })
 
 // 定义事件

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

@@ -1092,6 +1092,7 @@
         :work-order-status-options="gxt_work_order_status"
         :repair-order-flow-action-type-options="gxt_repair_order_flow_action_type"
         :inspection-type-options="gxt_inspection_type"
+        :finalize-method-options="gxt_finalize_method"
     />
 
     <!-- 作废工单对话框 -->
@@ -1501,14 +1502,16 @@ const {
   gxt_pause_reasons,
   gxt_repair_order_flow_action_type,
   gxt_order_suspend_reason,
-  gxt_info_entry
+  gxt_info_entry,
+  gxt_finalize_method
 } = proxy.useDict(
     "gxt_work_order_status",
     "gxt_inspection_type",
     "gxt_pause_reasons",
     "gxt_repair_order_flow_action_type",
     "gxt_order_suspend_reason",
-    "gxt_info_entry"
+    "gxt_info_entry",
+    "gxt_finalize_method"
 )
 const orderList = ref([])
 const open = ref(false)

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

@@ -1112,6 +1112,7 @@
         :work-area-options="gxt_work_area"
         :return-type-options="gxt_return_type"
         :accept-return-type-options="gxt_accept_return_type"
+        :finalize-method-options="gxt_finalize_method"
     />
 
     <!-- 审批对话框组件 -->
@@ -1224,9 +1225,9 @@ import ViewDialog from '@/components/repairOrder/view.vue'
 import ApproveDialog from '@/components/repairOrder/approve.vue'
 const { proxy } = getCurrentInstance()
 const { gxt_maintenance_type, gxt_work_order_status, gxt_order_priority_type,gxt_repair_order_flow_action_type,
-  gxt_order_suspend_reason,gxt_repair_method,gxt_reset_method,gxt_return_type,gxt_info_entry,gxt_work_area, gxt_accept_return_type }
+  gxt_order_suspend_reason,gxt_repair_method,gxt_reset_method,gxt_return_type,gxt_info_entry,gxt_work_area, gxt_accept_return_type,gxt_finalize_method }
     = proxy.useDict("gxt_maintenance_type", "gxt_work_order_status", "gxt_order_priority_type","gxt_repair_order_flow_action_type",
-    "gxt_order_suspend_reason","gxt_repair_method","gxt_reset_method","gxt_return_type","gxt_info_entry","gxt_work_area","gxt_accept_return_type")
+    "gxt_order_suspend_reason","gxt_repair_method","gxt_reset_method","gxt_return_type","gxt_info_entry","gxt_work_area","gxt_accept_return_type","gxt_finalize_method")
 
 // 数据列表相关
 const repairOrderList = ref([])