n20-common-lib 1.3.53 → 1.3.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.53",
+  "version": "1.3.56",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ApprovalCard/index.vue

@@ -29,6 +29,11 @@
                   >驳回</span
                 ></template
               >
+              <template v-else-if="item.result == status.invalid">
+                审批意见：<span class="n20-approval-reject"
+                  >作废</span
+                ></template
+              >
             </div>
           </div>
           <div v-if="item.suggestion" class="n20-description-c">
@@ -81,7 +86,8 @@ export default {
         submit: 1,
         approval: 2,
         reject: 3,
-        end: 4
+        invalid: 4,
+        end: 5
       })
     },
     approvalData: {
@@ -107,21 +113,21 @@ export default {
               assignee: item.assignee,
               suggestion: item.suggestion
             }
-            if ('approvalState' in item) {
+
+            if (item.taskName === '开始') {
+              _item.result = 1
+            } else if (item.taskName === '结束') {
+              _item.result = 5
+            } else if ('approvalState' in item) {
               _item.result = item.approvalState
+            } else if (!item.endTime) {
+              _item.result = 0
+            } else if (item.rejectFlag === 1) {
+              _item.result = 3
             } else {
-              if (item.taskName === '开始') {
-                _item.result = 1
-              } else if (item.taskName === '结束') {
-                _item.result = 4
-              } else if (!item.endTime) {
-                _item.result = 0
-              } else if (item.rejectFlag === 1) {
-                _item.result = 3
-              } else {
-                _item.result = 2
-              }
+              _item.result = 2
             }
+
             approvalData.push(_item)
           })
           this.approvalData.push(...approvalData)

package/src/components/ApprovalRecord/approvalImg.vue

@@ -2,14 +2,20 @@
 <template>
   <div class="approve-img">
     <img v-if="blobUrl" :src="blobUrl" />
+    <flowImg v-else-if="dataPro" :data-pro="dataPro" />
   </div>
 </template>
 
 <script>
 import axios from '../../utils/axios'
+import flowImg from './approvalImgPro/index.vue'
+let hasQ004_1 = true
 
 export default {
   name: 'ApprovalImg',
+  components: {
+    flowImg
+  },
   props: {
     procInstId: {
       type: String,
@@ -18,22 +24,54 @@ export default {
   },
   data() {
     return {
-      blobUrl: undefined
+      blobUrl: undefined,
+      dataPro: undefined
     }
   },
-  created() {
-    axios
-      .get('/bems/activiti/sample/Q004', {
-        procInstId: this.procInstId || this.$route.query.procInstId
-      })
-      .then(({ data }) => {
-        if (data) {
-          let file = new File([data], '流程图.svg', {
-            type: 'image/svg+xml'
-          })
-          this.blobUrl = URL.createObjectURL(file)
-        }
-      })
+  async created() {
+    hasQ004_1 ? this.getFlowData() : this.getSvg()
+  },
+  methods: {
+    getSvg() {
+      axios
+        .get('/bems/activiti/sample/Q004', {
+          procInstId: this.procInstId || this.$route.query.processInstanceId
+        })
+        .then(({ data }) => {
+          if (data) {
+            let file = new File([data], '流程图.svg', {
+              type: 'image/svg+xml'
+            })
+            this.blobUrl = URL.createObjectURL(file)
+          }
+        })
+    },
+    getFlowData() {
+      axios
+        .get(
+          '/bems/activiti/sample/Q004_1',
+          {
+            procInstId: this.procInstId || this.$route.query.processInstanceId
+          },
+          { noMsg: true }
+        )
+        .then((res) => {
+          this.dataPro = res.data
+        })
+        .catch((err) => {
+          if (err.msg && err.msg.includes('404')) {
+            hasQ004_1 = false
+            this.getSvg()
+          } else {
+            this.$message({
+              showClose: true,
+              message: err.msg,
+              type: 'error',
+              customClass: 'xhr-msg-top'
+            })
+          }
+        })
+    }
   }
 }
 </script>