APP维修结单

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/mobile/GxtMobileOrderController.java

@@ -446,7 +446,7 @@ public class GxtMobileOrderController extends BaseController
      * 结单工单
      */
     @Log(title = "结单", businessType = BusinessType.UPDATE)
-    @ApiOperation("结单工单")
+    @ApiOperation("维保结单工单")
     @PutMapping("/finish")
     public AjaxResult finishOrder(@RequestBody GxtWorkOrder gxtWorkOrder)
     {
@@ -454,4 +454,16 @@ public class GxtMobileOrderController extends BaseController
         result = gxtWorkOrderService.completeWorkOrder(gxtWorkOrder);
         return toAjax(result);
     }
+    /**
+     * 结单工单
+     */
+    @Log(title = "结单", businessType = BusinessType.UPDATE)
+    @ApiOperation("维修结单工单")
+    @PutMapping("/repairFinish")
+    public AjaxResult repairFinishOrder(@RequestBody GxtRepairOrder gxtRepairOrder)
+    {
+        int result = 0;
+        result = gxtRepairOrderService.finalizeGxtRepairOrder(gxtRepairOrder);
+        return toAjax(result);
+    }
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/task/OrderAutoFinalizeTask.java

@@ -163,6 +163,7 @@ public class OrderAutoFinalizeTask {
                     updateRepairOrder.setInfoEntry("1");
                     updateRepairOrder.setFinalizeMethod("1");
                     updateRepairOrder.setScoringStatus("to_self");
+                    updateRepairOrder.setRepairMethod("1");
 
                     gxtRepairOrderMapper.updateGxtRepairOrder(updateRepairOrder);
                     

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

@@ -43,27 +43,25 @@
             <el-input v-model="formData.brand" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="故障代码">
-            <el-input v-model="formData.faultCode" disabled />
+        <el-col :span="12" v-if="formData.teamLeaderName">
+          <el-form-item label="工作负责人">
+            <el-input v-model="formData.teamLeaderName" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="故障信息">
-            <el-input
-              v-model="formData.faultBarcode"
-              type="textarea"
-              placeholder="请输入故障信息"
-              maxlength="100"
-              show-word-limit
-              :rows="3"
-              disabled
-            />
-          </el-form-item>
+        <el-col :span="12">
+          <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="工作负责人">
-            <el-input v-model="formData.teamLeaderName" disabled />
+          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="formData.faultDesc">
+          <el-form-item label="故障描述">
+            <el-input
+                v-model="formData.faultDesc"
+                type="textarea"
+                :rows="3"
+                disabled
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">

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

@@ -38,14 +38,14 @@
         <el-col :span="12">
           <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /> </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /> </el-form-item>
+        </el-col>
         <el-col :span="24">
-          <el-form-item label="故障信息">
+          <el-form-item label="故障描述">
             <el-input
-              v-model="formData.faultBarcode"
+              v-model="formData.faultDesc"
               type="textarea"
-              placeholder="请输入故障信息"
-              maxlength="100"
-              show-word-limit
               :rows="3"
               disabled
             />

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

@@ -38,6 +38,22 @@
             <el-input v-model="formData.occurTime" disabled />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="故障描述">
+            <el-input
+                v-model="formData.faultDesc"
+                type="textarea"
+                :rows="3"
+                disabled
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="复位方式" prop="resetMethod">
             <el-select

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

@@ -45,11 +45,27 @@
             <el-input v-model="formData.brand" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="formData.teamLeaderName">
           <el-form-item label="工作负责人">
             <el-input v-model="formData.teamLeaderName" disabled />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="formData.faultDesc">
+          <el-form-item label="故障描述">
+            <el-input
+                v-model="formData.faultDesc"
+                type="textarea"
+                :rows="3"
+                disabled
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="12" v-if="formData.workOrderStatus == 'to_finish'">
           <el-form-item label="退回原因" prop="returnType">
             <el-select

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

@@ -13,9 +13,20 @@
             <el-input v-model="formData.pcsDeviceName" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="formData.faultBarcode">
-          <el-form-item label="故障信息">
-            <el-input v-model="formData.faultBarcode" type="textarea" :rows="3" disabled />
+        <el-col :span="12">
+          <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="formData.faultDesc">
+          <el-form-item label="故障描述">
+            <el-input
+                v-model="formData.faultDesc"
+                type="textarea"
+                :rows="3"
+                disabled
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">

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

@@ -2933,7 +2933,6 @@ function onMisInfoSelected(row) {
     listGxtOrder({pageNum: 1, pageSize: 10, misNo: row.misNo }).then(response => {
       const  gxtOrders= response.rows
       debugger
-      const targetForm = isForFinishForm ? finishForm : form; // 确定赋值目标
       if (gxtOrders.length > 0) {
         if (form.value.id == null) {
           proxy.$modal.msgWarning('选择工单已存在！请重新选择！')

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

@@ -766,14 +766,14 @@
           <el-col :span="12">
             <el-form-item label="故障代码"><el-input v-model="acceptForm.faultCode" disabled /></el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="故障条纹"><el-input v-model="acceptForm.faultBarcode" disabled /></el-form-item>
+          </el-col>
           <el-col :span="24">
-            <el-form-item label="故障条纹">
+            <el-form-item label="故障描述">
               <el-input
-                  v-model="acceptForm.faultBarcode"
+                  v-model="acceptForm.faultDesc"
                   type="textarea"
-                  placeholder="请输入故障条纹"
-                  maxlength="100"
-                  show-word-limit
                   :rows="3"
                   disabled
               />