vue2-client 1.18.56 → 1.18.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.56",
+  "version": "1.18.58",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/Upload/Upload.vue

@@ -74,7 +74,7 @@
       </a-button>
     </a-upload>
 
-    <height-scanner v-if="useScanner" @confirmPhoto="confirmPhoto" ref="heightScanner"/>
+    <height-scanner v-if="useScanner" :show="showScanner" @confirmPhoto="confirmPhoto" @cancel="handleCancelScanner" ref="heightScanner"/>
 
     <!-- 使用封装的图片预览组件 -->
     <image-preview-modal
@@ -105,7 +105,8 @@ export default {
       uploadedFileList: [],
       previewVisible: false,
       previewImage: '',
-      previewImageName: ''
+      previewImageName: '',
+      showScanner: false
     }
   },
   props: {
@@ -219,7 +220,12 @@ export default {
 
     useScannerUpload (e) {
       // 打开高拍仪
-      this.$refs.heightScanner.show = true
+      this.showScanner = true
+    },
+
+    handleCancelScanner () {
+      // 关闭高拍仪弹窗
+      this.showScanner = false
     },
 
     uploadFiles (info) {

package/src/base-client/components/common/XTable/XTable.vue

@@ -1229,7 +1229,7 @@ export default {
      */
     refresh (bool) {
       this.$nextTick(() => {
-        this.$refs.table.refresh(bool)
+        this.$refs.table?.refresh(bool)
       })
     },
     setScrollYHeight ({ extraHeight = this.extraHeight, id = this.uniqueId, type = '' }) {

package/src/components/HeightScanner/index.vue

@@ -101,7 +101,7 @@
         <a-col :span="24">
           <a-space>
             高拍仪
-            <a-button @click="handleCancel">取消</a-button>
+            <a-button @click="handleCancel">关闭</a-button>
           </a-space>
         </a-col>
       </a-row>
@@ -582,7 +582,7 @@ export default {
       this.$emit('confirmPhoto', this.previewImage)
     },
     handleCancel () {
-      this.show = false
+      this.$emit('cancel')
     }
   },
 

package/src/layouts/header/InstitutionDetail.vue

@@ -42,6 +42,7 @@
 import { Base64 } from 'js-base64'
 import { post } from '@vue2-client/services/api/restTools'
 import { formatDate } from '@vue2-client/utils/util'
+import { getConfigByNameAsync } from '@/services/api/common'
 
 export default {
   name: 'InstitutionDetail',
@@ -63,7 +64,9 @@ export default {
       institutionData: {},
       previewDocVisible: false,
       previewDocUrl: undefined,
-      previewDocLoading: false
+      previewDocLoading: false,
+      previewDocService: 'http://aote-office.8866.org:32510/onlinePreview?url=',
+      fileServer: 'http://aote-office.8866.org:8406'
     }
   },
   watch: {
@@ -75,25 +78,42 @@ export default {
     this.getDetailData()
   },
   methods: {
+    async getPreviewDocService () {
+      if (this.compatible === 'OA') {
+        this.fileServer = 'http://aote-office.8866.org:8406'
+        this.previewDocService = 'http://aote-office.8866.org:32510/onlinePreview?url='
+        return
+      }
+      await getConfigByNameAsync('previewDocServiceConfig').then(res => {
+        if (!res.fileServer) {
+          this.$message.error('文件预览服务配置错误')
+        } else {
+          this.previewDocService = res.previewDocService
+          this.fileServer = res.fileServer
+        }
+      })
+    },
     // 获取详情数据
     getDetailData () {
       if (!this.institutionId) {
         return
       }
       const otherFiles = []
-      post('/api/af-system/logic/getInstitutionDetail', {
-        id: this.institutionId
-      }).then(res => {
-        res.files.forEach(item => {
-          if (item.use_type === '制度文件') {
-            this.institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
-            this.showDocument = true
-          } else {
-            otherFiles.push(item)
-          }
+      this.getPreviewDocService().then(() => {
+        post('/api/af-system/logic/getInstitutionDetail', {
+          id: this.institutionId
+        }).then(res => {
+          res.files.forEach(item => {
+            if (item.use_type === '制度文件') {
+              this.institutionDocUrl = this.previewDocService + encodeURIComponent(Base64.encode(this.fileServer + item.url))
+              this.showDocument = true
+            } else {
+              otherFiles.push(item)
+            }
+          })
+          this.institutionData = res.institution
+          this.otherFiles = otherFiles
         })
-        this.institutionData = res.institution
-        this.otherFiles = otherFiles
       })
     },
     format (dateStr) {
@@ -101,12 +121,14 @@ export default {
     },
     // 其他附件预览
     handlePreviewDoc (url) {
-      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
-      if (this.previewDocUrl !== previewDocUrl) {
-        this.previewDocLoading = true
-        this.previewDocUrl = previewDocUrl
-      }
-      this.previewDocVisible = true
+      this.getPreviewDocService().then(() => {
+        const previewDocUrl = this.previewDocService + encodeURIComponent(Base64.encode(this.fileServer + url))
+        if (this.previewDocUrl !== previewDocUrl) {
+          this.previewDocLoading = true
+          this.previewDocUrl = previewDocUrl
+        }
+        this.previewDocVisible = true
+      })
     },
     // 下载文档
     handlePreDowDoc (file) {
@@ -116,7 +138,11 @@ export default {
       a.click()
     },
     confirm_institution () {
-      post('/api/af-system/logic/affirmInstitution', {
+      let serviceName = 'af-oa'
+      if (this.compatible === 'OA') {
+        serviceName = 'af-system'
+      }
+      post(`/api/${serviceName}/logic/affirmInstitution`, {
         data: {
           tobe: [
             {
@@ -132,10 +158,6 @@ export default {
     },
   }
 }
-// 文档预览服务 API
-const previewDocService = 'http://aote-office.8866.org:32510/onlinePreview?url='
-// 文件服务器地址
-const fileServer = 'http://aote-office.8866.org:8406'
 </script>
 
 <style lang="less" scoped>

package/src/utils/common.js

@@ -14,5 +14,5 @@ export async function blobValidate (data) {
 export function isDebugUser () {
   const store = Vue.$store
   const currUser = store.state.account?.user
-  return currUser.name === '1' || currUser.rolesnames.indexOf('运维人员') > -1
+  return currUser.name === '1' || currUser.rolesnames?.indexOf('运维人员') > -1
 }