n20-common-lib 1.3.85 → 1.3.86

package/package.json

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

package/src/components/ApprovalCard/ApproveCard-zjk.vue

@@ -0,0 +1,7 @@
+<script>
+import ApprovalCard from './index-zjk.vue'
+export default {
+  name: 'ApproveCardZjk',
+  extends: ApprovalCard
+}
+</script>

package/src/components/ApprovalCard/index-zjk.vue

@@ -0,0 +1,132 @@
+/* 审批进度 */
+<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>
+          <div class="flex-box flex-v">
+            <div class="n20-worker p-r-s" style="width: 300px">{{ item.memberName }}</div>
+            <div class="n20-worker p-r-s" style="width: 150px">{{ item.roleName }}</div>
+            <div class="n20-worker p-r-s text-c" style="width: 80px">{{ item.assignee }}</div>
+            <div class="n20-worker p-r-s text-c" style="width: 150px">
+              <span :class="item | typeF(status, 'color-')">{{ item.resultName | $lc }}</span>
+            </div>
+            <div class="flex-item">{{ item.suggestion }}</div>
+          </div>
+          <div v-if="item.ccUserName" class="n20-description-c m-t">抄送人：{{ item.ccUserName }}</div>
+        </div>
+      </el-timeline-item>
+    </el-timeline>
+  </div>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+import axios from '../../utils/axios'
+export default {
+  name: 'ApprovalCardZjk',
+  filters: {
+    typeF(item, status, prefix = '') {
+      let result = item.result
+      switch (result) {
+        case status.submit:
+          return prefix + 'primary'
+        case status.approval:
+          return prefix + 'primary'
+        case status.reject:
+          return prefix + 'danger'
+        case status.invalid:
+          return prefix + 'danger'
+        case status.end:
+          return prefix + 'primary'
+        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,
+        invalid: 4,
+        end: 5
+      })
+    },
+    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,
+              ccUserName: item.ccUserName, // 抄送人
+              memberName: item.memberName // 审批人单位
+            }
+            let resultName = item.optResult || ''
+            resultName = resultName.split('-')
+            resultName = resultName[resultName.length - 1]
+            _item.resultName = resultName
+
+            if (item.taskName === $lc('开始')) {
+              _item.result = 1
+            } else if (_item.resultName === $lc('加签推进')) {
+              _item.result = 2
+            } else if (_item.resultName === $lc('作废')) {
+              _item.result = 4
+            } else if (item.taskName === $lc('结束')) {
+              _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 {
+              _item.result = 2
+            }
+
+            approvalData.push(_item)
+          })
+          this.approvalData.push(...approvalData)
+        })
+    }
+  }
+}
+</script>

package/src/components/ApprovalCard/index.vue

@@ -10,7 +10,7 @@
         <div>
           <div class="flex-box">
             <div v-title="item.assignee" class="n20-worker flex-item m-r-s text-ellipsis" :show-overflow-tooltip="true">
-              <span class="worker-icon cl-icon-user"></span>
+              <span class="worker-icon n20-icon-user"></span>
               <span>{{ item.assignee }}</span>
             </div>
             <div class="n20-approval m-r-s">

package/src/components/ApprovalRecord/index-zjk.vue

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

package/src/components/ApprovalRecord/index.vue

@@ -7,10 +7,10 @@
         <el-button plain size="mini" :disabled="false" @click="imgV = true">{{ '流程图查看' | $lc }}</el-button>
       </template>
     </expandableWrap>
-    <el-dialog :title="'审批记录' | $lc" :visible.sync="cardV" width="700" class="p-a-0" append-to-body top="10vh">
+    <el-dialog :title="'审批记录' | $lc" :visible.sync="cardV" width="700px" 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="'查看流程' | $lc" :visible.sync="imgV" width="65%" class="p-a-0" append-to-body top="10vh">
+    <el-dialog :title="'查看流程' | $lc" :visible.sync="imgV" width="80%" class="p-a-0" append-to-body top="10vh">
       <approvalImg
         class="text-c p-a"
         :proc-inst-id="$route.query.processInstanceId"

package/src/index.js

@@ -62,6 +62,10 @@ import Diff from './components/Diff/index.vue'
 import TableO from './components/Table/indexO.vue'
 import FiltersO from './components/Filters/indexO.vue'
 import DialogO from './components/Dialog/indexO.vue'
+/* 中建科 */
+import ApprovalCardZjk from './components/ApprovalCard/index-zjk.vue'
+import ApproveCardZjk from './components/ApprovalCard/ApproveCard-zjk.vue'
+import ApprovalRecordZjk from './components/ApprovalRecord/index-zjk.vue'
 
 /** 第三方组件 */
 
@@ -155,7 +159,11 @@ const components = [
   /* old */
   TableO,
   FiltersO,
-  DialogO
+  DialogO,
+  /* 中建科 */
+  ApprovalCardZjk,
+  ApproveCardZjk,
+  ApprovalRecordZjk
 ]
 
 const install = function (Vue, opts = { prefix: 'Cl', i18nConfig: {} }) {
@@ -268,5 +276,9 @@ export {
   EventBubble,
   ApprovalImg,
   Stamp,
-  Diff
+  Diff,
+  /* 中建科 */
+  ApprovalCardZjk,
+  ApproveCardZjk,
+  ApprovalRecordZjk
 }