2 Commits 5b3be871ef ... 4358152444

Author SHA1 Message Date
  liangbowen 4358152444 问题修复 1 month ago
  liangbowen 664ba7ae0f 打印卡顿问题 1 month ago

+ 1 - 0
package.json

@@ -18,6 +18,7 @@
     "@wangeditor/editor": "^5.1.1",
     "@wangeditor/editor-for-vue": "^1.0.2",
     "axios": "0.18.1",
+    "default-passive-events": "^4.0.0",
     "echarts": "^5.4.3",
     "element-china-area-data": "^5.0.2",
     "element-ui": "^2.15.14",

+ 1 - 0
src/main.js

@@ -9,6 +9,7 @@ import "@/styles/global.scss";
 import "@/styles/index.scss"; // global css
 // import Print from 'vue-print-nb'
 import Print from './assets/print'
+import 'default-passive-events';
 Vue.use(Print);
 
 import App from "./App";

+ 5 - 0
src/styles/index.scss

@@ -185,3 +185,8 @@ aside {
 .multiselect--active {
   z-index: 1000 !important;
 }
+
+.el-dialog__wrapper {
+  overflow: auto !important;
+  overscroll-behavior: contain;
+}

+ 5 - 2
src/views/components/printTable.vue

@@ -24,11 +24,14 @@
         <tbody>
           <tr v-for="(item, index) in im" :key="index">
             <td v-for="(itm, idx) in tableHeader" :key="idx">
-              <span v-if="itm.value == 'mcType'">
+              <!-- <span v-if="itm.value == 'mcType'">
                 <span v-if="item.mcsType == '0'">普通耗材</span>
                 <span v-if="item.mcsType == '1'">高值耗材</span>
                 <span v-if="item.mcsType == '2'">试剂</span>
-              </span>
+                <span v-if="item.mcsType == '3'">总务耗材</span>
+                <span v-if="item.mcsType == '4'">低值可收费</span>
+                <span v-if="item.mcsType == '5'">低值不可收费</span>
+              </span> -->
               <span v-if="itm.value == 'iFas'">
                 <span v-if="item.isFas == '0'">否</span>
                 <span v-if="item.isFas == '1'">是</span>

+ 1 - 1
src/views/page/orderManage-sup/purOrderDelivery/printView.vue

@@ -238,7 +238,7 @@ export default {
     //   newHeader.pop();
     //   this.tableHeader = newHeader;
     // }
-    let newData = this.paginData(this.orderData, 5);
+    let newData = this.paginData(this.orderData, 15);
     this.tableData = newData;
   },
   methods: {

+ 14 - 7
src/views/page/procurement-settlement/reconciliation/supplierDetail.vue

@@ -3,7 +3,7 @@
   <div>
     <el-card>
       <div style="text-align: right">
-        <el-button type="primary" @click.stop="printDataView">打印</el-button>
+        <el-button type="primary" @click.stop="prDataView()">打印</el-button>
         <el-button
           type="primary"
           v-if="isShow"
@@ -92,11 +92,11 @@
             <el-table-column label="单价" prop="pric" align="center" />
             <el-table-column label="总计" prop="amt" align="center" />
             <el-table-column label="类别" prop="mcsType" align="center">
-              <template #default="{ row }">
+              <!-- <template #default="{ row }">
                 <span v-if="row.mcsType == '0'">普通耗材</span>
                 <span v-if="row.mcsType == '1'">高值耗材</span>
                 <span v-if="row.mcsType == '2'">试剂</span>
-              </template>
+              </template> -->
             </el-table-column>
             <el-table-column label="是否集采" prop="isFas" align="center">
               <template #default="{ row }">
@@ -120,9 +120,12 @@
           destroy-on-close
           append-to-body
         >
-          <div id="printMe">
-            <printTable :tableHeader="tableHeader" :tableData="list" />
+          <div class="prWrap">
+            <div id="printMe">
+              <printTable :tableHeader="tableHeader" :tableData="list" />
+            </div>
           </div>
+
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" v-print="printObj">打印</el-button>
           </span>
@@ -195,7 +198,7 @@ export default {
         },
         {
           label: "类别",
-          value: "mcType"
+          value: "mcsType"
         },
         {
           label: "是否集采",
@@ -299,7 +302,7 @@ export default {
         exportData(_res, "对账明细");
       });
     },
-    printDataView() {
+    prDataView() {
       this.comModal = true;
     },
     comhandleClose() {
@@ -433,4 +436,8 @@ export default {
   align-items: center;
   justify-content: flex-end;
 }
+.prWrap {
+  height: 400px;
+  overflow: auto;
+}
 </style>