Merge branch 'cjerp-contract-1.0' into test_cjerp

gesilong
2 parents b7053a15 7eccee4a
Showing 9 changed files with 191 additions and 1 deletions
api/contract.js
pages/contract_foreign_std/detail.vue
pages/contract_foreign_stock/detail.vue
pages/contract_foreign_unplan/detail.vue
pages/contract_process/detail.vue
pages/contract_retail/detail.vue
pages/contract_stock/detail.vue
pages/contract_unplan/detail.vue
utils/print.js
--- a/api/contract.js
View file @f84c5b2
+++ b/api/contract.js
View file @f84c5b2
@@ -20,6 +20,14 @@ export const statusMap = {
 }
 const baseUrl = '/contract';
+// 打印功能
+export function printStandardContractApi(params) {
+  return request({
+    url: `${baseUrl}/contractDistributorStandard/printStandardContract`,
+    method: 'get',
+    params
+  })
+}
 // 查询当前人所在办事处
 export function getDeptApi(params) {
   return request({
--- a/pages/contract_foreign_std/detail.vue
View file @f84c5b2
+++ b/pages/contract_foreign_std/detail.vue
View file @f84c5b2
@@ -122,6 +122,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName } from '@/utils/dic.js'
 import { downloadFile } from '@/utils/downloadFile.js'
+import { printFile } from '@/utils/print.js'
 export default {
     name: 'ContractForeignStdDetail',
@@ -225,6 +226,12 @@ export default {
                 variant: 'outline',
                 event: 'copy'
             },
+            {
+                text: '打印',
+                visible: true,
+                variant: 'outline',
+                event: 'print'
+            },
             ],
         }
     },
@@ -241,6 +248,7 @@ export default {
                 { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:approve')) },
                 { ...this.buttons[6], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:copy')) },
+                { ...this.buttons[7], visible: true },
             ]
         }
     },
@@ -371,6 +379,10 @@ export default {
             if (e === 'audit') return this.onAudit(btn && btn.params)
             if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
             if (e === 'copy') return this.onCopy(btn && btn.params)
+            if (e === 'print') return this.onPrint(this.detail.id || '')
+        },
+        onPrint(id) {
+            printFile(id)
         },
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
@@ -396,6 +408,7 @@ export default {
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
         },
         downloadFile,
+        printFile,
         async loadDetail() {
             if (!this.id) return
             try {
--- a/pages/contract_foreign_stock/detail.vue
View file @f84c5b2
+++ b/pages/contract_foreign_stock/detail.vue
View file @f84c5b2
@@ -141,6 +141,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 import { downloadFile } from '@/utils/downloadFile.js'
+import { printFile } from '@/utils/print.js'
 export default {
     name: 'ContractForeignStockDetail',
@@ -285,6 +286,12 @@ export default {
                 variant: 'outline',
                 event: 'copy'
             },
+            {
+                text: '打印',
+                visible: true,
+                variant: 'outline',
+                event: 'print'
+            },
             ],
         }
     },
@@ -311,6 +318,7 @@ export default {
                 { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
                 { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-approve')) }, 
                 { ...this.buttons[13], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:copy')) },
+                { ...this.buttons[14], visible: true },
             ]
         }
     },
@@ -459,7 +467,10 @@ export default {
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
             if (e === 'copy') return this.onCopy(btn && btn.params)
-
+            if (e === 'print') return this.onPrint(this.detail.id || '')
+        },
+        onPrint(id) {
+            printFile(id)
         },
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
@@ -490,6 +501,7 @@ export default {
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
         },
         downloadFile,
+        printFile,
         async loadDetail() {
             if (!this.id) return
             try {
--- a/pages/contract_foreign_unplan/detail.vue
View file @f84c5b2
+++ b/pages/contract_foreign_unplan/detail.vue
View file @f84c5b2
@@ -142,6 +142,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 import { downloadFile } from '@/utils/downloadFile.js'
+import { printFile } from '@/utils/print.js'
 export default {
     name: 'ContractForeignUnplanDetail',
@@ -291,6 +292,12 @@ export default {
                 variant: 'outline',
                 event: 'copy'
             },
+            {
+                text: '打印',
+                visible: true,
+                variant: 'outline',
+                event: 'print'
+            },
             ],
         }
     },
@@ -318,6 +325,7 @@ export default {
                 { ...this.buttons[8], visible: (s === 'STANDARD' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
                 { ...this.buttons[9], visible: (s === 'STANDARD' && f && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-approve')) },         //审核标准合同
                 { ...this.buttons[14], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:copy')) },
+                { ...this.buttons[15], visible: true },
             ]
         }
     },
@@ -455,6 +463,7 @@ export default {
             this.sheet = { ...this.sheet, visible: true, title: '合同是否规范', options, value: match ? match.value : '' }
         },
         downloadFile,
+        printFile,
         handleButtonClick(btn) {
             if (!btn || btn.disabled) return
             if (typeof btn.onClick === 'function') return btn.onClick(this.detail, btn.params)
@@ -474,6 +483,10 @@ export default {
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
             if (e === 'copy') return this.onCopy(btn && btn.params)
+            if (e === 'print') return this.onPrint(this.detail.id || '')
+        },
+        onPrint(id) {
+            printFile(id)
         },
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
--- a/pages/contract_process/detail.vue
View file @f84c5b2
+++ b/pages/contract_process/detail.vue
View file @f84c5b2
@@ -120,6 +120,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName } from '@/utils/dic.js'
 import { downloadFile } from '@/utils/downloadFile.js'
+import { printFile } from '@/utils/print.js'
 export default {
     name: 'ContractProcessDetail',
@@ -216,6 +217,12 @@ export default {
             variant: 'outline',
             event: 'copy'
           },
+          {
+            text: '打印',
+            visible: true,
+            variant: 'outline',
+            event: 'print'
+          },
         ],
         }
     },
@@ -231,6 +238,7 @@ export default {
           { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) },
           { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:approve')) },
           { ...this.buttons[5], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:processed-standard-contract:copy')) },
+          { ...this.buttons[6], visible: true },
         ]
       }
     },
@@ -354,6 +362,10 @@ export default {
             if (e === 'audit') return this.onAudit(this.detail.id || '', 'PROCESS_STD_AGMT')
             if (e === 'auditDetail') return this.onAuditDetail(this.detail.id || '', 'PROCESS_STD_AGMT')
             if (e === 'copy') return this.onCopy(btn && btn.params)
+            if (e === 'print') return this.onPrint(this.detail.id || '')
+        },
+        onPrint(id) {
+            printFile(id)
         },
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
@@ -383,6 +395,7 @@ export default {
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
         },
         downloadFile,
+        printFile,
         async loadDetail() {
             if (!this.id) return
             try {
--- a/pages/contract_retail/detail.vue
View file @f84c5b2
+++ b/pages/contract_retail/detail.vue
View file @f84c5b2
@@ -123,6 +123,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { getDicByCodes, getDicName } from '@/utils/dic.js'
 import { downloadFile } from '@/utils/downloadFile.js'
+import { printFile } from '@/utils/print.js'
 export default {
     name: 'ContractRetailDetail',
@@ -214,6 +215,12 @@ export default {
                 visible: true,
                 variant: 'outline',
                 event: 'copy'
+            },
+            {
+                text: '打印',
+                visible: true,
+                variant: 'outline',
+                event: 'print'
             }
             ],
             statusStyle: statusStyle,
@@ -232,6 +239,7 @@ export default {
                 { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:review')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:approve')) },
                 { ...this.buttons[5], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:copy')) },
+                { ...this.buttons[6], visible: true },
             ]
         }
     },
@@ -358,6 +366,7 @@ export default {
             })
         },
         downloadFile,
+        printFile,
         onUpload() {
             this.$refs.uploadPopup.open()
         },
@@ -371,7 +380,11 @@ export default {
             if (e === 'audit') return this.onAudit(btn && btn.params)
             if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
             if (e === 'copy') return this.onCopy(btn && btn.params)
+            if (e === 'print') return this.onPrint(btn && btn.params)
         },
+    onPrint() {
+        printFile(this.detail.id)
+    },
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
         },
--- a/pages/contract_stock/detail.vue
View file @f84c5b2
+++ b/pages/contract_stock/detail.vue
View file @f84c5b2
@@ -138,6 +138,8 @@ import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { downloadFile } from '@/utils/downloadFile.js'
+import { printFile } from '@/utils/print.js'
+
 export default {
     name: 'ContractStockDetail',
     components: { ProductRel, DetailButtons, FileUpload, SingleSelectSheet },
@@ -271,6 +273,12 @@ export default {
                 visible: true,
                 variant: 'outline',
                 event: 'copy'
+            },
+            {
+                text: '打印',
+                visible: true,
+                variant: 'outline',
+                event: 'print'
             }
         ],
         uploadId: '',
@@ -299,6 +307,7 @@ export default {
           { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-approve')) },
           { ...this.buttons[12], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:copy')) },
+          { ...this.buttons[13], visible: true },
         ]
       }
     },
@@ -402,6 +411,7 @@ export default {
         },
         downloadFile,
+        printFile,
         onSheetConfirm({ value, label }) {
             this.standardStandardized = value
             this.standardStandardizedName = label || ''
@@ -434,6 +444,10 @@ export default {
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'copy') return this.onCopy(this.detail)
+            if (e === 'print') return this.onPrint(this.detail.id || '')
+        },
+        onPrint(id) {
+            printFile(id)
         },
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
--- a/pages/contract_unplan/detail.vue
View file @f84c5b2
+++ b/pages/contract_unplan/detail.vue
View file @f84c5b2
@@ -139,6 +139,7 @@ import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 import { downloadFile } from '@/utils/downloadFile.js'
+import { printFile } from '@/utils/print.js'
 export default {
     name: 'ContractUnplanDetail',
@@ -277,6 +278,12 @@ export default {
                 variant: 'outline',
                 event: 'copy'
             },
+            {
+                text: '打印',
+                visible: true,
+                variant: 'outline',
+                event: 'print'
+            },
             ],
         }
     },
@@ -303,6 +310,7 @@ export default {
                 { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
                 { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-approve')) },
                 { ...this.buttons[13], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:copy')) },
+                { ...this.buttons[14], visible: true },
             ]
         }
     },
@@ -453,6 +461,10 @@ export default {
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'copy') return this.onCopy(btn && btn.params)
+            if (e === 'print') return this.onPrint(this.detail.id || '')
+        },
+        onPrint(id) {
+            printFile(id)
         },
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
@@ -482,6 +494,7 @@ export default {
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
         },
         downloadFile,
+        printFile,
         async loadDetail() {
             if (!this.id) return
             try {
--- a/utils/print.js 0 → 100644
View file @f84c5b2
+++ b/utils/print.js 0 → 100644
View file @f84c5b2
+import config from '@/config'
+import { getToken } from '@/utils/auth.js'
+
+export async function printFile(id, fileName = '合同.pdf') {
+    const bizId = id != null ? String(id) : ''
+    if (!bizId) {
+        uni.showToast({ title: '未获取到合同ID', icon: 'none' })
+        return
+    }
+
+    uni.showLoading({ title: '下载中' })
+    try {
+        const baseUrl = (config && config.baseUrl) ? String(config.baseUrl).replace(/\/$/, '') : ''
+        const rawUrl = `${baseUrl}/contract/contractDistributorStandard/printStandardContract?id=${encodeURIComponent(bizId)}`
+        const token = getToken()
+        const header = {}
+        if (token) header['X-Auth-Token'] = token
+
+        let url = rawUrl
+        // #ifdef H5
+        if (token) {
+            const separator = url.includes('?') ? '&' : '?'
+            url = `${url}${separator}X-Auth-Token=${encodeURIComponent(token)}`
+        }
+        // #endif
+
+        const res = await new Promise((resolve, reject) => {
+            uni.downloadFile({
+                url,
+                header,
+                success: resolve,
+                fail: reject
+            })
+        })
+
+        if (!(res && res.statusCode === 200)) {
+            uni.showToast({ title: '下载失败', icon: 'none' })
+            return
+        }
+
+        const filePath = res.tempFilePath
+
+        // #ifdef H5
+        const ua = navigator.userAgent.toLowerCase()
+        const isAndroid = ua.indexOf('android') > -1 || ua.indexOf('adr') > -1
+        const isWeChat = ua.indexOf('micromessenger') !== -1
+        if (isWeChat && isAndroid) {
+            uni.showModal({
+                title: '提示',
+                content: '微信环境下不支持直接打开，请复制链接后在浏览器打开',
+                confirmText: '复制链接',
+                showCancel: false,
+                success: function (r) {
+                    if (r.confirm) {
+                        uni.setClipboardData({
+                            data: url,
+                            success: function () { uni.showToast({ title: '链接已复制', icon: 'success' }) }
+                        })
+                    }
+                }
+            })
+        } else {
+            const win = window.open(filePath, '_blank')
+            if (!win) {
+                const link = document.createElement('a')
+                link.href = filePath
+                link.download = fileName || 'download'
+                document.body.appendChild(link)
+                link.click()
+                document.body.removeChild(link)
+            }
+        }
+        // #endif
+
+        // #ifndef H5
+        const ext = fileName && String(fileName).includes('.') ? String(fileName).split('.').pop().toLowerCase() : 'pdf'
+        uni.openDocument({
+            filePath,
+            fileType: ext || 'pdf',
+            showMenu: true,
+            fail: function () {
+                uni.showToast({ title: '无法打开此文件', icon: 'none' })
+            }
+        })
+        // #endif
+    } catch (e) {
+        uni.showToast({ title: '下载出错', icon: 'none' })
+    } finally {
+        uni.hideLoading()
+    }
+}