2.2测试bug

src/views/threeViolations/maintainTV/edit.vue

@@ -11,6 +11,17 @@
             </el-row>-->
 
             <el-row :gutter="20">
+              <!-- 公司，班组-->
+               <el-col :span="12">
+                              <el-form-item label="公司"  ref="gsid" prop="gsid">
+                                    <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
+                              </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                             <el-form-item label="班组"  ref="bmid" prop="bmid">
+                                <RelSelect  linkage :linkParams="{pid:form.gsid}"  :readonly="readonly" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
+                             </el-form-item>
+                         </el-col>
                 <el-col :span="12">
                   <el-form-item label="三违等级"  ref="swdj" prop="swdj">
                     <RelSelect  style="width: 100%;" src='/aqgl/swgl/swcfbz/init/swdj'  clearable :match="{value:'id',label:'name'}" v-model='form.swdj' ></RelSelect>
@@ -67,6 +78,8 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                  gsid:'',
+                  bmid:'',
                         //ID
                         id:'',
                         //序号

src/views/threeViolations/maintainTV/index.vue

@@ -4,6 +4,20 @@
 		<!-- 查询条件-->
 		<div class="search" v-condition>
 			<SearchButton :app='app'></SearchButton>
+      <el-row :gutter="20" class="search-row-1">
+      	<el-col :span="6" class="search-col">
+      		<div class="search-item">
+      			<span class="search-span">公司:</span>
+      			 <RelSelect  style="width: 100%;"  src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+      		</div>
+      	</el-col>
+        <el-col :span="6" class="search-col">
+        	<div class="search-item">
+        		<span class="search-span">班组:</span>
+        		<RelSelect  linkage :linkParams="{pid:queryParams.gsid}"  style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
+        	</div>
+        </el-col>
+      </el-row>
 		</div>
 		<!-- 按钮操作-->
 		<el-row class="tool-bar">
@@ -66,6 +80,8 @@
 				/* 查询参数*/
 				queryParams: {
 					wgnr: '',
+          gsid:'',
+          bmid:''
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [

src/views/train/paperManagement/index.vue

@@ -93,7 +93,7 @@
           url:'aqgl/pxgl/pxxm/query',label:'name',value:'id'
         }},
 				{label: "总分", prop: "score", fieldType: "float",width:192},
-        {label: "总分", prop: "hgfs", fieldType: "float",width:192},
+        {label: "合格分数", prop: "hgfs", fieldType: "float",width:192},
 				{label: "单选题量", prop: "scount", fieldType: "int",width:192},
 				{label: "单选题分值", prop: "sscore", fieldType: "float",width:192},
 				{label: "多选题量", prop: "mcount", fieldType: "int",width:192},