页面调整

src/views/riskPrecontrol/maintenanceRiskTask/edit.vue

@@ -2,22 +2,6 @@
     <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="djly" prop="djly">
-                        <el-input :readonly="readonly"  v-model="form.djly" ></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="风险排查标准编码"  ref="fxbzid" prop="fxbzid">
-                      	<SinggleTableSelector :label="form.fxbzid||'暂无'" @singleSelected='singleSelected'
-                      							:queryMethods='queryMethods' :tableTitle='tableTitle'></SinggleTableSelector>
-                        <!-- <el-input :readonly="readonly"  v-model="form.fxbzid" ></el-input> -->
-                        <!-- 点击弹框-->
-
-                    </el-form-item>
-                </el-col>
-            </el-row>
             <el-row :gutter="20">
                 <el-col :span="12">
                     <el-form-item label="下达时间"  ref="xdrq" prop="xdrq">
@@ -34,15 +18,15 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="实际检查时间"  ref="sjjcsj" prop="sjjcsj">
+                    <el-form-item label="检查时间"  ref="sjjcsj" prop="sjjcsj">
                         <el-date-picker  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">
-                        <el-input :readonly="readonly"  v-model="form.gwid" ></el-input>
+                   <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>
@@ -54,17 +38,11 @@
                           <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.bcid" ></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-col :span="12">
                     <el-form-item label="地点"  ref="fxpcdd" prop="fxpcdd">
@@ -76,16 +54,11 @@
                         <el-input :readonly="true"  v-model="form.fxd" ></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
-                    <el-form-item label="车间"  ref="cjName" prop="cjName">
-                        <el-input :readonly="true"  v-model="form.cjName" ></el-input>
+                <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-col :span="12">
-                    <el-form-item label="维护方式"  ref="bz" prop="bz">
-                        <el-input :readonly="true"  v-model="form.bz" ></el-input>
-                    </el-form-item>
-                </el-col> -->
             </el-row>
         </el-form>
     </RelDialog>

src/views/riskPrecontrol/maintenanceRiskTask/index.vue

@@ -15,8 +15,15 @@
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
-              <span class="search-span">检查岗位:</span>
-             <RelSelect  src='kzzx/bm/query' :match="{value:'id',label:'bmmc'}" v-model='queryParams.jcgw' ></RelSelect>
+               <span class="search-span">岗位:</span>
+                 <el-select v-model="queryParams.gwid" clearable placeholder="请选择">
+                   <el-option
+                     v-for="item in doQueryScgw"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
+                   </el-option>
+                 </el-select>
              </div>
           </el-col>
           <el-col :span="6" class="search-col">
@@ -81,8 +88,11 @@
 		doQuery,
 		doAdd,
 		doUpdate,
-		doDelete
+		doDelete,
 	} from "@/api/riskPrecontrol/maintenanceRiskTask.js";
+	import {
+  		doQueryScgw
+  	} from "@/api/riskPrecontrol/screeningCriteria.js";
   /* edit页面*/
   import Edit from './edit'
   import Details from './details.vue'
@@ -96,12 +106,19 @@
 
     /* 初始额外赋值*/
     async mounted() {
+    await this.$asRun(
+              [doQueryScgw(),
+              res => {
+                var data = res['data']['records'];
+                this.doQueryScgw = data
+                }
+              ]
+              )
       this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
-
-
     },
     data() {
       return {
+        doQueryScgw:[],
         activeName: 'first',
         /*需要的额外参数 */
         showDialog: false,
@@ -113,7 +130,7 @@
         /* 查询参数*/
         queryParams: {
           zt:'',
-          jcgw:'',
+          gwid:'',
           ksrq: new Date().getTime()-1000*60*60*24*30,
           jsrq: new Date().getTime()
         },
@@ -125,10 +142,9 @@
        	{label: "状态", prop: "ztName", fieldType: "ftString",width:50},
        	{label: "下达时间", prop: "xdrq", fieldType: "ftDateTime"},
        	{label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
-       	{label: "实际检查时间", prop: "sjjcsj", fieldType: "ftDateTime"},
-       	{label: "检查岗位", prop: "gwid", fieldType: "ftString",width:192},
+       	{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},

src/views/riskPrecontrol/screeningCriteria/edit.vue

@@ -16,7 +16,7 @@
                 </el-col>
                 <el-col :span="12">
                     <el-form-item label="岗位"  ref="gwid" prop="gwid">
-                        <el-input :readonly="readonly"  v-model="form.gwid" ></el-input>
+                          <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>
 

src/views/riskPrecontrol/screeningCriteria/index.vue

@@ -8,13 +8,20 @@
           <el-col :span="6" class="search-col">
               <div class="search-item">
                 <span class="search-span">岗位:</span>
-              <el-input  style="width:60% ;"></el-input>
+                  <el-select v-model="queryParams.gwid" clearable placeholder="请选择">
+                    <el-option
+                      v-for="item in doQueryScgw"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
               </div>
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
-              <span class="search-span">设备设施风险点:</span>
-             <el-input></el-input>
+              <span class="search-span">风险点:</span>
+             <el-input v-model="queryParams.fxd"></el-input>
             </div>
           </el-col>
 
@@ -76,7 +83,8 @@
     doAddJcnr,
     doUpdateJcnr,
     doDeleteJcnr,
-    doAutoGen
+    doAutoGen,
+    doQueryScgw
   } from "@/api/riskPrecontrol/screeningCriteria.js";
   /* edit页面*/
   import Edit from './edit'
@@ -93,10 +101,19 @@
 
     /* 初始额外赋值*/
     async mounted() {
+     await this.$asRun(
+          [doQueryScgw(),
+          res => {
+            var data = res['data']['records'];
+            this.doQueryScgw = data
+            }
+          ]
+          )
       this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
     },
     data() {
       return {
+        doQueryScgw:[],
         activeName: 'first',
         /*需要的额外参数 */
         showDialog: false,
@@ -107,8 +124,8 @@
         baseUrl: '/aqgl/fxyk/fxbz',
         /* 查询参数*/
         queryParams: {
-          ksrq: '',
-          jsrq: ''
+          gwid: '',
+          fxd: ''
         },
         /* 表格标题对应参数*/
         tableTitle:  [