挂起说明

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

@@ -18,7 +18,7 @@
             <el-input v-model="formData.content" type="textarea" :rows="3" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="挂起原因" prop="suspendReason">
             <el-select v-model="formData.suspendReason" placeholder="请选择挂起原因" style="width: 100%">
               <el-option
@@ -30,14 +30,14 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="挂起其他说明" prop="suspendExplain">
+        <el-col :span="24" v-if="formData.suspendReason == '4'">
+          <el-form-item label="说明" prop="suspendExplain">
             <el-input
               v-model="formData.suspendExplain"
               type="textarea"
               :rows="3"
-              placeholder="请输入挂起其他说明（选填）"
-              maxlength="1000"
+              placeholder="请输入说明"
+              maxlength="500"
               show-word-limit
             />
           </el-form-item>
@@ -92,6 +92,9 @@ const submitLoading = ref(false)
 const suspendRules = ref({
   suspendReason: [
     { required: true, message: "请选择挂起原因", trigger: "change" }
+  ],
+  suspendExplain: [
+    { required: true, message: "说明不能为空", trigger: "change" }
   ]
 })
 

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

@@ -18,7 +18,7 @@
             <el-input v-model="formData.faultBarcode" type="textarea" :rows="3" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="挂起原因" prop="suspendReason">
             <el-select v-model="formData.suspendReason" placeholder="请选择挂起原因" style="width: 100%">
               <el-option
@@ -30,15 +30,15 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="挂起其他说明" prop="suspendExplain">
+        <el-col :span="24" v-if="formData.suspendReason == '4'">
+          <el-form-item label="说明" prop="suspendExplain">
             <el-input
-              v-model="formData.suspendExplain"
-              type="textarea"
-              :rows="3"
-              placeholder="请输入挂起其他说明（选填）"
-              maxlength="1000"
-              show-word-limit
+                v-model="formData.suspendExplain"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入说明"
+                maxlength="500"
+                show-word-limit
             />
           </el-form-item>
         </el-col>
@@ -92,6 +92,9 @@ const submitLoading = ref(false)
 const suspendRules = ref({
   suspendReason: [
     { required: true, message: "请选择挂起原因", trigger: "change" }
+  ],
+  suspendExplain: [
+    { required: true, message: "说明不能为空", trigger: "change" }
   ]
 })
 

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

@@ -1416,7 +1416,7 @@ import {listMisInfo, listWorkPerson} from "@/api/gxt/misInfo.js";
 import {ElMessageBox} from "element-plus";
 import EquipmentSelectSingle from "@/components/equipmentSelect/single.vue";
 import useUserStore from '@/store/modules/user'
-import SuspendDialog from "@/components/repairOrder/suspend.vue";
+import SuspendDialog from "@/components/gxtOrder/suspend.vue";
 import ViewDialog from "@/components/gxtOrder/view.vue";
 
 // 工作负责人快速检索相关响应式数据

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

@@ -1393,7 +1393,7 @@
     />
 
     <!-- 维保挂起对话框 -->
-    <SuspendDialog
+    <SuspendWorkDialog
         v-model="suspendDialogVisible"
         :data="suspendForm"
         :suspend-reason-options="gxt_order_suspend_reason"
@@ -1441,6 +1441,7 @@ import FinalizeDialog from "@/components/repairOrder/finalize.vue";
 import ReturnDialog from "@/components/repairOrder/return.vue";
 import FinishDialog from "@/components/gxtOrder/finalize.vue";
 import SuspendDialog from "@/components/repairOrder/suspend.vue";
+import SuspendWorkDialog from "@/components/gxtOrder/suspend.vue";
 import ViewDialog from "@/components/repairOrder/view.vue";
 import ViewWorkOrderDialog from "@/components/gxtOrder/view.vue";
 
@@ -2852,6 +2853,7 @@ function handleRepairSuspend(row) {
   suspendForm.value = row
   suspendForm.value.suspendReason = undefined
   suspendRepairDialogVisible.value = true
+  proxy.resetForm("suspendFormRef")
 }
 
 // 用于传递给退回组件的提交方法