风险维护和设置

src/api/riskPrecontrol/maintenanceRiskTask.js

@@ -107,6 +107,14 @@ export function doQueryFxjcnr(query) {
   })
 }
 
+/* 责任人分配 */
+export function doFp(query) {
+  return request({
+    url: '/aqgl/fxyk/fxpc/doFp',
+    method: 'post',
+    data: query||{}
+  })
+}
 
 
 

src/views/riskPrecontrol/maintenanceRiskTask/edit.vue

@@ -10,13 +10,13 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+              <!--  <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> -->
                 <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"
@@ -39,8 +39,13 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="班次"  ref="bcid" prop="bcid">
-                        <el-input :readonly="readonly"  v-model="form.bcid" ></el-input>
+                    <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>
                 <!-- 标准带出数据-->
@@ -50,8 +55,8 @@
                     </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 label="风险点"  ref="fxd" prop="fxd">
+                        <el-input :readonly="true"  v-model="form.fxdName" ></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">

src/views/riskPrecontrol/maintenanceRiskTask/index.vue

@@ -116,7 +116,7 @@ import Zdzrr from './zdzrr'
     },
     data() {
       return {
-        DialogTitle:'指定责任人',
+        DialogTitle:'指定检查人',
         /*需要的额外参数 */
         showDialog:false,
         doQueryScgw:[],
@@ -125,7 +125,6 @@ import Zdzrr from './zdzrr'
         showDialog: false,
         DialogName: '',
         type: '',
-        DialogTitle: '',
         /* 基础url*/
         baseUrl: '/aqgl/fxyk/fxpc',
         /* 查询参数*/
@@ -142,20 +141,21 @@ import Zdzrr from './zdzrr'
        	// {label: "风险排查标准编码", prop: "fxbzid", fieldType: "ftString",width:192},
        	{label: "状态", prop: "ztName", fieldType: "ftString",width:50},
        	{label: "下达时间", prop: "xdrq", fieldType: "ftDateTime"},
-       	{label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
+       	// {label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
        	{label: "检查时间", prop: "sjjcsj", fieldType: "ftDateTime"},
        	{label: "检查岗位", prop: "gwName", fieldType: "ftString",width:192},
        	{label: "检查人", prop: "jcrName", fieldType: "ftString",width:192},
         {label: "地点", prop: "fxpcdd", fieldType: "ftString",width:192},
-        {label: "作业活动", prop: "fxd", fieldType: "ftString",width:192},
-        {label: "车间", prop: "cjName", fieldType: "ftString",width:192},
-        {label: "维护方式", prop: "jcrName", 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},
+        // {label: "维护方式", prop: "jcrName", fieldType: "ftString",width:192},
        	// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
        	// {label: "维护人", prop: "whr", fieldType: "ftString"},
        	// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
        	// {label: "创建人", prop: "cjr", fieldType: "ftString"},
        	// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
-       	{label: "班次", prop: "bcid", fieldType: "ftString",width:192},
+       	// {label: "班次", prop: "bcid", fieldType: "ftString",width:192},
        ],
         timer:false,
       }

src/views/riskPrecontrol/maintenanceRiskTask/zdzrr.vue

@@ -3,15 +3,9 @@
      <el-form slot="form" ref="form" label-width="100px" >
        <el-row :gutter="20">
 
-           <el-col :span="12">
-               <el-form-item label="责任人"  ref="zrr" prop="zrr">
-                 <personSelector :label="singleItem.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
-               </el-form-item>
-           </el-col>
-           <el-col :span="12">
-               <el-form-item label="复查人"  ref="fcr" prop="fcr">
-                   <!-- <el-input :readonly="readonly"  v-model="form.zrr" ></el-input> -->
-                    <personSelector :label="singleItem.fcrName||'暂无'" @selected='fcrSelected' ></personSelector>
+           <el-col :span="24">
+               <el-form-item label="检查人"  ref="jcrid" prop="jcrid">
+                 <personSelector :label="singleItem.jcrName||'暂无'" @selected='jcrSelected' ></personSelector>
                </el-form-item>
            </el-col>
 
@@ -28,7 +22,7 @@
 <script>
   import {
   	doFp
-  } from "@/api/dangerManagement/common.js"
+  } from "@/api/riskPrecontrol/maintenanceRiskTask.js"
   export default {
     props: {
       app: {
@@ -66,8 +60,8 @@ save(){
     }
   })
 },
- zrrSelected(row){
-          			  this.singleItem.zrr=row.id
+ jcrSelected(row){
+          			  this.singleItem.jcrid=row.id
           	},
  fcrSelected(row){
           			  this.singleItem.fcr=row.id

src/views/riskPrecontrol/riskSet/edit.vue

@@ -6,10 +6,19 @@
             <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="任务名称"  ref="name" prop="name">
-
                        <el-input :readonly="readonly"  v-model="form.name" ></el-input>
                     </el-form-item>
                 </el-col>
+                <el-col :span="24">
+                    <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-col :span="24">
+                    <el-form-item label="所属班组"  ref="bmid" prop="bmid">
+                       <RelSelect linkage :linkParams="{pid:form.gsid}" 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-row>
             <el-row :gutter="20">
                 <el-col :span="12">
@@ -144,6 +153,8 @@
 
                 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
                 form: {
+                  // bmid:'',
+                  gsid:'',
                   table:'FXSZMX',
                    name:'',
                    jldw:'',

src/views/riskPrecontrol/riskSet/selecter.vue

@@ -44,6 +44,8 @@
      },
      async mounted() {
        this.$nextTick(()=>{
+         this.queryParams.gsid=this.app.form.gsid
+         // this.queryParams.bmid=this.app.form.bmid
          this.$refs['TablePager'].pageQuery()
        })
 
@@ -85,7 +87,9 @@
      },
      data() {
        return {
-        queryParams:{},
+        queryParams:{
+          gwid:''
+        },
       tableTitle:  [
       {label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
       {label: "岗位", prop: "scgwName", fieldType: "ftString",width:300},

src/views/riskPrecontrol/screeningCriteria/content.vue

@@ -11,6 +11,7 @@
       <EditButton ref="edit" :app='app'></EditButton>
 	  <FieldButton  :app='app'></FieldButton>
       <ExcelButton :app='app'></ExcelButton>
+      <el-button size='mini' @click.native="autoGen()"  type="primary">生成作业</el-button>
     </el-row>
     <!-- 表格-->
     <div class="tablePagers">
@@ -28,7 +29,8 @@
 		doAddJcnr,
 		doUpdateJcnr,
 		doDeleteJcnr,
-    doQueryFpgw
+    doQueryFpgw,
+    doAutoGen,
 	} from  '@/api/riskPrecontrol/screeningCriteria';
   /* edit页面*/
   import Edit from './contentEdit.vue'
@@ -83,6 +85,17 @@
       }
     },
     methods: {
+      autoGen() {
+        if (this.app.selectOne || this.app.clickOne) {
+          doAutoGen(this.singleItem).then(res=>{
+            if(res.success){
+              this.$success('生成作业成功！')
+            }
+          })
+        }else{
+          this.$warning('请选中标准进行操作！');
+        }
+      },
    query: doQueryJcnr,
    		/* 基础增*/
    		apiAdd: doAddJcnr,

src/views/riskPrecontrol/screeningCriteria/index.vue

@@ -46,7 +46,7 @@
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
         <!-- 额外按钮-->
-        <el-button size='mini' @click.native="autoGen()"  type="primary">生成作业</el-button>
+        
         <!-- 表头设置 -->
 
         <!-- 权限-->