【修改】bug

package-lock.json

@@ -12,7 +12,7 @@
         "axios": "0.18.1",
         "clipboard": "^2.0.8",
         "concurrent-tasks": "^1.0.7",
-        "core-js": "3.6.5",
+        "core-js": "^3.6.5",
         "echarts": "^5.1.1",
         "element-ui": "2.13.2",
         "file-saver": "^2.0.5",
@@ -6837,7 +6837,7 @@
     },
     "node_modules/core-js": {
       "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.6.5.tgz",
       "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
       "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
       "hasInstallScript": true
@@ -26626,7 +26626,7 @@
     },
     "core-js": {
       "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.6.5.tgz",
       "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
     },
     "core-js-compat": {

package.json

@@ -17,7 +17,7 @@
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",
-    "core-js": "3.6.5",
+    "core-js": "^3.6.5",
     "echarts": "^5.1.1",
     "element-ui": "2.13.2",
     "file-saver": "^2.0.5",

src/main.js

@@ -4,6 +4,20 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // import locale from 'element-ui/lib/locale/lang/en' // lang i18n
+import {Loading} from 'element-ui'
+let loading;
+function startLoading() {
+  loading = Loading.service({
+    lock: true,
+    text: '拼命加载中...',
+    spinner: 'el-icon-loading',
+    customClass:'.app-container'
+  })
+}
+
+function endLoading() {
+  loading.close()
+}
 
 import * as echarts from 'echarts'
 Vue.prototype.$echarts = echarts
@@ -27,6 +41,8 @@ Vue.prototype.$warningNotify = warningNotify;
 Vue.prototype.$checkBtnRole = checkBtnRole;
 Vue.prototype.$getSummaries = getSummaries;
 Vue.prototype.$numToFixed = numToFixed;
+Vue.prototype.$startLoading = startLoading
+Vue.prototype.$endLoading = endLoading
 
 // 自定义组件
 import ExportButton from '@/components/Common/export-button.vue'

src/mixin/print.js

@@ -1,6 +1,5 @@
 import { disAutoConnect, hiprint, defaultElementTypeProvider } from 'vue-plugin-hiprint'
 disAutoConnect();
-import { Loading } from 'element-ui';
 import panel from '@/utils/panel'
 import { addPrint, getDtailPrintDis } from "@/api/supply/pickup";
 import { getDeliverDetail } from "@/api/supply/deliver";
@@ -8,6 +7,7 @@ import { addPrints } from "@/api/supply/pickup";
 import { getCompanyList } from "@/api/user";
 
 
+
 export default {
   data() {
     return {
@@ -160,7 +160,6 @@ export default {
               console.error('获取打印数据失败')
             }
           }, 0);
-
         }
       }
 

src/views/finance/receipt_list.vue

@@ -129,6 +129,7 @@
           <el-button
             type="primary"
             size="mini"
+            v-if="$checkBtnRole('print', $route.meta.roles)"
             @click="toPrint"
             :disabled="tableSelection.length < 1"
             >打印发货单
@@ -369,6 +370,7 @@
                 <el-button
                   type="text"
                   class="textColor"
+                  v-if="$checkBtnRole('print', $route.meta.roles)"
                   @click="toPrint(scope.row, 2)"
                   >打印</el-button
                 >
@@ -382,7 +384,7 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
+            :page-sizes="[10, 20, 30, 50,100,200]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
@@ -574,9 +576,12 @@ export default {
       // 兼容批量打印
       let params = !type ? this.tableSelection : [row.id];
       let len = params.length;
+      let loadingLen = len
       // 使用 i-- 提升for效率
+      this.$startLoading()
       for (let i = len; i > 0; i--) {
-        const { data } = await getK3ReceiptDetail({
+        try {
+          const { data } = await getK3ReceiptDetail({
           id: params[i - 1].id || params[i - 1],
         });
         // 模板基础配置
@@ -600,6 +605,14 @@ export default {
             content: this.setTableDom(data),
           },
         });
+        loadingLen--
+        } catch (error) {
+          this.$endLoading()
+          return
+        }
+      }
+      if (loadingLen === 0) {
+        this.$endLoading()
       }
       // 预览打印内容
       this.$refs.preView.show(this.hiprintTemplate, this.panel);

src/views/supply/deliver/sum_list.vue

@@ -208,7 +208,6 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <!-- v-if="$checkBtnRole('print', $route.meta.roles)" -->
             <el-button
               type="primary"
               size="mini"

src/views/supply/implement/nsales_list.vue

@@ -96,7 +96,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="时间排序" prop="printDesc">
+              <el-form-item label="打印时间排序" prop="printDesc">
                   <el-select v-model="screenForm.printDesc"  clearable filterable >
                     <el-option
                       label="默认"
@@ -156,6 +156,13 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
+            <el-table-column
+              align="left"
+              label="打印时间"
+              prop="printTime"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
             <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.orderType | orderTypeFilter }}

src/views/supply/sales/sales_list.vue

@@ -129,7 +129,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="时间排序" prop="printDesc">
+              <el-form-item label="打印时间排序" prop="printDesc">
                   <el-select v-model="screenForm.printDesc"  clearable filterable >
                     <el-option
                       label="默认"
@@ -233,6 +233,13 @@
             </el-table-column>
             <el-table-column
               align="left"
+              label="打印时间"
+              prop="printTime"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
               label="订单类型"
               prop="orderType"
               min-width="100"