12.4问题修改

src/router/index.js

@@ -164,6 +164,19 @@ export const powerRoutes=[
        name:'maintenanceRiskTask',
        path:"maintenanceRiskTask"
       },
+      {
+       component:'riskPrecontrol/queryRiskTask/index',
+       hidden:false,
+       meta:{
+           "title": "查询风险排查任务",
+           "icon": "",
+           "noCache": false,
+           "link": null,
+           "mkid":'test',
+       },
+       name:'queryRiskTask',
+       path:"queryRiskTask"
+      },
       {
        component:'riskPrecontrol/riskAnalysis/index',
        hidden:false,

src/views/riskPrecontrol/maintenanceRiskTask/index.vue

@@ -11,7 +11,7 @@
           <el-col :span="6" class="search-col">
             <div class="search-item">
               <span class="search-span">状态:</span>
-              <RelSelect  src='aqgl/fxyk/fxpc/init/zt'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt' ></RelSelect>
+              <RelSelect  style="width: 100%;" src='aqgl/fxyk/fxpc/init/zt'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt' ></RelSelect>
             </div>
           </el-col>
           <el-col :span="6" class="search-col">
@@ -20,6 +20,7 @@
                  <el-input v-model="queryParams.jcr" ></el-input>
              </div>
           </el-col>
+
           <el-col :span="6" class="search-col">
           	<div class="search-item">
           		<span class="search-span">开始日期:</span>
@@ -34,6 +35,20 @@
           </el-col>
 
         </el-row>
+         <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="{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">
@@ -135,6 +150,8 @@ import Zdzrr from './zdzrr'
         baseUrl: '/aqgl/fxyk/fxpc',
         /* 查询参数*/
         queryParams: {
+          gsid:'',
+          bmid:'',
           jcr:'',
           zt:'',
           ksrq: new Date().getTime()-1000*60*60*24*30,
@@ -146,10 +163,13 @@ import Zdzrr from './zdzrr'
        	// {label: "单据来源", prop: "djly", fieldType: "ftString",width:60},
        	// {label: "风险排查标准编码", prop: "fxbzid", fieldType: "ftString",width:192},
        	{label: "状态", prop: "ztName", fieldType: "ftString",width:50},
-       	{label: "下达时间", prop: "xdrq", fieldType: "ftDateTime"},
+       	{label: "下达日期", prop: "xdrq", fieldType: "ftDate"},
        	// {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
        	{label: "检查时间", prop: "sjjcsj", fieldType: "ftDateTime"},
+        	{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
        	{label: "检查岗位", prop: "gwName", fieldType: "ftString",width:192},
+        {label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
+        {label: "检查部位", prop: "jcyd", fieldType: "ftString",width:300},
        	{label: "检查人", prop: "jcrName", fieldType: "ftString",width:192},
         {label: "地点", prop: "fxpcdd", fieldType: "ftString",width:192},
         {label: "风险点", prop: "fxd", fieldType: "ftString",width:192},
@@ -165,7 +185,7 @@ import Zdzrr from './zdzrr'
         this.showDialog = true
         this.DialogTitle='关联隐患'
         this.DialogName='关联隐患'
-        
+
       },
 
       zdzrr(){

src/views/riskPrecontrol/queryRiskTask/edit.vue

+<template>
+    <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
+        <!-- 填写表单内容，slot=form必写-->
+        <el-form slot="form" ref="form" :model="form" label-width="120px" :rules="rules">
+            <el-row :gutter="20">
+                <el-col :span="12">
+                    <el-form-item label="下达时间"  ref="xdrq" prop="xdrq">
+                        <el-date-picker value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
+                                         v-model="form.xdrq"  placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+              <!--  <el-col :span="12">
+                    <el-form-item label="截止日期"  ref="jzrq" prop="jzrq">
+                        <el-date-picker  value-format="timestamp" style="width: 100%;" :readonly="readonly" type="date"
+                                         v-model="form.jzrq"  placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col> -->
+                <el-col :span="12">
+                    <el-form-item label="检查时间"  ref="sjjcsj" prop="sjjcsj">
+                        <el-date-picker value-format="timestamp"  style="width: 100%;" :readonly="readonly" type="date"
+                                         v-model="form.sjjcsj"  placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                   <el-form-item label="岗位"  ref="gwid" prop="gwid">
+                          <RelSelect :readonly="readonly" style="width: 100%;"  src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='form.gwid' ></RelSelect>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20">
+
+                <el-col :span="12">
+                    <el-form-item label="检查人"  ref="jcrid" prop="jcrid">
+                        <!-- <el-input :readonly="readonly"  v-model="form.jcrid" ></el-input> -->
+                          <personSelector :label="form.jcrName||form.jcrid||'暂无'" @selected='jcrSelected' ></personSelector>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="公司"  ref="bcid" prop="bcid">
+                        <el-input :readonly="readonly"  v-model="form.gsName" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="班组"  ref="bcid" prop="bcid">
+                        <el-input :readonly="readonly"  v-model="form.bzName" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <!-- 标准带出数据-->
+                <el-col :span="12">
+                    <el-form-item label="地点"  ref="fxpcdd" prop="fxpcdd">
+                        <el-input :readonly="true"  v-model="form.fxpcdd" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="风险点"  ref="fxd" prop="fxd">
+                        <el-input :readonly="true"  v-model="form.fxd" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item label="备注"  ref="bz" prop="bz">
+                        <el-input :readonly="readonly"  v-model="form.bz" ></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+    </RelDialog>
+</template>
+<script>
+  import {
+    doQuery
+  } from "@/api/riskPrecontrol/screeningCriteria.js";
+    import {editMixin} from 'common'
+    export default {
+        mixins: [editMixin],
+        /* 存放index页面传递的额外参数*/
+        mounted() {
+
+        },
+        /* 组件名称*/
+        name: "aqgl/fxykFxpcEdit",
+        /* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
+
+        data() {
+            return {
+
+                /* 额外初始化，根据需求*/
+                tableTitle: [{
+                					prop: 'id',
+                					label: '风险排查标准编码',
+                          width:300
+                				},
+                        {label: "部门", prop: "bmName", fieldType: "ftString",width:192},
+                        {label: "车间", prop: "cjName", fieldType: "ftString",width:192},
+                        {label: "岗位", prop: "gwName", fieldType: "ftString",width:192},
+                        {label: "风险地点", prop: "fxpcdd", fieldType: "ftString",width:300},
+                        {label: "风险点", prop: "fxd", fieldType: "ftString",width:300},
+                        {label: "事故类型", prop: "sglx", fieldType: "ftString",width:192},
+                        {label: "危险等级", prop: "wxdj", fieldType: "ftString",width:160},
+                        {label: "分值", prop: "fz", fieldType: "float"},
+                        {label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192},
+                        {label: "管控落实后等级", prop: "lsdj", fieldType: "ftString",width:160}],
+
+                bmList: [],
+
+                /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
+                form: {
+                  fxpcdd:'',
+                  fxd:'',
+                  cjName:'',
+                  /* 额外参数*/
+                            id:'',
+
+                            djly:'',
+
+                            fxbzid:'',
+
+                            zt:'',
+
+                            xdrq:new Date().getTime(),
+
+                            jzrq:new Date().getTime(),
+
+                            sjjcsj:new Date().getTime(),
+
+                            gwid:'',
+
+                            jcrid:'',
+
+                            bz:'',
+
+                            whrid:'',
+
+                            whr:'',
+
+                            whsj:new Date().getTime(),
+
+                            cjrid:'',
+
+                            cjr:'',
+
+                            cjsj:new Date().getTime(),
+
+                            sysversion:'',
+
+                            bcid:'',
+
+                },
+                /* form提交时的规则,具体规则参考官网*/
+                rules: {
+
+                }
+            }
+        },
+        methods: {
+          singleSelected(row){
+            this.form.fxbzid=row.id
+            this.form.fxpcdd=row.fxpcdd
+             this.form.fxd=row.fxd
+              this.form.cjName=row.cjName
+          },
+          queryMethods:doQuery,
+          jcrSelected(row){
+            console.log(row)
+                   			  this.form.jcrid=row.id
+
+                   	},
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/riskPrecontrol/queryRiskTask/index.vue

+<template>
+<!--  <div class="min_full" style="height: 140vh;"> -->
+
+    <div class="min_full" >
+<!-- <Zdzrr :app='this' v-if="showDialog&&DialogName=='指定检查人'" ></Zdzrr> -->
+ <yhContent :app='this' v-if="showDialog&&DialogName=='关联隐患'" ></yhContent>
+      <!-- 查询条件-->
+      <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='aqgl/fxyk/fxpc/init/zt'  clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt' ></RelSelect>
+            </div>
+          </el-col>
+          <el-col :span="6" class="search-col">
+            <div class="search-item">
+               <span class="search-span">检查人员:</span>
+                 <el-input v-model="queryParams.jcr" ></el-input>
+             </div>
+          </el-col>
+
+          <el-col :span="6" class="search-col">
+          	<div class="search-item">
+          		<span class="search-span">开始日期:</span>
+          		<el-date-picker value-format="timestamp" v-model="queryParams.ksrq"></el-date-picker>
+          	</div>
+          </el-col>
+          <el-col :span="6" class="search-col">
+          	<div class="search-item">
+          		<span class="search-span">结束日期:</span>
+          		<el-date-picker value-format="timestamp" v-model="queryParams.jsrq" ></el-date-picker>
+          	</div>
+          </el-col>
+
+        </el-row>
+         <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="{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-col :span="6" class="search-col">
+               <div class="search-item">
+                 <span class="search-span">检查结果:</span>
+                  <RelSelect style="width: 100%;"  src='aqgl/fxyk/fxpc/init/jcjg'  filterable clearable :match="{value:'id',label:'name'}" v-model='queryParams.jcjg' ></RelSelect>
+               </div>
+           </el-col>
+         </el-row>
+      </div>
+      <!-- 按钮操作-->
+      <el-row class="tool-bar">
+        <PrintButton :app='app'></PrintButton>
+        <ViewButton ref="view" :app='app'></ViewButton>
+        <AttachFileButton :app='app'></AttachFileButton>
+        <FieldButton :app='app'></FieldButton>
+        <ExcelButton :app='app'></ExcelButton>
+        <!-- 额外按钮-->
+        <!-- 表头设置 -->
+        <!-- 权限-->
+      </el-row>
+      <!-- 表格-->
+      <div class="tablePagers">
+        <TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
+          @getRow='getRow'>
+          <template slot="tabCustom">
+          	<el-table-column label="关联隐患" width="90" header-align="center" >
+          		<template slot-scope="scope" >
+                <span @click="watchglyh(scope.row)" style="color: cornflowerblue;cursor: pointer;line-height: 30px;text-align: center;width: 70px;display: inline-block;">查看</span>
+          		</template>
+          	</el-table-column>
+          </template>
+        </TablePager>
+      </div>
+    </div>
+</template>
+
+<script>
+// import Zdzrr from './zdzrr'
+  /* 引入需要的接口*/
+	/* 引入需要的接口*/
+	import {
+		doQuery,
+		doAdd,
+		doUpdate,
+		doDelete,
+	} from "@/api/riskPrecontrol/maintenanceRiskTask.js";
+	import {
+  		doQueryScgw
+  	} from "@/api/riskPrecontrol/screeningCriteria.js";
+  /* edit页面*/
+  import Edit from './edit'
+  // import Details from './details.vue'
+  // import Content from './content.vue'
+  import yhContent from './yhContent.vue'
+  import {
+    tableMixin
+  } from 'common'
+  export default {
+    mixins: [tableMixin],
+    name: 'appVersion',
+
+    /* 初始额外赋值*/
+    async mounted() {
+    await this.$asRun(
+              [doQueryScgw(),
+              res => {
+                var data = res['data']['records'];
+                this.doQueryScgw = data
+                }
+              ]
+              )
+      this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
+      console.log(this)
+    },
+    data() {
+      return {
+        DialogTitle:'指定检查人',
+        /*需要的额外参数 */
+        showDialog:false,
+        doQueryScgw:[],
+        activeName: 'first',
+        /*需要的额外参数 */
+        showDialog: false,
+        DialogName: '',
+        type: '',
+        /* 基础url*/
+        baseUrl: '/aqgl/fxyk/fxpc',
+        /* 查询参数*/
+        queryParams: {
+          jcjg:'',
+          gsid:'',
+          bmid:'',
+          jcr:'',
+          zt:'',
+          ksrq: new Date().getTime()-1000*60*60*24*30,
+          jsrq: new Date().getTime()
+        },
+        /* 表格标题对应参数*/
+       tableTitle: [
+       	// {label: "ID", prop: "id", fieldType: "ftString",width:192},
+       	// {label: "单据来源", prop: "djly", fieldType: "ftString",width:60},
+       	// {label: "风险排查标准编码", prop: "fxbzid", fieldType: "ftString",width:192},
+       	{label: "状态", prop: "ztName", fieldType: "ftString",width:50},
+       	{label: "下达日期", prop: "xdrq", fieldType: "ftDate"},
+       	// {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
+       	{label: "检查时间", prop: "sjjcsj", fieldType: "ftDateTime"},
+        	{label: "检查结果", prop: "jcjgName"},
+        	{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
+       	{label: "检查岗位", prop: "gwName", fieldType: "ftString",width:192},
+        {label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
+        {label: "检查部位", prop: "jcyd", fieldType: "ftString",width:300},
+       	{label: "检查人", prop: "jcrName", fieldType: "ftString",width:192},
+        {label: "地点", prop: "fxpcdd", fieldType: "ftString",width:192},
+        {label: "风险点", prop: "fxd", fieldType: "ftString",width:192},
+        {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
+         {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
+       ],
+        timer:false,
+      }
+    },
+    methods: {
+      watchglyh(row){
+        this.watchglyh.fxpcid=row.id
+        this.showDialog = true
+        this.DialogTitle='关联隐患'
+        this.DialogName='关联隐患'
+
+      },
+
+      zdzrr(){
+        if (this.app.selectOne || this.app.clickOne) {
+        	this.showDialog = true
+          this.DialogTitle='指定检查人'
+           this.DialogName='指定检查人'
+        } else {
+        	this.$warning('请选中一行操作');
+        }
+      },
+      getRow: function(e) {
+        this.rowItem = e
+        // this.$refs.Details.queryParams.fxbzid=e.fxbzid
+        // this.$refs.Content.queryParams.mid=e.id
+        // this.$refs.yhContent.queryParams.fxd=e.id
+        // this.$nextTick(()=>{
+        //    this.$refs.Details.query()
+        //    this.$refs.Content.$refs['TablePager'].pageQuery()
+        //     this.$refs.yhContent.$refs['TablePager'].pageQuery()
+        // })
+      },
+      /* 基础查询*/
+      /* 基础查询*/
+      query: doQuery,
+      		/* 基础增*/
+      		apiAdd: doAdd,
+      		/* 基础更新*/
+      		apiUpdate: doUpdate,
+      		/* 删除操作*/
+      		apiDelete: doDelete,
+      init() {
+
+      },
+
+
+
+    },
+    components: {
+      Edit,
+      // Details,
+      // Content,
+      // Zdzrr,
+      yhContent
+    }
+
+
+  }
+</script>
+
+<style scoped>
+  /deep/.el-tabs__item {
+    font-size: 13px;
+    color: #666;
+  }
+</style>

src/views/riskPrecontrol/queryRiskTask/yhContent.vue

+<template>
+    <DefaultDialog :app='app'>
+  <!--  v-show='queryParams.mid'-->
+  <div class="min_full" slot="form"  style="height: calc(84vh - 75px);border: 0px;">
+    <!-- 按钮操作-->
+    <el-row class="tool-bar">
+      <ViewButton ref="view" :app='this'></ViewButton>
+    </el-row>
+    <!-- 表格-->
+    <div class="tablePagers">
+      <TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
+        @getRow='getRow'>
+      </TablePager>
+    </div>
+  </div>
+   </DefaultDialog>
+</template>
+
+<script>
+  /* 引入需要的接口*/
+	import {
+		doQuery,
+		doAdd,
+		doUpdate,
+		doDelete
+	} from "@/api/dangerManagement/enterSafetyRecords.js"
+  /* edit页面*/
+  import Edit from './yhContentEdit.vue'
+    import {tableMixin_noapp} from 'common'
+  export default {
+    props:['app'],
+    mixins: [tableMixin_noapp],
+    /* 初始额外赋值*/
+    async mounted() {
+this.$nextTick(()=>{
+  console.log(this.app.watchglyh.fxpcid)
+  this.queryParams.fxpcid=this.app.watchglyh.fxpcid
+
+  this.$refs['TablePager'].pageQuery()
+})
+
+    },
+    data() {
+      return {
+        /*需要的额外参数 */
+        typeMap: [],
+        systemType: [],
+        	baseUrl: '/aqgl/yhgl/yhjl',
+        /* 查询参数*/
+        queryParams: {
+            fxpcid:''
+        },
+        /* 表格标题对应参数*/
+       tableTitle: [
+        {label: "状态", prop: "ztName", fieldType: "ftString",width:60},
+        {label: "公司", prop: "gsid", fieldType: "ftString",width:192,transform:{
+          url:'jcsj/common/bm/queryGs',label:'bmmc',value:'id'
+        }},
+          {label: "班组", prop: "bmid", fieldType: "ftString",width:192,transform:{
+            url:'jcsj/common/bm/queryBz',label:'bmmc',value:'id'
+          }},
+          //
+          // {label: "状态", prop: "zt", fieldType: "ftString",transform:{
+          //   url:'aqgl/yhgl/yhjl/init/zt',label:'name',value:'id'
+          // }},
+          // {label: "整改说明", prop: "clff", fieldType: "ftString",width:300},
+          //  {label: "整改完成时间", prop: "clsj", fieldType: "ftDateTime"},
+
+
+					{label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
+          /* */
+          {label: "整改日期", prop: "clsj", fieldType: "ftDateTime"},
+          {label: "复查日期", prop: "fcsj", fieldType: "ftDateTime"},
+          /* */
+					{label: "风险点", prop: "fxdName", fieldType: "ftString",width:300},
+					{label: "隐患地点", prop: "yhdd", fieldType: "ftString",width:300},
+          {label: "隐患类型", prop: "flid", fieldType: "ftString",width:192,transform:{
+            url:'aqgl/yhgl/yhfl/query',label:'name',value:'id'
+          }},
+          {label: "隐患等级", prop: "dj", fieldType: "ftString",width:192,transform:{
+            url:'aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id'
+          }},
+					{label: "内容", prop: "nr", fieldType: "ftString",width:300},
+					// {label: "责任部门", prop: "bmName", fieldType: "ftString",width:192},
+					// {label: "制定整改方案", prop: "zdzgfa", fieldType: "ftString",width:6},
+					{label: "责任人", prop: "zrrName", fieldType: "ftString",width:192},
+					{label: "整改方案", prop: "zgfa", fieldType: "ftString",width:300},
+					 {label: "管控措施", prop: "gkcs", fieldType: "ftString",width:300},
+             {label: "要求整改完成时间", prop: "yqzgsj", fieldType: "ftDateTime"},
+					// {label: "隐患分类", prop: "flid", fieldType: "ftString",width:192},
+					{label: "处理人", prop: "clrName", fieldType: "ftString",width:192},
+										// {label: "处理时间", prop: "clsj", fieldType: "ftDateTime"},
+										// {label: "处理方法", prop: "clff", fieldType: "ftString",width:300},
+										{label: "复查人", prop: "fcrName", fieldType: "ftString",width:192},
+					          {label: "上报人", prop: "sbrName", fieldType: "ftString",width:192},
+					/* 检查人 */
+										// {label: "复查时间", prop: "fcsj", fieldType: "ftDateTime"},
+										// {label: "复查结果", prop: "fcjg", fieldType: "ftString",width:300},
+										// {label: "处置人", prop: "czr", fieldType: "ftString",width:192},
+										// {label: "处置时间", prop: "czsj", fieldType: "ftDateTime"},
+										// {label: "处置意见", prop: "czyj", fieldType: "ftString",width:300},
+										// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
+										// {label: "附件数", prop: "attachcount", fieldType: "int"},
+										{label: "备注", prop: "bz", fieldType: "ftString",width:300},
+										// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
+										{label: "维护人", prop: "whr", fieldType: "ftString"},
+										{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
+										// {label: "创建人", prop: "cjr", fieldType: "ftString"},
+										// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
+				]
+      }
+    },
+    methods: {
+      /* 基础查询*/
+      query: doQuery,
+      /* 基础增*/
+      apiAdd: doAdd,
+      /* 基础更新*/
+      apiUpdate: doUpdate,
+      /* 删除操作*/
+      apiDelete: doDelete,
+      /* 初始化赋值操作*/
+    },
+    /* 注册组件*/
+    components: {
+      Edit
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/riskPrecontrol/queryRiskTask/yhContentEdit.vue

+<template>
+    <RelDialog :stopEvent='false' :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
+        <!-- 填写表单内容，slot=form必写-->
+        <el-form slot="form" style="height: 65vh;overflow: auto;overflow-x: hidden;padding-right: 20px;" ref="form" :model="form" label-width="100px" :rules="rules">
+            <el-row :gutter="20">
+                <el-col :span="12">
+                    <el-form-item label="发现日期"  ref="fxrq" prop="fxrq">
+                        <el-date-picker value-format="timestamp"  style="width: 100%;" :readonly="readonly" type="date"
+                                         v-model="form.fxrq"  placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <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="fxd" prop="fxd">
+                        <RelSelect linkage :linkParams="{gsid:form.gsid}" style="width: 100%;" :readonly="readonly" src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='form.fxd' ></RelSelect>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="隐患地点"  ref="yhdd" prop="yhdd">
+                        <el-input :readonly="readonly"  v-model="form.yhdd" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="隐患类型"  ref="flid" prop="flid">
+                        <RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
+                    </el-form-item>
+                </el-col>
+        <el-col :span="12">
+            <el-form-item label="隐患等级"  ref="dj" prop="dj">
+                 <RelSelect style='width: 100%;'  src='aqgl/fxyk/fxpc/init/wxdj'  clearable :match="{value:'id',label:'name'}" v-model='form.dj' ></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="24">
+                    <el-form-item  label="隐患内容"  ref="nr" prop="nr">
+                        <el-input type='textarea' :readonly="readonly"  v-model="form.nr" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item  label="整改措施"  ref="zgfa" prop="zgfa">
+                        <el-input type='textarea' :readonly="readonly"  v-model="form.zgfa" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item  label="管控措施"  ref="gkcs" prop="gkcs">
+                        <el-input type='textarea' :readonly="readonly"  v-model="form.gkcs" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item  label="整改说明"  ref="clff" prop="clff">
+                        <el-input type='textarea' :readonly="readonly"  v-model="form.clff" ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <el-form-item  label="复查说明"  ref="fcsm" prop="fcsm">
+                        <el-input type='textarea' :readonly="readonly"  v-model="form.fcsm" ></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20">
+
+                <el-col :span="12">
+                    <el-form-item label="整改完成日期"  ref="yqzgsj" prop="yqzgsj">
+                       <el-date-picker value-format="timestamp"  style="width: 100%;" :readonly="readonly" type="date"
+                                        v-model="form.yqzgsj"  placeholder="选择日期">
+                       </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="上报人"  ref="sbr" prop="sbr">
+                        <!-- <el-input :readonly="readonly"  v-model="form.zrr" ></el-input> -->
+                         <personSelector :label="form.sbrName||'暂无'" @selected='sbrSelected' ></personSelector>
+                    </el-form-item>
+                </el-col>
+
+            </el-row>
+            <el-row :gutter="20">
+                <el-col :span="24">
+                    <el-form-item label="备注"  ref="bz" prop="bz">
+                        <el-input type='textarea' :readonly="readonly"  v-model="form.bz" ></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+    </RelDialog>
+</template>
+<script>
+    import {editMixin} from 'common'
+    export default {
+        mixins: [editMixin],
+        /* 存放index页面传递的额外参数*/
+        mounted() {
+          /* 赋值*/
+        },
+        /* 组件名称*/
+        /* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
+
+        data() {
+            return {
+
+                /* 额外初始化，根据需求*/
+                systemType: [],
+
+                bmList: [],
+
+                /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
+                form: {
+                  fcsm:'',
+                  clff:'',
+                  sbr:'',
+                  sbrName:'',
+                  gkcs:'',
+                  zgfa:'',
+                  zrrName:'',
+                            id:'',
+
+                            fxrq:new Date().getTime(),
+
+                            fxd:'',
+
+                            yhdd:'',
+
+                            sbjb:'',
+
+                            nr:'',
+
+                            bmid:'',
+
+                            zdzgfa:'',
+
+                            zrr:'',
+
+                            dj:'',
+
+                            flid:'',
+
+                            clr:'',
+                            yqzgsj:new Date().getTime(),
+                            clsj:new Date().getTime(),
+
+                            clff:'',
+
+                            fcr:'',
+
+                            fcsj:new Date().getTime(),
+
+                            fcjg:'',
+
+                            czr:'',
+
+                            czsj:new Date().getTime(),
+
+                            czyj:'',
+
+                            zt:'',
+
+                            attachcount:'',
+
+                            bz:'',
+
+                            wfid:'',
+
+                            wfinstid:'',
+
+                            wfpid:'',
+
+                            wfpname:'',
+
+                            wfwuserid:'',
+
+                            wfwusername:'',
+
+                            wfhuserid:'',
+
+                            wfhusername:'',
+
+                            whrid:'',
+
+                            whr:'',
+
+                            whsj:new Date().getTime(),
+
+                            cjrid:'',
+
+                            cjr:'',
+
+                            cjsj:new Date().getTime(),
+
+                            sysversion:'',
+
+                },
+                /* form提交时的规则,具体规则参考官网*/
+                rules: {
+
+                }
+            }
+        },
+        methods: {
+ sbrSelected(row){
+          			  this.form.sbr=row.id
+          	}
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/riskPrecontrol/riskSet/index.vue

@@ -80,10 +80,8 @@
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
-                {label:"名称", prop:"name"},
-                {label:"岗位", prop:"gwid",transform:{
-          url:'/aqgl/jcsj/scgw/query',label:'name',value:'id'
-        }},
+                {label:"名称", prop:"name",width: 230},
+                {label:"公司", prop:"gsName",width: 230},
                 {label: "描述", prop: "desc",width: 230},
                 {label: "上次执行时间", prop: "pretime",width: 200},
                 {label: "下次执行时间", prop: "nexttime",width: 200},

src/views/riskPrecontrol/screeningCriteria/edit.vue

@@ -25,6 +25,12 @@
                         <el-input :readonly="readonly"  v-model="form.fxd" ></el-input>
                     </el-form-item>
                 </el-col>
+                
+                <el-col :span="24">
+                    <el-form-item label="危害因素"  ref="whys" prop="whys">
+                        <el-input  type="textarea" :readonly="readonly"  v-model="form.whys" ></el-input>
+                    </el-form-item>
+                </el-col>
 
                 <el-col :span="24">
                     <el-form-item label="检查部位"  ref="jcyd" prop="jcyd">
@@ -46,11 +52,7 @@
                         <RelSelect  style="width: 100%;" src='aqgl/fxyk/fxpc/init/wxdj' :match="{value:'id',label:'name'}" v-model='form.lsdj' ></RelSelect>
                     </el-form-item>
                 </el-col>
-                <el-col :span="24">
-                    <el-form-item label="危害因素"  ref="whys" prop="whys">
-                        <el-input  type="textarea" :readonly="readonly"  v-model="form.whys" ></el-input>
-                    </el-form-item>
-                </el-col>
+              
                 <!-- 事故后果 -->
                 <el-col :span="24">
                     <el-form-item label="技术措施"  ref="jscs" prop="jscs">
@@ -186,6 +188,14 @@
                 },
                 /* form提交时的规则,具体规则参考官网*/
                 rules: {
+                  gsid: [{ required: true, trigger: 'blur' }],
+                   fxpcdd: [{ required: true, trigger: 'blur' }],
+                    fxd: [{ required: true, trigger: 'blur' }],
+                     jcyd: [{ required: true, trigger: 'blur' }],
+                      wxdj: [{ required: true, trigger: 'blur' }],
+                       lsdj: [{ required: true, trigger: 'blur' }],
+                        whys: [{ required: true, trigger: 'blur' }],
+                        sghg: [{ required: true, trigger: 'blur' }],
 
                 }
             }