风险点维护增加查询 公司维护

src/views/dangerManagement/dangerReviewRecord/fcjg.vue

@@ -13,6 +13,13 @@
                     </el-option>
                   </el-select>
               </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="fcjg=='N'">
+              <el-form-item label="整改完成日期"  ref="yqzgsj" prop="yqzgsj">
+                 <el-date-picker value-format="timestamp"  style="width: 100%;" :readonly="readonly" type="date"
+                                  v-model="singleItem.yqzgsj"  placeholder="选择日期">
+                 </el-date-picker>
+              </el-form-item>
           </el-col>
            <el-col :span="24">
                <el-form-item label="复查说明"  ref="fcsm" prop="fcsm">
@@ -20,6 +27,7 @@
                </el-form-item>
            </el-col>
 
+
        </el-row>
        </el-form>
     <div slot="reFooter" class="refooter" >
@@ -64,9 +72,11 @@
     methods: {
 save(){
   let params={
+    yqzgsj:this.singleItem.yqzgsj,
     fcjg:this.fcjg,
     fcsm:this.singleItem.fcsm,
-    id:this.singleItem.id
+    id:this.singleItem.id,
+    
   }
   doFc(params).then(res=>{
     if(res.success){

src/views/riskPrecontrol/screeningCriteria/index.vue

@@ -5,6 +5,18 @@
       <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'  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="{gsid:queryParams.gsid}" style="width: 100%;" clearable :readonly="readonly" src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='queryParams.fxd' ></RelSelect>
+            </div>
+          </el-col>
           <el-col :span="6" class="search-col">
               <div class="search-item">
                 <span class="search-span">岗位:</span>
@@ -18,12 +30,7 @@
                   </el-select>
               </div>
           </el-col>
-          <el-col :span="6" class="search-col">
-            <div class="search-item">
-              <span class="search-span">风险点:</span>
-             <el-input v-model="queryParams.fxd"></el-input>
-            </div>
-          </el-col>
+
 
         </el-row>
       </div>
@@ -124,11 +131,13 @@
         baseUrl: '/aqgl/fxyk/fxbz',
         /* 查询参数*/
         queryParams: {
+          gsid:'',
           gwid: '',
           fxd: ''
         },
         /* 表格标题对应参数*/
         tableTitle:  [
+          {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
 				{label: "部门", prop: "bmName", fieldType: "ftString",width:192},
 				{label: "车间", prop: "cjName", fieldType: "ftString",width:192},
 				{label: "岗位", prop: "gwName", fieldType: "ftString",width:192},