Z 1 год назад
Родитель
Сommit
7d3c4ed913
1 измененных файлов с 17 добавлено и 12 удалено
  1. 17 12
      src/views/inspectionProject/components/user-edit.vue

+ 17 - 12
src/views/inspectionProject/components/user-edit.vue

@@ -66,6 +66,7 @@
               <el-option label="规格" :value="'4'" />
               <el-option label="时间" :value="'5'" />
               <el-option label="范围" :value="'6'" />
+              <el-option label="文本" :value="'7'" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -76,7 +77,8 @@
             form.textType == 1 ||
             form.textType == 3 ||
             form.textType == 4 ||
-            form.textType == 5
+            form.textType == 5 ||
+            form.textType == 7
           "
         >
           <el-form-item label="默认值:">
@@ -121,7 +123,17 @@
         </el-col>
 
         <el-col :span="12" v-if="form.textType != 2 && form.textType != 5">
-          <el-form-item label="参数单位:" prop="unitName">
+          <el-form-item
+            label="参数单位:"
+            prop="unitName"
+            :rules="[
+              {
+                required: form.textType == 7 ? false : true,
+                message: '请选择参数单位',
+                trigger: 'change'
+              }
+            ]"
+          >
             <DictSelection
               dictName="工艺参数单位"
               clearable
@@ -133,9 +145,7 @@
         </el-col>
 
         <el-col :span="12" v-if="form.textType == 5">
-          <el-form-item label="参数单位:" prop="">
-            h(小时)
-          </el-form-item>
+          <el-form-item label="参数单位:" prop=""> h(小时) </el-form-item>
         </el-col>
 
         <el-col :span="24">
@@ -182,10 +192,7 @@
 
         <el-col :span="12">
           <el-form-item label="附件:" prop="imgUrl">
-            <fileUpload
-              v-model="form.imgUrl"
-             type="add"
-            />
+            <fileUpload v-model="form.imgUrl" type="add" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -358,9 +365,7 @@
             { required: true, message: '请输入质检编码', trigger: 'blur' }
           ],
 
-          unitName: [
-            { required: true, message: '请选择参数单位', trigger: 'change' }
-          ],
+          // unitName:
           textType: [
             { required: true, message: '请选择参数类型', trigger: 'blur' }
           ],