From 7fe2a9c8e1a5374e5103a72bfa9575dad5904336 Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Fri, 13 Aug 2021 20:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=83=A8=E5=88=86=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allot/components/chengya_list.vue |  30 ++-
 src/views/ysjl/3000/dj/yy/index.vue         | 192 ++++++++++++++++----
 src/views/ysjl/3000/jj/wjf-yy/index.vue     | 192 ++++++++++++++++----
 src/views/ysjl/3000/jj/yy-jj/index.vue      | 175 ++++++++++++++++++
 4 files changed, 500 insertions(+), 89 deletions(-)
 create mode 100644 src/views/ysjl/3000/jj/yy-jj/index.vue

diff --git a/src/views/allot/components/chengya_list.vue b/src/views/allot/components/chengya_list.vue
index dd75837..2005b29 100644
--- a/src/views/allot/components/chengya_list.vue
+++ b/src/views/allot/components/chengya_list.vue
@@ -16,11 +16,11 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-input v-model="listQuery.searchRenwu.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
-          <el-select v-model="listQuery.searchRenwu.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="handleFilter">
+          <el-input v-model="listQuery.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
+          <el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable @change="handleFilter">
             <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
-          <el-select v-model="listQuery.searchRenwu.quhuadaima" placeholder="请选择所属区划" clearable value="" @change="handleFilter">
+          <el-select v-model="listQuery.quhuadaima" placeholder="请选择所属区划" clearable value="" @change="handleFilter">
             <el-option
               v-for="item in areas"
               :key="item.value"
@@ -28,7 +28,7 @@
               :value="item.value"
             />
           </el-select>
-          <el-input v-model="listQuery.searchRenwu.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -36,20 +36,20 @@
             清除
           </el-button>
           <br>
-          <el-select v-model="listQuery.searchRenwu.jianyanleibie" placeholder="检验类别" clearable style="width:100px" value="" @change="handleFilter">
+          <el-select v-model="listQuery.jianyanleibie" placeholder="检验类别" clearable style="width:100px" value="" @change="handleFilter">
             <el-option value="DJ" label="定期检验" />
             <el-option value="JJ" label="监督检验" />
             <el-option value="ZJ" label="制造检验" />
           </el-select>
-          <el-date-picker v-model="listQuery.searchRenwu.shouliriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择报检日期" style="width: 150px" @change="handleFilter" />
-          <el-input v-model="listQuery.searchRenwu.shigongdanwei" placeholder="施工单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
-          <el-date-picker v-model="listQuery.searchRenwu.xianchangjianyanStart" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期（起）" style="width: 180px;" />
-          <el-date-picker v-model="listQuery.searchRenwu.xianchangjianyanEnd" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期（止）" style="width: 180px;" />
-          <el-select v-model="listQuery.searchRenwu.shouliren" filterable allow-create default-first-option clearable placeholder="请选择受理人员" style="width: 110px;">
+          <el-date-picker v-model="listQuery.shouliriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择报检日期" style="width: 150px" @change="handleFilter" />
+          <el-input v-model="listQuery.shigongdanwei" placeholder="施工单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
+          <el-date-picker v-model="listQuery.xianchangjianyanStart" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期（起）" style="width: 180px;" />
+          <el-date-picker v-model="listQuery.xianchangjianyanEnd" type="date" value-format="yyyy-MM-dd" placeholder="现场检验日期（止）" style="width: 180px;" />
+          <el-select v-model="listQuery.shouliren" filterable allow-create default-first-option clearable placeholder="请选择受理人员" style="width: 110px;">
             <el-option v-for="user in users" :key="user.id" :label="user.nickname" :value="user.nickname" />
           </el-select>
           <span class="radio-group-label">申请现场检验：</span>
-          <el-radio-group v-model="listQuery.searchRenwu.zhongjianState" @change="handleFilter">
+          <el-radio-group v-model="listQuery.zhongjianState" @change="handleFilter">
             <el-radio :label="0">
               否
             </el-radio>
@@ -187,11 +187,9 @@ export default {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
         orderBy: 'shouliriqi desc',
-        searchRenwu: {
           shiyongdanwei: undefined,
           shebeizhongleidaima: '',
           bjState: '2'
-        }
       },
       renwudan: {
         teamId: '',
@@ -314,7 +312,7 @@ export default {
           bjdIds: this.bjdIds
         }
       }).then(data => {
-        this.allotList = data.list
+        this.allotList = data
         this.allotSbzl = this.allotList[0].shebeizhongleidaima
         this.renwudan = {
           xiadariqi: new Date()
@@ -454,9 +452,7 @@ export default {
       })
     },
     clearSearch() {
-      this.listQuery.searchRenwu = {
-        bjState: '2'
-      }
+      this.listQuery.bjState="2"      
       this.getList()
     },
     // 表格单击选中行 getAllotListByBjdId
diff --git a/src/views/ysjl/3000/dj/yy/index.vue b/src/views/ysjl/3000/dj/yy/index.vue
index 6815ada..c9d1e46 100644
--- a/src/views/ysjl/3000/dj/yy/index.vue
+++ b/src/views/ysjl/3000/dj/yy/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" />
   </div>
 </template>
 <script>
@@ -11,45 +11,165 @@ export default {
   components: { baseInfo },
   data() {
     return {
-      type: '1'
+      type: '3',
+      arrayGroup: [
+        {
+          header: [
+            {
+              label: '层站',
+              prop: 'D7',
+              type: 1
+            },
+            {
+              label: '3.7 轿厢与井道壁距离单位：m）',
+              prop: 'D6',
+              type: 1
+            },
+            {
+              label: '按20%抽查的项目',
+              type: 2,
+              child: [
+                {
+                  label: '6.6门的运行和导向',
+                  prop: 'D5',
+                  type: 1
+                },
+                {
+                  label: '6.7自动关闭层门装置',
+                  prop: 'D4',
+                  type: 1
+                },
+                {
+                  label: '6.8紧急开锁装置',
+                  prop: 'D3',
+                  type: 1
+                },
+                {
+                  label: '6.9 门的锁紧',
+                  prop: 'D2',
+                  type: 1
+                },
+                {
+                  label: '6.10门的闭合',
+                  prop: 'D1',
+                  type: 1
+                }
+              ]
+            }
+          ],
+          data: []
+        },
+        {
+          header: [
+            {
+              label: '层站',
+              prop: 'D8',
+              type: 1
+            },
+            {
+              label: '6.3施力层门间隙',
+              prop: 'D7',
+              type: 1
+            },
+            {
+              label: '6.3门扇与门扇',
+              prop: 'D6',
+              type: 1
+            },
+            {
+              label: '6.3门扇与门楣',
+              prop: 'D5',
+              type: 1
+            },
+            {
+              label: '6.3门扇与地坎',
+              prop: 'D4',
+              type: 1
+            },
+            {
+              label: '6.9门锁啮合长度',
+              prop: 'D3',
+              type: 1
+            },
+            {
+              label: '6.12门刀与层门地坎间距',
+              prop: 'D2',
+              type: 1
+            },
+            {
+              label: '6.12门锁滚轮与轿门地坎间距',
+              prop: 'D1',
+              type: 1
+            }
+          ],
+          data: []
+        }
+      ],
+      tableHeader2: [
+        {
+          label: '载荷',
+          type: 1
+        },
+        {
+          label: '30%',
+          prop: 'D1',
+          type: 1
+        },
+        {
+          label: '40%',
+          prop: 'D2',
+          type: 1
+        },
+        {
+          label: '45%',
+          prop: 'D3',
+          type: 1
+        },
+        {
+          label: '50%',
+          prop: 'D4',
+          type: 1
+        },
+        {
+          label: '60%',
+          prop: 'D5',
+          type: 1
+        }
+      ],
+      list: [],
+      list1: []
     }
   },
-  computed: {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  }
+  computed: {},
+  created() {},
+  methods: {}
 }
 </script>
 
 <style>
-  .el-input__inner {
-    border: 1px solid #00000075;
-    border-radius: 4px;
-  }
-  .el-textarea__inner {
-    border: 1px solid #91393975;
-    border-radius: 4px;
-  }
-  .el-form-item__error {
-    padding-top: 0;
-    position: absolute;
-  }
-  .el-input.is-disabled .el-input__inner {
-    color: #606266;
-  }
-  .el-textarea.is-disabled .el-textarea__inner {
-    color: #606266;
-  }
-  .el-dialog__body {
-    padding-top: 10px;
-}
-  .myTable .el-input__inner{
-    padding: 0 5px;
-    text-align: center;
-  }
+.el-input__inner {
+  border: 1px solid #00000075;
+  border-radius: 4px;
+}
+.el-textarea__inner {
+  border: 1px solid #91393975;
+  border-radius: 4px;
+}
+.el-form-item__error {
+  padding-top: 0;
+  position: absolute;
+}
+.el-input.is-disabled .el-input__inner {
+  color: #606266;
+}
+.el-textarea.is-disabled .el-textarea__inner {
+  color: #606266;
+}
+.el-dialog__body {
+  padding-top: 10px;
+}
+.myTable .el-input__inner {
+  padding: 0 5px;
+  text-align: center;
+}
 </style>
diff --git a/src/views/ysjl/3000/jj/wjf-yy/index.vue b/src/views/ysjl/3000/jj/wjf-yy/index.vue
index 779de59..6615388 100644
--- a/src/views/ysjl/3000/jj/wjf-yy/index.vue
+++ b/src/views/ysjl/3000/jj/wjf-yy/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :table-header="tableHeader" :list="list" :num="3" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" />
   </div>
 </template>
 <script>
@@ -11,45 +11,165 @@ export default {
   components: { baseInfo },
   data() {
     return {
-      type: '2'
+      type: '2',
+      arrayGroup: [
+        {
+          header: [
+            {
+              label: '层站',
+              prop: 'D7',
+              type: 1
+            },
+            {
+              label: '3.7 轿厢与井道壁距离单位：m）',
+              prop: 'D6',
+              type: 1
+            },
+            {
+              label: '按20%抽查的项目',
+              type: 2,
+              child: [
+                {
+                  label: '6.6门的运行和导向',
+                  prop: 'D5',
+                  type: 1
+                },
+                {
+                  label: '6.7自动关闭层门装置',
+                  prop: 'D4',
+                  type: 1
+                },
+                {
+                  label: '6.8紧急开锁装置',
+                  prop: 'D3',
+                  type: 1
+                },
+                {
+                  label: '6.9 门的锁紧',
+                  prop: 'D2',
+                  type: 1
+                },
+                {
+                  label: '6.10门的闭合',
+                  prop: 'D1',
+                  type: 1
+                }
+              ]
+            }
+          ],
+          data: []
+        },
+        {
+          header: [
+            {
+              label: '层站',
+              prop: 'D8',
+              type: 1
+            },
+            {
+              label: '6.3施力层门间隙',
+              prop: 'D7',
+              type: 1
+            },
+            {
+              label: '6.3门扇与门扇',
+              prop: 'D6',
+              type: 1
+            },
+            {
+              label: '6.3门扇与门楣',
+              prop: 'D5',
+              type: 1
+            },
+            {
+              label: '6.3门扇与地坎',
+              prop: 'D4',
+              type: 1
+            },
+            {
+              label: '6.9门锁啮合长度',
+              prop: 'D3',
+              type: 1
+            },
+            {
+              label: '6.12门刀与层门地坎间距',
+              prop: 'D2',
+              type: 1
+            },
+            {
+              label: '6.12门锁滚轮与轿门地坎间距',
+              prop: 'D1',
+              type: 1
+            }
+          ],
+          data: []
+        }
+      ],
+      tableHeader2: [
+        {
+          label: '电动机电流载重量百分比',
+          type: 1
+        },
+        {
+          label: '30%',
+          prop: 'D1',
+          type: 1
+        },
+        {
+          label: '40%',
+          prop: 'D2',
+          type: 1
+        },
+        {
+          label: '45%',
+          prop: 'D3',
+          type: 1
+        },
+        {
+          label: '50%',
+          prop: 'D4',
+          type: 1
+        },
+        {
+          label: '60%',
+          prop: 'D5',
+          type: 1
+        }
+      ],
+      list: [],
+      list1: []
     }
   },
-  computed: {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  }
+  computed: {},
+  created() {},
+  methods: {}
 }
 </script>
 
 <style>
-  .el-input__inner {
-    border: 1px solid #00000075;
-    border-radius: 4px;
-  }
-  .el-textarea__inner {
-    border: 1px solid #91393975;
-    border-radius: 4px;
-  }
-  .el-form-item__error {
-    padding-top: 0;
-    position: absolute;
-  }
-  .el-input.is-disabled .el-input__inner {
-    color: #606266;
-  }
-  .el-textarea.is-disabled .el-textarea__inner {
-    color: #606266;
-  }
-  .el-dialog__body {
-    padding-top: 10px;
-}
-  .myTable .el-input__inner{
-    padding: 0 5px;
-    text-align: center;
-  }
+.el-input__inner {
+  border: 1px solid #00000075;
+  border-radius: 4px;
+}
+.el-textarea__inner {
+  border: 1px solid #91393975;
+  border-radius: 4px;
+}
+.el-form-item__error {
+  padding-top: 0;
+  position: absolute;
+}
+.el-input.is-disabled .el-input__inner {
+  color: #606266;
+}
+.el-textarea.is-disabled .el-textarea__inner {
+  color: #606266;
+}
+.el-dialog__body {
+  padding-top: 10px;
+}
+.myTable .el-input__inner {
+  padding: 0 5px;
+  text-align: center;
+}
 </style>
diff --git a/src/views/ysjl/3000/jj/yy-jj/index.vue b/src/views/ysjl/3000/jj/yy-jj/index.vue
new file mode 100644
index 0000000..6dc0a62
--- /dev/null
+++ b/src/views/ysjl/3000/jj/yy-jj/index.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" :array-group="arrayGroup" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/3000/common/index'
+
+export default {
+  name: 'ElevatorYeyin',
+  components: { baseInfo },
+  data() {
+    return {
+      type: '4',
+      arrayGroup: [
+        {
+          header: [
+            {
+              label: '层站',
+              prop: 'D7',
+              type: 1
+            },
+            {
+              label: '3.7 轿厢与井道壁距离单位：m）',
+              prop: 'D6',
+              type: 1
+            },
+            {
+              label: '按20%抽查的项目',
+              type: 2,
+              child: [
+                {
+                  label: '6.6门的运行和导向',
+                  prop: 'D5',
+                  type: 1
+                },
+                {
+                  label: '6.7自动关闭层门装置',
+                  prop: 'D4',
+                  type: 1
+                },
+                {
+                  label: '6.8紧急开锁装置',
+                  prop: 'D3',
+                  type: 1
+                },
+                {
+                  label: '6.9 门的锁紧',
+                  prop: 'D2',
+                  type: 1
+                },
+                {
+                  label: '6.10门的闭合',
+                  prop: 'D1',
+                  type: 1
+                }
+              ]
+            }
+          ],
+          data: []
+        },
+        {
+          header: [
+            {
+              label: '层站',
+              prop: 'D8',
+              type: 1
+            },
+            {
+              label: '6.3施力层门间隙',
+              prop: 'D7',
+              type: 1
+            },
+            {
+              label: '6.3门扇与门扇',
+              prop: 'D6',
+              type: 1
+            },
+            {
+              label: '6.3门扇与门楣',
+              prop: 'D5',
+              type: 1
+            },
+            {
+              label: '6.3门扇与地坎',
+              prop: 'D4',
+              type: 1
+            },
+            {
+              label: '6.9门锁啮合长度',
+              prop: 'D3',
+              type: 1
+            },
+            {
+              label: '6.12门刀与层门地坎间距',
+              prop: 'D2',
+              type: 1
+            },
+            {
+              label: '6.12门锁滚轮与轿门地坎间距',
+              prop: 'D1',
+              type: 1
+            }
+          ],
+          data: []
+        }
+      ],
+      tableHeader2: [
+        {
+          label: '载荷',
+          type: 1
+        },
+        {
+          label: '30%',
+          prop: 'D1',
+          type: 1
+        },
+        {
+          label: '40%',
+          prop: 'D2',
+          type: 1
+        },
+        {
+          label: '45%',
+          prop: 'D3',
+          type: 1
+        },
+        {
+          label: '50%',
+          prop: 'D4',
+          type: 1
+        },
+        {
+          label: '60%',
+          prop: 'D5',
+          type: 1
+        }
+      ],
+      list: [],
+      list1: []
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+.el-input__inner {
+  border: 1px solid #00000075;
+  border-radius: 4px;
+}
+.el-textarea__inner {
+  border: 1px solid #91393975;
+  border-radius: 4px;
+}
+.el-form-item__error {
+  padding-top: 0;
+  position: absolute;
+}
+.el-input.is-disabled .el-input__inner {
+  color: #606266;
+}
+.el-textarea.is-disabled .el-textarea__inner {
+  color: #606266;
+}
+.el-dialog__body {
+  padding-top: 10px;
+}
+.myTable .el-input__inner {
+  padding: 0 5px;
+  text-align: center;
+}
+</style>