From 7f3c482ea6b4742532957891a14cae012ffd2cbc Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Fri, 13 Aug 2021 21:51:08 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allot/components/chengya_list.vue |   8 +-
 src/views/ysjl/3000/common/index.vue        | 146 ++++++++++++++++----
 src/views/ysjl/3000/dj/common/table.vue     |   5 +-
 src/views/ysjl/3000/dj/common/table2.vue    |  82 +++++++++++
 src/views/ysjl/3000/dj/zdft/index.vue       | 108 +++++++++++++++
 5 files changed, 319 insertions(+), 30 deletions(-)
 create mode 100644 src/views/ysjl/3000/dj/common/table2.vue
 create mode 100644 src/views/ysjl/3000/dj/zdft/index.vue

diff --git a/src/views/allot/components/chengya_list.vue b/src/views/allot/components/chengya_list.vue
index 2005b29..05799a2 100644
--- a/src/views/allot/components/chengya_list.vue
+++ b/src/views/allot/components/chengya_list.vue
@@ -187,9 +187,9 @@ export default {
         pageNum: 1, // 页码
         pageSize: 20, // 每页条数
         orderBy: 'shouliriqi desc',
-          shiyongdanwei: undefined,
-          shebeizhongleidaima: '',
-          bjState: '2'
+        shiyongdanwei: undefined,
+        shebeizhongleidaima: '',
+        bjState: '2'
       },
       renwudan: {
         teamId: '',
@@ -452,7 +452,7 @@ export default {
       })
     },
     clearSearch() {
-      this.listQuery.bjState="2"      
+      this.listQuery.bjState = '2'
       this.getList()
     },
     // 表格单击选中行 getAllotListByBjdId
diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 2ef778c..d555c7f 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -188,7 +188,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 1" :gutter="20">
+            <el-row v-if="fromType == 1||fromType==5||fromType==3" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="使用单位名称" prop="shiyongdanwei">
                   <el-input
@@ -199,7 +199,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 2" :gutter="20">
+            <el-row v-if="fromType == 2 ||fromType == 4" :gutter="20">
               <el-col :span="18">
                 <el-form-item
                   label="施工单位名称"
@@ -213,7 +213,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 2" :gutter="20">
+            <el-row v-if="fromType == 2 ||fromType == 4" :gutter="20">
               <el-col :span="9">
                 <el-form-item
                   label="施工单位许可证编号"
@@ -247,7 +247,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 1" :gutter="20">
+            <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="安全管理人员" prop="anquanguanlirenyuan">
                   <el-input
@@ -290,7 +290,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 1" :gutter="20">
+            <el-row v-if="fromType == 1 ||fromType == '5'" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="注册代码" prop="zhucedaima">
                   <el-input
@@ -301,7 +301,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 1" :gutter="20">
+            <el-row :gutter="20">
               <el-col :span="18">
                 <el-form-item label="设备使用地点" prop="anzhuangdidian">
                   <el-input
@@ -312,7 +312,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 1" :gutter="20">
+            <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="单位内编号" prop="danweineibubianhao">
                   <el-input
@@ -333,7 +333,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType == 1" :gutter="20">
+            <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="改造单位名称" prop="gaizaodanwei">
                   <el-input
@@ -386,7 +386,14 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="维保电话" prop="weibaodanweiDianhua">
+                <el-form-item v-if="fromType==5" label="维护保养单位电话" prop="weibaodanweiDianhua">
+                  <el-input
+                    v-model="ysjl.weibaodanweiDianhua"
+                    type="text"
+                    :disabled="edit"
+                  />
+                </el-form-item>
+                <el-form-item v-else label="维保电话" prop="weibaodanweiDianhua">
                   <el-input
                     v-model="ysjl.weibaodanweiDianhua"
                     type="text"
@@ -404,8 +411,22 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row v-if="fromType!=='5'" :gutter="20">
+              <el-col :span="18">
+                <el-form-item label="现场检验条件" prop="xianchangjianyantiaojian">
+                  <el-radio-group v-model="ysjl.xianchangjianyantiaojian">
+                    <el-radio label="符合">
+                      符合
+                    </el-radio>
+                    <el-radio label="不符合">
+                      不符合
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </fieldset>
-          <fieldset>
+          <fieldset v-if="fromType !=='5'">
             <legend>设备技术参数</legend>
             <el-row :gutter="20">
               <el-col :span="9">
@@ -416,7 +437,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="额定速度" prop="edingsudu">
+                <el-form-item v-if="fromType==4" label="额定速度">
+                  <el-input v-model="param.edingsuduShangxing" type="text">
+                    <span slot="suffix">m/s</span>
+                  </el-input>
+                  <el-input v-model="param.edingsuduXiaxing" type="text">
+                    <span slot="suffix">m/s</span>
+                  </el-input>
+                </el-form-item>
+                <el-form-item v-else label="额定速度" prop="edingsudu">
                   <el-input v-model="param.edingsudu" type="text">
                     <span slot="suffix">m/s</span>
                   </el-input>
@@ -449,6 +478,72 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row v-if="fromType==3|| fromType==4" :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="油缸数量" prop="youguanshuliang">
+                  <el-input v-model="param.youguanshuliang" type="text" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="顶升形式" prop="dingshengxingshi">
+                  <el-input v-model="param.dingshengxingshi" type="text" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </fieldset>
+          <fieldset v-else>
+            <legend>设备技术参数</legend>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="名义速度" prop="mingyisudu">
+                  <el-input v-model="param.mingyisudu" type="text">
+                    <span slot="suffix">m/s</span>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="名义宽度" prop="mingyikuandu">
+                  <el-input v-model="param.mingyikuandu" type="text">
+                    <span slot="suffix">mm</span>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="9">
+                <el-form-item label="倾斜角" prop="qingxiejiao">
+                  <el-input
+                    v-model="param.qingxiejiao"
+                    type="text"
+                  >
+                    <span slot="suffix">°</span>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="输送能力" prop="shusongnengli">
+                  <el-input v-model="param.shusongnengli" type="text">
+                    <span slot="suffix">p/h</span>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="9">
+                <el-form-item label="提升高度" prop="tishenggaodu">
+                  <el-input v-model="param.tishenggaodu" type="text">
+                    <span slot="suffix">m</span>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="9">
+                <el-form-item label="使用区长度" prop="quduanchangdu">
+                  <el-input v-model="param.quduanchangdu" type="text">
+                    <span slot="suffix">m</span>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </fieldset>
           <fieldset>
             <el-row :gutter="20">
@@ -511,7 +606,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col v-if="fromType!=='5'" :span="8">
                 <el-form-item label="检验完成日期" prop="jianyanjieshuriqi">
                   <el-date-picker
                     v-model="ysjl.jianyanjieshuriqi"
@@ -560,8 +655,12 @@
       <el-tab-pane label="检验项目" name="second">
         <Inspection :bgfy-data="bgfyData" />
       </el-tab-pane>
+      <el-tab-pane v-if="fromType == '5'" label="附表1" name="three">
+        <Table2 ref="table2" />
+      </el-tab-pane>
       <el-tab-pane
         v-for="(item, index) in arrayGroup"
+        v-else
         :key="index"
         :label="'附表' + (index + 1)"
         :name="'tab' + index"
@@ -570,13 +669,14 @@
           ref="table3"
           :tabel-header="item.header"
           :table-data="item.data"
+          :from-type="fromType"
           @addfn="addfn(item)"
         />
       </el-tab-pane>
       <!-- <el-tab-pane v-if="fromType==1" label="附表二" name="four">
         <Table ref="table2" :tabel-header="tableHeader1" :table-data="list1"/>
       </el-tab-pane> -->
-      <el-tab-pane v-if="fromType == 1" label="附表3" name="five">
+      <el-tab-pane v-if="fromType == 1||fromType==3" label="附表3" name="five">
         <Table1 ref="table1" :pic="pic" />
       </el-tab-pane>
     </el-tabs>
@@ -662,10 +762,11 @@ import Enclosure from '@/views/common/Enclosure'
 import Inspection from '@/views/ysjl/3000/common/inspection-items'
 import Table from '@/views/ysjl/3000/dj/common/table'
 import Table1 from '@/views/ysjl/3000/dj/common/table1'
+import Table2 from '@/views/ysjl/3000/dj/common/table2'
 
 export default {
   name: 'BaseInfo',
-  components: { SignName, Sticky, Enclosure, Inspection, Table, Table1 },
+  components: { SignName, Sticky, Enclosure, Inspection, Table, Table1, Table2 },
   props: {
     arrayGroup: {
       require: true,
@@ -766,7 +867,6 @@ export default {
   },
   methods: {
     addfn(item) {
-      console.log('哈哈哈哈哈')
       const length = item.data.length
       item.data.push({
         id: parseInt(length),
@@ -778,7 +878,6 @@ export default {
         D6: '',
         D7: ''
       })
-      console.log(item)
     },
     initYsjl() {
       this.ysjlController.init(this.$route.query).then((data) => {
@@ -807,7 +906,6 @@ export default {
       })
     },
     getFbList() {
-      console.log(this.ysjlId)
       this.ysjlController.getYsjlFb(this.ysjlId).then((data) => {
         console.log(data)
         // this.param = data
@@ -833,12 +931,10 @@ export default {
       })
     },
     getParam() {
-      console.log(this.ysjlId)
       const id = this.ysjlId || this.$route.query.templateId
       this.ysjlController
         .getParam(id, this.$route.query.sbzldm)
         .then((data) => {
-          console.log(data)
           this.param = data
         })
     },
@@ -862,13 +958,11 @@ export default {
       if (this.$route.query.state === 'update') {
         this.jyxmController.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort).then((data) => {
           this.bgfyData = data
-          console.log(data, 5685)
           this.tableJs.mergeColRows(this.cols, this.rows, data)
         })
       } else {
         this.jyxmController.getCyJyxm(this.$route.query.templateId, sort).then((data) => {
           this.bgfyData = data
-          console.log(data, 5685)
           this.tableJs.mergeColRows(this.cols, this.rows, data)
         })
       }
@@ -1012,6 +1106,9 @@ export default {
     saveYsjl(operation) {
       const tableData = []
       const arr = []
+      if(this.fromType=='5'){
+        arr.push(this.$refs.table2.tableData)
+      } else{
       this.arrayGroup.map((item) => {
         item.data.forEach(k => {
           delete k.id
@@ -1023,7 +1120,7 @@ export default {
         delete item.name
       })
       arr.push(arr1)
-      console.log(arr, 333333333)
+      }
       this.bgfyData.forEach((row) => {
         tableData.push({
           ysjlId: this.ysjlId,
@@ -1078,9 +1175,8 @@ export default {
     },
 
     save(operation, type, jyxm, fb) {
-      console.log(JSON.stringify(fb), jyxm, 222222222222222)
-      console.log(this.ysjl.imagePath, this.$refs.table1, 55555555)
-      this.ysjl.imagePath = this.$refs.table1.imgPath
+      if(this.fromType!=='5')this.ysjl.imagePath = this.$refs.table1.imgPath
+      
       // 判断报告编号是否重复
       if (this.isRepeat) {
         this.$message({
diff --git a/src/views/ysjl/3000/dj/common/table.vue b/src/views/ysjl/3000/dj/common/table.vue
index c2c93c0..84d6c72 100644
--- a/src/views/ysjl/3000/dj/common/table.vue
+++ b/src/views/ysjl/3000/dj/common/table.vue
@@ -60,6 +60,10 @@ export default {
         return []
       }
     },
+    fromType: {
+      type: String,
+      default: ''
+    },
     tableData: {
       type: Array,
       require: true,
@@ -70,7 +74,6 @@ export default {
   },
   data() {
     return {
-      type: '1',
       options: [
         {
           value: '√',
diff --git a/src/views/ysjl/3000/dj/common/table2.vue b/src/views/ysjl/3000/dj/common/table2.vue
new file mode 100644
index 0000000..d3fc83d
--- /dev/null
+++ b/src/views/ysjl/3000/dj/common/table2.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="app-container">
+    <el-table :data="tableData" style="width: 50%" border>
+      <el-table-column label="" prop="D2" />
+      <el-table-column label="制停距离（m）" prop="D1">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.D1" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+export default {
+  name: 'Table2',
+  components: {},
+  props: {
+    tabelHeader: {
+      type: Array,
+      require: true,
+      default: () => {
+        return []
+      }
+    },
+    tableData: {
+      type: Array,
+      require: true,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      options: [
+        {
+          value: '√',
+          id: '1'
+        },
+        {
+          value: 'X',
+          id: '2'
+        },
+        {
+          value: '/',
+          id: '3'
+        }
+      ]
+    }
+  },
+  computed: {},
+  created() {
+    this.tableData = [
+      {
+        D1: '',
+        D2: '第一行'
+      },
+      {
+        D1: '',
+        D2: '第二行'
+      },
+      {
+        D1: '',
+        D2: '第三行'
+      }
+    ]
+  },
+  mounted() {
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style scoped>
+.searchBox {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 20px;
+}
+</style>
diff --git a/src/views/ysjl/3000/dj/zdft/index.vue b/src/views/ysjl/3000/dj/zdft/index.vue
new file mode 100644
index 0000000..75ed9db
--- /dev/null
+++ b/src/views/ysjl/3000/dj/zdft/index.vue
@@ -0,0 +1,108 @@
+<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: '5',
+      arrayGroup: [
+        {
+          header: [
+            {
+              label: '',
+              prop: 'D2',
+              type: 1
+            },
+            {
+              label: '制停距离（m）',
+              prop: 'D1',
+              type: 1
+            }
+          ],
+          data: [{
+            D2: '第一次',
+            D1: ''
+          }, {
+            D2: '第二次',
+            D1: ''
+          }, {
+            D2: '第三次',
+            D1: ''
+          }]
+        }
+      ],
+      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>