yusheng hai 1 ano
pai
achega
f499c48f4a

+ 6 - 5
src/views/inspectionProject/components/user-edit.vue

@@ -150,14 +150,15 @@
 
 
         <el-col :span="24">
         <el-col :span="24">
           <el-form-item label="工艺要求:" prop="inspectionStandard">
           <el-form-item label="工艺要求:" prop="inspectionStandard">
-            <el-input v-model="form.inspectionStandard">
-              <DictSelection
+            <DictSelection
                 style="width: 100px"
                 style="width: 100px"
-                slot="prepend"
+              
                 clearable
                 clearable
                 dictName="数学字符"
                 dictName="数学字符"
                 v-model="form.symbol"
                 v-model="form.symbol"
               ></DictSelection>
               ></DictSelection>
+            <el-input v-model="form.inspectionStandard" type="textarea" style="width:calc(100% - 100px)">
+        
             </el-input>
             </el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -184,9 +185,9 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="备注:" prop="inspectionRemark">
           <el-form-item label="备注:" prop="inspectionRemark">
-            <el-input placeholder="请输入" v-model="form.inspectionRemark" />
+            <el-input placeholder="请输入" v-model="form.inspectionRemark" type="textarea" style="height: 100px;" />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 

+ 2 - 0
src/views/inspectionProject/index.vue

@@ -61,6 +61,8 @@
               ? '时间'
               ? '时间'
               : row.textType == 6
               : row.textType == 6
               ? '范围'
               ? '范围'
+              : row.textType == 7
+              ? '文本'
               : ''
               : ''
           }}
           }}
         </template>
         </template>