n20-common-lib 1.3.84 → 1.3.86

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -70,7 +70,7 @@
       v-drag
       :visible.sync="setCarboncopyV"
       :title="'设置抄送用户' | $lc"
-      width="900px"
+      width="960px"
       append-to-body
       top="7.5vh"
     >
@@ -80,7 +80,7 @@
       v-drag
       :visible.sync="setAddtaskV"
       :title="'设置加签用户' | $lc"
-      width="900px"
+      width="960px"
       append-to-body
       top="7.5vh"
     >

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -1,39 +1,59 @@
 <template>
-  <cl-page style="height: 75vh">
+  <cl-page style="height: 75vh; --table-w: 650px">
     <div slot="header" class="flex-box flex-v m-b">
-      <span class="m-r-ss">{{ '单位名称' | $lc }}</span>
+      <span class="m-r-ss">{{ '用户姓名' | $lc }}</span>
       <span>
-        <el-input v-model="searchObj.cltName" size="mini" />
+        <el-input v-model="searchObj.uname" size="mini" :placeholder="'请输入用户姓名' | $lc" />
       </span>
-      <span class="m-l m-r-ss">{{ '姓名' | $lc }}</span>
+      <span class="m-l m-r-ss">{{ '单位名称' | $lc }}</span>
       <span>
-        <el-input v-model="searchObj.uname" size="mini" />
+        <el-input v-model="searchObj.cltName" size="mini" :placeholder="'请选择单位' | $lc" />
       </span>
-      <span class="m-l m-r-ss">{{ '用户编号' | $lc }}</span>
-      <span>
-        <el-input v-model="searchObj.uno" size="mini" />
-      </span>
-      <el-button class="m-l-auto" plain size="mini" @click="searchFn">{{ '查询' | $lc }}</el-button>
+      <el-button class="m-l" plain size="mini" @click="resetFn">{{ '重置' | $lc }}</el-button>
+      <el-button type="primary" size="mini" @click="searchFn">{{ '查询' | $lc }}</el-button>
+    </div>
+    <div class="flex-box" style="height: 100%">
+      <el-table
+        ref="elTable"
+        :key="elTableKey"
+        :data="nodeTable"
+        row-key="uno"
+        border
+        height="100%"
+        style="width: var(--table-w); flex: none"
+        @select="sltChange"
+        @select-all="sltChange"
+      >
+        <el-table-column :reserve-selection="true" type="selection" width="46" header-align="center" align="center" />
+        <el-table-column prop="uname" :label="'用户姓名' | $lc" header-align="center" align="center" />
+        <el-table-column prop="cltName" :label="'单位名称' | $lc" header-align="center" align="center" />
+        <el-table-column prop="uno" :label="'登录账号/用户编号' | $lc" header-align="center" align="center" />
+      </el-table>
+      <div class="flex-column flex-c p-l p-r">
+        <i class="el-icon-d-arrow-left m-b"></i>
+        <i class="el-icon-d-arrow-right"></i>
+      </div>
+      <div class="flex-item bd-a">
+        <div class="text-c" style="height: 44px; line-height: 44px; background: var(--background-color-base)">
+          抄送对象
+        </div>
+        <div v-for="item in selectArr" :key="item.uno" class="flex-box p-a-s">
+          <span
+            v-title="item.uname + '/' + item.cltName"
+            :show-overflow-tooltip="true"
+            class="text-ellipsis"
+            style="width: 200px"
+            >{{ item.uname }}/{{ item.cltName }}</span
+          >
+          <el-link class="m-l-auto" :underline="false" icon="el-icon-close m-l-auto" @click="closeFn(item)" />
+        </div>
+      </div>
     </div>
-
-    <el-table
-      ref="elTable"
-      :key="elTableKey"
-      :data="nodeTable"
-      row-key="uno"
-      border
-      height="100%"
-      @select="sltChange"
-      @select-all="sltChange"
-    >
-      <el-table-column :reserve-selection="true" type="selection" width="46" header-align="center" align="center" />
-      <el-table-column prop="uno" :label="'编号' | $lc" header-align="center" align="center" />
-      <el-table-column prop="uname" :label="'姓名' | $lc" header-align="center" align="center" />
-      <el-table-column prop="cltName" :label="'单位' | $lc" header-align="center" align="center" />
-    </el-table>
     <template slot="footer">
-      <div class="flex-box flex-r m-t m-b">
+      <div class="flex-box m-t m-b" style="width: var(--table-w)">
+        <cl-statis :page-sum="nodeTable.length" :total-sun="pageObj.totalSize" />
         <cl-pagination
+          class="m-l-auto"
           :page-obj="pageObj"
           :page-key="{ no: 'pageNum', size: 'pageSize', total: 'totalSize' }"
           @change="getList"
@@ -50,10 +70,12 @@
 <script>
 import ClPage from '../PageLayout/page.vue'
 import ClPagination from '../Pagination/index.vue'
+import ClStatis from '../Statis/index.vue'
 export default {
   components: {
     ClPage,
-    ClPagination
+    ClPagination,
+    ClStatis
   },
   props: {
     carbonCopyList: {
@@ -104,9 +126,16 @@ export default {
       this.pageObj.pageNum = 1
       this.getList()
     },
+    resetFn() {
+      this.searchObj = {}
+    },
     sltChange(list) {
       this.selectArr = list || []
     },
+    closeFn(item) {
+      this.selectArr = this.selectArr.filter((d) => d.uno !== item.uno)
+      this.$refs.elTable.toggleRowSelection(item, false)
+    },
     confirmFn() {
       this.$emit('confirm', this.selectArr)
     }

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
 }