大溪沟新增基础功能，其他功能调整

src/router/index.js

@@ -1533,6 +1533,19 @@ export const powerRoutes = [{
         name: 'fcgzysqd',
         path: "fcgzysqd"
       },
+      {
+        component: 'daily/zywxys/index',
+        hidden: false,
+        meta: {
+          "title": "主要危险因素",
+          "icon": "",
+          "noCache": false,
+          "link": null,
+          "mkid": 905100600,
+        },
+        name: 'zywxys',
+        path: "zywxys"
+      },
       {
         component: 'daily/nros/index',
         hidden: false,

src/views/daily/fcgzysqd/edit.vue

@@ -28,8 +28,8 @@
                 "value": "id",
                 "label": "bmmc"
               },
-              change:(row)=>{
-                this.form.pid=row.id
+              change: (row) => {
+                this.form.pid = row.id
               }
             }
           },
@@ -45,12 +45,12 @@
                 "value": "id",
                 "label": "name"
               },
-              linkage:true,
+              linkage: true,
               linkParams: ['pid'],
             }
           },
+
           {
-            required: true,
             label: '作业类型',
             prop: 'ufcgzylxid',
             span: 8,
@@ -63,6 +63,46 @@
               }
             },
           },
+          {
+            label: '主要危险因素',
+            prop: 'zywxyswhId',
+            span: 12,
+            type: 'RelSelect',
+            "typeConfig": {
+              "src": "aqgl/rcgl/uzywxyswh/query",
+              "match": {
+                "value": "id",
+                "label": "name"
+              }
+            },
+          },
+          {
+            label: '作业负责人',
+            prop: 'zyfzrId',
+            span: 12,
+            type: 'AuxInput',
+            typeConfig: {
+              code: 'USER',
+              label: 'fzrName',
+              transform: {
+                value: 'id',
+                label: 'username'
+              }
+            }
+          },
+          {
+            label: '作业开始日期',
+            prop: 'zyksrq',
+            span: 12,
+            type: 'date',
+          },
+          {
+            label: '作业结束日期',
+            prop: 'zyjsrq',
+            span: 12,
+            type: 'date',
+          },
+
           {
             required: true,
             label: '作业内容',
@@ -70,6 +110,12 @@
             span: 24,
             type: 'textarea'
           },
+          {
+            label: '作业地点',
+            prop: 'zydd',
+            span: 24,
+            type: 'input',
+          },
           {
             label: '备注',
             prop: 'bz',

src/views/daily/fcgzysqd/index.vue

@@ -62,11 +62,31 @@
               field: "fcgzylxName",
               width: 140
             },
+            {
+              title: "主要危险因素",
+              field: "zywxyswhName",
+              width: 140
+            },
+            {
+              title: "负责人",
+              field: "fzrName",
+              width: 140
+            },
             {
               title: "作业内容",
               field: "zynr",
               width: 250
             },
+            {
+              title: "作业开始日期",
+              field: "zyksrq",
+              fieldType: "ftDate"
+            },
+            {
+              title: "作业结束日期",
+              field: "zyjsrq",
+              fieldType: "ftDate"
+            },
             {
               title: "备注",
               field: "bz",

src/views/daily/zywxys/edit.vue

+<template>
+  <RelDialog width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
+    <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
+      <el-row :gutter="20" :app="this">
+        <EditColItem  :required="item.required||false" :readonly="item.readonly?true:false "  v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label" :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule"  />
+      </el-row>
+    </el-form>
+  </RelDialog>
+</template>
+<script>
+
+  import {
+    editMixin
+  } from 'common'
+  export default {
+    mixins: [editMixin],
+    data() {
+      return {
+        editColItemList: [
+
+          {
+            label: '编码',
+            prop: 'code',
+            span: 12,
+            type: 'input',
+            required:true,
+          },
+          {
+            label: '名称',
+            prop: 'name',
+            span: 12,
+            type: 'input',
+            required:true,
+          },
+          {
+            label: '备注',
+            prop: 'bz',
+            span: 24,
+            type: 'input'
+          },
+
+        ]
+      }
+    }
+  }
+</script>

src/views/daily/zywxys/index.vue

+<template>
+  <BasePage class="min_full" :config="config" >
+    <template  #dialog="ctx"  >
+      <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
+    </template>
+    <template  #toolbar="ctx"  >
+      <!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
+     <!-- <el-button @click="demo(ctx.basePage)" size='mini'  type="primary">示例按钮</el-button> -->
+    </template>
+
+  </BasePage>
+</template>
+
+<script>
+  import Edit from './edit.vue'
+  export default{
+    data(){
+      return{
+        config:{
+          /* 基本配置*/
+          url:'aqgl/rcgl/uzywxyswh',
+          tableTitle: [
+               {label: "编码", prop: "code", fieldType: "ftString",width:120},
+               {label: "名称", prop: "name", fieldType: "ftString",width:300},
+               {label: "备注", prop: "bz", fieldType: "ftString",width:300},
+               {label: "维护人", prop: "whr", fieldType: "ftString"},
+               {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
+               {label: "创建人", prop: "cjr", fieldType: "ftString", show: false},
+               {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime", show: false},
+          ],
+          queryParams:[[
+              {
+                label: '名称',
+                prop: 'name',
+                span: 6,
+                type: 'input',
+                value:''
+              }
+            ]],
+            /* 默认启停用  */
+          showqt:false,
+
+
+          }
+      }
+
+    },
+    methods: {
+      /* 示例*/
+      // demo(basePage){
+
+      // }
+    },
+    components:{
+      Edit
+    }
+
+  }
+
+</script>
+
+<style>
+</style>