安全活动增加公司

src/views/safetyactivity/activityRecord/edit.vue

@@ -11,12 +11,20 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="组织单位"  ref="bmid" prop="bmid">
-                       <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryBz' :readonly="readonly"  :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
+                    <el-form-item label="公司"  ref="gsid" prop="gsid">
+                      <RelSelect :readonly="readonly" filterable style="width: 100%;"  src='/jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
                        <!-- <el-input :readonly="readonly"  v-model="form.bmid" ></el-input> -->
                     </el-form-item>
                 </el-col>
             </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="所属部门"  ref="bmid" prop="bmid">
+                <!-- <el-input :readonly="readonly"  v-model="form.name" ></el-input> -->
+                <RelSelect :readonly="readonly"  filterable linkage :linkParams="{pid:form.gsid}" style="width: 100%;"  src='jcsj/common/bm/queryBz' :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
+              </el-form-item>
+            </el-col>
+          </el-row>
             <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="活动内容"  ref="content" prop="content">
@@ -54,6 +62,7 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                  gsid:'',
                         //ID
                         id:'',
                         //活动日期

src/views/safetyactivity/activityRecord/index.vue

@@ -17,12 +17,18 @@
                 <el-date-picker value-format="timestamp" v-model="queryParams.jsrq"></el-date-picker>
               </div>
           </el-col>
-          <el-col :span="6" class="search-col">
-           <div class="search-item">
-              <span class="search-span">部门:</span>
-               <RelSelect  src='jcsj/common/bm/queryBz'  clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
-            </div>
-          </el-col>
+        <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>
+            <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>
 		<!-- 按钮操作-->
@@ -89,8 +95,9 @@
 				},
 			/* 表格标题对应参数*/
 			tableTitle: [
+        {label: "公司", prop: "gsName", fieldType: "ftString",width:160},
 				{label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"},
-				{label: "组织单位", prop: "bmName", fieldType: "ftString",width:160},
+				{label: "部门", prop: "bmName", fieldType: "ftString",width:160},
 				{label: "活动内容", prop: "content", fieldType: "ftString",width:300},
 				{label: "活动结论", prop: "hdjl", fieldType: "ftString",width:300},
 			  	{label: "备注", prop: "bz", fieldType: "ftString",width:300},