Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/api/platform/bpmn/bpmInstHis.js

@@ -11,6 +11,17 @@ export function queryPageList(params) {
     data: params
   })
 }
+/**
+ * 查询列表数据过滤不归档流程
+ * @param {*} params
+ */
+ export function queryClassify(params) {
+    return request({
+      url: BPMN_URL() + '/bpm/instance/history/queryClassify',
+      method: 'post',
+      data: params
+    })
+  }
 /**
  * 获取流程实例信息
  * @param {*} params

src/business/platform/data/templaterender/components/print.vue

@@ -5,31 +5,31 @@
         custom-class="print-dialog"
         append-to-body
         :close-on-click-modal="false"
-        :title="title"
+        :title="type + title"
         top="5vh"
         @close="$emit('update:show', false)"
     >
         <vue-easy-print tableShow ref="easyPrint" :onePageRow="1">
-            <div class="content">
+            <div :class="$style.content">
                 <div
                     v-for="(item, index) in list"
                     :key="index"
-                    class="box"
+                    :class="$style.box"
                 >
                     <template v-for="(o, i) in modelList">
-                        <div v-if="item[o.value]" class="item" :style="`width: ${o.width};`">
-                            <span class="name">{{ o.label }}：</span>
-                            <span class="value">{{ item[o.value] }}</span>
+                        <div v-if="item[o.value]" :class="$style.item" :style="`width: ${o.width};`">
+                            <span :class="$style.name">{{ o.label }}：</span>
+                            <span :class="$style.value">{{ item[o.value] }}</span>
                         </div>
                     </template>
-                    <!-- <vue-barcode
+                    <vue-barcode
                         :value="item.bianHao"
                         :width="3"
-                        :height="40"
+                        :height="20"
                         :fontSize="0"
                         :margin="0"
-                        class="barcode"
-                    ></vue-barcode> -->
+                        :class="$style.barcode"
+                    ></vue-barcode>
                 </div>
             </div>
         </vue-easy-print>
@@ -51,7 +51,7 @@
             },
             title: {
                 type: String,
-                default: '入库标签打印'
+                default: '标签打印'
             },
             list: {
                 type: Array,
@@ -103,13 +103,12 @@
                         value: 'youXiaoQi'
                     },
                     {
-                        label: '生厂商',
-                        value: 'shengChanShang',
-                        width: '100%'
+                        label: '保存条件',
+                        value: 'baoCunTiaoJian'
                     },
                     {
-                        label: '保存条件',
-                        value: 'baoCunTiaoJian',
+                        label: '生厂商',
+                        value: 'shengChanShang',
                         width: '100%'
                     }
                 ]
@@ -122,30 +121,34 @@
         }
     }
 </script>
-<style lang="scss">
-    .print-dialog {
-        width: 500px;
-        min-width: 500px;
-        height: 680px;
+<style lang="scss" module>
+    :global {
+        .print-dialog {
+            width: 500px;
+            min-width: 500px;
+            height: 630px;
+        }
     }
     .content {
         // display: flex;
         // flex-wrap: wrap;
         // justify-content: center;
         padding: 10px;
-        min-height: 380px;
+        min-height: 490px;
         overflow: auto;
         .box {
             position: relative;
-            width: 300px;
-            height: 240px;
-            font-size: 14px;
-            padding: 10px;
+            width: 244px;
+            height: 140px;
+            padding: 4px 2px;
             margin: 0 auto 20px;
             border: 1px solid #000;
             border-radius: 4px;
             .item {
-                margin-bottom: 6px;
+                font-size: 12px;
+                font-weight: 100;
+                // line-height: 12px;
+                margin-bottom: 2px;
                 display: inline-block;
                 min-width: 50%;
                 .name {
@@ -155,7 +158,7 @@
             .barcode {
                 position: absolute;
                 text-align: center;
-                bottom: 10px;
+                bottom: 0px;
                 left: 0;
                 right: 0;
             }

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -102,7 +102,7 @@
                     <div class="div_operation el-icon-s-order" slot="reference">查阅记录</div>
                     <div class="div_content">
                         <!-- 获取所有输出报告-->
-                        <template v-if="record.report.length">
+                        <template v-if="record.report.length && record.report[0]">
                             <div v-for="item in record.report" class="content_item">
                                 <span style="cursor: pointer;" @click="openReport(item, record.bizKey)">
                                     <i class="el-icon-tickets" style="font-size: 18px;"/>
@@ -127,7 +127,7 @@
                                 style="width: 100%;"
                             />
                         </div>
-                        <div v-if="!record.report.length && !record.file.length">无报表及附件数据</div>
+                        <div v-if="(!record.report.length || !record.report[0]) && (!record.file.length || !fileId)">无报表及附件数据</div>
                     </div>
                 </el-popover>
             </template>
@@ -159,7 +159,7 @@
 </template>
 
 <script>
-    import { queryPageList } from '@/api/platform/bpmn/bpmInstHis'
+    import { queryPageList, queryClassify } from '@/api/platform/bpmn/bpmInstHis'
     import ActionUtils from '@/utils/action'
     import IbpsTypeTree from '@/business/platform/cat/type/tree'
     import FixHeight from '@/mixins/height'
@@ -281,7 +281,7 @@
             // 加载数据
             loadData() {
                 this.loading = true
-                queryPageList(this.getSearcFormData()).then((response) => {
+                queryClassify(this.getSearcFormData()).then((response) => {
                     let data = response.data && response.data.dataResult
                     data.forEach(item => {
                         let temp = this.getParenthesesStr(item.subject)

src/views/platform/bpmn/bpmInstHis/record/FEI.vue

@@ -9,9 +9,9 @@
         data () {
             return {
                 info: {
-                    title: '非CNAS非CMA检测档案',
+                    title: '全部检测档案',
                     reportPath: '43罗湖/LHXBJY 检测报告',
-                    type: '非'
+                    type: ''
                 }
             }
         }

src/views/platform/bpmn/bpmInstHis/record/component/testingRecord.vue

@@ -274,11 +274,13 @@
             }
         },
         created () {
-            this.globalSql = `select * from t_lhjcbgb where zhuang_tai_ in ('已完成', '待发放') and bao_gao_lei_bie_ = '${this.info.type}'`
+            // 全部检测档案type为空
+            const args = this.info.type ? ` and bao_gao_lei_bie_ = '${this.info.type}'` : ''
+            this.globalSql = `select * from t_lhjcbgb where zhuang_tai_ in ('已完成', '待发放')${args}`
             // this.globalSql = `select * from t_lhjcbgb where bao_gao_lei_bie_ = '${this.info.type}'`
             const sql = `${this.globalSql} order by create_time_ desc limit 0,20`
             this.loadData(sql)
-            const sumsql = `select count(*) as total  from t_lhjcbgb where zhuang_tai_ in ('已完成', '待发放') and bao_gao_lei_bie_ = '${this.info.type}'`
+            const sumsql = `select count(*) as total  from t_lhjcbgb where zhuang_tai_ in ('已完成', '待发放')${args}`
             curdPost('sql', sumsql).then((response) => {
                 this.total = response.variables.data[0].total
             })

src/views/system/jbdHome/board/checkBoard.vue

@@ -102,7 +102,7 @@
 
             this.timer = setInterval(() => {
                 this.updateAll()
-            },600000)
+            },10 * 1000)
         },
         beforeDestroy() {
             if (screenfull.isFullscreen) {

src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -121,7 +121,7 @@
                 style="width: 90%; margin: 0 auto"
               >
                 <el-table-column
-                  prop="xiang_miao_shu_r_"
+                  prop="bu_fu_he_xiang_mi"
                   label="不符合项描述"
                   width="300"
                 >
@@ -748,7 +748,7 @@ export default {
       await repostCurd("sql", sql).then((res) => {
         let data = res.variables.data;
         data.forEach((item) => {
-          if (item.ping_shen_yi_ju_.includes("RB")) {
+          if (item.shen_he_lei_xing_.includes("CMA")) {
             this_.CMAtable.push(item);
           } else {
             this_.CNASTableData.push(item);