Merge remote-tracking branch 'origin/master'

src/views/system/time/index.vue

@@ -29,8 +29,11 @@
 				<el-col :span="24">
 					<el-row>
 						<el-col :span="8">
-							<el-form-item label="户籍地" prop="villagerGroup">
-							  <el-cascader placeholder="点击选择户籍地" :options="options" filterable @change="chahetwo" :props="optionProps" style="width: 100%;"></el-cascader>
+							<el-form-item label="进度" prop="progress">
+							  <!-- <el-input v-model="queryParams.progress" placeholder="请输入进度" clearable size="small" @keyup.enter.native="handleQuery" /> -->
+							  <el-select v-model="queryParams.progress" placeholder="进度" clearable >
+							    <el-option v-for="dict in statusOptionstue" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+							  </el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -98,12 +101,10 @@
 											/> -->
 							      </el-form-item>
 						</el-col>
+						
 						<el-col :span="8">
-							<el-form-item label="进度" prop="progress">
-							  <!-- <el-input v-model="queryParams.progress" placeholder="请输入进度" clearable size="small" @keyup.enter.native="handleQuery" /> -->
-							  <el-select v-model="queryParams.progress" placeholder="进度" clearable >
-							    <el-option v-for="dict in statusOptionstue" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-							  </el-select>
+							<el-form-item label="户籍地" prop="villagerGroup">
+							  <el-cascader placeholder="点击选择户籍地" :options="options" filterable @change="chahetwo" :props="optionProps" style="width: 100%;"></el-cascader>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8" style="text-align: center;">
@@ -249,7 +250,10 @@
           <el-col :span="6">
             <el-form-item label="户别" prop="houseType">
               <!-- <el-select v-model="form.houseType" placeholder="请选择户别"><el-option label="请选择字典生成" value="" /></el-select> -->
-              <el-input v-model="form.houseType" placeholder="请输入内容" />
+              <!-- <el-input v-model="form.houseType" placeholder="请输入内容" /> -->
+			  <el-select v-model="form.houseType" placeholder="户别" clearable style="width: 100%;" >
+			    <el-option v-for="dict in typeOptionshuuj" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+			  </el-select>
             </el-form-item>
           </el-col>
 
@@ -539,6 +543,16 @@ export default {
           dictLabel: '未完成'
         }
       ],
+	  typeOptionshuuj:[
+		  {
+		    dictValue: '农业',
+		    dictLabel: '农业'
+		  },
+		  {
+		    dictValue: '非农业',
+		    dictLabel: '非农业'
+		  }
+	  ],
       deptOptionstwo: [],
       options: [],
       optionProps: {