|  | @@ -66,7 +66,7 @@
 | 
											
												
													
														|  |            v-hasPermi="['${moduleName}:${businessName}:add']"
 |  |            v-hasPermi="['${moduleName}:${businessName}:add']"
 | 
											
												
													
														|  |          >新增</el-button>
 |  |          >新增</el-button>
 | 
											
												
													
														|  |        </el-col>
 |  |        </el-col>
 | 
											
												
													
														|  | -	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 | 
											
												
													
														|  |      </el-row>
 |  |      </el-row>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      <el-table
 |  |      <el-table
 | 
											
										
											
												
													
														|  | @@ -140,7 +140,7 @@
 | 
											
												
													
														|  |            <el-input v-model="form.${field}" placeholder="请输入${comment}" />
 |  |            <el-input v-model="form.${field}" placeholder="请输入${comment}" />
 | 
											
												
													
														|  |          </el-form-item>
 |  |          </el-form-item>
 | 
											
												
													
														|  |  #elseif($column.htmlType == "select" && "" != $dictType)
 |  |  #elseif($column.htmlType == "select" && "" != $dictType)
 | 
											
												
													
														|  | -        <el-form-item label="${comment}">
 |  | 
 | 
											
												
													
														|  | 
 |  | +        <el-form-item label="${comment}" prop="${field}">
 | 
											
												
													
														|  |            <el-select v-model="form.${field}" placeholder="请选择${comment}">
 |  |            <el-select v-model="form.${field}" placeholder="请选择${comment}">
 | 
											
												
													
														|  |              <el-option
 |  |              <el-option
 | 
											
												
													
														|  |                v-for="dict in ${field}Options"
 |  |                v-for="dict in ${field}Options"
 | 
											
										
											
												
													
														|  | @@ -152,7 +152,7 @@
 | 
											
												
													
														|  |            </el-select>
 |  |            </el-select>
 | 
											
												
													
														|  |          </el-form-item>
 |  |          </el-form-item>
 | 
											
												
													
														|  |  #elseif($column.htmlType == "select" && $dictType)
 |  |  #elseif($column.htmlType == "select" && $dictType)
 | 
											
												
													
														|  | -        <el-form-item label="${comment}">
 |  | 
 | 
											
												
													
														|  | 
 |  | +        <el-form-item label="${comment}" prop="${field}">
 | 
											
												
													
														|  |            <el-select v-model="form.${field}" placeholder="请选择${comment}">
 |  |            <el-select v-model="form.${field}" placeholder="请选择${comment}">
 | 
											
												
													
														|  |              <el-option label="请选择字典生成" value="" />
 |  |              <el-option label="请选择字典生成" value="" />
 | 
											
												
													
														|  |            </el-select>
 |  |            </el-select>
 | 
											
										
											
												
													
														|  | @@ -272,9 +272,8 @@ export default {
 | 
											
												
													
														|  |  #else
 |  |  #else
 | 
											
												
													
														|  |  #set($comment=$column.columnComment)
 |  |  #set($comment=$column.columnComment)
 | 
											
												
													
														|  |  #end
 |  |  #end
 | 
											
												
													
														|  | -#set($comment=$column.columnComment)
 |  | 
 | 
											
												
													
														|  |          $column.javaField: [
 |  |          $column.javaField: [
 | 
											
												
													
														|  | -          { required: true, message: "$comment不能为空", trigger: "blur" }
 |  | 
 | 
											
												
													
														|  | 
 |  | +          { required: true, message: "$comment不能为空", trigger: "#if($column.htmlType == "select")"change"#else"blur"#end" }
 | 
											
												
													
														|  |          ]#if($velocityCount != $columns.size()),#end
 |  |          ]#if($velocityCount != $columns.size()),#end
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  #end
 |  |  #end
 |