@lambo-design/workflow-approve 1.0.0-beta.25 → 1.0.0-beta.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.25",
+  "version": "1.0.0-beta.27",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.140",
-    "@lambo-design/shared": "^1.0.0-beta.209"
+    "@lambo-design/core": "^4.7.1-beta.145",
+    "@lambo-design/shared": "^1.0.0-beta.220"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/candidate-groups-box.vue

@@ -1930,7 +1930,7 @@ export default {
       }
       if (this.permScope == 'all'){
         this.getRootOrganTree(organTreeType)
-        this.getReadingRangeOrgType(permScope, organTreeType)
+        this.ucAdapterType === 'sc' ? this.getReadingRangeOrgType(permScope, organTreeType) : ''
       } else {
         this.getReadingRangeBM(this.permScope, inputValue, this.organTreeType)
         this.getReadingRange(this.permScope, this.organTreeType)

package/src/components/history.vue

@@ -66,7 +66,7 @@
                                       v-else-if="item.auditResult === '80'">跳转指定节点</span>
                                 <span style="color: #19be6b; font-size: 13px;"
                                       v-else-if="item.auditResult === '90'">驳回指定节点</span>
-                                <span style="color: #ff9900; font-size: 13px;" v-else>待审批</span>
+                                <span style="color: #ff9900; font-size: 13px;" v-else>{{ '待' + handleName }}</span>
                               </Col>
                               <Col span="12" style="text-align: right">
                                 <Button v-if="item.fileList && item.fileList.length > 0" size="small" type="primary" ghost class="urging" @click="openModal(item)">查看附件</Button>
@@ -147,6 +147,10 @@ export default {
       type: Boolean,
       default: false
     },
+    handleName: {
+      type: String,
+      default: "审批"
+    },
     //横竖版样式不同
     portraitWidth: {
       type: Number,
@@ -325,9 +329,9 @@ export default {
     },
     showDate(item) {
       if (item.auditResult){
-        return '处理时间：'
+        return `处理时间：${item.auditDate}`
       }
-      return '接收时间：'
+      return `接收时间：${item.createTime}`
     }
   },
   mounted() {

package/src/portrait.vue

@@ -448,6 +448,7 @@ export default {
       handleName: '',
       auditOpinionTitle: '',
       auditResult: '',
+      auditGroup: '',
       custChange: 'auditInfo',
       auditInfo: "auditInfo",
       auditProcess: "auditProcess",
@@ -688,6 +689,38 @@ export default {
           }, label)
         }
       })
+      column.push({
+        title: `附件`, key: 'fileList', minWidth: 200,
+        render: (h, { row }) => {
+          if (!row.fileList || row.fileList.length === 0) {
+            return h('span', '无');  // 如果没有附件，显示“无”
+          }
+
+          //显示所有附件
+          return h('div', row.fileList.map(file => {
+            return h('a', {
+              style: {
+                display: 'block',
+                marginTop: '5px',
+                marginRight:'5px',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                maxWidth: '100px',
+              },
+              attrs: {
+                title: file.attachName  // 鼠标悬停时显示完整名称
+              },
+              on: {
+                click: () => {
+                  this.getAttach(file);
+                }
+              },
+            }, file.attachName);
+          }));
+        }
+      })
+
       return column
     },
   },
@@ -752,6 +785,7 @@ export default {
             .then(resp => {
               let data = resp.data.data.rows
               self.permScope = data[0].permScope
+              self.auditGroup = data[0].auditGroup
               self.defaultOrganTreeType = data[0].organTreeType ? data[0].organTreeType : '00'
               self.getNodeOrganTreeType(procType)
             }).catch(err => {
@@ -791,6 +825,7 @@ export default {
       ajax.get(self.smartFlowServerContext + "/manage/processDone/getDoneDetail", {params: param}).then(function (resp) {
         if (resp.data.code === '200') {
           let rows = resp.data.data.rows
+          self.auditGroup = rows[0].auditGroup
           if (rows.length > 0) {
             self.hisAuditOpinion = []
             let taskList = resp.data.data.rows