Просмотр исходного кода

Merge branch 'develop_lb1' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh06

# Conflicts:
#	public/version.json
#	src/views/common/pdfViewModal.vue
lilei 3 лет назад
Родитель
Сommit
b0c95698d6

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1655264410977
+  "version": 1655277881277
 }

+ 3 - 3
src/views/common/pdfViewModal.vue

@@ -22,7 +22,7 @@
             </div>
           </div>
           <div>
-            <div>
+            <div v-if="hasClipboard">
               <a-button :disabled="scalLoading" size="small" @click="handleCapture('export')"><a-icon type="export" /> 导出图片</a-button>
             </div>
           </div>
@@ -136,7 +136,7 @@ export default {
   },
   computed: {
     hasClipboard () {
-      return !!typeof ClipboardItem
+      return typeof ClipboardItem !== 'undefined'
     }
   },
   methods: {
@@ -252,8 +252,8 @@ export default {
     // 将照片复制到剪贴版
     copyImgBtn (base64Data) {
       const blobInput = this.convertBase64ToBlob(base64Data.split(',')[1], 'image/png')
-      const clipboardItemInput = new ClipboardItem({ 'image/png': blobInput })
       if (navigator.clipboard) {
+        const clipboardItemInput = new ClipboardItem({ 'image/png': blobInput })
         navigator.clipboard.write([clipboardItemInput])
         this.$message.success('复制截图成功!')
       } else {

+ 2 - 0
src/views/financialManagement/financialCollection/list.vue

@@ -295,6 +295,8 @@ export default {
       settleReceiptQuerySum(params).then(res => {
         if (res.status == 200) {
           this.totalData = Object.assign(this.totalData, res.data)
+          const tab = this.tabPaneData.find(item => item.bizType == this.queryParam.bizType)
+          tab.countNum = this.totalData.count || 0
         }
       })
     },

+ 2 - 0
src/views/financialManagement/financialPayment/list.vue

@@ -234,6 +234,8 @@ export default {
       settlePayQuerySum(params).then(res => {
         if (res.status == 200) {
           this.totalData = Object.assign(this.totalData, res.data)
+          const tab = this.tabPaneData.find(item => item.bizType == this.queryParam.bizType)
+          tab.countNum = this.totalData.count || 0
         }
       })
     },