n20-common-lib 1.2.35 → 1.2.38

package/src/components/ApprovalCard/index.vue

@@ -1,128 +1,128 @@
-/* 审批进度 */
-<template>
-  <div class="n20-approve-wrap">
-    <el-timeline :reverse="true">
-      <el-timeline-item
-        v-for="(item, i) in approvalData"
-        :key="i"
-        :type="item | typeF(status)"
-        :hide-timestamp="true"
-      >
-        <div class="n20-time">
-          <div>{{ item.endTime | dataF }}</div>
-          <div>{{ item.endTime | timeF }}</div>
-        </div>
-        <div class="flex-box">
-          <div class="n20-worker m-r-s">
-            <span class="worker-icon cl-icon-user"></span>
-            <span>{{ item.assignee }}</span>
-          </div>
-          <div class="n20-approval m-r-s">
-            <template v-if="item.result == status.submit">提交</template>
-            <template v-else-if="item.result == status.end">结束</template>
-            <template v-else-if="item.result == status.approval">
-              审批意见：批准
-            </template>
-            <template v-else-if="item.result == status.reject">
-              审批意见：<span class="n20-approval-reject">驳回</span></template
-            >
-          </div>
-          <div v-if="item.suggestion" class="n20-description-c flex-item">
-            {{ item.suggestion }}
-          </div>
-        </div>
-      </el-timeline-item>
-    </el-timeline>
-  </div>
-</template>
-
-<script>
-import axios from '../../utils/axios'
-export default {
-  name: 'ApproveCard',
-  filters: {
-    typeF(item, status) {
-      let result = item.result
-      switch (result) {
-        case status.submit:
-          return 'primary'
-        case status.approval:
-          return 'primary'
-        case status.reject:
-          return 'danger'
-        default:
-          return undefined
-      }
-    },
-    dataF(_t) {
-      let t = _t || ''
-      let ts = t.split(' ') || ['', '']
-      return ts[0]
-    },
-    timeF(_t) {
-      let t = _t || ''
-      let ts = t.split(' ') || ['', '']
-      return ts[1]
-    }
-  },
-  props: {
-    close: {
-      type: Boolean,
-      default: false
-    },
-    status: {
-      type: Object,
-      default: () => ({
-        waiting: 0,
-        submit: 1,
-        approval: 2,
-        reject: 3,
-        end: 4
-      })
-    },
-    approvalData: {
-      type: Array,
-      default: () => []
-    },
-    procInstId: {
-      type: String,
-      default: undefined
-    }
-  },
-  created() {
-    if (this.procInstId) {
-      axios
-        .get('/bems/activiti/sample/Q003', {
-          procInstId: this.procInstId
-        })
-        .then(({ data = [] }) => {
-          let approvalData = []
-          data.forEach((item) => {
-            let _item = {
-              endTime: item.endTime || '',
-              assignee: item.assignee,
-              suggestion: item.suggestion
-            }
-            if ('approvalState' in item) {
-              _item.result = item.approvalState
-            } 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
-              }
-            }
-            approvalData.push(_item)
-          })
-          this.approvalData.push(...approvalData)
-        })
-    }
-  }
-}
-</script>
+/* 审批进度 */
+<template>
+  <div class="n20-approve-wrap">
+    <el-timeline :reverse="true">
+      <el-timeline-item
+        v-for="(item, i) in approvalData"
+        :key="i"
+        :type="item | typeF(status)"
+        :hide-timestamp="true"
+      >
+        <div class="n20-time">
+          <div>{{ item.endTime | dataF }}</div>
+          <div>{{ item.endTime | timeF }}</div>
+        </div>
+        <div class="flex-box">
+          <div class="n20-worker m-r-s">
+            <span class="worker-icon cl-icon-user"></span>
+            <span>{{ item.assignee }}</span>
+          </div>
+          <div class="n20-approval m-r-s">
+            <template v-if="item.result == status.submit">提交</template>
+            <template v-else-if="item.result == status.end">结束</template>
+            <template v-else-if="item.result == status.approval">
+              审批意见：批准
+            </template>
+            <template v-else-if="item.result == status.reject">
+              审批意见：<span class="n20-approval-reject">驳回</span></template
+            >
+          </div>
+          <div v-if="item.suggestion" class="n20-description-c flex-item">
+            {{ item.suggestion }}
+          </div>
+        </div>
+      </el-timeline-item>
+    </el-timeline>
+  </div>
+</template>
+
+<script>
+import axios from '../../utils/axios'
+export default {
+  name: 'ApproveCard',
+  filters: {
+    typeF(item, status) {
+      let result = item.result
+      switch (result) {
+        case status.submit:
+          return 'primary'
+        case status.approval:
+          return 'primary'
+        case status.reject:
+          return 'danger'
+        default:
+          return undefined
+      }
+    },
+    dataF(_t) {
+      let t = _t || ''
+      let ts = t.split(' ') || ['', '']
+      return ts[0]
+    },
+    timeF(_t) {
+      let t = _t || ''
+      let ts = t.split(' ') || ['', '']
+      return ts[1]
+    }
+  },
+  props: {
+    close: {
+      type: Boolean,
+      default: false
+    },
+    status: {
+      type: Object,
+      default: () => ({
+        waiting: 0,
+        submit: 1,
+        approval: 2,
+        reject: 3,
+        end: 4
+      })
+    },
+    approvalData: {
+      type: Array,
+      default: () => []
+    },
+    procInstId: {
+      type: String,
+      default: undefined
+    }
+  },
+  created() {
+    if (this.procInstId) {
+      axios
+        .get('/bems/activiti/sample/Q003', {
+          procInstId: this.procInstId
+        })
+        .then(({ data = [] }) => {
+          let approvalData = []
+          data.forEach((item) => {
+            let _item = {
+              endTime: item.endTime || '',
+              assignee: item.assignee,
+              suggestion: item.suggestion
+            }
+            if ('approvalState' in item) {
+              _item.result = item.approvalState
+            } 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
+              }
+            }
+            approvalData.push(_item)
+          })
+          this.approvalData.push(...approvalData)
+        })
+    }
+  }
+}
+</script>

package/src/components/ApprovalRecord/approvalImg.vue

@@ -1,39 +1,44 @@
-/* 审批流程图 */
-<template>
-  <div class="approve-img">
-    <img v-if="blobUrl" :src="blobUrl" />
-  </div>
-</template>
-
-<script>
-import axios from '../../utils/axios'
-
-export default {
-  name: 'ApprovalImg',
-  props: {
-    // blobUrl: {
-    //   type: String,
-    //   default: undefined
-    // }
-  },
-  data() {
-    return {
-      blobUrl: undefined
-    }
-  },
-  created() {
-    axios
-      .get('/bems/activiti/sample/Q004', {
-        procInstId: this.$route.query.processInstanceId
-      })
-      .then(({ data }) => {
-        if (data) {
-          let file = new File([data], '流程图.svg', {
-            type: 'image/svg+xml'
-          })
-          this.blobUrl = URL.createObjectURL(file)
-        }
-      })
-  }
-}
-</script>
+/* 审批流程图 */
+<template>
+  <div class="approve-img">
+    <img v-if="blobUrl" :src="blobUrl" />
+  </div>
+</template>
+
+<script>
+import axios from '../../utils/axios'
+
+export default {
+  name: 'ApprovalImg',
+  props: {
+    // blobUrl: {
+    //   type: String,
+    //   default: undefined
+    // },
+  },
+  inject: {
+    procInstId: {
+      from: 'procInstId'
+    }
+  },
+  data() {
+    return {
+      blobUrl: undefined
+    }
+  },
+  created() {
+    axios
+      .get('/bems/activiti/sample/Q004', {
+        procInstId: this.procInstId
+      })
+      .then(({ data }) => {
+        if (data) {
+          let file = new File([data], '流程图.svg', {
+            type: 'image/svg+xml'
+          })
+          this.blobUrl = URL.createObjectURL(file)
+        }
+      })
+  }
+}
+</script>

package/src/components/ApprovalRecord/flowDialog.vue

@@ -0,0 +1,44 @@
+<template>
+  <div>
+    <el-button plain size="mini" :disabled="false" @click="imgV = true"
+      >流程图查看</el-button
+    >
+    <el-dialog
+      title="查看流程"
+      :visible.sync="imgV"
+      width="65%"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
+      <approvalImg
+        :proc-inst-id="procInstId"
+        class="text-c p-a"
+        style="height: 70vh; overflow: auto"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import approvalImg from './approvalImg.vue'
+export default {
+  components: {
+    approvalImg
+  },
+  props: {
+    procInstId: {
+      type: String,
+      default: ''
+    }
+  },
+  provide() {
+    return { procInstId: this.$route.query.procInstId || this.procInstId }
+  },
+  data() {
+    return {
+      imgV: false
+    }
+  }
+}
+</script>

package/src/components/ApprovalRecord/index.vue

@@ -1,59 +1,59 @@
-/* 审批记录 */
-<template>
-  <div>
-    <expandableWrap title="审批记录" :show-expand="false">
-      <template slot="tips">
-        <el-button plain size="mini" :disabled="false" @click="cardV = true"
-          >审批进度查看</el-button
-        >
-        <el-button plain size="mini" :disabled="false" @click="imgV = true"
-          >流程图查看</el-button
-        >
-      </template>
-    </expandableWrap>
-    <el-dialog
-      title="审批记录"
-      :visible.sync="cardV"
-      width="700"
-      class="p-a-0"
-      append-to-body
-      top="10vh"
-    >
-      <approvalCard
-        class="p-a"
-        :proc-inst-id="$route.query.processInstanceId"
-        style="height: 70vh; overflow: auto"
-      />
-    </el-dialog>
-    <el-dialog
-      title="查看流程"
-      :visible.sync="imgV"
-      width="65%"
-      class="p-a-0"
-      append-to-body
-      top="10vh"
-    >
-      <approvalImg class="text-c p-a" style="height: 70vh; overflow: auto" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import expandableWrap from '../Expandable/index.vue'
-import approvalCard from '../ApprovalCard/index.vue'
-import approvalImg from './approvalImg.vue'
-export default {
-  name: 'ApprovalRecord',
-  components: {
-    expandableWrap,
-    approvalCard,
-    approvalImg
-  },
-  data() {
-    return {
-      cardV: false,
-      imgV: false
-    }
-  }
-}
-</script>
+/* 审批记录 */
+<template>
+  <div>
+    <expandableWrap title="审批记录" :show-expand="false">
+      <template slot="tips">
+        <el-button plain size="mini" :disabled="false" @click="cardV = true"
+          >审批进度查看</el-button
+        >
+        <el-button plain size="mini" :disabled="false" @click="imgV = true"
+          >流程图查看</el-button
+        >
+      </template>
+    </expandableWrap>
+    <el-dialog
+      title="审批记录"
+      :visible.sync="cardV"
+      width="700"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
+      <approvalCard
+        class="p-a"
+        :proc-inst-id="$route.query.processInstanceId"
+        style="height: 70vh; overflow: auto"
+      />
+    </el-dialog>
+    <el-dialog
+      title="查看流程"
+      :visible.sync="imgV"
+      width="65%"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
+      <approvalImg class="text-c p-a" style="height: 70vh; overflow: auto" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import expandableWrap from '../Expandable/index.vue'
+import approvalCard from '../ApprovalCard/index.vue'
+import approvalImg from './approvalImg.vue'
+export default {
+  name: 'ApprovalRecord',
+  components: {
+    expandableWrap,
+    approvalCard,
+    approvalImg
+  },
+  data() {
+    return {
+      cardV: false,
+      imgV: false
+    }
+  }
+}
+</script>