新增试验分类修改

src/views/tentative/collect/test.vue

@@ -82,40 +82,40 @@
 
         <!-- 新增/编辑 -->
         <hc-new-dialog
-            v-model="addFormShow" :loading="addFormLoading" title="新增分类" widths="30rem"
+            v-model="addFormShow" :loading="addFormLoading" title="新增分类" widths="35rem"
             @close="addModalClose" @save="addModalSave"
         >
             <el-form
                 ref="addFormRef" :model="addFormModal" :rules="addFormRules" label-position="left"
                 label-width="auto" size="large"
             >
-                <el-form-item class="mb-0" label="合同段:" prop="contractId">
-                    <el-select v-model="addFormModal.contractId" placeholder="请选择">
+                <el-form-item class="mb-1" label="合同段:" prop="contractId">
+                    <el-select v-model="addFormModal.contractId" placeholder="请选择" clearable>
                         <el-option
                             v-for="item in contractOptions" :key="item.id" :label="item.contractName"
                             :value="item.id"
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item class="mb-0 mt-4" label="汇总类别:" prop="classId">
-                    <el-select v-model="addFormModal.classId" placeholder="请选择">
+                <el-form-item class="mb-1 mt-4" label="汇总类别:" prop="classId">
+                    <el-select v-model="addFormModal.classId" placeholder="请选择" clearable>
                         <el-option v-for="item in testOpt" :key="item.id" :label="item.className" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item class="mb-0 mt-4" label="报告时间:">
+                <el-form-item class="mb-1 mt-4" label="报告时间:">
                     <HcDatePicker :dates="addbetweenTime" clearable @change="addbetweenTimeUpdate" />
                 </el-form-item>
+                <el-form-item class="mb-1 mt-4" label="单位类型:" prop="unitType">
+                    <el-select v-model="addFormModal.unitType" placeholder="请选择" clearable>
+                        <el-option v-for="item in unitOpt" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="mb-5 mt-4" label="检测类型:" prop="detectionType">
+                    <el-select v-model="addFormModal.detectionType" placeholder="请选择" clearable>
+                        <el-option v-for="item in typeData" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
             </el-form>
-            <el-form-item class="mb-0 mt-4" label="单位类型:" prop="unitType	">
-                <el-select v-model="addFormModal.unitType	" placeholder="请选择">
-                    <el-option v-for="item in unitOpt" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </el-form-item>
-            <el-form-item class="mb-0 mt-4" label="检测类型:" prop="detectionType">
-                <el-select v-model="addFormModal.detectionType" placeholder="请选择">
-                    <el-option v-for="item in typeData" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-            </el-form-item>
         </hc-new-dialog>
 
         <!-- 查阅关联 -->
@@ -148,7 +148,7 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
-import { arrToId, getArrValue, getObjVal, isNullES, isString } from 'js-fast-way'
+import { arrToId, formValidate, getArrValue, getObjVal, isNullES, isString } from 'js-fast-way'
 import { HcDelMsg } from 'hc-vue3-ui'
 import { getDictionary } from '~api/other'
 import { toPdfPage } from '~uti/btn-auth'
@@ -391,14 +391,43 @@ const addClick = () => {
 const addModalClose = () => {
     addFormShow.value = false
     addFormModal.value = {}
+    addbetweenTime.value = []
+
 
 }
 
-const addFormRules = ref(null)
+
+
+
+const addFormRules = {
+    contractId: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择合同段',
+    },
+    classId: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择汇总类别',
+    },
+    unitType: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择单位类型',
+    },
+    detectionType: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择检测类型',
+    },
+}
 const addFormRef = ref(null)
 
 const addModalSave = async () => {
     console.log(addFormModal.value)
+      const res = await formValidate(addFormRef.value)
+      if (!res) return
+
     addFormLoading.value = true
     const { error, code, msg } = await save({
         ...addFormModal.value,