员工持证增加公司

src/views/daily/holdCertificate/edit.vue

@@ -3,17 +3,22 @@
         <!-- 填写表单内容，slot=form必写-->
         <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
             <el-row :gutter="20">
-                <el-col :span="12">
+                <el-col :span="8">
                     <el-form-item label="职工"  ref="userid" prop="userid">
                      <!--   <el-input :readonly="readonly"  v-model="form.userid" ></el-input> -->
                      <personSelector :label="form.username||form.userid||'暂无'" @selected='userSelected' ></personSelector>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                     <el-form-item label="证书编号"  ref="code" prop="code">
                         <el-input :readonly="readonly"  v-model="form.code" ></el-input>
                     </el-form-item>
                 </el-col>
+              <el-col :span="8">
+                <el-form-item label="所属公司"  ref="gsid" prop="gsid">
+                  <RelSelect style="width: 100%;"  :readonly="readonly" src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="24">
@@ -34,12 +39,12 @@
                    <el-form-item label="作业类别"  ref="flid" prop="flid">
                       <RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/ygczxx/init/zsfl'  clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
                    </el-form-item>
-               </el-col> 
+               </el-col>
                 <el-col :span="12">
                    <el-form-item label="适用范围"  ref="syfw" prop="syfw">
                       <RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/ygczxx/init/syfw'  clearable :match="{value:'id',label:'name'}" v-model='form.syfw' ></RelSelect>
                    </el-form-item>
-               </el-col>             
+               </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="9">
@@ -77,7 +82,7 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                 
+
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="12">
@@ -120,6 +125,7 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                        gsid:'',
                         userName:'',
                         //ID
                         id:'',
@@ -169,6 +175,7 @@
                 },
                 /* form提交时的规则,具体规则参考官网*/
                 rules: {
+                    gsid: [{required: true,trigger: 'blur'}, ],
                     userid: [{required: true,trigger: 'blur'}, ],
                     fzdw: [{required: true,trigger: 'blur'},],
                     fzrq: [{required: true,trigger: 'blur'}, ],

src/views/daily/holdCertificate/index.vue

@@ -4,7 +4,13 @@
 		<!-- 查询条件-->
 		<div class="search" v-condition>
 			<SearchButton :app='app'></SearchButton>
-			<el-row :gutter="24" class="search-row-1">
+			<el-row :gutter="30" 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'  filterable clearable :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>
@@ -91,6 +97,7 @@ import {
 				baseUrl: '/aqgl/rcgl/ygczxx',
 				/* 查询参数*/
 				queryParams: {
+          gsid:'',
 					code:'',
           user:'',
           syfw:'',
@@ -99,6 +106,7 @@ import {
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
+					{label: "公司", prop: "gsName", fieldType: "ftString",width:100},
 					{label: "状态", prop: "ztName", fieldType: "ftString",width:60},
 					{label: "职工工号", prop: "usercode", fieldType: "ftString",width:140},
 					{label: "职工姓名", prop: "username", fieldType: "ftString",width:160},