n20-common-lib 2.7.26 → 2.7.28

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -231,19 +231,19 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
-import axios from '../../utils/axios'
-import { linkGo, linkPush } from '../../utils/urlToGo'
 import getJsonc from '../../assets/getJsonc.js'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
+import axios from '../../utils/axios'
+import { $lc } from '../../utils/i18n/index'
+import { linkGo, linkPush } from '../../utils/urlToGo'
 import ClDialog from '../Dialog'
 import ClUpload from '../Upload'
+import dCloumn from './getDCloumn'
 import CarboncopyProp from './setCarboncopyProp.vue'
 import RejectToProp from './setRejectToProp.vue'
 import ShowAppOpi from './showAppOpi.vue'
 import ShowOtherAtt from './showOtherAttr.vue'
 import { toExaminePath } from './specialHandle'
-import dCloumn from './getDCloumn'
 const prefixCls = 'n20-approval-Button'
 // window._approvalExtend = { 'addtask.chdUserInfo.extend': {}, 'appOpi.queryAppOpiAndUser.exist': undefined, 'card.countermand.suggestion': false }
 if (!window._approvalExtend) window._approvalExtend = {}
@@ -633,7 +633,14 @@ export default {
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
       }
-      const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, this.getParam())
+      let { isCheck } = this.$route.query
+      let params = {
+        plainText: '',
+        signText: '',
+        isCheck,
+        auditAdvanceDtos: this.getParam()
+      }
+      const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`)
       if (code === 200) {
         this.promptType = data.promptType
         switch (data.promptType) {

package/src/components/FileUploadTable/index.vue

@@ -533,13 +533,13 @@ export default {
         if (type === 'preview') {
           // 预览
           return {
-            url: `/onlinePreview?beid=${row[this.keys.url]}`,
+            url: `/onlinePreview?beid=${row[this.keys.rowKey]}`,
             name: row[this.keys.name] + '.html',
             sameOrg: this.seeTypes.test(row[this.keys.name])
           }
         } else {
           // 下载
-          let blob = await axios.get(`/neams/eamsbaserecord/download/${row[this.keys.url]}`, null, {
+          let blob = await axios.get(`/neams/eamsbaserecord/download/${row[this.keys.rowKey]}`, null, {
             responseType: 'blob'
           })
           let name = row[this.keys.name] || blob.name