From e6fee4a1935389d62e28c610292acb1546a7ffcf Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Fri, 20 Aug 2021 21:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=90=84=E7=A7=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ysjl/1000/dj/sy/sysy.vue         |   3 +-
 src/views/ysjl/2000/2100/zbg/dj/edit.vue   |  38 +-
 src/views/ysjl/2000/2100/zbg/nd/edit.vue   |  12 +-
 src/views/ysjl/2000/2200/zbg/dj/edit.vue   |  46 +-
 src/views/ysjl/2000/2200/zbg/nd/tuoche.vue |   7 +-
 src/views/ysjl/2000/2300/zbg/jj/cyqp.vue   | 610 ---------------------
 src/views/ysjl/2000/2400/common/ycjl.vue   |  23 +-
 src/views/ysjl/2000/2400/zbg/jj/edit.vue   |  16 +-
 src/views/ysjl/7000/jj/edit.vue            |   4 +-
 9 files changed, 68 insertions(+), 691 deletions(-)
 delete mode 100644 src/views/ysjl/2000/2300/zbg/jj/cyqp.vue

diff --git a/src/views/ysjl/1000/dj/sy/sysy.vue b/src/views/ysjl/1000/dj/sy/sysy.vue
index 07ee012..d66f5ee 100644
--- a/src/views/ysjl/1000/dj/sy/sysy.vue
+++ b/src/views/ysjl/1000/dj/sy/sysy.vue
@@ -483,7 +483,8 @@ export default {
         data = {
           ysjlId: this.ysjlId,
           isReport: false,
-          order: sort
+          order: sort,
+          templateId: this.$route.query.templateId
         }
       }
       this.api({
diff --git a/src/views/ysjl/2000/2100/zbg/dj/edit.vue b/src/views/ysjl/2000/2100/zbg/dj/edit.vue
index 8b04ac6..123350f 100644
--- a/src/views/ysjl/2000/2100/zbg/dj/edit.vue
+++ b/src/views/ysjl/2000/2100/zbg/dj/edit.vue
@@ -24,10 +24,10 @@
         <el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
           预览
         </el-button>
-        <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
+        <!-- <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
           查看驳回意见
         </el-button>
-        <Symbols />
+        <Symbols /> -->
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
@@ -327,12 +327,12 @@
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="检验开始日期" prop="jianyankaishiriqi">
-                  <el-date-picker v-model="ysjl.jianyankaishiriqi" type="date" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker v-model="ysjl.jianyankaishiriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="检验结束日期" prop="jianyanjieshuriqi">
-                  <el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -340,7 +340,7 @@
               <el-col :span="9">
                 <el-form-item label="下次定期检验日期" label-width="150px" prop="xiacijianyanriqi">
                   <el-input v-if="ysjl.jianyanjielun === '不符合要求'" v-model="ysjl.xiacijianyanriqishuoming" type="text" disabled="true" />
-                  <el-date-picker v-else v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker v-else v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
@@ -1006,9 +1006,9 @@
           </fieldset>
         </el-form>
       </el-tab-pane>
-      <el-tab-pane label="压力容器原始资料" name="sixth">
+      <!-- <el-tab-pane label="压力容器原始资料" name="sixth">
         <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
     <el-dialog :visible.sync="jyfaDialogVisible" title="添加检验方案" width="600px">
       <jyfa ref="jyfa" :info="info" @childMethod="getJyxm" />
@@ -1052,13 +1052,13 @@ import jyfa from '../../../../addJyfa'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import pictureUpload from '@/components/Upload'
-import SliceUpload from '@/components/SliceUpload'
-import Symbols from '@/views/common/Symbols'
+// import SliceUpload from '@/components/SliceUpload'
+// import Symbols from '@/views/common/Symbols'
 import { getDepartmentTreeList } from '@/api/common'
 
 export default {
   name: 'RqDjYsjl',
-  components: { SignName, Sticky, jyfa, pictureUpload, SliceUpload, Symbols },
+  components: { SignName, Sticky, jyfa, pictureUpload },
   data() {
     return {
       // 预定义值
@@ -1201,13 +1201,13 @@ export default {
         this.ysjl = data.ysjl
         this.departmentId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
-        // 设置初始值
-        const tempTime = new Date()
-        this.ysjl.jianyankaishiriqi = tempTime
-        this.ysjl.jianyanjieshuriqi = tempTime
-        let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
-        xcjyrq = new Date(xcjyrq)
-        this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
+        // // 设置初始值
+        // const tempTime = new Date()
+        // this.ysjl.jianyankaishiriqi = tempTime
+        // this.ysjl.jianyanjieshuriqi = tempTime
+        // let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
+        // xcjyrq = new Date(xcjyrq)
+        // this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
         this.ysjl.xiacijianyanriqishuoming = '/'
         this.$set(this.ysjl, 'shebeipinzhong', '储存')
         this.$set(this.ysjl, 'jianyanjielun', '符合要求')
@@ -1589,9 +1589,9 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                cyJyxm:{
+                cyJyxm: {
                   jyxm: jyxm,
-                  bgjyxm: jyxm,
+                  bgjyxm: jyxm
                 }
               }
             }).then(data => {
diff --git a/src/views/ysjl/2000/2100/zbg/nd/edit.vue b/src/views/ysjl/2000/2100/zbg/nd/edit.vue
index 1d51cb2..8a33d0a 100644
--- a/src/views/ysjl/2000/2100/zbg/nd/edit.vue
+++ b/src/views/ysjl/2000/2100/zbg/nd/edit.vue
@@ -17,7 +17,7 @@
         <el-button v-if="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
           预览
         </el-button>
-        <Symbols />
+        <!-- <Symbols /> -->
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
@@ -117,7 +117,7 @@
               </el-col>
               <el-col :span="9">
                 <el-form-item label="下次定期检验日期" prop="xiacijianyanriqi">
-                  <el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -190,7 +190,7 @@
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="下次年度检查日期" prop="xiaciniandujianchariqi">
-                  <el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" style="width: 100%;" />
+                  <el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" style="width: 100%;" value-format="yyyy-MM-dd" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -281,11 +281,11 @@
 import Utils from '@/utils/contact.js' // 导入签名方法
 import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
-import Symbols from '@/views/common/Symbols'
+// import Symbols from '@/views/common/Symbols'
 import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'RqNdYsjl',
-  components: { SignName, Sticky, Symbols },
+  components: { SignName, Sticky },
   data() {
     return {
       edit: false, // 页面编辑状态
@@ -381,8 +381,6 @@ export default {
         this.ysjl = data.ysjl
         this.departmentId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
-        const tempTime = new Date()
-        this.ysjl.jianyanjieshuriqi = tempTime
         this.ysjl.jianyanjielun = '符合要求'
         this.param = {
           wentijizai: '无',
diff --git a/src/views/ysjl/2000/2200/zbg/dj/edit.vue b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
index d8bce7c..c8778c6 100644
--- a/src/views/ysjl/2000/2200/zbg/dj/edit.vue
+++ b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
@@ -351,12 +351,12 @@
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="下次年度检验日期" prop="xiaciniandujianchariqi">
-                  <el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" editable style="width: 100%;" />
+                  <el-date-picker v-model="param.xiaciniandujianchariqi" type="date" placeholder="选择日期" editable style="width: 100%;" value-format="yyyy-MM-dd" />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
                 <el-form-item label="下次全面检验日期" prop="xiacijianyanriqi">
-                  <el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" editable style="width: 100%;" />
+                  <el-date-picker v-model="ysjl.xiacijianyanriqi" type="date" placeholder="选择日期" editable style="width: 100%;" value-format="yyyy-MM-dd" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -816,26 +816,7 @@ export default {
   name: 'RqDjGcYsjl',
   components: { SignName, Sticky, jyfa },
   props: {
-    neibuleibiejielun: {
-      type: String,
-      default: '汽车罐车（罐式集装箱）定期检验结论记录'
-    },
-    neibuleibieshencha: {
-      type: String,
-      default: '汽车罐车（罐式集装箱）资料审查记录'
-    },
-    neibuleibieparam: {
-      type: String,
-      default: '汽车罐车（罐式集装箱）资料审查记录附页'
-    },
-    datashow: {
-      type: Boolean,
-      default: true
-    },
-    jyxm: {
-      type: String,
-      default: ''
-    }
+
   },
   data() {
     return {
@@ -890,7 +871,12 @@ export default {
       similarVisible: false,
       similarTableData: [],
       djjgs: ['无'],
-      departmemtArr: []
+      departmemtArr: [],
+      neibuleibiejielun: '汽车罐车（罐式集装箱）定期检验结论记录',
+      neibuleibieshencha: '汽车罐车（罐式集装箱）资料审查记录',
+      neibuleibieparam: '汽车罐车（罐式集装箱）资料审查记录附页',
+      datashow: true,
+      jyxm: ''
     }
   },
   computed: {
@@ -951,12 +937,12 @@ export default {
         this.ysjl = data.ysjl
         this.templateId = this.ysjl.departmentId
         this.param = data.param ? data.param : {}
-        const tempTime = new Date()
+        // const tempTime = new Date()
         this.$set(this.ysjl, 'jianyankaishiriqi', this.dateFormat(new Date()))
         this.$set(this.ysjl, 'jianyanjieshuriqi', this.dateFormat(new Date()))
-        let xcjyrq = (tempTime.getFullYear() + 1) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
-        xcjyrq = new Date(xcjyrq)
-        this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
+        // let xcjyrq = (tempTime.getFullYear() + 1) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
+        // xcjyrq = new Date(xcjyrq)
+        // this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
         this.$set(this.ysjl, 'bianzhiriqi', this.dateFormat(new Date()))
         this.$set(this.ysjl, 'jianyanyiju', '《移动式压力容器安全技术监察规程》（TSG R0005）\n' + '《压力容器定期检验规则》（TSG R7001）')
         this.$set(this.ysjl, 'shebeipinzhong', '汽车罐车')
@@ -1185,9 +1171,9 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                cyJyxm:{
-                jyxm: jyxm,
-                bgjyxm: jyxm,
+                cyJyxm: {
+                  jyxm: jyxm,
+                  bgjyxm: jyxm
                 }
               }
             }).then(data => {
diff --git a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
index a461d1a..77b8596 100644
--- a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
+++ b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
@@ -629,9 +629,10 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                jyxm: JSON.stringify(this.tableData),
-                bgjyxm: JSON.stringify(this.tableDataBg),
-                flag: operation
+                cyJyxm: {
+                  jyxm: JSON.stringify(this.tableData),
+                  bgjyxm: JSON.stringify(this.tableDataBg)
+                }
               }
             }).then(data => {
               Utils.$emit('bggl-daiban-list')
diff --git a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
deleted file mode 100644
index 0f43138..0000000
--- a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
+++ /dev/null
@@ -1,610 +0,0 @@
-<!-- 车用气瓶安装监督检验报告 -->
-<template>
-  <div class="app-container">
-    <sticky style="margin-bottom: 10px;">
-      <div class="sub-navbar">
-        <el-button v-show="state === 'create'" type="success" icon="el-icon-edit" size="medium" @click="saveYsjl('add')">
-          保存
-        </el-button>
-        <el-button v-show="state === 'update'" type="primary" icon="el-icon-edit" size="medium" @click="saveYsjl('upd')">
-          更新
-        </el-button>
-        <el-button v-show="state === 'update'" type="success" icon="el-icon-upload2" size="medium" @click="saveYsjl('build')">
-          生成报告
-        </el-button>
-        <el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
-          预览
-        </el-button>
-        <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
-          查看驳回意见
-        </el-button>
-      </div>
-    </sticky>
-    <el-tabs v-model="checkedTab" type="card">
-      <el-tab-pane label="基本信息" name="first">
-        <el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="130px">
-          <fieldset>
-            <legend>基本信息</legend>
-            <el-row :gutter="20">
-              <el-col v-if="state === 'create' || ysjl.jilubianhao === null || ysjl.jilubianhao === ''" :span="13">
-                <el-form-item label="报告编号">
-                  <el-input v-model="jlbh1" style="width:70px" disabled /> -
-                  <el-input v-model="jlbh2" style="width:120px" disabled /> -
-                  <el-input v-model="jlbh3" style="width:120px" />
-                </el-form-item>
-              </el-col>
-              <el-col v-else :span="9">
-                <el-form-item label="报告编号" prop="jilubianhao">
-                  <el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" @blur="judgeRepeat(ysjl.jilubianhao, ysjl.id)" />
-                </el-form-item>
-              </el-col>
-              <el-col v-if="isRepeat" :span="2">
-                <span style="color:red">编号重复</span>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <el-form-item label="安装单位" prop="shigongdanwei">
-                  <el-input v-model="ysjl.shigongdanwei" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="安装许可证编号" prop="shigongxukezheng">
-                  <el-input v-model="ysjl.shigongxukezheng" type="text" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="安装日期" prop="shigongriqi">
-                  <el-date-picker v-model="ysjl.shigongriqi" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <el-form-item label="气瓶制造单位" prop="zhizaodanwei">
-                  <el-input v-model="ysjl.zhizaodanwei" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="产品编号" prop="chanpinbianhao">
-                  <el-input v-model="ysjl.chanpinbianhao" type="text" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="设备代码" prop="shebeidaima">
-                  <el-input v-model="ysjl.shebeidaima" type="text" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="制造日期" prop="zhizaoriqi">
-                  <el-date-picker v-model="ysjl.zhizaoriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="登记机关" prop="dengjijiguan">
-                  <el-select v-model="ysjl.dengjijiguan" filterable style="width: 100%;">
-                    <el-option v-for="(item, index) in djjgs" :key="index" :label="item" :value="item" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="检验金额(元)" prop="jianyanheding">
-                  <el-input-number v-model="ysjl.jianyanheding" :disabled="ysjl.retreatState === 2 && ysjl.jfState !== null && ysjl.jfState" :controls="false" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </fieldset>
-          <fieldset>
-            <legend>性能参数</legend>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="公称压力" prop="yali">
-                  <el-input v-model="param.yali" type="text" style="width: 120%;" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="工作介质" prop="jiezhi">
-                  <el-input v-model="param.jiezhi" type="text" style="width: 120%;" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="车辆牌号/车辆底盘号" label-width="150px" prop="rongqituhao">
-                  <el-input v-model="param.rongqituhao" type="text" style="width: 120%;" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </fieldset>
-          <fieldset>
-            <legend>检验信息</legend>
-            <el-row :gutter="20" style="text-align:left;margin-left: 35px;font-size: 18px;color: #606266;line-height: 60px;font-weight: bolder;">
-              根据《中华人民共和国特种设备安全法》、《特种设备安全监察条例》、《车用气瓶安全技术监察规程》的要求，该车用气瓶安装经我机构监督检验，其安装安全质量
-              <el-select v-model="ysjl.jianyanjielun" placeholder="请选择" style="width: 100px;">
-                <el-option label="符合" value="符合" />
-                <el-option label="不符合" value="不符合" />
-              </el-select>
-              相关要求，特发此证。
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="检验开始日期" prop="jianyankaishiriqi">
-                  <el-date-picker v-model="ysjl.jianyankaishiriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="检验结束日期" prop="jianyanjieshuriqi">
-                  <el-date-picker v-model="ysjl.jianyanjieshuriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="选择科室" prop="departmentId">
-                  <el-cascader
-                    v-model="ysjl.departmentId"
-                    :options="departmemtArr"
-                    :props="{ value: 'id', label: 'name', checkStrictly: true }"
-                    :show-all-levels="false"
-                    @change="handleChange"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :span="9">
-                <el-form-item label="检验人员" prop="jianyanrenyuan">
-                  <el-input v-model="jianyanrenyuan" disabled />
-                  <el-input v-show="false" v-model="ysjl.jianyanrenyuan" />
-                </el-form-item>
-              </el-col>
-              <el-col v-if="state !== 'bgView'" :span="9">
-                <sign-name :ysjl="ysjl" :jianyanrenyuan="jianyanrenyuan" :disabled="edit" @setSignValue="singNameValue" />
-              </el-col>
-            </el-row>
-          </fieldset>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="车用气瓶安装监督检验报告附页" name="second">
-        <el-table
-          :data="bgfyData"
-          :span-method="arraySpanMethod"
-          border
-          highlight-current-row
-          stripe
-          style="width:80%"
-        >
-          <el-table-column type="index" width="60" align="center" label="序号" />
-          <el-table-column align="center" label="检验项目">
-            <el-table-column align="left" prop="jianyanxiang" width="150" label="检验项" />
-            <el-table-column align="left" prop="jianyanmu" width="300" label="检验内容" />
-          </el-table-column>
-          <el-table-column align="center" prop="xiangmuleibie" label="类别" />
-          <el-table-column align="center" prop="jianyanjieguo" label="检验结果">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.jianyanjieguo" :disabled="edit" filterable allow-create default-first-option placeholder="请选择" style="width: 100%;">
-                <el-option label="资料齐全" value="资料齐全" />
-                <el-option label="未到首次检验日期" value="未到首次检验日期" />
-                <el-option label="无变更" value="无变更" />
-                <el-option label="未发现超标缺陷" value="未发现超标缺陷" />
-                <el-option label="符合要求" value="符合要求" />
-                <el-option label="不符合要求" value="不符合要求" />
-                <el-option label="合格" value="合格" />
-                <el-option label="齐全" value="齐全" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="beizhu" label="工作见证">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.beizhu" :disabled="edit" name="fyGongzuojianzheng" placeholder="请输入内容" />
-            </template>
-          </el-table-column>
-        </el-table>
-        <br>
-        <el-form ref="param" :model="param" class="el_form" label-position="right" label-width="250px">
-          <el-row>
-            <el-col :span="11" style="height: 60px">
-              <el-form-item label="对安装单位质量体系运转情况的评价：" prop="aqglqkjcjg">
-                <el-input v-model="param.aqglqkjcjg" type="textarea" placeholder="请输入内容" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="11" style="height: 80px">
-              <el-form-item label="记事栏：" prop="qita">
-                <el-input v-model="param.qita" type="textarea" placeholder="请输入内容" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-<script>
-import Sticky from '@/components/Sticky'
-import SignName from '@/views/common/SignName'
-import Utils from '@/utils/contact.js'
-import { getDepartmentTreeList } from '@/api/common'
-
-export default {
-  name: 'CyqpAjYsjl',
-  components: { SignName, Sticky },
-  data() {
-    return {
-      // 预定义值
-      edit: false, // 页面编辑状态
-      bgfyData: [], // 车用气瓶安装监检验报告附页
-      jlbh1: 'PJ1',
-      jlbh2: 'ZZSYC' + new Date().getFullYear(),
-      jlbh3: '',
-      // 检验人员
-      jianyanrenyuan: '',
-      // 接收传入该页面的值
-      // 页面状态 {create=> 创建，update=> 更新}
-      state: this.$route.query.state,
-      ysjl: {},
-      departmentId: this.$route.query.departmentId,
-      param: {},
-      checkedTab: 'first',
-      // 表格合并相关
-      // 参与列合并的字段，在这里增加即可
-      cols: [
-        {
-          name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致
-          getValue(row) { // 该列用于比较的值的获取方法
-            return row.jianyanxiang
-          }
-        },
-        {
-          name: 'jianyanmu',
-          getValue(row) {
-            return row.jianyanmu
-          }
-        }
-      ],
-      // 参与行内合并的字段
-      rows: [
-        {
-          name: 'jianyanxiang',
-          getValue(row) {
-            return row.jianyanxiang
-          }
-        },
-        {
-          name: 'jianyanmu',
-          getValue(row) {
-            return row.jianyanmu
-          }
-        }
-      ],
-      isRepeat: false,
-      users: [],
-      djjgs: ['无'],
-      departmemtArr: []
-    }
-  },
-  // computed: {
-  //   jilubianhao: function() {
-  //     let bianhao
-  //     if (this.ysjl.jilubianhao === null || this.ysjl.jilubianhao === undefined || this.ysjl.jilubianhao === '') {
-  //       return this.jlbh1 + this.jlbh2 + '-' + this.jlbh3
-  //     } else {
-  //       bianhao = this.ysjl.jilubianhao
-  //     }
-  //     return this.judgeRepeat(bianhao, this.ysjl.id)
-  //   }
-  // },
-  // watch: {
-  //   jlbh3: function(val) {
-  //     this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
-  //     this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
-  //   },
-  //   jilubianhao: function(newValue) {
-  //     this.judgeRepeat(newValue, this.ysjl.id)
-  //   }
-  // },
-  // 页面创建后执行
-  created() {
-    // if (this.state === 'create') {
-    //   // 设置初始值
-    //   this.initYsjl()
-    // } else {
-    //   this.getYsjl()
-    //   this.getParam(this.$route.query.id, this.$route.query.sbzldm)
-    // }
-    // this.getUserList()
-    // this.getJyxm(1)
-    // this.getArea()
-  },
-  mounted() {
-    if (!this.ysjl.jilubianhao) {
-      this.getMaxBh()
-    }
-    this.getDepartmentArr()
-  },
-  methods: {
-    getDepartmentArr() {
-      getDepartmentTreeList().then(res => {
-        this.departmemtArr = res
-      })
-    },
-    handleChange(v) {
-      this.ysjl.departmentId = v[1]
-    },
-    initYsjl() {
-      this.api({
-        url: '/ysjl/initYsjl',
-        method: 'post',
-        data: {
-          templateId: this.$route.query.templateId,
-          renwuId: this.$route.query.renwuId,
-          neibuleibie: this.$route.query.neibuleibie,
-          sblbdm: this.$route.query.sblbdm,
-          sblbmc: this.$route.query.sblbmc,
-          sbpzdm: this.$route.query.sbpzdm,
-          sbpzmc: this.$route.query.sbpzmc
-        }
-      }).then(data => {
-        this.ysjl = data.ysjl
-        this.departmentId = this.ysjl.departmentId
-        this.param = data.param ? data.param : {}
-        const tempTime = new Date()
-        this.$set(this.ysjl, 'jianyanjielun', '符合')
-        this.ysjl.jianyankaishiriqi = tempTime
-        this.ysjl.jianyanjieshuriqi = tempTime
-        this.ysjl.jiaoheriqi = tempTime
-        let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
-        xcjyrq = new Date(xcjyrq)
-        this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
-        this.ysjl.xiacijianyanriqishuoming = '/'
-      })
-    },
-    getYsjl() {
-      this.api({
-        url: '/ysjl',
-        method: 'get',
-        params: {
-          ysjlId: this.$route.query.id
-        }
-      }).then(data => {
-        this.ysjl = data
-        this.departmentId = this.ysjl.departmentId
-        if (this.ysjl.jianyanrenyuan) {
-          this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
-        }
-        // 查询最大记录编号
-        if (this.ysjl.jilubianhao === null || this.ysjl.jilubianhao === undefined || this.ysjl.jilubianhao === '') {
-          this.getMaxBh()
-        }
-      })
-    },
-    getParam(ysjlId, sbzldm) {
-      // 根据原始记录id查询参数
-      this.api({
-        url: '/ysjl/getParamByYsjlId',
-        method: 'get',
-        params: { ysjlId: ysjlId, sbzldm: sbzldm }
-      }).then(data => {
-        this.param = data
-      })
-    },
-    // 签名方法
-    singNameValue(data) {
-      this.jianyanrenyuan = data.name
-      this.ysjl.jianyanrenyuan = data.id
-      if (this.state !== 'create') {
-        this.common.signName(this.ysjl.id, this.ysjl.jianyanrenyuan)
-        Utils.$emit('ysjl-list')
-      }
-    },
-    getUserList() {
-      this.api({
-        url: '/user/all',
-        method: 'get'
-      }).then(data => {
-        this.users = data
-      })
-    },
-    // 查询最大记录编号
-    getMaxBh() {
-      const aheadPart = this.jlbh1 + '-' + this.jlbh2 + this.jlbh3 + '-'
-      this.api({
-        url: '/ysjl/gainCurrentBh',
-        method: 'get',
-        params: {
-          aheadPart: aheadPart,
-          hinderPart: ''
-        }
-      }).then(data => {
-        this.jlbh3 = data
-      })
-    },
-    // 查询检验项目
-    getJyxm(sort) {
-      let url = ''
-      let data = {}
-      if (this.state === 'create') {
-        url = '/jyxm/getCyJyxm'
-        data = {
-          templateId: this.$route.query.templateId,
-          order: sort
-        }
-      } else {
-        url = '/jyxm/getCyJyxmByYsjl'
-        data = {
-          ysjlId: this.$route.query.id,
-          isReport: false,
-          order: sort
-        }
-      }
-      this.api({
-        url: url,
-        method: 'get',
-        params: data
-      }).then(data => {
-        console.log(data)
-        this.bgfyData = data
-        this.tableJs.getData(this.cols, this.rows, data)
-      })
-    },
-    saveYsjl: function(operation) {
-      this.tableData = []
-      const retData = []
-      for (let i = 0; i < this.bgfyData.length; i++) {
-        // 把检验项数组转换成字符串
-        const retRow = {}
-        retRow.id = this.bgfyData[i].id
-        if (this.bgfyData[i].jianyanjieguo !== '' && this.bgfyData[i].jianyanjieguo !== null && this.bgfyData[i].jianyanjieguo !== undefined) {
-          retRow.jianyanjieguo = this.bgfyData[i].jianyanjieguo
-        }
-        if (this.bgfyData[i].beizhu !== '' && this.bgfyData[i].beizhu !== null && this.bgfyData[i].beizhu !== undefined) {
-          retRow.beizhu = this.bgfyData[i].beizhu
-        }
-        retData.push(retRow)
-      }
-      this.tableData.push(retData)
-      let type = ''
-      if (operation === 'add') {
-        type = 'post'
-        this.ysjl.bglx = 1
-        this.ysjl.cjState = 'ysjl'
-        this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
-        this.ysjl.jlprintState = 0
-        this.ysjl.jianyanxiangmu = 'cyqp'
-        this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + this.jlbh3
-        this.save(operation, type)
-      } else if (operation === 'upd') {
-        type = 'put'
-        this.save(operation, type)
-      } else if (operation === 'build') {
-        if (this.ysjl.jilubianhao && this.ysjl.jilubianhao.indexOf('COPY') > -1) {
-          this.$message({
-            type: 'error',
-            message: '请先修改记录编号，不允许携带COPY标志生成报告!'
-          })
-          return false
-        }
-        if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') {
-          this.$message({
-            type: 'error',
-            message: '请先签名再生成报告!'
-          })
-          return false
-        }
-        this.tableData = null
-        type = 'put'
-        this.save(operation, type)
-      }
-    },
-    save(operation, type) {
-      // 判断报告编号是否重复
-      if (this.isRepeat) {
-        this.$message({ message: '报告编号重复，请先修改报告编号再保存', type: 'error' })
-        return false
-      } else {
-        this.$refs['ysjl'].validate(valid => {
-          if (valid) {
-            const jyxm = JSON.stringify(this.tableData)
-            this.api({
-              url: '/ysjl',
-              method: type,
-              data: {
-                ysjl: this.ysjl,
-                param: this.param,
-                jyxm: jyxm,
-                bgjyxm: jyxm,
-                flag: operation
-              }
-            }).then(data => {
-              // 刷新任务列表，原始报告待办，原始报告已办，检验报告
-              Utils.$emit('task-list')
-              Utils.$emit('bggl-daiban-list')
-              if (operation === 'add') {
-                this.ysjl.id = data
-                this.param.ysjlId = data
-                this.$message({ message: '保存成功', type: 'success' })
-              } else if (operation === 'upd') {
-                this.$message({ message: '更新成功', type: 'success' })
-              } else if (operation === 'build') {
-                Utils.$emit('ysjl-list')
-                Utils.$emit('ysjl-yb-list')
-                Utils.$emit('bggl-daiban-list')
-                // 修改16版任务状态
-                this.common.updRenwuState(this.ysjl.id, 2, true)
-                // 生成pdf
-                this.common.viewYsjlNoOpen(this.ysjl.id, 'YSJL')
-                this.$message({ message: '生成报告成功', type: 'success' })
-                this.$store.dispatch('delCurrentViews', {
-                  view: this.$route,
-                  $router: this.$router
-                })
-              }
-              this.state = 'update'
-            })
-          }
-        })
-      }
-    },
-    judgeRepeat(bianhao, id) {
-      this.api({
-        url: '/ysjl/judgeRepeat',
-        method: 'get',
-        params: {
-          ysjlId: id,
-          bianhao: bianhao
-        }
-      }).then(data => {
-        this.isRepeat = data > 0
-      })
-    },
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 1) {
-        if (rowIndex === 0) {
-          return [2, 1]
-        } else if (rowIndex === 2 || rowIndex === 6) {
-          return [3, 1]
-        } else if (rowIndex === 5 || rowIndex === 9 || rowIndex === 10) {
-          return [1, 2]
-        } else {
-          return [0, 0]
-        }
-      } else if (columnIndex === 2) {
-        if (rowIndex === 5 || rowIndex === 9 || rowIndex === 10) {
-          return [0, 0]
-        }
-      } else if (columnIndex === 5) {
-        if (rowIndex === 0) {
-          return [11, 1]
-        } else {
-          return [0, 0]
-        }
-      }
-    },
-    /**
-     * 查询区划
-     */
-    getArea() {
-      this.api({
-        url: '/area/getShiArea',
-        method: 'get',
-        params: {
-          shidaima: '370100'
-        }
-      }).then(data => {
-        data.forEach(area => {
-          this.djjgs.push(area.label + '市场监督管理局')
-        })
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/ysjl/2000/2400/common/ycjl.vue b/src/views/ysjl/2000/2400/common/ycjl.vue
index cf2775f..fde97d4 100644
--- a/src/views/ysjl/2000/2400/common/ycjl.vue
+++ b/src/views/ysjl/2000/2400/common/ycjl.vue
@@ -24,10 +24,10 @@
         <el-button v-show="state !== 'create'" type="warning" icon="el-icon-view" size="medium" @click="common.viewYsjl(ysjl.id, 'YSJL')">
           预览
         </el-button>
-        <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
+        <!-- <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
           查看驳回意见
         </el-button>
-        <Symbols />
+        <Symbols /> -->
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
@@ -547,10 +547,10 @@ import Sticky from '@/components/Sticky'
 import jyfa from '@/views/ysjl/addJyfa'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact.js'
-import Symbols from '@/views/common/Symbols'
+// import Symbols from '@/views/common/Symbols'
 export default {
   name: 'Ycjl',
-  components: { SignName, Sticky, jyfa, Symbols },
+  components: { SignName, Sticky, jyfa },
   props: {
     neibuleibieparam: {
       type: String,
@@ -692,10 +692,10 @@ export default {
         this.ysjl = data.ysjl
         this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
         // 设置初始值
-        const tempTime = new Date()
-        let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
-        xcjyrq = new Date(xcjyrq)
-        this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
+        // const tempTime = new Date()
+        // let xcjyrq = (tempTime.getFullYear() + 2) + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
+        // xcjyrq = new Date(xcjyrq)
+        // this.ysjl.xiacijianyanriqi = xcjyrq.setDate(xcjyrq.getDate() - 1)
         this.dateFormat()
         this.ysjl.xiacijianyanriqishuoming = '/'
         this.ysjl.bianzhiren = this.$store.getters.userId + ''
@@ -944,9 +944,10 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                jyxm: jyxm,
-                bgjyxm: jyxm,
-                flag: operation
+                cyJyxm: {
+                  jyxm: jyxm,
+                  bgjyxm: jyxm
+                }
               }
             }).then(data => {
               // 刷新任务列表，原始记录待办，原始记录已办，检验报告
diff --git a/src/views/ysjl/2000/2400/zbg/jj/edit.vue b/src/views/ysjl/2000/2400/zbg/jj/edit.vue
index a67f721..1fc3fbd 100644
--- a/src/views/ysjl/2000/2400/zbg/jj/edit.vue
+++ b/src/views/ysjl/2000/2400/zbg/jj/edit.vue
@@ -34,10 +34,10 @@
         <el-button type="success" size="medium" icon="el-icon-edit" @click="batchUpdDate">
           批量修改日期
         </el-button>
-        <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
+        <!-- <el-button v-show="state !== 'create'" type="info" icon="el-icon-message" size="medium" @click="common.viewRejection(ysjl.id)">
           查看驳回意见
         </el-button>
-        <Symbols />
+        <Symbols /> -->
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
@@ -402,9 +402,9 @@
           </el-row>
         </el-form>
       </el-tab-pane>
-      <el-tab-pane label="压力容器原始资料" name="third">
-        <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
-      </el-tab-pane>
+      <!-- <el-tab-pane label="压力容器原始资料" name="third"> -->
+      <!-- <SliceUpload :renwu-id="ysjl.renwuId ? Number(ysjl.renwuId) : Number($route.query.renwuId)" :drag="true" />
+      </el-tab-pane> -->
     </el-tabs>
     <el-dialog :visible.sync="jyxmrqShow" title="批量修改日期" width="500px" @close="closeDialog">
       <template>
@@ -456,14 +456,14 @@
 import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact.js'
-import SliceUpload from '@/components/SliceUpload'
-import Symbols from '@/views/common/Symbols'
+// import SliceUpload from '@/components/SliceUpload'
+// import Symbols from '@/views/common/Symbols'
 import jyfa from '@/views/ysjl/addJyfa'
 import { getDepartmentTreeList } from '@/api/common'
 
 export default {
   name: 'YcJdYsjl',
-  components: { SignName, Sticky, SliceUpload, Symbols, jyfa },
+  components: { SignName, Sticky, jyfa },
   data() {
     return {
       // 预定义值
diff --git a/src/views/ysjl/7000/jj/edit.vue b/src/views/ysjl/7000/jj/edit.vue
index 5ad4623..da7d096 100644
--- a/src/views/ysjl/7000/jj/edit.vue
+++ b/src/views/ysjl/7000/jj/edit.vue
@@ -589,8 +589,8 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                cyJyxm:{
-                  jyxm: JSON.stringify(this.tableData),
+                cyJyxm: {
+                  jyxm: JSON.stringify(this.tableData)
                 }
               }
             }).then(data => {