优化中

src/api/common.js

@@ -164,7 +164,6 @@ export function rebutFn(params) {
     method: 'post',
     data: params,
     paramsSerializer: function(data) {
-      console.log(require('qs').stringify(data, { indices: false }), 8888888888888)
       return require('qs').stringify(data, { indices: false })
     }
   })

src/views/audit/list.vue

@@ -64,7 +64,7 @@
         <template slot-scope="scope">
           <el-button type="success" size="mini" icon="el-icon-view" title="预览 原始记录" circle @click="common.viewYsjl(scope.row.id, 'YSJL')" />
           <el-button type="primary" size="mini" icon="el-icon-view" title="预览 报告" circle @click="common.viewYsjl(scope.row.id, 'JYBG')" />
-          <el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
+          <el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].renwuId)" />
         </template>
       </el-table-column>
     </el-table>
@@ -711,14 +711,14 @@ export default {
     },
     /**
        * 根据报告ID查看驳回原因
-       * @param ysjlId
+       * @param renwuId
        */
-    viewAllRejection(ysjlId) {
+    viewAllRejection(renwuId) {
       this.api({
-        url: '/taskinfo/viewAllRejection',
+        url: '/taskinfo/viewRejection',
         method: 'get',
         params: {
-          ysjlId: ysjlId
+          renwuId: renwuId
         }
       }).then(data => {
         this.infoNotes = data

src/views/bggl/components/original_db_list.vue

@@ -137,8 +137,7 @@
           <el-button v-if="scope.row.shebeizhongleidaima === '2000' && scope.row.jianyanleibie === 'ZJ'" v-show="scope.row.jilubianhao" type="success" size="mini" icon="el-icon-view" title="预览记录" circle @click="showZJPreviewJudge(scope.row)" />
           <el-button v-else v-show="scope.row.jilubianhao" type="success" size="mini" icon="el-icon-view" title="预览 原始记录" circle @click="common.viewYsjl(scope.row.id, 'YSJL')" />
           <el-button type="primary" size="mini" icon="el-icon-view" title="预览 报告" circle @click="common.viewYsjl(scope.row.id, 'JYBG')" />
-          <el-button v-show="scope.row.shebeizhongleidaima === '2000' && scope.row.jianyanleibie === 'ZJ'" type="primary" size="mini" circle icon="el-icon-scissors" title="绘制驳回文件" @click="showDrawCanvas(scope.row)" />
+          <el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(scope.row.renwuId)" />
-          <el-button size="mini" type="info" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(scope.row.id)" />
           <el-button v-show="scope.row.shebeizhongleidaima === '2000' && scope.row.jianyanleibie === 'ZJ'" type="info" size="mini" circle icon="el-icon-info" title="查看相关鉴证" @click="showVerification(scope.row.renwuId,false)" />
           <!-- 锅炉制造 并且 当前报告的检验人员中包含当前用户 才显示该按钮 -->
           <el-button v-if="scope.row.shebeizhongleidaima === '1000' && scope.row.jianyanleibie === 'ZJ' && scope.row.jianyanrenyuan.split(',').indexOf(String($store.getters.userId)) !== -1" type="info" size="mini" circle title="收费信息" @click="showSfInfo(scope.row)">
@@ -284,11 +283,11 @@
         </el-form-item>
         <el-form-item label="驳回环节：" required>
           <el-select v-model="bohuiForm.flowstatus" placeholder="请选择">
-            <el-option v-if="str==2" label="起草环节" value="1" />
+            <el-option v-if="flowstatus === 2 || flowstatus === 3" label="起草环节" value="1" />
-            <el-option v-if="str==3" label="审核环节" value="1" />
+            <el-option v-if="flowstatus === 3" label="审核环节" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item label="上传驳回附件：">
+        <!--        <el-form-item label="上传驳回附件：">
           <span style="color: #dd6161">多张图片可合成一份pdf文件进行上传</span>
           <el-upload
             action=""
@@ -307,7 +306,7 @@
               点击上传
             </el-button>
           </el-upload>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogBohuiVisible = false">
@@ -321,41 +320,18 @@
 
     <!-- 驳回意见 -->
     <el-dialog :visible.sync="dialogBohuiyijianVisible" :modal-append-to-body="false" title="驳回意见" width="50%">
-      <el-form>
-        <el-form-item>
-          <span class="radio-group-label">绘制文件：</span>
-          <el-button type="primary" size="small" icon="el-icon-view" @click="rejectPicture('YSJL')">
-            原始记录
-          </el-button>
-          <el-button type="primary" size="small" icon="el-icon-view" @click="rejectPicture('JYBG')">
-            报    告
-          </el-button>
-        </el-form-item>
-      </el-form>
       <el-table :data="infoNotes">
-        <el-table-column align="center" label="驳回人" prop="infoSend" />
+        <el-table-column :formatter="formatter.getChineseName" align="center" label="驳回人" prop="infoSend" />
         <el-table-column align="center" label="驳回意见" prop="infoNotes" />
         <el-table-column align="center" label="驳回时间" prop="createTime" />
-        <el-table-column align="center" label="驳回附件" width="120">
+        <!--        <el-table-column align="center" label="驳回附件" width="120">
           <template slot-scope="{row}">
             <el-button type="primary" size="small" circle icon="el-icon-view" title="预览" @click="common.viewReject(row.id, row.fileName)" />
           </template>
-        </el-table-column>
+        </el-table-column>-->
       </el-table>
     </el-dialog>
 
-    <!--选择绘制PDF-->
-    <el-dialog :visible.sync="dialogDrawCanvasVisible" :modal-append-to-body="appendToBody" title="选择绘制驳回文件" width="16%">
-      <el-form style="width: 200px;">
-        <el-button type="primary" plain size="small" icon="el-icon-search" @click="drawCanvas('YSJL')">
-          原始记录
-        </el-button>
-        <el-button type="primary" plain size="small" icon="el-icon-search" @click="drawCanvas('JYBG')">
-          报    告
-        </el-button>
-      </el-form>
-    </el-dialog>
-
     <!--选择预览记录文件（制造监检压力容器）-->
     <el-dialog :visible.sync="dialogZJPreviewVisible" :modal-append-to-body="appendToBody" title="选择预览记录文件" width="20%">
       <el-form>
@@ -447,7 +423,7 @@ export default {
       modelId: '',
       currentRenwuId: 0,
       jylbList: [],
-      str: '',
+      flowstatus: '',
       statusList: [
         {
           value: 1,
@@ -681,20 +657,17 @@ export default {
       }
       this.ysjlId = []
       const arr = []
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (this.multipleSelection.length > 1) {
-          if (this.multipleSelection[i].flowstatus !== this.multipleSelection[i + 1].flowstatus) {
-            this.$message('选择的驳回数据状态请保持一致')
-          }
-        }
 
-        if (this.multipleSelection[i].flowstatus !== 1) {
+      this.flowstatus = this.multipleSelection[0].flowstatus
-          arr.push(this.multipleSelection[i].id)
+      if (this.flowstatus === 1) {
-          this.str = this.multipleSelection[i].flowstatus
+        this.$message('存在未流转报告。')
-        } else {
+        return false
-          this.$message('存在未流转报告。')
+      }
-          return false
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        if (this.multipleSelection[i].flowstatus !== this.flowstatus) {
+          this.$message('选择的驳回数据环节请保持一致')
         }
+        arr.push(this.multipleSelection[0].id)
       }
       this.ysjlId = arr
       if (this.ysjlId.length) {
@@ -1329,18 +1302,17 @@ export default {
     },
     /**
        * 根据报告ID查看驳回原因
-       * @param ysjlId
+       * @param renwuId
        */
-    viewAllRejection(ysjlId) {
+    viewAllRejection(renwuId) {
       this.api({
-        url: '/taskinfo/viewAllRejection',
+        url: '/taskinfo/viewRejection',
         method: 'get',
         params: {
-          ysjlId: ysjlId
+          renwuId: renwuId
         }
       }).then(data => {
         this.infoNotes = data
-        this.ysjlId = ysjlId
         if (!this.infoNotes.length) {
           this.$alert('暂无驳回意见！', '驳回意见', {
             confirmButtonText: '关闭'

src/views/bggl/daishen_list.vue

@@ -72,7 +72,7 @@
         <template slot-scope="scope">
           <el-button type="success" size="mini" icon="el-icon-view" title="预览 原始记录" circle @click="common.viewYsjl(scope.row.id, 'YSJL')" />
           <el-button type="primary" size="mini" icon="el-icon-view" title="预览 报告" circle @click="common.viewYsjl(scope.row.id, 'JYBG')" />
-          <el-button type="info" size="mini" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
+          <el-button type="info" size="mini" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].renwuId)" />
           <el-button type="warning" size="mini" icon="el-icon-view" title="预览交费凭据" circle @click="previewCredentials(scope.row.sfdId)" />
         </template>
       </el-table-column>
@@ -740,14 +740,14 @@ export default {
     },
     /**
        * 根据报告ID查看驳回原因
-       * @param ysjlId
+       * @param renwuId
        */
-    viewAllRejection(ysjlId) {
+    viewAllRejection(renwuId) {
       this.api({
-        url: '/taskinfo/viewAllRejection',
+        url: '/taskinfo/viewRejection',
         method: 'get',
         params: {
-          ysjlId: ysjlId
+          renwuId: renwuId
         }
       }).then(data => {
         this.infoNotes = data

src/views/bjd/dj_input.vue

@@ -30,7 +30,7 @@
               审核通过
             </el-button>
           </template>
-          <template v-if="bjd.shebeizhongleidaima === 'F000'">
+          <!--          <template v-if="bjd.shebeizhongleidaima === 'F000'">
             <el-upload
               :show-file-list="false"
               :before-upload="beforeUpload"
@@ -41,19 +41,19 @@
                 导入数据
               </el-button>
             </el-upload>
-          </template>
+          </template>-->
         </template>
         <template v-else>
           <el-button
             type="success"
-            icon="el-icon-printer"
+            icon="el-icon-view"
             size="medium"
-            @click="viewHzd"
+            @click="bjdService.viewHzd(bjd.id)"
           >
-            打印回执单
+            预览回执单
           </el-button>
           <el-button
-            v-if="form==1"
+            v-if="form === 1"
             type="success"
             icon="el-icon-printer"
             size="medium"
@@ -63,7 +63,7 @@
           </el-button>
         </template>
 
-        <el-button
+        <!--        <el-button
           type="success"
           icon="el-icon-download"
           size="medium"
@@ -71,7 +71,7 @@
           @click="common.downloadTemplate(templateName)"
         >
           下载导入模板
-        </el-button>
+        </el-button>-->
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="border-card">
@@ -1512,7 +1512,6 @@ import Sticky from '@/components/Sticky'
 import Utils from '../../utils/contact.js'
 import Pagination from '@/components/Pagination'
 import { deleteRenwuFn } from '@/api/common'
-import qs from 'qs'
 
 // import XLSX from 'xlsx'
 export default {
@@ -2531,34 +2530,6 @@ export default {
         $router: this.$router
       })
     },
-    viewHzd() {
-      const arr = [this.bjd.id]
-      this.preview({
-        url: '/print/batchGeneratePdfHzd',
-        method: 'get',
-        params: {
-          bjdIds: arr
-        },
-        paramsSerializer: function(params) {
-          return qs.stringify(params, { indices: false })
-        }
-      }).then((data) => {
-        this.preview({
-          url: '/print/createXmlOther',
-          method: 'post',
-          params: {
-            ids: arr,
-            type: 'HZD'
-          },
-          paramsSerializer: function(params) {
-            return qs.stringify(params, { indices: false })
-          }
-        }).then((data) => {
-          data = data.replace(/\\/g, '/')
-          window.open(data)
-        })
-      })
-    },
     editFixedHidden() {
       const els = document.getElementsByClassName('el-table__fixed-right')
       if (els.length > 0) {

src/views/bjd/jj_input.vue

@@ -14,7 +14,7 @@
               审核通过
             </el-button>
           </template>
-          <template v-if="bjd.bjType === 'cyqp'">
+          <!--          <template v-if="bjd.bjType === 'cyqp'">
             <el-upload
               :show-file-list="false"
               :before-upload="beforeUpload"
@@ -25,16 +25,16 @@
                 导入数据
               </el-button>
             </el-upload>
-          </template>
+          </template>-->
         </template>
         <template v-else>
-          <el-button type="success" icon="el-icon-printer" @click="viewHzd">
+          <el-button type="success" icon="el-icon-view" @click="bjdService.viewHzd(bjd.id)">
-            打印回执单
+            预览回执单
           </el-button>
         </template>
-        <el-button type="success" icon="el-icon-download" size="medium" @click="common.downloadTemplate(templateName)">
+        <!--        <el-button type="success" icon="el-icon-download" size="medium" @click="common.downloadTemplate(templateName)">
           下载导入模板
-        </el-button>
+        </el-button>-->
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="border-card">

src/views/bjd/zj_input.vue

@@ -86,7 +86,7 @@
           <el-button type="danger" size="mini" icon="el-icon-remove-outline" @click="delRow()">
             删除
           </el-button>
-          <template v-if="sbzldm === '1000' || sbzldm === '2000'">
+          <!--          <template v-if="sbzldm === '1000' || sbzldm === '2000'">
             <el-button type="success" icon="el-icon-download" size="mini" @click="common.downloadTemplate(templateName)">
               下载导入模板
             </el-button>
@@ -100,7 +100,7 @@
                 导入数据
               </el-button>
             </el-upload>
-          </template>
+          </template>-->
           <span style="margin-left: 20px;color: red;font-size: 13px;">如若【设备类别】相同，只编辑填写第一条即可！</span>
         </template>
         <el-switch v-model="fixedFlag" active-color="#13ce66" inactive-color="#ff4949" @change="editFixedHidden()" />
@@ -213,20 +213,6 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="s107" width="220" label="生产形式">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.s107" @focus="focusGetCategory(scope.row.sblbpz)">
-                  <div v-for="(item,index) in ((scope.row.shebeileibiedaima && (scope.row.shebeileibiedaima === '2200' || scope.row.shebeileibiedaima === '2300')) ? productionsOnly3 : productions)" :key="index">
-                    <el-popover placement="right" width="180" trigger="hover">
-                      <el-button type="warning" round plain @click="downloadTemplate(scope.row, item.value)">
-                        下载数据模板文件
-                      </el-button>
-                      <el-option :key="index" slot="reference" :label="item.name" :value="item.value" />
-                    </el-popover>
-                  </div>
-                </el-select>
-              </template>
-            </el-table-column>
           </template>
           <template v-else-if="sbzldm === '7000'">
             <el-table-column align="center" prop="sblbpz" min-width="280" label="设备类别/品种">

src/views/ysjl/components/original_db_list.vue

@@ -78,7 +78,7 @@
         <template slot-scope="scope">
           <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editYsjl(scope.$index)" />
           <el-button type="success" size="mini" circle icon="el-icon-view" title="预览 原始记录" @click="common.viewYsjl(scope.row.bglx === 1 ? scope.row.id : scope.row.parentId, 'YSJL')" />
-          <el-button type="info" size="mini" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].id)" />
+          <el-button type="info" size="mini" icon="el-icon-message" title="查看驳回意见" circle @click="viewAllRejection(list[scope.$index].renwuId)" />
         </template>
       </el-table-column>
     </el-table>
@@ -369,14 +369,14 @@ export default {
     },
     /**
      * 根据报告ID查看驳回原因
-     * @param ysjlId
+     * @param renwuId
      */
-    viewAllRejection(ysjlId) {
+    viewAllRejection(renwuId) {
       this.api({
-        url: '/taskinfo/viewAllRejection',
+        url: '/taskinfo/viewRejection',
         method: 'get',
         params: {
-          ysjlId: ysjlId
+          renwuId: renwuId
         }
       }).then(data => {
         this.infoNotes = data