Explorar o código

fix:检测附件

zhangjingyuan %!s(int64=3) %!d(string=hai) anos
pai
achega
ae8ccc6414

+ 62 - 112
src/views/platform/bpmn/bpmInstHis/listType/CMAOjiancedangan.vue

@@ -112,6 +112,28 @@
                 </div>
               </el-popover>
             </div>
+            <div>
+              <el-popover placement="left" width="200" trigger="click">
+                <div
+                  class="div_test item"
+                  style="color: #85ce61"
+                  slot="reference"
+                  @click="getjianceFile(scope.row)"
+                >
+                  <i class="el-icon-s-order"></i> 检测附件
+                </div>
+                <div class="three-item">
+                  <div
+                    style="color: #85ce61; cursor: pointer"
+                    v-for="it in jianceFileList"
+                    :key="it.id_"
+                    @click="jianceFile(it)"
+                  >
+                  {{ it.fileName }}.{{ it.ext }}
+                  </div>
+                </div>
+              </el-popover>
+            </div>
             <div
               class="item"
               style="color: #85ce61"
@@ -204,13 +226,22 @@
       >
       </el-pagination>
     </div>
+    <image-viewer
+            v-if="fileType === 'image'"
+            :z-index="zIndex"
+            :url-list="[fileUrl]"
+            :on-close="() => fileType = ''"
+        />
   </div>
 </template>
 
 <script>
 import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
 import GetReport from "../corresponding/getReport.js";
-import { SYSTEM_URL, BASE_API } from '@/api/baseUrl'
+import { SYSTEM_URL, BASE_API } from '@/api/baseUrl';
+import PopupManager from '@/utils/popup';
+import { previewFile } from '@/api/platform/file/attachment'
+const imageType = ['jpg', 'jpeg', 'bmp', 'png', 'gif']
 export default {
   mixins: [GetReport],
   data() {
@@ -240,13 +271,18 @@ export default {
       wTBH:[],
       tongyonglujin: '',// 检测项目通用路径
       srcUrl: '',
+      fileUrl: '',
+      fileType: '',
+      zIndex: 2000,
       fileList: [],
       fileType: '',
-      fileOption: {
-        user: {}
-      }
+      fileOption: {user: {}},
+      jianceFileList:[],
     };
   },
+  components: {
+    ImageViewer: () => import('@/components/ibps-file-viewer/image')
+  },
   filters: {
     returnHetong(value, arr) {
       for (var i = 0; i < arr.length; i++) {
@@ -392,114 +428,6 @@ export default {
             }
           })
         });
-      // if (itemName.includes("pH检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-103-R01 A1 pH检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("渗透压摩尔浓度检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-105-R01 A2 渗透压摩尔浓度检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("最低装量")) {
-      //   this.alertReport("42明鉴/张/最低装载量.rpx", shujuid);
-      // } else if (itemName.includes("无菌检测(薄膜过滤法)")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-102-R01 A2 无菌检测薄膜过滤法记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("无菌检测(全自动微生物培养)")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/无菌检测(全自动微生物培养).rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("内毒素检测(凝胶法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-117-R01 A1 细菌内毒素(凝胶法)检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("动态显色法")) {
-      //   this.alertReport(
-      //     "42明鉴/张/动态显色法检测内毒素记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("手动细胞计数")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-106-R01 A1 细胞计数检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("手动细胞活率")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-107-R01 A1 细胞活率检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(台盼蓝染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-118-R01  A0细胞计数和细胞活率(台盼蓝仪器法)检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(双荧光染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-119-R01  A0细胞计数和细胞活率(双荧光染色法)检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("牛血清白蛋白残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-111-R01 A1 牛血清白蛋白残留量检测.rpx",
-      //     '0c5c64b2083f43daa73d47bc1928d3ee'
-      //   );
-      // } else if (itemName.includes("青霉素残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/青霉素残留量检测记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("支原体检测(培养法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-104-R01 A1 支原体检测培养法记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("支原体检测(荧光PCR法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-113-R01 A1支原体检测(荧光PCR法) 副本.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测3项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测3项.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测5项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测5项.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测8项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测8项.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("CIK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-123-R01 A0 CIK细胞表面标志物检测记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("NK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/恰/MJT-SJ-124-R01  A0 NK细胞表面标志物检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("淋巴细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-125-R01 A0 淋巴细胞表面标志物检测记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("支原体检测(化学发光法)记录表")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-114-R01 A1 支原体检测(化学发光法)记录表.rpx",
-      //     shujuid
-      //   );
-      // }
     },
     selectSplit() {
       // pin凑sql
@@ -531,6 +459,28 @@ export default {
         return "where";
       }
     },
+  //检测附件
+    getjianceFile(row){
+      let this_ =this;
+      this.jianceFileList = []
+      // const { bao_gao_pdf_, suo_you_yuan_shi_ } = row.suo_you_yuan_shi_
+      let sql = `select id_ as id, file_name_ as fileName, ext_ as ext from ibps_file_attachment where find_in_set(id_, '${row.jian_ce_yuan_shi_}')`
+        curdPost('sql', sql).then(res => {
+           this_.jianceFileList = res.variables && res.variables.data;
+        })
+     
+    },
+    jianceFile(file){
+      if (imageType.includes(file.ext)) {
+        this.zIndex = PopupManager.getZIndex()
+        this.fileUrl = previewFile(file.id)
+        this.fileType = 'image'
+      } else {
+         this.getOption(file)
+         this.openWindow()
+         this.fileType = ''
+      }
+    },
     search() {
       let moreSql = this.selectSplit();
       var sql =

+ 64 - 121
src/views/platform/bpmn/bpmInstHis/listType/CMAjiancedangan.vue

@@ -72,21 +72,14 @@
             <div
               class="item"
               style="color: #85ce61"
-              @click="
-                alertReport(
-                  reports.jianceshenqingdan,
-                  scope.row.jian_ce_shen_qing
-                )
-              "
+              @click="alertReport(reports.jianceshenqingdan,scope.row.jian_ce_shen_qing)"
             >
               <i class="el-icon-s-order"></i> 检测委托单
             </div>
             <div
               class="item"
               style="color: #85ce61"
-              @click="
-                alertReport(reports.hetongpingshen, scope.row.jian_ce_shen_qing)
-              "
+              @click="alertReport(reports.hetongpingshen, scope.row.jian_ce_shen_qing)"
             >
               <i class="el-icon-s-order"></i> 合同评审
             </div>
@@ -112,6 +105,28 @@
                 </div>
               </el-popover>
             </div>
+            <div>
+              <el-popover placement="left" width="200" trigger="click">
+                <div
+                  class="div_test item"
+                  style="color: #85ce61"
+                  slot="reference"
+                  @click="getjianceFile(scope.row)"
+                >
+                  <i class="el-icon-s-order"></i> 检测附件
+                </div>
+                <div class="three-item">
+                  <div
+                    style="color: #85ce61; cursor: pointer"
+                    v-for="it in jianceFileList"
+                    :key="it.id_"
+                    @click="jianceFile(it)"
+                  >
+                  {{ it.fileName }}.{{ it.ext }}
+                  </div>
+                </div>
+              </el-popover>
+            </div>
             <div
               class="item"
               style="color: #85ce61"
@@ -204,13 +219,22 @@
       >
       </el-pagination>
     </div>
+    <image-viewer
+            v-if="fileType === 'image'"
+            :z-index="zIndex"
+            :url-list="[fileUrl]"
+            :on-close="() => fileType = ''"
+        />
   </div>
 </template>
 
 <script>
 import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
 import GetReport from "../corresponding/getReport.js";
-import { SYSTEM_URL, BASE_API } from '@/api/baseUrl'
+import { SYSTEM_URL, BASE_API } from '@/api/baseUrl';
+import PopupManager from '@/utils/popup';
+import { previewFile } from '@/api/platform/file/attachment'
+const imageType = ['jpg', 'jpeg', 'bmp', 'png', 'gif']
 export default {
   mixins: [GetReport],
   data() {
@@ -240,13 +264,18 @@ export default {
       wTBH:[],
       tongyonglujin: '',// 检测项目通用路径
       srcUrl: '',
+      fileUrl: '',
+      fileType: '',
+      zIndex: 2000,
       fileList: [],
       fileType: '',
-      fileOption: {
-        user: {}
-      }
+      fileOption: {user: {}},
+      jianceFileList:[],
     };
   },
+  components: {
+    ImageViewer: () => import('@/components/ibps-file-viewer/image')
+  },
   filters: {
     returnHetong(value, arr) {
       for (var i = 0; i < arr.length; i++) {
@@ -392,114 +421,6 @@ export default {
             }
           })
         });
-      // if (itemName.includes("pH检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-103-R01 A1 pH检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("渗透压摩尔浓度检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-105-R01 A2 渗透压摩尔浓度检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("最低装量")) {
-      //   this.alertReport("42明鉴/张/最低装载量.rpx", shujuid);
-      // } else if (itemName.includes("无菌检测(薄膜过滤法)")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-102-R01 A2 无菌检测薄膜过滤法记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("无菌检测(全自动微生物培养)")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/无菌检测(全自动微生物培养).rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("内毒素检测(凝胶法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-117-R01 A1 细菌内毒素(凝胶法)检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("动态显色法")) {
-      //   this.alertReport(
-      //     "42明鉴/张/动态显色法检测内毒素记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("手动细胞计数")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-106-R01 A1 细胞计数检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("手动细胞活率")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-107-R01 A1 细胞活率检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(台盼蓝染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-118-R01  A0细胞计数和细胞活率(台盼蓝仪器法)检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(双荧光染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-119-R01  A0细胞计数和细胞活率(双荧光染色法)检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("牛血清白蛋白残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-111-R01 A1 牛血清白蛋白残留量检测.rpx",
-      //     '0c5c64b2083f43daa73d47bc1928d3ee'
-      //   );
-      // } else if (itemName.includes("青霉素残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/青霉素残留量检测记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("支原体检测(培养法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-104-R01 A1 支原体检测培养法记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("支原体检测(荧光PCR法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-113-R01 A1支原体检测(荧光PCR法) 副本.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测3项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测3项.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测5项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测5项.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测8项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测8项.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("CIK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-123-R01 A0 CIK细胞表面标志物检测记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("NK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/恰/MJT-SJ-124-R01  A0 NK细胞表面标志物检测记录.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("淋巴细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-125-R01 A0 淋巴细胞表面标志物检测记录表.rpx",
-      //     shujuid
-      //   );
-      // } else if (itemName.includes("支原体检测(化学发光法)记录表")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-114-R01 A1 支原体检测(化学发光法)记录表.rpx",
-      //     shujuid
-      //   );
-      // }
     },
     selectSplit() {
       // pin凑sql
@@ -531,6 +452,28 @@ export default {
         return "where";
       }
     },
+    //检测附件
+    getjianceFile(row){
+      let this_ =this;
+      this.jianceFileList = []
+      // const { bao_gao_pdf_, suo_you_yuan_shi_ } = row.suo_you_yuan_shi_
+      let sql = `select id_ as id, file_name_ as fileName, ext_ as ext from ibps_file_attachment where find_in_set(id_, '${row.jian_ce_yuan_shi_}')`
+        curdPost('sql', sql).then(res => {
+           this_.jianceFileList = res.variables && res.variables.data;
+        })
+     
+    },
+    jianceFile(file){
+      if (imageType.includes(file.ext)) {
+        this.zIndex = PopupManager.getZIndex()
+        this.fileUrl = previewFile(file.id)
+        this.fileType = 'image'
+      } else {
+         this.getOption(file)
+         this.openWindow()
+         this.fileType = ''
+      }
+    },
     search() {
       let moreSql = this.selectSplit();
       var sql =

+ 64 - 122
src/views/platform/bpmn/bpmInstHis/listType/CNASjiancedangan.vue

@@ -111,6 +111,28 @@
                 </div>
               </el-popover>
             </div>
+            <div>
+              <el-popover placement="left" width="200" trigger="click">
+                <div
+                  class="div_test item"
+                  style="color: #85ce61"
+                  slot="reference"
+                  @click="getjianceFile(scope.row)"
+                >
+                  <i class="el-icon-s-order"></i> 检测附件
+                </div>
+                <div class="three-item">
+                  <div
+                    style="color: #85ce61; cursor: pointer"
+                    v-for="it in jianceFileList"
+                    :key="it.id_"
+                    @click="jianceFile(it)"
+                  >
+                  {{ it.fileName }}.{{ it.ext }}
+                  </div>
+                </div>
+              </el-popover>
+            </div>
             <div
               class="item"
               style="color: #85ce61"
@@ -203,13 +225,22 @@
       >
       </el-pagination>
     </div>
+    <image-viewer
+            v-if="fileType === 'image'"
+            :z-index="zIndex"
+            :url-list="[fileUrl]"
+            :on-close="() => fileType = ''"
+        />
   </div>
 </template>
 
 <script>
 import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
 import GetReport from "../corresponding/getReport.js";
-import { SYSTEM_URL, BASE_API } from '@/api/baseUrl'
+import { SYSTEM_URL, BASE_API } from '@/api/baseUrl';
+import PopupManager from '@/utils/popup';
+import { previewFile } from '@/api/platform/file/attachment'
+const imageType = ['jpg', 'jpeg', 'bmp', 'png', 'gif']
 export default {
   mixins: [GetReport],
   data() {
@@ -239,13 +270,18 @@ export default {
       wTBH: [],
       tongyonglujin: '',// 检测项目通用路径
       srcUrl: '',
+      fileUrl: '',
+      fileType: '',
+      zIndex: 2000,
       fileList: [],
       fileType: '',
-      fileOption: {
-        user: {}
-      }
+      fileOption: {user: {}},
+      jianceFileList:[],
     };
   },
+  components: {
+    ImageViewer: () => import('@/components/ibps-file-viewer/image')
+  },
   filters: {
     returnHetong(value, arr) {
       for (var i = 0; i < arr.length; i++) {
@@ -338,7 +374,6 @@ export default {
       var sql =`select jian_ce_xiang_mu2,jian_ce_xiang_si_ ,jian_ce_xiang_me_ ,jian_ce_xiang_ms_  FROM t_mjypb  WHERE  wai_jian_= (SELECT jian_ce_shen_qing  FROM t_mjjcbg  WHERE id_= '${info.id_}') AND yang_pin_bian_hao = '${info.yang_pin_bian_hao}'`;
       curdPost("sql", sql).then((res) => {
         itemId = res.variables.data;
-        console.log(itemId,"2323")
         if(itemId.length <=0 ||itemId ==null){
           return
         }
@@ -392,116 +427,6 @@ export default {
             }
           })
         });
-
-
-      // if (itemName.includes("pH检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-103-R01 A1 pH检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("渗透压摩尔浓度检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-105-R01 A2 渗透压摩尔浓度检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("最低装量")) {
-      //   this.alertReport("42明鉴/张/最低装载量.rpx", this.runqianId);
-      // } else if (itemName.includes("无菌检测(薄膜过滤法)")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-102-R01 A2 无菌检测薄膜过滤法记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("无菌检测(全自动微生物培养)")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/无菌检测(全自动微生物培养).rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("内毒素检测(凝胶法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-117-R01 A1 细菌内毒素(凝胶法)检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("内毒素检测(动态显色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/张/动态显色法检测内毒素记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("手动细胞计数")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-106-R01 A1 细胞计数检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("手动细胞活率")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-107-R01 A1 细胞活率检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(台盼蓝染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-118-R01  A0细胞计数和细胞活率(台盼蓝仪器法)检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(双荧光染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-119-R01  A0细胞计数和细胞活率(双荧光染色法)检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("牛血清白蛋白残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-111-R01 A1 牛血清白蛋白残留量检测.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("青霉素残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/青霉素残留量检测记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("支原体检测(培养法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-104-R01 A1 支原体检测培养法记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("支原体检测(荧光PCR法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-113-R01 A1支原体检测(荧光PCR法) 副本.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测3项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测3项.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测5项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测5项.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测8项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测8项.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("CIK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-123-R01 A0 CIK细胞表面标志物检测记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("NK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/恰/MJT-SJ-124-R01  A0 NK细胞表面标志物检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("淋巴细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-125-R01 A0 淋巴细胞表面标志物检测记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("支原体检测(化学发光法)记录表")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-114-R01 A1 支原体检测(化学发光法)记录表.rpx",
-      //     this.runqianId
-      //   );
-      // }
     },
     isYubaogao(value, row) {},
     // pin凑sql
@@ -534,6 +459,28 @@ export default {
         return "WHERE";
       }
     },
+    //检测附件
+    getjianceFile(row){
+      let this_ =this;
+      this.jianceFileList = []
+      // const { bao_gao_pdf_, suo_you_yuan_shi_ } = row.suo_you_yuan_shi_
+      let sql = `select id_ as id, file_name_ as fileName, ext_ as ext from ibps_file_attachment where find_in_set(id_, '${row.jian_ce_yuan_shi_}')`
+        curdPost('sql', sql).then(res => {
+           this_.jianceFileList = res.variables && res.variables.data;
+        })
+     
+    },
+    jianceFile(file){
+      if (imageType.includes(file.ext)) {
+        this.zIndex = PopupManager.getZIndex()
+        this.fileUrl = previewFile(file.id)
+        this.fileType = 'image'
+      } else {
+         this.getOption(file)
+         this.openWindow()
+         this.fileType = ''
+      }
+    },
     search() {
       let moreSql = this.selectSplit();
       var sql =
@@ -544,16 +491,11 @@ export default {
     },
     handleSizeChange(value) {
       this.currentPage4 = 1;
-      let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
-        value;
+      let sql ="select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +value;
       this.loadData(sql);
     },
     handleCurrentChange(value) {
-      let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
-        value +
-        ", 20";
+      let sql ="select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +value +", 20";
       this.loadData(sql);
     },
     // 获取附件信息

+ 61 - 111
src/views/platform/bpmn/bpmInstHis/listType/feijiancedangan.vue

@@ -113,6 +113,28 @@
                 </div>
               </el-popover>
             </div>
+            <div>
+              <el-popover placement="left" width="200" trigger="click">
+                <div
+                  class="div_test item"
+                  style="color: #85ce61"
+                  slot="reference"
+                  @click="getjianceFile(scope.row)"
+                >
+                  <i class="el-icon-s-order"></i> 检测附件
+                </div>
+                <div class="three-item">
+                  <div
+                    style="color: #85ce61; cursor: pointer"
+                    v-for="it in jianceFileList"
+                    :key="it.id_"
+                    @click="jianceFile(it)"
+                  >
+                  {{ it.fileName }}.{{ it.ext }}
+                  </div>
+                </div>
+              </el-popover>
+            </div>
             <div
               class="item"
               style="color: #85ce61"
@@ -205,6 +227,12 @@
       >
       </el-pagination>
     </div>
+    <image-viewer
+            v-if="fileType === 'image'"
+            :z-index="zIndex"
+            :url-list="[fileUrl]"
+            :on-close="() => fileType = ''"
+        />
   </div>
 </template>
 
@@ -212,6 +240,9 @@
 import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
 import GetReport from "../corresponding/getReport.js";
 import { SYSTEM_URL, BASE_API } from '@/api/baseUrl'
+import PopupManager from '@/utils/popup';
+import { previewFile } from '@/api/platform/file/attachment'
+const imageType = ['jpg', 'jpeg', 'bmp', 'png', 'gif']
 export default {
   data() {
     return {
@@ -240,14 +271,19 @@ export default {
       wTBH: [],
       tongyonglujin: '',// 检测项目通用路径
       srcUrl: '',
+      fileUrl: '',
+      fileType: '',
+      zIndex: 2000,
       fileList: [],
       fileType: '',
-      fileOption: {
-        user: {}
-      }
+      fileOption: {user: {}},
+      jianceFileList:[],
     };
   },
   mixins: [GetReport],
+  components: {
+    ImageViewer: () => import('@/components/ibps-file-viewer/image')
+  },
   filters: {
     returnHetong(value, arr) {
       for (var i = 0; i < arr.length; i++) {
@@ -382,114 +418,6 @@ export default {
             }
           })
         });
-      // if (itemName.includes("pH检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-103-R01 A1 pH检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("渗透压摩尔浓度检测")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-105-R01 A2 渗透压摩尔浓度检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("最低装量")) {
-      //   this.alertReport("42明鉴/张/最低装载量.rpx", this.runqianId);
-      // } else if (itemName.includes("无菌检测(薄膜过滤法)")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-102-R01 A2 无菌检测薄膜过滤法记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("无菌检测(全自动微生物培养)")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/无菌检测(全自动微生物培养).rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("内毒素检测(凝胶法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-117-R01 A1 细菌内毒素(凝胶法)检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("内毒素检测(动态显色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/张/动态显色法检测内毒素记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("手动细胞计数")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-106-R01 A1 细胞计数检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("手动细胞活率")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-107-R01 A1 细胞活率检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(台盼蓝染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-118-R01  A0细胞计数和细胞活率(台盼蓝仪器法)检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("自动细胞计数和活率(双荧光染色法)")) {
-      //   this.alertReport(
-      //     "42明鉴/郑/MJT-SJ-119-R01  A0细胞计数和细胞活率(双荧光染色法)检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("牛血清白蛋白残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-111-R01 A1 牛血清白蛋白残留量检测.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("青霉素残留检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/青霉素残留量检测记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("支原体检测(培养法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-104-R01 A1 支原体检测培养法记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("支原体检测(荧光PCR法)")) {
-      //   this.alertReport(
-      //     "42明鉴/卢/MJT-SJ-113-R01 A1支原体检测(荧光PCR法) 副本.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测3项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测3项.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测5项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测5项.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("间充质干细胞表型检测8项")) {
-      //   this.alertReport(
-      //     "42明鉴/柯/间充质干细胞表型检测8项.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("CIK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-123-R01 A0 CIK细胞表面标志物检测记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("NK细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/恰/MJT-SJ-124-R01  A0 NK细胞表面标志物检测记录.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("淋巴细胞表型检测")) {
-      //   this.alertReport(
-      //     "42明鉴/张/MJT-SJ-125-R01 A0 淋巴细胞表面标志物检测记录表.rpx",
-      //     this.runqianId
-      //   );
-      // } else if (itemName.includes("支原体检测(化学发光法)记录表")) {
-      //   this.alertReport(
-      //     "42明鉴/林/MJT-SJ-114-R01 A1 支原体检测(化学发光法)记录表.rpx",
-      //     this.runqianId
-      //   );
-      // }
     },
     YubaogaoItem(info) {
       let itemId;
@@ -553,6 +481,28 @@ export default {
         return "WHERE";
       }
     },
+    //检测附件
+    getjianceFile(row){
+      let this_ =this;
+      this.jianceFileList = []
+      // const { bao_gao_pdf_, suo_you_yuan_shi_ } = row.suo_you_yuan_shi_
+      let sql = `select id_ as id, file_name_ as fileName, ext_ as ext from ibps_file_attachment where find_in_set(id_, '${row.jian_ce_yuan_shi_}')`
+        curdPost('sql', sql).then(res => {
+           this_.jianceFileList = res.variables && res.variables.data;
+        })
+     
+    },
+    jianceFile(file){
+      if (imageType.includes(file.ext)) {
+        this.zIndex = PopupManager.getZIndex()
+        this.fileUrl = previewFile(file.id)
+        this.fileType = 'image'
+      } else {
+         this.getOption(file)
+         this.openWindow()
+         this.fileType = ''
+      }
+    },
     search() {
       let moreSql = this.selectSplit();
       var sql =