n20-common-lib 2.20.21 → 2.20.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.20.21",
+  "version": "2.20.23",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AIButton/index.vue

@@ -25,6 +25,7 @@
 <script>
 import Dialog from '../Dialog/index.vue'
 import clUpload from '../Upload/index.vue'
+import axios from '../../utils/axios.js'
 let dayjs = undefined
 import('../../index.js').then((res) => {
   dayjs = res.dayjs
@@ -81,7 +82,7 @@ export default {
         this.$message.error('请先配置bussType')
         return false
       }
-      const { data, code } = await this.$axios.post(
+      const { data, code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
         {
           beid: beid,

package/src/components/ApprovalButtons/index.vue

@@ -566,7 +566,7 @@ export default {
       }
       this.beforeFn(this.beforeRatify, async () => {
         try {
-          const res = await this.$axios.post(
+          const res = await axios.post(
             '/bems/activiti/admin/todo/showAdvancePop',
             {
               isAgentcy: this.$route.query.isAgentcy,
@@ -625,7 +625,7 @@ export default {
     },
     async getIsShowUploadWidget() {
       const { processInstanceId: procInstId, taskId } = this.$route.query
-      let { code, data } = await this.$axios.get(
+      let { code, data } = await axios.get(
         `/bems/activiti/admin/todo/isShowUploadWidget/${procInstId}/${taskId}`,
         null,
         {
@@ -995,7 +995,7 @@ export default {
             }
           ]
         }
-        const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
+        const { code, data } = await axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
         if (code === 200) {
           this.promptType = data.promptType
           // 成功 失败  待确认 提交数据
@@ -1115,7 +1115,7 @@ export default {
     },
     // 获取数据字典加签备注
     async getMdmDataDoc() {
-      const { code, data } = await this.$axios.get(`/bems/1.0/mdmDataDoc`, {
+      const { code, data } = await axios.get(`/bems/1.0/mdmDataDoc`, {
         typeCode: 'ADD_TASK_TAG'
       })
       if (code === 200) {

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -178,7 +178,7 @@ export default {
     // 查询是否显示审批意见
     getAction() {
       try {
-        this.$axios.get('/bems/activiti/actAppOpi/isShowOpiUser', {}, { loading: false, noMsg: true }).then((res) => {
+        axios.get('/bems/activiti/actAppOpi/isShowOpiUser', {}, { loading: false, noMsg: true }).then((res) => {
           if (res.data === '1') {
             this.hasZdy = true
           } else {
@@ -194,7 +194,7 @@ export default {
       let list
       switch (type) {
         case '保存为常用语':
-          this.$axios.post('/bems/activiti/actAppOpi/saveAppOpi', { message: this.message }).then((res) => {
+          axios.post('/bems/activiti/actAppOpi/saveAppOpi', { message: this.message }).then((res) => {
             if (res.code === 200) {
               this.$message.success('保存成功')
             }
@@ -212,7 +212,7 @@ export default {
           this.deleteList.forEach((d) => {
             d.appNoType && list.push(d)
           })
-          this.$axios.post('/bems/activiti/actAppOpi/saveList', list).then((res) => {
+          axios.post('/bems/activiti/actAppOpi/saveList', list).then((res) => {
             if (res.code === 200) {
               this.$message.success('保存成功')
               this.setSpr = false

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -49,7 +49,7 @@
             </tr>
             <tr v-for="(item, i) in assigneeEnd" :key="i">
               <td>{{ item.assignee }}</td>
-              <td class="text-c">{{ item.optName }}</td>
+              <td class="text-c">{{ item.optName || item.optResult }}</td>
               <td>{{ item.suggestion }}</td>
               <td>{{ item.endTime }}</td>
             </tr>

package/src/components/ElectronicArchive/index.vue

@@ -538,7 +538,7 @@ export default {
   },
   methods: {
     async getOfficeStatus() {
-      const { data } = await this.$axios.get(
+      const { data } = await axios.get(
         this.requestPrefix
           ? `${this.requestPrefix}/neams/eamsBaseFile/getOfficeIsEnable`
           : `/neams/eamsBaseFile/getOfficeIsEnable`

package/src/components/FileUploadTable/FileUploadTableV3.vue

@@ -544,7 +544,7 @@ export default {
         this.$message.error('请先配置bussType')
         return false
       }
-      const { data, code } = await this.$axios.post(
+      const { data, code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
         {
           beid: row.beid,
@@ -594,7 +594,7 @@ export default {
         })
     },
     async getOfficeStatus() {
-      const { data } = await this.$axios.get(
+      const { data } = await axios.get(
         this.apiPrefix
           ? `${this.apiPrefix}/neams/eamsBaseFile/getOfficeIsEnable`
           : `/neams/eamsBaseFile/getOfficeIsEnable`

package/src/components/FileUploadTable/aiCheckDialog.vue

@@ -37,6 +37,7 @@
 <script>
 import Dialog from '../Dialog/index.vue'
 import Table from '../Table/index.vue'
+import axios from '../../utils/axios.js'
 
 export default {
   name: 'AiCheckDialog',
@@ -122,7 +123,7 @@ export default {
         item.status = '1'
         return item
       })
-      const { code } = await this.$axios.post(
+      const { code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}/neams/ai/saveAiBussResult` : `/neams/ai/saveAiBussResult`,
         list
       )

package/src/components/FileUploadTable/index.vue

@@ -556,7 +556,7 @@ export default {
     },
     // ai校验结果
     async getAiCheckData(row) {
-      const { data, code } = await this.$axios.get(
+      const { data, code } = await axios.get(
         this.apiPrefix ? `${this.apiPrefix}/neams/ai/getAiBussResult` : `/neams/ai/getAiBussResult`,
         {
           beid: row.beid,
@@ -581,7 +581,7 @@ export default {
           this.$message.error('请先配置bussType')
           return false
         }
-        let { data, code } = await this.$axios.post(
+        let { data, code } = await axios.post(
           this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
           {
             ...this.AIOptions,
@@ -605,7 +605,7 @@ export default {
         this.$message.error('请先配置bussType')
         return false
       }
-      const { data, code } = await this.$axios.post(
+      const { data, code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
         {
           beid: row.beid,
@@ -655,7 +655,7 @@ export default {
         })
     },
     async getOfficeStatus() {
-      const { data } = await this.$axios.get(
+      const { data } = await axios.get(
         this.apiPrefix
           ? `${this.apiPrefix}/neams/eamsBaseFile/getOfficeIsEnable`
           : `/neams/eamsBaseFile/getOfficeIsEnable`

package/src/components/HandlingAdvice/index.vue

@@ -59,6 +59,7 @@
 import { $lc } from '../../utils/i18n/index'
 import ShowOtherAttNew from '../ApprovalButtons/showOtherAttrNew.vue'
 import ExpandablePane from '../Expandable/main.vue'
+import axios from '../../utils/axios.js'
 export default {
   name: 'HandlingAdvice',
   components: { ShowOtherAttNew, ExpandablePane },
@@ -106,7 +107,7 @@ export default {
      */
     async getHandlingAdvice(typeCode, procInstId) {
       try {
-        const { code, data } = await this.$axios.post(
+        const { code, data } = await axios.post(
           `/bems/activiti/admin/todo/isFlowStartWithOptions`,
           { typeCode },
           {
@@ -138,7 +139,7 @@ export default {
         }
         // 回显操作
         if (procInstId) {
-          const { data: data1 } = await this.$axios.get(
+          const { data: data1 } = await axios.get(
             `/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`,
             {},
             {

package/src/components/Preview/index.vue

@@ -46,6 +46,7 @@
 <script>
 import importG from '../../utils/importGlobal.js'
 import Dialog from '../Dialog/index.vue'
+import axios from '../../utils/axios.js'
 const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
   return component
@@ -167,7 +168,7 @@ export default {
       }
     },
     async getFileInfo(id) {
-      const response = await this.$axios.post(
+      const response = await axios.post(
         this.apiPrefix ? this.apiPrefix + '/neams/eamsbaserecord/downloadFile' : '/neams/eamsbaserecord/downloadFile',
         { beid: id },
         { responseType: 'blob', loading: true }