Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/views/threeViolations/maintainTV/edit.vue

@@ -12,7 +12,7 @@
             <el-row :gutter="20">
                 <el-col :span="12">
                   <el-form-item label="履职分类"  ref="wglx" prop="wglx">
-                    <RelSelect  style="width: 100%;" src='/aqgl/swgl/swcgbz/init/wglx'  clearable :match="{value:'id',label:'name'}" v-model='form.wglx' ></RelSelect>
+                    <RelSelect  style="width: 100%;" src='/aqgl/swgl/swcfbz/init/wglx'  clearable :match="{value:'id',label:'name'}" v-model='form.wglx' ></RelSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/threeViolations/maintainTV/index.vue

@@ -78,11 +78,9 @@
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
-					{label: "序号", prop: "xh", fieldType: "int"},
+					// {label: "序号", prop: "xh", fieldType: "int"},
 					{label: "三违内容", prop: "content", fieldType: "ftString",width:300},
-					{label: "类型", prop: "wglx", fieldType: "ftString",width:100,transform:{
-          url:'/aqgl/swgl/swcgbz/init/wglx',label:'name',value:'id'
-        }},
+					{label: "类型", prop: "wglxName", fieldType: "ftString",width:100},
 					{label: "考核分数", prop: "khfs", fieldType: "int"},
 					{label: "罚款金额下限", prop: "fkjexx", fieldType: "float"},
 					{label: "罚款金额上限", prop: "fkjesx", fieldType: "float"},