diff --git a/src/views/allot/rwd_list.vue b/src/views/allot/rwd_list.vue
index f3da577..9dbe35b 100644
--- a/src/views/allot/rwd_list.vue
+++ b/src/views/allot/rwd_list.vue
@@ -98,6 +98,7 @@
       <el-table-column align="center" label="查看报检" width="60">
         <template slot-scope="scope">
           <el-button type="success" size="small" circle icon="el-icon-view" title="预览报检单" @click="editBjd(scope.$index)" />
+          <el-button type="info" size="small" circle icon="el-icon-edit" title="修改报检单" @click="modifyBjd(scope.$index)" />
         </template>
       </el-table-column>
     </el-table>
@@ -222,6 +223,15 @@ export default {
         this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type })
       }
     },
+    modifyBjd($index) {
+      const bjd = this.list[$index]
+      const type = '/finish'
+      if (bjd.jianyanleibie === 'DJ') {
+        this.$router.push({ path: '/bjd/bjd-dj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type, params: { form: 1 }})
+      } else {
+        this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type, params: { form: 1 }})
+      }
+    },
     printRwd() {
       if (this.multipleSelection.length > 1) {
         this.$message({ message: '只能打印一份任务单', type: 'error' })
diff --git a/src/views/allot/tuihui_list.vue b/src/views/allot/tuihui_list.vue
index 2b7a965..4c502cf 100644
--- a/src/views/allot/tuihui_list.vue
+++ b/src/views/allot/tuihui_list.vue
@@ -19,11 +19,11 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-select v-model="listQuery.searchRw.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
+          <el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
             <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
-          <el-input v-model="listQuery.searchRw.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchRw.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -31,8 +31,8 @@
             清除
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchRw.zhucedaima" placeholder="注册代码" clearable style="width: 220px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchRw.shiyongdengjibianhao" placeholder="使用登记证编号" clearable style="width: 180px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 220px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证编号" clearable style="width: 180px" @keyup.enter.native="handleFilter" />
         </el-form-item>
       </el-form>
     </div>
@@ -76,9 +76,6 @@
             <el-button type="danger" size="mini" circle icon="el-icon-close" title="拒绝" @click="updateBohui(scope.row.id, 'danger')" />
           </span>&nbsp;&nbsp;&nbsp;&nbsp;
           <el-button size="mini" type="info" icon="el-icon-message" title="查看退回原因" circle @click="viewBohui(scope.row.id)" />
-          <el-button size="mini" type="info" title="查看退回附件" circle @click="viewFujian(scope.row.id)">
-            <svg-icon icon-class="old" />
-          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -159,8 +156,7 @@ export default {
       tempDepartment: {},
       listQuery: {
         pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
-        searchRw: {}
+        pageRow: 20 // 每页条数
       },
       renwudan: {
         teamId: '',
@@ -192,7 +188,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    // this.getList()
     this.getSbzlList()
     this.getDepartment()
     this.getUserList(this.departmentId)
@@ -263,7 +259,7 @@ export default {
     },
     viewBohui(id) { // 任务撤回
       this.api({
-        url: '/taskinfoView/list',
+        url: '/taskinfo/list',
         method: 'get',
         params: {
           renwuId: id
@@ -465,11 +461,14 @@ export default {
     },
     handleFilter() {
       // 查询事件
+      console.log(this.listQuery)
       this.listQuery.pageNum = 1
       this.getList()
     },
     clearSearch() {
-      this.listQuery.searchRw = {
+      this.listQuery = {
+        pageNum: 1, // 页码
+        pageRow: 20
       }
       this.getList()
     },
diff --git a/src/views/allot/zuofei_list.vue b/src/views/allot/zuofei_list.vue
index 7b98375..482581b 100644
--- a/src/views/allot/zuofei_list.vue
+++ b/src/views/allot/zuofei_list.vue
@@ -123,7 +123,7 @@ export default {
     },
     viewBohui(id) { // 任务撤回
       this.api({
-        url: '/taskinfoView/list',
+        url: '/taskinfo/list',
         method: 'get',
         params: {
           renwuId: id
diff --git a/src/views/bjd/dj_create.vue b/src/views/bjd/dj_create.vue
index 004dcf0..88165b9 100644
--- a/src/views/bjd/dj_create.vue
+++ b/src/views/bjd/dj_create.vue
@@ -243,8 +243,15 @@ export default {
     },
     handleFilter() {
       // 查询事件
-      this.listQuery.pageNum = 1
-      this.getList()
+      if (!this.listQuery.shebeizhongleidaima) {
+        this.$message({
+          message: '请先选择设备种类',
+          type: 'warning'
+        })
+      } else {
+        this.listQuery.pageNum = 1
+        this.getList()
+      }
     },
     clearSearch() {
       this.listQuery = {
diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue
index aa3cbcc..4699297 100644
--- a/src/views/bjd/dj_input.vue
+++ b/src/views/bjd/dj_input.vue
@@ -1,16 +1,32 @@
 <template>
   <div class="app-container">
-    <sticky style="margin-bottom: 10px;">
+    <sticky style="margin-bottom: 10px">
       <div class="sub-navbar">
         <template v-if="formState !== 'finish'">
-          <el-button v-if="formState === 'create' || formState === 'newBuild'" type="success" icon="el-icon-edit" size="medium" @click="bjdSave(false)">
+          <el-button
+            v-if="formState === 'create' || formState === 'newBuild'"
+            type="success"
+            icon="el-icon-edit"
+            size="medium"
+            @click="bjdSave(false)"
+          >
             保存并核价
           </el-button>
           <template v-else>
-            <el-button type="success" icon="el-icon-edit" size="medium" @click="bjdSave(false)">
+            <el-button
+              type="success"
+              icon="el-icon-edit"
+              size="medium"
+              @click="bjdSave(false)"
+            >
               更新/核价
             </el-button>
-            <el-button type="warning" icon="el-icon-circle-check-outline" size="medium" @click="bjdSave(true)">
+            <el-button
+              type="warning"
+              icon="el-icon-circle-check-outline"
+              size="medium"
+              @click="bjdSave(true)"
+            >
               审核通过
             </el-button>
           </template>
@@ -28,25 +44,57 @@
           </template>
         </template>
         <template v-else>
-          <el-button type="success" icon="el-icon-printer" size="medium" @click="viewHzd">
+          <el-button
+            type="success"
+            icon="el-icon-printer"
+            size="medium"
+            @click="viewHzd"
+          >
             打印回执单
           </el-button>
+          <el-button
+            v-if="form==1"
+            type="success"
+            icon="el-icon-printer"
+            size="medium"
+            @click="modifyFn"
+          >
+            修改
+          </el-button>
         </template>
-        <el-button type="success" icon="el-icon-download" size="medium" style="margin-right: 10px;" @click="common.downloadTemplate(templateName)">
+
+        <el-button
+          type="success"
+          icon="el-icon-download"
+          size="medium"
+          style="margin-right: 10px"
+          @click="common.downloadTemplate(templateName)"
+        >
           下载导入模板
         </el-button>
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="border-card">
       <el-tab-pane label="检验项目申请表" name="first">
-        <el-form ref="bjd" :model="bjd" :rules="rules" class="small-space" label-position="right" label-width="120px">
+        <el-form
+          ref="bjd"
+          :model="bjd"
+          :rules="rules"
+          class="small-space"
+          label-position="right"
+          label-width="120px"
+        >
           <fieldset>
             <legend>设备种类</legend>
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="检验类别:" prop="jianyanleibie">
                   <el-input v-model="jianyanleibie" type="text" disabled />
-                  <el-input v-show="false" v-model="bjd.jianyanleibie" type="text" />
+                  <el-input
+                    v-show="false"
+                    v-model="bjd.jianyanleibie"
+                    type="text"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
@@ -60,7 +108,17 @@
             <legend>基本信息</legend>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item :rules="[{ required: true, message: '使用单位不能为空', trigger: 'change'}]" label="使用单位:" prop="shiyongdanwei">
+                <el-form-item
+                  :rules="[
+                    {
+                      required: true,
+                      message: '使用单位不能为空',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="使用单位:"
+                  prop="shiyongdanwei"
+                >
                   <el-input v-model="bjd.shiyongdanwei" type="text" />
                 </el-form-item>
               </el-col>
@@ -79,7 +137,17 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item :rules="[{ required: true, message: '使用单位电话不能为空', trigger: 'change'}]" label="联系电话:" prop="shiyongdanweiDianhua">
+                <el-form-item
+                  :rules="[
+                    {
+                      required: true,
+                      message: '使用单位电话不能为空',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="联系电话:"
+                  prop="shiyongdanweiDianhua"
+                >
                   <el-input v-model="bjd.shiyongdanweiDianhua" type="text" />
                 </el-form-item>
               </el-col>
@@ -102,7 +170,10 @@
               <el-row v-if="!(bjd.shebeizhongleidaima === '1000')" :gutter="20">
                 <el-col :span="9">
                   <el-form-item label="联系人:" prop="shigongdanweiLianxiren">
-                    <el-input v-model="bjd.shigongdanweiLianxiren" type="text" />
+                    <el-input
+                      v-model="bjd.shigongdanweiLianxiren"
+                      type="text"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="9">
@@ -115,7 +186,17 @@
             <div v-if="bjd.shebeizhongleidaima === '3000'">
               <el-row :gutter="20">
                 <el-col :span="18">
-                  <el-form-item :rules="[{ required: true, message: '维保单位不能为空', trigger: 'change'}]" label="维保单位:" prop="weibaodanwei">
+                  <el-form-item
+                    :rules="[
+                      {
+                        required: true,
+                        message: '维保单位不能为空',
+                        trigger: 'change',
+                      },
+                    ]"
+                    label="维保单位:"
+                    prop="weibaodanwei"
+                  >
                     <el-input v-model="bjd.weibaodanwei" type="text" />
                   </el-form-item>
                 </el-col>
@@ -127,7 +208,17 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="9">
-                  <el-form-item :rules="[{ required: true, message: '维保单位电话不能为空', trigger: 'change'}]" label="联系电话:" prop="weibaodanweiDianhua">
+                  <el-form-item
+                    :rules="[
+                      {
+                        required: true,
+                        message: '维保单位电话不能为空',
+                        trigger: 'change',
+                      },
+                    ]"
+                    label="联系电话:"
+                    prop="weibaodanweiDianhua"
+                  >
                     <el-input v-model="bjd.weibaodanweiDianhua" type="text" />
                   </el-form-item>
                 </el-col>
@@ -135,40 +226,115 @@
             </div>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item :rules="[{ required: true, message: '区划名称不能为空', trigger: 'change'}]" label="区划名称:" prop="quhuadaima">
-                  <el-select v-model="bjd.quhuadaima" placeholder="请选择" style="width: 240px;" @change="quhuaChange">
-                    <el-option v-for="item in areas" :key="item.value" :label="item.label" :value="item.value" />
+                <el-form-item
+                  :rules="[
+                    {
+                      required: true,
+                      message: '区划名称不能为空',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="区划名称:"
+                  prop="quhuadaima"
+                >
+                  <el-select
+                    v-model="bjd.quhuadaima"
+                    placeholder="请选择"
+                    style="width: 240px"
+                    @change="quhuaChange"
+                  >
+                    <el-option
+                      v-for="item in areas"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item :rules="[{ required: true, message: '检验科室不能为空', trigger: 'change'}]" label="检验科室:" prop="departmentId">
-                  <el-select v-model="bjd.departmentId" placeholder="请选择" style="width: 240px;">
-                    <el-option v-for="dept in depts" :key="dept.id" :label="dept.name" :value="dept.id" />
+                <el-form-item
+                  :rules="[
+                    {
+                      required: true,
+                      message: '检验科室不能为空',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="检验科室:"
+                  prop="departmentId"
+                >
+                  <el-select
+                    v-model="bjd.departmentId"
+                    placeholder="请选择"
+                    style="width: 240px"
+                  >
+                    <el-option
+                      v-for="dept in depts"
+                      :key="dept.id"
+                      :label="dept.name"
+                      :value="dept.id"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="9">
-                <el-form-item :rules="[{ required: true, message: '报检日期不能为空', trigger: 'change'}]" label="报检日期:" prop="baojianriqi">
-                  <el-date-picker v-model="bjd.baojianriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 98%;" />
+                <el-form-item
+                  :rules="[
+                    {
+                      required: true,
+                      message: '报检日期不能为空',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="报检日期:"
+                  prop="baojianriqi"
+                >
+                  <el-date-picker
+                    v-model="bjd.baojianriqi"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期"
+                    style="width: 98%"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item :rules="[{ required: true, message: '受理日期不能为空', trigger: 'change'}]" label="受理日期:" prop="shouliriqi">
-                  <el-date-picker v-model="bjd.shouliriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 95%;" />
+                <el-form-item
+                  :rules="[
+                    {
+                      required: true,
+                      message: '受理日期不能为空',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="受理日期:"
+                  prop="shouliriqi"
+                >
+                  <el-date-picker
+                    v-model="bjd.shouliriqi"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期"
+                    style="width: 95%"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row v-if="!(bjd.shebeizhongleidaima === '1000')" :gutter="20">
               <el-col :span="18">
                 <el-form-item label="备注:" prop="beizhu">
-                  <el-input v-model="bjd.bjdBeizhu" :autosize="{ minRows: 2, maxRows: 2 }" type="textarea" />
+                  <el-input
+                    v-model="bjd.bjdBeizhu"
+                    :autosize="{ minRows: 2, maxRows: 2 }"
+                    type="textarea"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
-            <div v-if="formState === 'finish'" style="margin-top: 10px;">
+            <div v-if="formState === 'finish'" style="margin-top: 10px">
               <el-row>
                 <el-col :span="9">
                   <el-form-item label="受理人:" prop="shouliren">
@@ -184,97 +350,75 @@
             </div>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item :rules="[{ required: true, message: '报检人电话不能为空，该电话用于短信通知企业网上交费。', trigger: 'change'}]" label="报检人电话:" prop="baojiandianhua">
+                <el-form-item
+                  :rules="[
+                    {
+                      required: true,
+                      message:
+                        '报检人电话不能为空，该电话用于短信通知企业网上交费。',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="报检人电话:"
+                  prop="baojiandianhua"
+                >
                   <el-input v-model="bjd.baojiandianhua" type="text" />
                 </el-form-item>
               </el-col>
             </el-row>
           </fieldset>
-          <fieldset>
-            <legend>非税系统交费信息</legend>
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <span style="color: red;font-size: 20px;">请正确填写发票信息中的内容和收取电子发票的邮箱地址</span>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="开票单位全称:" prop="jiaokuandanwei">
-                  <el-input v-model="bjd.jiaokuandanwei" type="text" placeholder="缴费（开票）单位全称" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="发票接收邮箱:" :rules="[{ required: false, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]" prop="jiaokuanyouxiang">
-                  <el-input v-model="bjd.jiaokuanyouxiang" placeholder="请填写常用邮箱，用于接收电子发票。" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="缴费联系人:" prop="jiaokuanren">
-                  <el-input v-model="bjd.jiaokuanren" type="text" placeholder="请录入缴费联系人" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="缴费联系电话:" prop="jiaokuandianhua">
-                  <el-input v-model="bjd.jiaokuandianhua" placeholder="用于接收非税发票通知" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="查询报检电话:" prop="baojiandianhua">
-                  <el-input v-model="bjd.baojiandianhua" type="text" placeholder="用于接收微信收费单交费通知" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="缴款码:" prop="jiaokuanma">
-                  <el-input v-model="bjd.jiaokuanma" disabled />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </fieldset>
-          <fieldset>
-            <legend>领取信息</legend>
-            <el-row :gutter="20">
-              <el-col :span="9">
-                <el-form-item label="领取方式:" prop="lingqufangshi">
-                  <el-select v-model="bjd.lingqufangshi" style="width: 240px;" @change="lqfsChange">
-                    <el-option label="自取" value="自取" />
-                    <el-option label="自打印" value="自打印" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-button v-if="bjd.lingqufangshi === '邮寄'" type="warning" icon="el-icon-circle-check-outline" size="medium" @click="postInfoSave">
-                修改地址
-              </el-button>
-            </el-row>
-          </fieldset>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="申请检验设备明细表" name="second">
         <template v-if="formState !== 'finish'">
           <template v-if="sbzldm !== 'F000'">
-            <el-button type="success" size="mini" icon="el-icon-edit" @click="openDialogParam()">
+            <el-button
+              type="success"
+              size="mini"
+              icon="el-icon-edit"
+              @click="openDialogParam()"
+            >
               批量修改
             </el-button>
-            <el-button type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+            <el-button
+              type="success"
+              size="mini"
+              icon="el-icon-circle-plus-outline"
+              @click="addRow"
+            >
               查找添加
             </el-button>
           </template>
-          <el-button type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRowN">
+          <el-button
+            type="success"
+            size="mini"
+            icon="el-icon-circle-plus-outline"
+            @click="addRowN"
+          >
             手动添加
           </el-button>
-          <el-button type="danger" size="mini" icon="el-icon-remove-outline" @click="delRow()">
+          <el-button
+            type="danger"
+            size="mini"
+            icon="el-icon-remove-outline"
+            @click="delRow()"
+          >
             删除
           </el-button>
-          <span style="margin-left: 20px;color: red;">如若【设备类别】相同，只编辑填写第一条即可！</span>
+          <span
+            style="margin-left: 20px; color: red"
+          >如若【设备类别】相同，只编辑填写第一条即可！</span>
         </template>
-        <el-switch v-model="fixedFlag" active-color="#13ce66" inactive-color="#ff4949" @change="editFixedHidden()" />
+        <el-switch
+          v-model="fixedFlag"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+          @change="editFixedHidden()"
+        />
         <el-table
           ref="bjBaseList"
           v-loading="loading"
-          v-adaptive="{bottomOffset: 50}"
+          v-adaptive="{ bottomOffset: 50 }"
           height="0"
           :data="tableData"
           :row-class-name="tableRowClassName"
@@ -282,23 +426,43 @@
           highlight-current-row
           border
           stripe
-          style="width:100%;margin-top: 5px;"
+          style="width: 100%; margin-top: 5px"
           @row-click="onRowClick"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="40" />
-          <el-table-column align="center" type="index" width="50" label="序号" />
-          <el-table-column align="center" prop="neibuleibie" min-width="130" label="检验类别(项目)">
+          <el-table-column
+            align="center"
+            type="index"
+            width="50"
+            label="序号"
+          />
+          <el-table-column
+            align="center"
+            prop="neibuleibie"
+            min-width="130"
+            label="检验类别(项目)"
+          >
             <template slot-scope="scope">
               <el-select v-model="scope.row.neibuleibie" placeholder="请选择">
-                <el-option v-for="item in jylbs" :key="item.code" :label="item.name" :value="item.code" />
+                <el-option
+                  v-for="item in jylbs"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="sblbpz" min-width="200" label="设备类别/品种">
+          <el-table-column
+            align="center"
+            prop="sblbpz"
+            min-width="200"
+            label="设备类别/品种"
+          >
             <template slot-scope="scope">
               <el-cascader
-                :ref="'cascader'+scope.$index"
+                :ref="'cascader' + scope.$index"
                 v-model="scope.row.sblbpz"
                 :options="sblbList"
                 style="width: 100%"
@@ -307,139 +471,324 @@
             </template>
           </el-table-column>
           <!-- 通用：1000、2000、3000、4000、5000 -->
-          <template v-if="sbzldm === '1000' || sbzldm === '2000' || sbzldm === '3000' || sbzldm === '4000' || sbzldm === '5000'">
-            <el-table-column v-if="sbzldm !== '1000'" align="center" prop="shebeimingcheng" min-width="120" label="设备名称">
+          <template
+            v-if="
+              sbzldm === '1000' ||
+                sbzldm === '2000' ||
+                sbzldm === '3000' ||
+                sbzldm === '4000' ||
+                sbzldm === '5000'
+            "
+          >
+            <el-table-column
+              v-if="sbzldm !== '1000'"
+              align="center"
+              prop="shebeimingcheng"
+              min-width="120"
+              label="设备名称"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.shebeimingcheng" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.shebeimingcheng"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="danweineibubianhao" min-width="100" label="单位内编号">
+            <el-table-column
+              align="center"
+              prop="danweineibubianhao"
+              min-width="100"
+              label="单位内编号"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.danweineibubianhao" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.danweineibubianhao"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column v-if="sbzldm !== '1000'" align="center" prop="zhucedaima" min-width="225" label="注册代码" sortable>
+            <el-table-column
+              v-if="sbzldm !== '1000'"
+              align="center"
+              prop="zhucedaima"
+              min-width="225"
+              label="注册代码"
+              sortable
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.zhucedaima" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.zhucedaima"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="shiyongdengjibianhao" min-width="135" label="使用登记编号">
+            <el-table-column
+              align="center"
+              prop="shiyongdengjibianhao"
+              min-width="135"
+              label="使用登记编号"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.shiyongdengjibianhao" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.shiyongdengjibianhao"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="chanpibianhao" min-width="135" label="出厂编号">
+            <el-table-column
+              align="center"
+              prop="chanpibianhao"
+              min-width="135"
+              label="出厂编号"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.chanpinbianhao" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.chanpinbianhao"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="guigexinghao" min-width="135" label="规格型号">
+            <el-table-column
+              align="center"
+              prop="guigexinghao"
+              min-width="135"
+              label="规格型号"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.guigexinghao" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.guigexinghao"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
           </template>
           <!-- 压力容器：2000 -->
           <template v-if="sbzldm === '2000'">
-            <el-table-column align="center" prop="xiacijianyanriqi" min-width="150" label="下次检验日期">
+            <el-table-column
+              align="center"
+              prop="xiacijianyanriqi"
+              min-width="150"
+              label="下次检验日期"
+            >
               <template slot-scope="scope">
-                <el-date-picker v-model="scope.row.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" style="width: 150px;" />
+                <el-date-picker
+                  v-model="scope.row.xiacijianyanriqi"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  style="width: 150px"
+                />
               </template>
             </el-table-column>
           </template>
           <!-- 压力管道：8000 -->
           <template v-else-if="sbzldm === '8000'">
-            <el-table-column align="center" prop="shebeimingcheng" min-width="120" label="装置名称">
+            <el-table-column
+              align="center"
+              prop="shebeimingcheng"
+              min-width="120"
+              label="装置名称"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.shebeimingcheng" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.shebeimingcheng"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="shiyongdengjibianhao" min-width="175" label="使用登记编号">
+            <el-table-column
+              align="center"
+              prop="shiyongdengjibianhao"
+              min-width="175"
+              label="使用登记编号"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.shiyongdengjibianhao" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.shiyongdengjibianhao"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="xiacijianyanriqi" min-width="150" label="到期时间">
+            <el-table-column
+              align="center"
+              prop="xiacijianyanriqi"
+              min-width="150"
+              label="到期时间"
+            >
               <template slot-scope="scope">
-                <el-date-picker v-model="scope.row.xiacijianyanriqi" type="date" value-format="yyyy-MM-dd" style="width: 150px;" />
+                <el-date-picker
+                  v-model="scope.row.xiacijianyanriqi"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  style="width: 150px"
+                />
               </template>
             </el-table-column>
           </template>
           <!-- 安全阀：F000 -->
           <template v-else-if="sbzldm === 'F000'">
-            <el-table-column align="center" prop="zhizaodanwei" min-width="200" label="制造单位">
+            <el-table-column
+              align="center"
+              prop="zhizaodanwei"
+              min-width="200"
+              label="制造单位"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.zhizaodanwei" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.zhizaodanwei"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="zhizaoxukezhengbianhao" min-width="150" label="制造许可证编号">
+            <el-table-column
+              align="center"
+              prop="zhizaoxukezhengbianhao"
+              min-width="150"
+              label="制造许可证编号"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.zhizaoxukezhengbianhao" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.zhizaoxukezhengbianhao"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="chanpinbianhao" min-width="150" label="产品编号">
+            <el-table-column
+              align="center"
+              prop="chanpinbianhao"
+              min-width="150"
+              label="产品编号"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.chanpinbianhao" placeholder="请输入内容" />
+                <el-input
+                  v-model="scope.row.chanpinbianhao"
+                  placeholder="请输入内容"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s35" min-width="200" label="安装位置">
+            <el-table-column
+              align="center"
+              prop="s35"
+              min-width="200"
+              label="安装位置"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s35" placeholder="请输入内容" />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s8" min-width="170" label="出厂日期">
+            <el-table-column
+              align="center"
+              prop="s8"
+              min-width="170"
+              label="出厂日期"
+            >
               <template slot-scope="scope">
-                <el-date-picker v-model="scope.row.s8" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" />
+                <el-date-picker
+                  v-model="scope.row.s8"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s16" min-width="120" label="安全阀类型">
+            <el-table-column
+              align="center"
+              prop="s16"
+              min-width="120"
+              label="安全阀类型"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s16" placeholder="请输入内容" />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s3" min-width="150" label="安全阀型号">
+            <el-table-column
+              align="center"
+              prop="s3"
+              min-width="150"
+              label="安全阀型号"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s3" placeholder="请输入内容" />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s4" min-width="120" label="公称通径">
+            <el-table-column
+              align="center"
+              prop="s4"
+              min-width="120"
+              label="公称通径"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s4" placeholder="请输入内容" />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s5" min-width="120" label="阀座口径(mm)">
+            <el-table-column
+              align="center"
+              prop="s5"
+              min-width="120"
+              label="阀座口径(mm)"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s5" placeholder="请输入内容" />
               </template>
             </el-table-column>
             <el-table-column align="center" label="压力级别范围(MPa)">
-              <el-table-column align="center" prop="s6" min-width="120" label="起始范围(MPa)">
+              <el-table-column
+                align="center"
+                prop="s6"
+                min-width="120"
+                label="起始范围(MPa)"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s6" placeholder="请输入内容" />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="s7" min-width="120" label="结束范围(MPa)">
+              <el-table-column
+                align="center"
+                prop="s7"
+                min-width="120"
+                label="结束范围(MPa)"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s7" placeholder="请输入内容" />
                 </template>
               </el-table-column>
             </el-table-column>
-            <el-table-column align="center" prop="s36" min-width="120" label="设计压力">
+            <el-table-column
+              align="center"
+              prop="s36"
+              min-width="120"
+              label="设计压力"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s36" placeholder="请输入内容" />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s17" min-width="120" label="工作压力">
+            <el-table-column
+              align="center"
+              prop="s17"
+              min-width="120"
+              label="工作压力"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s17" placeholder="请输入内容" />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s2" min-width="120" label="工作介质">
+            <el-table-column
+              align="center"
+              prop="s2"
+              min-width="120"
+              label="工作介质"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s2" placeholder="请输入内容" />
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s1" min-width="120" label="要求整定压力">
+            <el-table-column
+              align="center"
+              prop="s1"
+              min-width="120"
+              label="要求整定压力"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.s1" placeholder="请输入内容" />
               </template>
@@ -448,64 +797,141 @@
           <!-- 第一次进来不对核定参数展示 后台进行信息提取后在做核价处理 -->
           <template v-if="formState !== 'create'">
             <template v-if="sbzldm === '1000'">
-              <el-table-column align="center" prop="edingchuli" label="额定出力" fixed="right">
+              <el-table-column
+                align="center"
+                prop="edingchuli"
+                label="额定出力"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s3" placeholder="请输入" />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="edingyali" label="额定压力" fixed="right">
+              <el-table-column
+                align="center"
+                prop="edingyali"
+                label="额定压力"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s4" placeholder="请输入" />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="chukouwendu" label="出口温度" fixed="right">
+              <el-table-column
+                align="center"
+                prop="chukouwendu"
+                label="出口温度"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s7" placeholder="请输入" />
                 </template>
               </el-table-column>
             </template>
             <template v-if="sbzldm === '2000'">
-              <el-table-column align="center" prop="rongji" label="容积" fixed="right">
+              <el-table-column
+                align="center"
+                prop="rongji"
+                label="容积"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s5" placeholder="请输入" />
                 </template>
               </el-table-column>
             </template>
             <template v-if="sbzldm === '3000'">
-              <el-table-column align="center" prop="ceng" label="层" fixed="right">
+              <el-table-column
+                align="center"
+                prop="ceng"
+                label="层"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s1" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s1"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="quduanchangdu" label="区段长度" fixed="right">
+              <el-table-column
+                align="center"
+                prop="quduanchangdu"
+                label="区段长度"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s14" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s14"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="tishenggaodu" label="提升高度" fixed="right">
+              <el-table-column
+                align="center"
+                prop="tishenggaodu"
+                label="提升高度"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s16" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s16"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="gonggongjiaotong" label="公共交通" fixed="right">
+              <el-table-column
+                align="center"
+                prop="gonggongjiaotong"
+                label="公共交通"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.ss1" placeholder="请选择" @change="beforeHejia">
+                  <el-select
+                    v-model="scope.row.ss1"
+                    placeholder="请选择"
+                    @change="beforeHejia"
+                  >
                     <el-option label="×" value="0" />
                     <el-option label="√" value="1" />
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="fujian" label="复检" fixed="right">
+              <el-table-column
+                align="center"
+                prop="fujian"
+                label="复检"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.ss2" placeholder="请选择" @change="beforeHejia">
+                  <el-select
+                    v-model="scope.row.ss2"
+                    placeholder="请选择"
+                    @change="beforeHejia"
+                  >
                     <el-option label="×" value="0" />
                     <el-option label="√" value="1" />
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="xiansuqi" label="限速器" fixed="right">
+              <el-table-column
+                align="center"
+                prop="xiansuqi"
+                label="限速器"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.ss3" placeholder="请选择" @change="beforeHejia">
+                  <el-select
+                    v-model="scope.row.ss3"
+                    placeholder="请选择"
+                    @change="beforeHejia"
+                  >
                     <el-option label="不校验" value="0" />
                     <el-option label="校验" value="1" />
                   </el-select>
@@ -513,32 +939,82 @@
               </el-table-column>
             </template>
             <template v-if="sbzldm === '4000'">
-              <el-table-column align="center" prop="kuadu" label="跨度" fixed="right">
+              <el-table-column
+                align="center"
+                prop="kuadu"
+                label="跨度"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s1" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s1"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="edingqizhongliang" label="额定起重量" fixed="right">
+              <el-table-column
+                align="center"
+                prop="edingqizhongliang"
+                label="额定起重量"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s2" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s2"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="edingqizhongliju" label="额定起重力矩" fixed="right">
+              <el-table-column
+                align="center"
+                prop="edingqizhongliju"
+                label="额定起重力矩"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s3" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s3"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="qishenggaodu" label="起升高度" fixed="right">
+              <el-table-column
+                align="center"
+                prop="qishenggaodu"
+                label="起升高度"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s4" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s4"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="boweishu" label="存车容量" fixed="right">
+              <el-table-column
+                align="center"
+                prop="boweishu"
+                label="存车容量"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s12" placeholder="请输入" />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="eliehuanjing" label="恶劣检验环境" fixed="right">
+              <el-table-column
+                align="center"
+                prop="eliehuanjing"
+                label="恶劣检验环境"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.ss1" placeholder="请选择">
                     <el-option label="×" value="0" />
@@ -546,15 +1022,29 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="sijishi" label="有司机室" fixed="right">
+              <el-table-column
+                align="center"
+                prop="sijishi"
+                label="有司机室"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.ss2" placeholder="请选择" @change="beforeHejia">
+                  <el-select
+                    v-model="scope.row.ss2"
+                    placeholder="请选择"
+                    @change="beforeHejia"
+                  >
                     <el-option label="×" value="0" />
                     <el-option label="√" value="1" />
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="fugan" label="副杆" fixed="right">
+              <el-table-column
+                align="center"
+                prop="fugan"
+                label="副杆"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.ss3" placeholder="请选择">
                     <el-option label="×" value="0" />
@@ -562,9 +1052,18 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="fujian" label="复检" fixed="right">
+              <el-table-column
+                align="center"
+                prop="fujian"
+                label="复检"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.ss4" placeholder="请选择" @change="beforeHejia">
+                  <el-select
+                    v-model="scope.row.ss4"
+                    placeholder="请选择"
+                    @change="beforeHejia"
+                  >
                     <el-option label="×" value="0" />
                     <el-option label="√" value="1" />
                   </el-select>
@@ -572,17 +1071,40 @@
               </el-table-column>
             </template>
             <template v-if="sbzldm === '5000'">
-              <el-table-column align="center" prop="edingqizhongliang" mini-width="100" label="额定起重量" fixed="right">
+              <el-table-column
+                align="center"
+                prop="edingqizhongliang"
+                mini-width="100"
+                label="额定起重量"
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.s1" placeholder="请输入" @keyup.enter.native="beforeHejia" @blur="beforeHejia" />
+                  <el-input
+                    v-model="scope.row.s1"
+                    placeholder="请输入"
+                    @keyup.enter.native="beforeHejia"
+                    @blur="beforeHejia"
+                  />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="paizhaohaoma" mini-width="140" label="厂车牌照编号" fixed="right">
+              <el-table-column
+                align="center"
+                prop="paizhaohaoma"
+                mini-width="140"
+                label="厂车牌照编号"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s5" placeholder="请输入" />
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="ranliaozhonglei" mini-width="120" label="燃料种类" fixed="right">
+              <el-table-column
+                align="center"
+                prop="ranliaozhonglei"
+                mini-width="120"
+                label="燃料种类"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.s6" placeholder="请选择">
                     <el-option label="汽油" value="汽油" />
@@ -594,51 +1116,102 @@
               </el-table-column>
             </template>
             <template v-if="sbzldm === '8000'">
-              <el-table-column align="center" prop="guandaochangdu" min-width="175" label="管道长度(m)/数量(条)" fixed="right">
+              <el-table-column
+                align="center"
+                prop="guandaochangdu"
+                min-width="175"
+                label="管道长度(m)/数量(条)"
+                fixed="right"
+              >
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.s32" placeholder="请输入内容" />
                 </template>
               </el-table-column>
             </template>
-            <el-table-column v-if="formState !== 'create' && formState !== 'newBuild'" prop="xitongheding" min-width="90" label="标准费用" fixed="right">
+            <el-table-column
+              v-if="formState !== 'create' && formState !== 'newBuild'"
+              prop="xitongheding"
+              min-width="90"
+              label="标准费用"
+              fixed="right"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.xitongheding" placeholder="待核定" disabled />
+                <el-input
+                  v-model="scope.row.xitongheding"
+                  placeholder="待核定"
+                  disabled
+                />
               </template>
             </el-table-column>
-            <el-table-column v-if="formState !== 'create' && formState !== 'newBuild'" prop="datingheding" min-width="90" label="核定费用" fixed="right">
+            <el-table-column
+              v-if="formState !== 'create' && formState !== 'newBuild'"
+              prop="datingheding"
+              min-width="90"
+              label="核定费用"
+              fixed="right"
+            >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.datingheding" placeholder="请输入" />
+                <el-input
+                  v-model="scope.row.datingheding"
+                  placeholder="请输入"
+                />
               </template>
             </el-table-column>
           </template>
         </el-table>
       </el-tab-pane>
       <!-- 修改检验类别/设备类别/设备品种方法 -->
-      <el-dialog :title="editParamTitle" :visible.sync="dialogFormParam" @close="dialogFormParam = false">
-        <el-form ref="param" :model="param" class="small-space" label-position="right" label-width="120px">
+      <el-dialog
+        :title="editParamTitle"
+        :visible.sync="dialogFormParam"
+        @close="dialogFormParam = false"
+      >
+        <el-form
+          ref="param"
+          :model="param"
+          class="small-space"
+          label-position="right"
+          label-width="120px"
+        >
           <div v-if="formState !== 'finish'">
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="检验类别:" prop="neibuleibie">
                   <el-select v-model="param.neibuleibie" placeholder="请选择">
-                    <el-option v-for="item in jylbs" :key="item.code" :label="item.name" :value="item.code" />
+                    <el-option
+                      v-for="item in jylbs"
+                      :key="item.code"
+                      :label="item.name"
+                      :value="item.code"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备类别:" prop="sblb">
-                  <el-select v-model="param.sblb" value-key="value" @change="sblbChange">
-                    <el-option v-for="item in sblbList" :key="item.value" :label="item.label" :value="item" />
+                  <el-select
+                    v-model="param.sblb"
+                    value-key="value"
+                    @change="sblbChange"
+                  >
+                    <el-option
+                      v-for="item in sblbList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备品种:" prop="sbpz">
-                  <el-select
-                    v-model="param.sbpz"
-                    value-key="value"
-                  >
-                    <el-option v-for="item in sbpzList" :key="item.value" :label="item.label" :value="item" />
+                  <el-select v-model="param.sbpz" value-key="value">
+                    <el-option
+                      v-for="item in sbpzList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item"
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -651,7 +1224,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="是否复检" prop="ss2">
-                  <el-select v-model="param.ss2" placeholder="请选择" @change="beforeHejia">
+                  <el-select
+                    v-model="param.ss2"
+                    placeholder="请选择"
+                    @change="beforeHejia"
+                  >
                     <el-option label="×" value="0" />
                     <el-option label="√" value="1" />
                   </el-select>
@@ -672,25 +1249,71 @@
           </el-button>
         </div>
       </el-dialog>
-      <el-dialog title="设备列表" width="90%" :visible.sync="baseListVisible" @close="baseListVisible = false">
-        <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 200px" @keyup.enter.native="getBaseList" />
-        <el-input v-model="listQuery.shigongdanwei" placeholder="施工单位名称" clearable style="width: 200px" @keyup.enter.native="getBaseList" />
-        <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 220px" @keyup.enter.native="getBaseList" />
-        <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证编号" clearable style="width: 160px" @keyup.enter.native="getBaseList" />
-        <el-input v-model="listQuery.danweineibubianhao" placeholder="单位内部编号" clearable style="width: 160px" @keyup.enter.native="getBaseList" />
-        <el-input v-model="listQuery.chanpinbianhao" placeholder="出厂编号" clearable style="width: 160px" @keyup.enter.native="getBaseList" />
+      <el-dialog
+        title="设备列表"
+        width="90%"
+        :visible.sync="baseListVisible"
+        @close="baseListVisible = false"
+      >
+        <el-input
+          v-model="listQuery.shiyongdanwei"
+          placeholder="使用单位名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="getBaseList"
+        />
+        <el-input
+          v-model="listQuery.shigongdanwei"
+          placeholder="施工单位名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="getBaseList"
+        />
+        <el-input
+          v-model="listQuery.zhucedaima"
+          placeholder="注册代码"
+          clearable
+          style="width: 220px"
+          @keyup.enter.native="getBaseList"
+        />
+        <el-input
+          v-model="listQuery.shiyongdengjibianhao"
+          placeholder="使用登记证编号"
+          clearable
+          style="width: 160px"
+          @keyup.enter.native="getBaseList"
+        />
+        <el-input
+          v-model="listQuery.danweineibubianhao"
+          placeholder="单位内部编号"
+          clearable
+          style="width: 160px"
+          @keyup.enter.native="getBaseList"
+        />
+        <el-input
+          v-model="listQuery.chanpinbianhao"
+          placeholder="出厂编号"
+          clearable
+          style="width: 160px"
+          @keyup.enter.native="getBaseList"
+        />
         <el-button type="primary" icon="el-icon-search" @click="getBaseList">
           查询
         </el-button>
         <el-button type="info" icon="el-icon-clear" @click="clearSearch">
           清除
         </el-button>
-        <el-button type="success" size="small" icon="el-icon-circle-plus-outline" @click="batchAddToBjBase">
+        <el-button
+          type="success"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          @click="batchAddToBjBase"
+        >
           添加
         </el-button>
         <el-table
           ref="baseTable"
-          v-adaptive="{bottomOffset: 50}"
+          v-adaptive="{ bottomOffset: 50 }"
           height="0"
           :data="baseList"
           border
@@ -707,28 +1330,99 @@
               <span v-text="getIndex(scope.$index)" />
             </template>
           </el-table-column>
-          <el-table-column align="center" label="设备种类" prop="shebeizhonglei" min-width="80" />
-          <el-table-column align="center" label="使用单位" prop="shiyongdanwei" min-width="150" />
-          <el-table-column :formatter="clearBlank" align="center" label="注册代码" prop="zhucedaima" min-width="180" />
-          <el-table-column :formatter="clearBlank" align="center" label="使用登记证编号" prop="shiyongdengjibianhao" min-width="90" />
-          <el-table-column :formatter="clearBlank" align="center" label="出厂编号" prop="chanpinbianhao" min-width="80" />
-          <el-table-column :formatter="clearBlank" align="center" label="单位内部编号" prop="danweineibubianhao" min-width="60" />
-          <el-table-column :formatter="clearBlank" align="center" label="下次检验日期" prop="xiacijianyanriqi" min-width="100" />
-          <el-table-column :formatter="clearBlank" align="center" label="区划名称" prop="quhuamingcheng" min-width="50" />
+          <el-table-column
+            align="center"
+            label="设备种类"
+            prop="shebeizhonglei"
+            min-width="80"
+          />
+          <el-table-column
+            align="center"
+            label="使用单位"
+            prop="shiyongdanwei"
+            min-width="150"
+          />
+          <el-table-column
+            :formatter="clearBlank"
+            align="center"
+            label="注册代码"
+            prop="zhucedaima"
+            min-width="180"
+          />
+          <el-table-column
+            :formatter="clearBlank"
+            align="center"
+            label="使用登记证编号"
+            prop="shiyongdengjibianhao"
+            min-width="90"
+          />
+          <el-table-column
+            :formatter="clearBlank"
+            align="center"
+            label="出厂编号"
+            prop="chanpinbianhao"
+            min-width="80"
+          />
+          <el-table-column
+            :formatter="clearBlank"
+            align="center"
+            label="单位内部编号"
+            prop="danweineibubianhao"
+            min-width="60"
+          />
+          <el-table-column
+            :formatter="clearBlank"
+            align="center"
+            label="下次检验日期"
+            prop="xiacijianyanriqi"
+            min-width="100"
+          />
+          <el-table-column
+            :formatter="clearBlank"
+            align="center"
+            label="区划名称"
+            prop="quhuamingcheng"
+            min-width="50"
+          />
           <el-table-column align="center" label="操作" min-width="50">
             <template slot-scope="scope">
-              <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addToBjBase(scope.$index)" />
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+                @click="addToBjBase(scope.$index)"
+              />
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getBaseList" />
+        <pagination
+          v-show="totalCount > 0"
+          :total="totalCount"
+          :page-num.sync="listQuery.pageNum"
+          :page-row.sync="listQuery.pageRow"
+          @pagination="getBaseList"
+        />
       </el-dialog>
-      <el-dialog title="邮寄信息" width="800px" :visible.sync="formYJVisible" @close="formYJVisible = false">
-        <el-form ref="postInfo" :model="postInfo" label-position="right" label-width="120px">
+      <el-dialog
+        title="邮寄信息"
+        width="800px"
+        :visible.sync="formYJVisible"
+        @close="formYJVisible = false"
+      >
+        <el-form
+          ref="postInfo"
+          :model="postInfo"
+          label-position="right"
+          label-width="120px"
+        >
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="使用单位:" prop="shiyongdanwei">
-                <el-input v-model="postInfo.shiyongdanwei" type="text" disabled />
+                <el-input
+                  v-model="postInfo.shiyongdanwei"
+                  type="text"
+                  disabled
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -758,7 +1452,14 @@
         </span>
       </el-dialog>
     </el-tabs>
-    <iframe :src="printbutton" oncancel="onafterprint" frameborder="0" scrolling="no" height="0px" aria-disabled="true" />
+    <iframe
+      :src="printbutton"
+      oncancel="onafterprint"
+      frameborder="0"
+      scrolling="no"
+      height="0px"
+      aria-disabled="true"
+    />
   </div>
 </template>
 <script>
@@ -843,7 +1544,8 @@ export default {
       templateName: '',
       fixedFlag: true,
       fixedWidth: '',
-      isShengju: true
+      isShengju: true,
+      form: this.$route.params.form
     }
   },
   watch: {
@@ -864,7 +1566,8 @@ export default {
     } else if (this.formState === 'update' || this.formState === 'finish') {
       // 查询报检信息
       this.getBjdInfo()
-    } else if (this.formState === 'create') { // 直接起草过来的数据
+    } else if (this.formState === 'create') {
+      // 直接起草过来的数据
       this.getSblb()
       // 先加载当前的数据
       // this.tableData = this.$route.query.params
@@ -889,7 +1592,7 @@ export default {
         data: {
           paramList: renwus
         }
-      }).then(data => {
+      }).then((data) => {
         this.tableData = data
         this.$refs.bjBaseList.doLayout()
         if (this.tableData !== null && this.tableData !== undefined) {
@@ -918,9 +1621,12 @@ export default {
         params: {
           bjdId: this.$route.params.id
         }
-      }).then(data => {
+      }).then((data) => {
         this.bjd = data
-        if (this.bjd.baojiandianhua === undefined || this.bjd.baojiandianhua === null) {
+        if (
+          this.bjd.baojiandianhua === undefined ||
+          this.bjd.baojiandianhua === null
+        ) {
           this.bjd.baojiandianhua = this.bjd.weibaodanweiDianhua
         }
         this.getSblb()
@@ -935,29 +1641,41 @@ export default {
         params: {
           bjdId: this.bjd.id
         }
-      }).then(data => {
+      }).then((data) => {
         this.tableData = data
         for (const tableObj of this.tableData) {
           const sblbpz = []
           // 如果设备类别代码不存在，或者设备类别代码是设备种类代码时
-          const isNotExistSblbdm = !tableObj.shebeileibiedaima || tableObj.shebeileibiedaima.substring(1, 2) === '0'
+          const isNotExistSblbdm =
+            !tableObj.shebeileibiedaima ||
+            tableObj.shebeileibiedaima.substring(1, 2) === '0'
           // 如果存在注册代码
           if (isNotExistSblbdm && tableObj.zhucedaima) {
             // 如果注册代码上记录的设备类别代码是2010类型时，将调整为2100。
             if (tableObj.zhucedaima.substring(1, 2) === '0') {
-              tableObj.shebeileibiedaima = tableObj.zhucedaima.substring(0, 1) + tableObj.zhucedaima.substring(2, 3) + '00'
+              tableObj.shebeileibiedaima =
+                tableObj.zhucedaima.substring(0, 1) +
+                tableObj.zhucedaima.substring(2, 3) +
+                '00'
             } else {
               // 正常从注册代码中提取并拼接为设备类别代码
-              tableObj.shebeileibiedaima = tableObj.zhucedaima.substring(0, 2) + '00'
+              tableObj.shebeileibiedaima =
+                tableObj.zhucedaima.substring(0, 2) + '00'
             }
           }
           // 如果设备品种代码不存在，或者设备品种代码是设备类别代码时
-          const isNotExistSbpzdm = !tableObj.shebeipinzhongdaima || tableObj.shebeipinzhongdaima.substring(2, 3) === '0'
+          const isNotExistSbpzdm =
+            !tableObj.shebeipinzhongdaima ||
+            tableObj.shebeipinzhongdaima.substring(2, 3) === '0'
           // 如果存在注册代码时
           if (isNotExistSbpzdm && tableObj.zhucedaima) {
             tableObj.shebeipinzhongdaima = tableObj.zhucedaima.substring(0, 4)
           }
-          if (tableObj.shebeipinzhongdaima === '2140' || tableObj.shebeipinzhongdaima === '2110' || tableObj.shebeipinzhongdaima === '2120') {
+          if (
+            tableObj.shebeipinzhongdaima === '2140' ||
+            tableObj.shebeipinzhongdaima === '2110' ||
+            tableObj.shebeipinzhongdaima === '2120'
+          ) {
             tableObj.shebeipinzhongdaima = '2170'
           }
           sblbpz.push(tableObj.shebeileibiedaima)
@@ -986,31 +1704,54 @@ export default {
         obj.shebeileibiedaima = this.sbzldm.substring(0, 1) + '100'
         if (obj.zhucedaima.length > 10) {
           const testzcdm = obj.zhucedaima.substring(0, 4)
-          const testzcdma = testzcdm.substring(1, 2) === '0' ? testzcdm.substring(2, 3) : testzcdm.substring(1, 2)
+          const testzcdma =
+            testzcdm.substring(1, 2) === '0'
+              ? testzcdm.substring(2, 3)
+              : testzcdm.substring(1, 2)
           if (testzcdma != null) {
             obj.shebeipinzhongdaima = testzcdm
             if (testzcdma !== '0') {
-              obj.shebeileibiedaima = this.sbzldm.substring(0, 1) + testzcdma + '00'
+              obj.shebeileibiedaima =
+                this.sbzldm.substring(0, 1) + testzcdma + '00'
             }
           }
         }
       }
       if (!testpz.test(obj.shebeipinzhongdaima)) {
-        obj.shebeipinzhongdaima = this.sbzldm.substring(0, 1) + obj.shebeileibiedaima.substring(1, 2) + '10'
+        obj.shebeipinzhongdaima =
+          this.sbzldm.substring(0, 1) +
+          obj.shebeileibiedaima.substring(1, 2) +
+          '10'
       }
       if (obj.shebeipinzhongdaima !== '' && obj.shebeipinzhongdaima !== null) {
-        if (obj.shebeipinzhongdaima === '2140' || obj.shebeipinzhongdaima === '2110' || obj.shebeipinzhongdaima === '2120') {
+        if (
+          obj.shebeipinzhongdaima === '2140' ||
+          obj.shebeipinzhongdaima === '2110' ||
+          obj.shebeipinzhongdaima === '2120'
+        ) {
           obj.shebeipinzhongdaima = '2170'
         }
       }
       // 将关键信息默认‘/’
-      if (obj.danweineibubianhao === 'null' || obj.danweineibubianhao === '' || obj.danweineibubianhao === null) {
+      if (
+        obj.danweineibubianhao === 'null' ||
+        obj.danweineibubianhao === '' ||
+        obj.danweineibubianhao === null
+      ) {
         obj.danweineibubianhao = '/'
       }
-      if (obj.zhucedaima === 'null' || obj.zhucedaima === '' || obj.zhucedaima === null) {
+      if (
+        obj.zhucedaima === 'null' ||
+        obj.zhucedaima === '' ||
+        obj.zhucedaima === null
+      ) {
         obj.zhucedaima = '/'
       }
-      if (obj.shiyongdengjibianhao === 'null' || obj.shiyongdengjibianhao === '' || obj.shiyongdengjibianhao === null) {
+      if (
+        obj.shiyongdengjibianhao === 'null' ||
+        obj.shiyongdengjibianhao === '' ||
+        obj.shiyongdengjibianhao === null
+      ) {
         obj.shiyongdengjibianhao = '/'
       }
       // 增加核价默认值
@@ -1027,7 +1768,8 @@ export default {
     getSblb() {
       this.getSblbList('2', this.sbzldm, undefined)
     },
-    getSblbList(level, sbzl, sblb) { // 设备类别下拉菜单
+    getSblbList(level, sbzl, sblb) {
+      // 设备类别下拉菜单
       this.api({
         url: '/sedirectory/getList',
         method: 'get',
@@ -1036,7 +1778,7 @@ export default {
           sbzl: sbzl,
           sblb: sblb
         }
-      }).then(data => {
+      }).then((data) => {
         switch (level) {
           case '2':
             this.sblbList = data
@@ -1056,29 +1798,31 @@ export default {
           parentCode: 'DJ',
           species: this.bjd.shebeizhongleidaima
         }
-      }).then(data => {
+      }).then((data) => {
         this.jylbs = data
       })
     },
-    getArea() { // 查询区划
+    getArea() {
+      // 查询区划
       this.api({
         url: '/area/getShiArea',
         method: 'get',
         params: {
           shidaima: '370100'
         }
-      }).then(data => {
+      }).then((data) => {
         this.areas = data
       })
     },
-    getDepts() { // 查询科室
+    getDepts() {
+      // 查询科室
       this.api({
         url: '/department/getDepartmentByCode',
         method: 'get',
         params: {
           code: this.bjd.shebeizhongleidaima
         }
-      }).then(data => {
+      }).then((data) => {
         this.depts = data
       })
     },
@@ -1090,7 +1834,7 @@ export default {
         url: '/bjdDepartment/getObj',
         method: 'get',
         params: this.bjdDepartment
-      }).then(data => {
+      }).then((data) => {
         if (data != null) {
           this.bjdDepartment = data
           this.$set(this.bjd, 'departmentId', this.bjdDepartment.departmentId)
@@ -1172,7 +1916,8 @@ export default {
         this.$refs.bjBaseList.setCurrentRow(d)
       }, 10) // 用于延时渲染后选中这行
     },
-    addRow: function() { // 添加行数据
+    addRow: function() {
+      // 添加行数据
       this.baseListVisible = true
     },
     getBaseList() {
@@ -1180,7 +1925,7 @@ export default {
         url: '/se/list',
         method: 'get',
         params: this.listQuery
-      }).then(data => {
+      }).then((data) => {
         this.baseList = data.list
         this.totalCount = data.totalCount
       })
@@ -1208,10 +1953,16 @@ export default {
         let baseIds = ''
         for (let i = 0; i < this.addRowIndex.length; i++) {
           for (let i = 0; i < this.tableData.length; i++) {
-            if (this.tableData[i].zhucedaima === this.baseList[this.addRowIndex[i]].zhucedaima) {
+            if (
+              this.tableData[i].zhucedaima ===
+              this.baseList[this.addRowIndex[i]].zhucedaima
+            ) {
               return true
             }
-            if (this.tableData[i].shiyongdengjibianhao === this.baseList[this.addRowIndex[i]].shiyongdengjibianhao) {
+            if (
+              this.tableData[i].shiyongdengjibianhao ===
+              this.baseList[this.addRowIndex[i]].shiyongdengjibianhao
+            ) {
               return true
             }
           }
@@ -1222,7 +1973,7 @@ export default {
             url: '/bjd/relationParam',
             method: 'get',
             params: { baseIds: baseIds.substr(0, baseIds.length - 1) }
-          }).then(data => {
+          }).then((data) => {
             if (data != null) {
               for (let j = 0; j < data.length; j++) {
                 this.setDefaultValue(data[j])
@@ -1251,7 +2002,10 @@ export default {
         if (this.tableData[i].zhucedaima === this.baseList[index].zhucedaima) {
           flag = true
         }
-        if (this.tableData[i].shiyongdengjibianhao === this.baseList[index].shiyongdengjibianhao) {
+        if (
+          this.tableData[i].shiyongdengjibianhao ===
+          this.baseList[index].shiyongdengjibianhao
+        ) {
           flag = true
         }
       }
@@ -1281,7 +2035,7 @@ export default {
           url: '/bjd/relationParam',
           method: 'get',
           params: { baseIds: this.baseList[index].id }
-        }).then(data => {
+        }).then((data) => {
           if (data != null) {
             this.setDefaultValue(data[0])
             data[0].baseId = data[0].id
@@ -1318,10 +2072,10 @@ export default {
       const sblbpz = this.tableData[index].sblbpz
       this.tableData[index].shebeileibiedaima = sblbpz[0]
       this.tableData[index].shebeipinzhongdaima = sblbpz[1]
-      this.sblbList.forEach(item => {
+      this.sblbList.forEach((item) => {
         if (item.value === sblbpz[0]) {
           this.tableData[index].shebeileibie = item.label
-          item.children.forEach(itemc => {
+          item.children.forEach((itemc) => {
             if (itemc.value === sblbpz[1]) {
               this.tableData[index].shebeipinzhong = itemc.label
             }
@@ -1329,7 +2083,8 @@ export default {
         }
       })
     },
-    editRow: function() { // 修改行数据
+    editRow: function() {
+      // 修改行数据
       if (this.delRowIndex.length === 0) {
         for (let i = 0; i < this.tableData.length; i++) {
           if (this.param.neibuleibie !== '') {
@@ -1382,7 +2137,8 @@ export default {
       this.tableData.push()
       this.dialogFormParam = false
     },
-    delRow: function() { // 删除行数据
+    delRow: function() {
+      // 删除行数据
       if (this.delRowIndex.length === 0) {
         this.$message({
           type: 'error',
@@ -1394,37 +2150,38 @@ export default {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        }).then(() => {
-          // 对delRowIndex进行排序，因为删除一个元素后index值会变
-          this.delRowIndex.sort(function(x, y) {
-            if (x < y) {
-              return 1
-            }
-            if (x > y) {
-              return -1
-            }
-            return 0
-          })
-          for (let i = 0; i < this.delRowIndex.length; i++) {
-            // 在实际数据中进行删除
-            if (this.formState !== 'create') {
-              // 前提条件要满足非新建报检
-              const delid = this.tableData[this.delRowIndex[i]].id
-              if (delid != null) {
-                this.apibjd({
-                  url: '/renwu/delRenwu',
-                  method: 'delete',
-                  params: { id: delid }
-                }).then(data => {
-                  // 不做处理
-                })
+        })
+          .then(() => {
+            // 对delRowIndex进行排序，因为删除一个元素后index值会变
+            this.delRowIndex.sort(function(x, y) {
+              if (x < y) {
+                return 1
+              }
+              if (x > y) {
+                return -1
+              }
+              return 0
+            })
+            for (let i = 0; i < this.delRowIndex.length; i++) {
+              // 在实际数据中进行删除
+              if (this.formState !== 'create') {
+                // 前提条件要满足非新建报检
+                const delid = this.tableData[this.delRowIndex[i]].id
+                if (delid != null) {
+                  this.apibjd({
+                    url: '/renwu/delRenwu',
+                    method: 'delete',
+                    params: { id: delid }
+                  }).then((data) => {
+                    // 不做处理
+                  })
+                }
               }
+              this.tableData.splice(this.delRowIndex[i], 1)
             }
-            this.tableData.splice(this.delRowIndex[i], 1)
-          }
-          this.$refs.bjBaseList.clearSelection()
-          this.delRowIndex = []
-        })
+            this.$refs.bjBaseList.clearSelection()
+            this.delRowIndex = []
+          })
           .catch(() => {
             this.$message({
               type: 'info',
@@ -1445,21 +2202,39 @@ export default {
     },
     // 修改邮寄地址
     savePostInfo(operation) {
-      this.$refs['postInfo'].validate(valid => {
+      this.$refs['postInfo'].validate((valid) => {
         if (valid) {
           this.apibjd({
             url: 'postInfo/save',
             method: 'post',
             data: this.postInfo
-          }).then(data => {
+          }).then((data) => {
             this.$message({ message: '保存成功', type: 'success' })
           })
         }
       })
     },
+    formTime(v) {
+      const date = new Date(v)
+      const y = date.getFullYear()
+      let m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      let d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      const h = date.getHours()
+      let minute = date.getMinutes()
+      minute = minute < 10 ? '0' + minute : minute
+      const seconds =
+        date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+      const time =
+        y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + seconds
+      return time
+    },
     // 报检单保存
     bjdSave(audit) {
-      this.$refs['bjd'].validate(valid => {
+      this.bjd.baojianriqi = this.formTime(this.bjd.baojianriqi)
+      this.bjd.shouliriqi = this.formTime(this.bjd.shouliriqi)
+      this.$refs['bjd'].validate((valid) => {
         if (valid) {
           if (this.judgeNull(this.bjd.quhuadaima)) {
             this.$message({
@@ -1482,7 +2257,12 @@ export default {
                   message: '请通过批量修改完善设备类别及品种！！'
                 })
                 return false
-              } else if (this.sbzldm !== '8000' && this.judgeNull(this.tableData[i].zhucedaima) && this.judgeNull(this.tableData[i].shiyongdengjibianhao) && this.judgeNull(this.tableData[i].chanpinbianhao)) {
+              } else if (
+                this.sbzldm !== '8000' &&
+                this.judgeNull(this.tableData[i].zhucedaima) &&
+                this.judgeNull(this.tableData[i].shiyongdengjibianhao) &&
+                this.judgeNull(this.tableData[i].chanpinbianhao)
+              ) {
                 this.$message({
                   type: 'error',
                   message: '设备代码、使用登记编号、出厂编号不能同时为空！'
@@ -1494,19 +2274,28 @@ export default {
                   this.tableData[i].shebeileibiedaima = '7300'
                   this.tableData[i].shebeileibie = '压力管道阀门'
                 } else {
-                  this.tableData[i].shebeileibiedaima = this.tableData[0].shebeileibiedaima
-                  this.tableData[i].shebeileibie = this.tableData[0].shebeileibie
+                  this.tableData[i].shebeileibiedaima =
+                    this.tableData[0].shebeileibiedaima
+                  this.tableData[i].shebeileibie =
+                    this.tableData[0].shebeileibie
                 }
               }
               if (this.sbzldm === 'F000') {
-                if (!this.tableData[i].chanpinbianhao || this.tableData[i].chanpinbianhao === '/') {
+                if (
+                  !this.tableData[i].chanpinbianhao ||
+                  this.tableData[i].chanpinbianhao === '/'
+                ) {
                   this.$message({
                     type: 'error',
                     message: '产品编号不能为空！'
                   })
                   return false
                 }
-              } else if ((this.tableData[i].zhucedaima === '/' || this.judgeNull(this.tableData[i].zhucedaima)) && this.tableData[i].shiyongdengjibianhao === '/') {
+              } else if (
+                (this.tableData[i].zhucedaima === '/' ||
+                  this.judgeNull(this.tableData[i].zhucedaima)) &&
+                this.tableData[i].shiyongdengjibianhao === '/'
+              ) {
                 this.$message({
                   type: 'error',
                   message: '注册代码、使用登记编号不能同时为空！'
@@ -1535,7 +2324,7 @@ export default {
               audit: audit,
               isShengju: this.isShengju
             }
-          }).then(data => {
+          }).then((data) => {
             Utils.$emit('bjd-list')
             Utils.$emit('allot-list')
             if (audit) {
@@ -1546,14 +2335,16 @@ export default {
                   confirmButtonText: '确定',
                   cancelButtonText: '取消',
                   type: 'warning'
-                }).then(() => {
-                  this.printHzd()
-                }).catch(() => {
-                  this.$store.dispatch('delCurrentViews', {
-                    view: this.$route,
-                    $router: this.$router
-                  })
                 })
+                  .then(() => {
+                    this.printHzd()
+                  })
+                  .catch(() => {
+                    this.$store.dispatch('delCurrentViews', {
+                      view: this.$route,
+                      $router: this.$router
+                    })
+                  })
               } else {
                 this.deleteCurrentView()
               }
@@ -1562,9 +2353,11 @@ export default {
                 url: '/baseInfo/updateStateAndRiqiByIds',
                 method: 'get',
                 params: {
-                  ids: this.$refs.tableData.selection.map(info => {
-                    return info.seId
-                  }).join(','),
+                  ids: this.$refs.tableData.selection
+                    .map((info) => {
+                      return info.seId
+                    })
+                    .join(','),
                   state: '1'
                 }
               })
@@ -1576,7 +2369,10 @@ export default {
                 sblbpz.push(tableObj.shebeipinzhongdaima)
                 this.$set(tableObj, 'sblbpz', sblbpz)
               }
-              if (this.formState === 'create' || this.formState === 'newBuild') {
+              if (
+                this.formState === 'create' ||
+                this.formState === 'newBuild'
+              ) {
                 this.$message({ message: '保存成功', type: 'success' })
                 this.bjd = data.bjd
                 this.formState = 'update'
@@ -1595,23 +2391,51 @@ export default {
       let importField = []
       if (this.sbzldm === 'F000') {
         importField = [
-          [{ label: '使用单位', value: 'shiyongdanwei' }, { label: '使用单位地址', value: 'shiyongdanweiDizhi' }, { label: '使用单位联系人', value: 'shiyongdanweiLianxiren' },
-            { label: '使用单位电话', value: 'shiyongdanweiDianhua' }, { label: '区划名称', value: 'quhuamingcheng' }],
-          [{ label: '制造单位', value: 'zhizaodanwei' }, { label: '制造许可证编号', value: 'zhizaoxukezhengbianhao' }, { label: '产品编号', value: 'chanpinbianhao' },
-            { label: '安装位置', value: 's35' }, { label: '出厂日期', value: 's8' }, { label: '安全阀类型', value: 's16' }, { label: '安全阀型号', value: 's3' },
-            { label: '公称通径', value: 's4' }, { label: '阀座口径(mm)', value: 's5' }, { label: '起始范围(MPa)', value: 's6' }, { label: '结束范围(MPa)', value: 's7' },
-            { label: '设计压力', value: 's36' }, { label: '工作压力', value: 's17' }, { label: '工作介质', value: 's2' }, { label: '要求整定压力', value: 's1' },
-            { label: '密封试验压力', value: 's20' }, { label: '校验方式及介质', value: 's9' }, { label: '校验介质温度(℃)', value: 's12' }]
+          [
+            { label: '使用单位', value: 'shiyongdanwei' },
+            { label: '使用单位地址', value: 'shiyongdanweiDizhi' },
+            { label: '使用单位联系人', value: 'shiyongdanweiLianxiren' },
+            { label: '使用单位电话', value: 'shiyongdanweiDianhua' },
+            { label: '区划名称', value: 'quhuamingcheng' }
+          ],
+          [
+            { label: '制造单位', value: 'zhizaodanwei' },
+            { label: '制造许可证编号', value: 'zhizaoxukezhengbianhao' },
+            { label: '产品编号', value: 'chanpinbianhao' },
+            { label: '安装位置', value: 's35' },
+            { label: '出厂日期', value: 's8' },
+            { label: '安全阀类型', value: 's16' },
+            { label: '安全阀型号', value: 's3' },
+            { label: '公称通径', value: 's4' },
+            { label: '阀座口径(mm)', value: 's5' },
+            { label: '起始范围(MPa)', value: 's6' },
+            { label: '结束范围(MPa)', value: 's7' },
+            { label: '设计压力', value: 's36' },
+            { label: '工作压力', value: 's17' },
+            { label: '工作介质', value: 's2' },
+            { label: '要求整定压力', value: 's1' },
+            { label: '密封试验压力', value: 's20' },
+            { label: '校验方式及介质', value: 's9' },
+            { label: '校验介质温度(℃)', value: 's12' }
+          ]
         ]
       }
-      this.bjdController.beforeUpload(this, file, importField, this.sbzldm, this.bjd.bjType)
+      this.bjdController.beforeUpload(
+        this,
+        file,
+        importField,
+        this.sbzldm,
+        this.bjd.bjType
+      )
       return false
     },
     beforeHejia() {
       // 核定价格
       for (let i = 0; i < this.tableData.length; i++) {
         if (this.formState === 'finish') {
-          this.$message.warning('只允许更新核定费用，已审核的参数修改无效！！！')
+          this.$message.warning(
+            '只允许更新核定费用，已审核的参数修改无效！！！'
+          )
           return false
         }
         // 初始化参数
@@ -1625,7 +2449,10 @@ export default {
         } else if (this.sbzldm === '3000') {
           if (this.tableData[i].shebeileibiedaima !== undefined) {
             if (this.tableData[i].shebeileibiedaima.substring(0, 2) === '30') {
-              const sblbdm = this.tableData[i].shebeileibiedaima.substring(2, 3)
+              const sblbdm = this.tableData[i].shebeileibiedaima.substring(
+                2,
+                3
+              )
               this.tableData[i].shebeileibiedaima = '3' + sblbdm + '00'
             }
           }
@@ -1633,7 +2460,10 @@ export default {
         } else if (this.sbzldm === '4000') {
           if (this.tableData[i].shebeileibiedaima !== '') {
             if (this.tableData[i].shebeileibiedaima.substring(0, 2) === '40') {
-              const sblbdm = this.tableData[i].shebeileibiedaima.substring(2, 3)
+              const sblbdm = this.tableData[i].shebeileibiedaima.substring(
+                2,
+                3
+              )
               this.tableData[i].shebeileibiedaima = '4' + sblbdm + '00'
             }
           }
@@ -1663,25 +2493,29 @@ export default {
         params: {
           bjdIds: this.bjd.id
         }
-      }).then(data => {
-        this.preview({
-          url: '/print/generatePdfListing',
-          method: 'post',
-          data: {
-            info: data.bjd,
-            paramList: data.renwu,
-            viewType: 'HZD'
-          }
-        }).then(data => {
-          data = data.replace(/\\/g, '/')
-          window.open(data)
-          this.deleteCurrentView()
-        }).catch(() => {
+      })
+        .then((data) => {
+          this.preview({
+            url: '/print/generatePdfListing',
+            method: 'post',
+            data: {
+              info: data.bjd,
+              paramList: data.renwu,
+              viewType: 'HZD'
+            }
+          })
+            .then((data) => {
+              data = data.replace(/\\/g, '/')
+              window.open(data)
+              this.deleteCurrentView()
+            })
+            .catch(() => {
+              this.deleteCurrentView()
+            })
+        })
+        .catch(() => {
           this.deleteCurrentView()
         })
-      }).catch(() => {
-        this.deleteCurrentView()
-      })
     },
     deleteCurrentView() {
       this.$store.dispatch('delCurrentViews', {
@@ -1696,7 +2530,7 @@ export default {
         params: {
           bjdIds: this.bjd.id
         }
-      }).then(data => {
+      }).then((data) => {
         this.preview({
           url: '/print/generatePdfListing',
           method: 'post',
@@ -1705,7 +2539,7 @@ export default {
             paramList: data.renwu,
             viewType: 'HZD'
           }
-        }).then(data => {
+        }).then((data) => {
           data = data.replace(/\\/g, '/')
           window.open(data)
         })
@@ -1721,6 +2555,22 @@ export default {
       } else {
         els[0].style.width = '180px'
       }
+    },
+    // finish=>修改保存
+    modifyFn() {
+      this.apibjd({
+        url: '/bjd/printHzd',
+        method: 'put',
+        params: {
+          bjdIds: this.bjd
+        }
+      })
+        .then((data) => {
+          this.$message({
+            message: '修改成功',
+            type: 'success'
+          })
+        })
     }
   }
 }
diff --git a/src/views/bjd/dj_list.vue b/src/views/bjd/dj_list.vue
index 80fe0b8..83a276a 100644
--- a/src/views/bjd/dj_list.vue
+++ b/src/views/bjd/dj_list.vue
@@ -284,10 +284,11 @@ export default {
         return false
       } else {
         for (let i = 0; i < this.multipleSelection.length; i++) {
-          this.$confirm('共' + this.multipleSelection.length + '条报检项目将作废，是否继续?', '提示', {
+          this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废，是否继续?', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
-            type: 'warning'
+            inputPattern: /\S/,
+            inputErrorMessage: '作废原因不能为空'
           }).then(() => {
             for (let i = 0; i < this.multipleSelection.length; i++) {
               this.ids.push(this.multipleSelection[i].id)
diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue
index d86f60c..87643d9 100644
--- a/src/views/bjd/jj_list.vue
+++ b/src/views/bjd/jj_list.vue
@@ -23,9 +23,6 @@
           <el-button type="info" icon="el-icon-delete" @click="delBjd">
             删除
           </el-button>
-          <el-button v-if="hasRole('JDFPRW')" type="primary" icon="el-icon-delete" @click="showUpdateSgLxrDhDialog">
-            修改施工联系人电话
-          </el-button>
         </div>
       </sticky>
       <el-form>
diff --git a/src/views/search/list.vue b/src/views/search/list.vue
index d0f7560..c7e03d7 100644
--- a/src/views/search/list.vue
+++ b/src/views/search/list.vue
@@ -234,7 +234,7 @@ export default {
       this.taskInfoListData.length = 0
       this.loading = true
       this.api({
-        url: '/taskinfoView/list',
+        url: '/taskinfo/list',
         method: 'get',
         params: {
           renwuId: taskinfo.id,
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 5250a8c..58bdc5f 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -21,6 +21,9 @@
           <el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu">
             任务完成
           </el-button>
+          <el-button type="info" icon="el-icon-minus" @click="terminationFn">
+            终止任务
+          </el-button>
         </div>
       </sticky>
       <el-form>
@@ -627,6 +630,7 @@ export default {
     deleteRenwu() {
       if (!this.$refs.list.selection.length) {
         this.$message.error('请选择要作废的任务')
+        return false
       }
       this.$prompt('正在执行作废任务操作,确定继续?', '提示', {
         inputType: 'textarea',
@@ -664,6 +668,7 @@ export default {
     completeRenwu() {
       if (!this.$refs.list.selection.length) {
         this.$message.error('请选择要完成的任务')
+        return false
       }
       this.$confirm('正在执行任务完成操作，确定继续?', '提示', {
         confirmButtonText: '确定',
@@ -689,6 +694,37 @@ export default {
         })
       })
     },
+    // 终止任务
+    terminationFn() {
+      if (!this.$refs.list.selection.length) {
+        this.$message.error('请选择要终止的任务')
+        return false
+      }
+      this.$prompt('请输入终止原因', '确认提前终止任务？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /\S/,
+        inputErrorMessage: '终止原因不能为空'
+      }).then(() => {
+        this.apibjd({
+          url: 'renwu/terminateRenwu',
+          method: 'put',
+          params: {
+            renwuIds: this.$refs.list.selection.map(rw => {
+              return rw.id
+            }).join(',')
+          }
+        }).then(data => {
+          this.$message.success('任务已终止')
+          this.getList()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
+    },
     /**
      * 显示相关鉴证文件上传窗口
      * @param renwuId