Procházet zdrojové kódy

fix:判空条件添加,并且添加检验必填

ly před 11 měsíci
rodič
revize
4687a0dff6

+ 13 - 5
src/views/business/production/onWorkDetail/onWorkDetailDialog.vue

@@ -2,14 +2,14 @@
   <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :close-on-click-modal = "false"
               v-model="outerVisible" title="任务进度" width="765" height="800">
     <div v-if="!falg">
-      <el-form v-if="recordStatu === 1 &&handlerId === useUserStore().user.userId" :model="sumbitForm" label-width="auto" ref="workDetailForm" style="max-width: 700px;">
-        <el-form-item label="记录日期">
+      <el-form v-if="recordStatu === 1 &&handlerId === useUserStore().user.userId" :rules="rules" :model="sumbitForm" label-width="auto" ref="workDetailForm" style="max-width: 700px;">
+        <el-form-item label="记录日期" prop="recordDate">
           <el-date-picker v-model="sumbitForm.recordDate" type="date" clearable
                           format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                           style="width: 100%;">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="进度描述">
+        <el-form-item label="进度描述"  prop="recordDetail">
           <el-input class="no-scrollbar" type="textarea" v-model="sumbitForm.recordDetail" />
         </el-form-item>
         <div style="display: flex;
@@ -75,7 +75,7 @@ import {ElButton, ElTable} from "element-plus";
 import {ref} from "@vue/reactivity";
 import modal from "@/plugins/modal"
 import useUserStore from "@/store/modules/user";
-import {defineProps, getCurrentInstance, reactive, toRefs} from "vue";
+import {computed, defineProps, getCurrentInstance, reactive, toRefs} from "vue";
 import {
   getDetail,
   updateDetail,
@@ -107,6 +107,14 @@ const form = reactive({
   workOrderId: null,
   inputHidden:0,
 });
+const rules = computed(() => ({
+  recordDate: [
+    {type:'date', required: true, message: "记录日期不能为空"},
+  ],
+  recordDetail: [
+    { required: true, message: "进度描述不能为空"},
+  ],
+}));
 type TFrom = typeof form;
 const sumbitForm = reactive<TFrom>(form);
 const workDetailForm = ref();
@@ -203,7 +211,7 @@ const formclear = () => {
 const onSubmit = () =>{
   fullscreenLoading.value = true;
   sumbitForm.workOrderId = workOrderId;
-  if(sumbitForm.recordDetail != null && sumbitForm.recordDetail !== ''){
+  if(sumbitForm.recordDate != null && sumbitForm.recordDetail != null && sumbitForm.recordDetail !== ''){
     addDetail(sumbitForm).then((response) => {
       sumbitForm.recordDetail = null;
       sumbitForm.recordDate = null;

+ 7 - 2
src/views/business/production/onceWork/resultDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog class="resultDiv" @mouseenter="handleEnter" @paste="(e)=>handlePase(e)" v-loading.fullscreen.lock="fullscreenLoading" :close-on-click-modal = "false"
              v-model="outerVisible" title="任务结果" width="600">
-    <el-form :model="sumbitForm" label-width="auto" ref="workDetailForm" style="max-width: 600px">
+    <el-form :model="sumbitForm" label-width="auto" :rules="rules" ref="workDetailForm" style="max-width: 600px">
       <div v-if="falg">
         <el-form-item>
           任务结果:{{sumbitForm.resultStatus === 2?'暂停办理':sumbitForm.resultStatus === 0?'终止任务':'完成任务'}}
@@ -99,7 +99,7 @@
 import {ElButton} from "element-plus";
 import {ref} from "@vue/reactivity";
 import { uploadFile } from "@/api/tool/file";
-import {defineProps, getCurrentInstance, reactive, toRefs} from "vue";
+import {computed, defineProps, getCurrentInstance, reactive, toRefs} from "vue";
 import useUserStore from "@/store/modules/user";
 import {
   updateRecordStatus,
@@ -143,6 +143,11 @@ interface Ifile{
   originalFileName?:string;
   fileUrl?:string;
 }
+const rules = computed(() => ({
+  resultStatus: [
+    { required: true, message: "任务结果不能为空"},
+  ],
+}));
 const data = reactive({
   selectStatus: [
     {