n20-common-lib 1.3.67 → 1.3.68-0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.67",
+  "version": "1.3.680.1",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -56,7 +56,6 @@
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-eslint": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.2.38",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
     "clipboard": "^2.0.11",
@@ -76,7 +75,7 @@
     "md2vue-loader": "git+https://gitee.com/bable2000/md2vue-loader.git",
     "mockjs": "^1.1.0",
     "node-sass": "6.0.0",
-    "nstc-get-i18n": "^0.0.1",
+    "nstc-get-i18n": "^0.0.3",
     "qiankun": "^2.5.1",
     "sass-loader": "^10.2.0",
     "screenfull": "^5.1.0",

package/src/assets/css/cl-approve-card.scss

@@ -63,6 +63,5 @@
     font-weight: initial;
     font-size: $--font-size-base;
     color: $--color-text-regular;
-    padding: 12px;
   }
 }

package/src/components/ApprovalButtons/index.vue

@@ -1,7 +1,24 @@
 /* 审批按钮组 */
 <template>
   <div>
-    <el-form label-position="left" label-width="5em">
+    <el-form label-position="right" label-width="5em">
+      <div class="flex-box">
+        <div v-if="authList.includes('isCarboncopy')" class="flex-1">
+          <el-form-item label="抄送">
+            <el-input
+              :value="carbonCopyList.map((c) => c.uname).join(', ')"
+              type="textarea"
+              :autosize="{ minRows: 1 }"
+              @focus="setCarboncopyV = true"
+            />
+          </el-form-item>
+        </div>
+        <div v-if="authList.includes('加签')" class="flex-1">
+          <el-form-item label="加签">
+            <el-input type="textarea" :autosize="{ minRows: 1 }" />
+          </el-form-item>
+        </div>
+      </div>
       <el-form-item label="审批意见" :error="errMsg">
         <el-input
           ref="msg-input"
@@ -22,6 +39,9 @@
       <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">作 废</el-button>
       <el-button plain @click="goFrom">返 回</el-button>
     </div>
+    <cl-dialog v-drag :visible.sync="setCarboncopyV" title="设置抄送用户" width="900px" append-to-body top="7.5vh">
+      <carboncopy-prop :carbon-copy-list="carbonCopyList" @close="setCarboncopyV = false" @confirm="setCarboncopyOk" />
+    </cl-dialog>
   </div>
 </template>
 
@@ -29,9 +49,15 @@
 import axios from '../../utils/axios'
 import { linkGo } from '../../utils/urlToGo'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
+import ClDialog from '../Dialog'
+import CarboncopyProp from './setCarboncopyProp.vue'
 
 export default {
   name: 'ApprovalButtons',
+  components: {
+    ClDialog,
+    CarboncopyProp
+  },
   props: {
     message: {
       type: String,
@@ -59,7 +85,9 @@ export default {
       errMsg: undefined,
       taskId: '',
       taskDefKey: '',
-      authList: []
+      authList: [],
+      setCarboncopyV: false,
+      carbonCopyList: []
     }
   },
   computed: {
@@ -125,7 +153,8 @@ export default {
           message: this.messageC,
           formData: JSON.stringify(this.formData),
           signText: this.signText,
-          isAgentcy: isAgentcy
+          isAgentcy: isAgentcy,
+          carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname }))
         }
       ]
     },
@@ -208,6 +237,11 @@ export default {
           this.thenMsg(data, '作废')
         })
       })
+    },
+    setCarboncopyOk(list) {
+      this.carbonCopyList = list
+
+      this.setCarboncopyV = false
     }
   }
 }

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -0,0 +1,117 @@
+<template>
+  <cl-page style="height: 75vh">
+    <div slot="header" class="flex-box flex-v m-b">
+      <span class="m-r-ss">单位名称</span>
+      <span>
+        <el-input v-model="searchObj.cltName" size="mini" />
+      </span>
+      <span class="m-l m-r-ss">姓名</span>
+      <span>
+        <el-input v-model="searchObj.uname" size="mini" />
+      </span>
+      <span class="m-l m-r-ss">用户编号</span>
+      <span>
+        <el-input v-model="searchObj.uno" size="mini" />
+      </span>
+      <el-button class="m-l-auto" plain size="mini" @click="searchFn">查询</el-button>
+    </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="编号" header-align="center" align="center" />
+      <el-table-column prop="uname" label="姓名" header-align="center" align="center" />
+      <el-table-column prop="cltName" label="单位" header-align="center" align="center" />
+    </el-table>
+    <template slot="footer">
+      <div class="flex-box flex-r m-t m-b">
+        <cl-pagination
+          :page-obj="pageObj"
+          :page-key="{ no: 'pageNum', size: 'pageSize', total: 'totalSize' }"
+          @change="getList"
+        />
+      </div>
+      <div class="text-c">
+        <el-button type="primary" @click="confirmFn">确 定</el-button>
+        <el-button @click="$emit('close')">取 消</el-button>
+      </div>
+    </template>
+  </cl-page>
+</template>
+
+<script>
+import ClPage from '../PageLayout/page.vue'
+import ClPagination from '../Pagination/index.vue'
+export default {
+  components: {
+    ClPage,
+    ClPagination
+  },
+  props: {
+    carbonCopyList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      nodeTable: [],
+      searchObj: {
+        uno: undefined,
+        uname: undefined,
+        cltName: undefined,
+        roleName: undefined
+      },
+      pageObj: {
+        pageNum: 1,
+        pageSize: 10,
+        totalSize: 0
+      },
+      selectArr: [],
+      elTableKey: 0
+    }
+  },
+  mounted() {
+    this.$refs.elTable.clearSelection()
+    this.carbonCopyList.forEach((item) => {
+      this.$refs.elTable.toggleRowSelection(item, true)
+    })
+
+    this.pageObj = { pageNum: 1, pageSize: 10, totalSize: 0 }
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.$axios
+        .post('/bems/activiti/online/chdUserInfo', {
+          data: this.searchObj,
+          ...this.pageObj
+        })
+        .then(({ data }) => {
+          this.nodeTable = data.list
+          this.pageObj.totalSize = data.totalSize
+        })
+    },
+    searchFn() {
+      this.pageObj.pageNum = 1
+      this.getList()
+    },
+    sltChange(list) {
+      this.selectArr = list || []
+    },
+    confirmFn() {
+      this.$emit('confirm', this.selectArr)
+    }
+  }
+}
+</script>
+
+<style></style>

package/src/components/ApprovalCard/index.vue

@@ -27,9 +27,10 @@
               >
             </div>
           </div>
-          <div v-if="item.suggestion" class="n20-description-c">
+          <div v-if="item.suggestion" class="n20-description-c m-t">
             {{ item.suggestion }}
           </div>
+          <div v-if="item.ccUserName" class="n20-description-c m-t">抄送人：{{ item.ccUserName }}</div>
         </div>
       </el-timeline-item>
     </el-timeline>
@@ -102,7 +103,8 @@ export default {
             let _item = {
               endTime: item.endTime || '',
               assignee: item.assignee,
-              suggestion: item.suggestion
+              suggestion: item.suggestion,
+              ccUserName: item.ccUserName // 抄送人
             }
 
             if (item.taskName === '开始') {

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -34,32 +34,32 @@
       }}</span>
       <el-button type="text" icon="el-icon-full-screen" style="font-size: 16px" @click="scaleReset" />
     </div>
-    <span v-title></span>
-    <div ref="msgEl" class="activiti-msg">
-      <div v-if="assignee">{{ assignee }}</div>
-      <div v-else-if="assigneeEnd">
-        <table cellspacing="0" class="m-t-ss m-b-ss" style="border-collapse: collapse; min-width: 460px">
-          <tr>
-            <td class="text-c">已审批人</td>
-            <td class="text-c">审批类型</td>
-            <td class="text-c">审批意见</td>
-            <td class="text-c">审批时间</td>
-          </tr>
-          <tr v-for="(item, i) in assigneeEnd" :key="i">
-            <td>{{ item.assignee }}</td>
-            <td class="text-c">{{ item.optResult }}</td>
-            <td>{{ item.suggestion }}</td>
-            <td>{{ item.endTime }}</td>
-          </tr>
-        </table>
+    <el-popover ref="title-pop" v-model="msgV" trigger="manual" placement="top">
+      <div class="activiti-msg">
+        <div v-if="assigneeEnd" class="m-t-ss m-b-ss">
+          <table cellspacing="0" style="border-collapse: collapse; min-width: 460px">
+            <tr>
+              <td class="text-c">已审批人</td>
+              <td class="text-c">审批类型</td>
+              <td class="text-c">审批意见</td>
+              <td class="text-c">审批时间</td>
+            </tr>
+            <tr v-for="(item, i) in assigneeEnd" :key="i">
+              <td>{{ item.assignee }}</td>
+              <td class="text-c">{{ item.optResult }}</td>
+              <td>{{ item.suggestion }}</td>
+              <td>{{ item.endTime }}</td>
+            </tr>
+          </table>
+        </div>
+        <div v-if="assignee" :class="{ 'm-t-s': assigneeEnd }">{{ assignee }}</div>
       </div>
-    </div>
+    </el-popover>
   </div>
 </template>
 
 <script>
 import importG from '../../../utils/importGlobal.js'
-import { tipShow, tipHide } from '../../../directives/VTitle/index.js'
 export default {
   filters: {
     zoomFormat(val) {
@@ -75,13 +75,15 @@ export default {
   data() {
     this.svgW = undefined
     this.svgC = undefined
+    this.markerId = ''
     return {
       assignee: undefined,
       assigneeEnd: undefined,
       min: 0.4,
       max: 2,
       step: 0.1,
-      zoomValue: 1
+      zoomValue: 1,
+      msgV: false
     }
   },
   watch: {
@@ -92,7 +94,7 @@ export default {
   async mounted() {
     this.svgW = this.$refs['activiti-svg-wrap']
 
-    let { flowString, seqRecords, taskDefIdMap, currentActivityId, currentAssigneeName } = this.dataPro
+    let { flowString, seqRecords, taskDefIdMap = {}, currAssMap = {}, currentActivityIdList = [] } = this.dataPro
     let flowSvg = flowString
     if (flowString.includes('bpmn2:definitions')) {
       let { default: bpmn2svg } = await importG('bpmn2svg', () =>
@@ -105,12 +107,17 @@ export default {
       seqRecords.forEach((obj) => {
         this.setTaskRecord(obj)
       })
-      for (let k in taskDefIdMap) {
-        this.addEvent(k, taskDefIdMap[k])
-      }
-      if (currentActivityId) {
-        this.addEvent(currentActivityId, currentAssigneeName, 'pending')
+      currentActivityIdList.forEach((currentActivityId) => {
+        let assignee = currAssMap[currentActivityId]
+        let assigneeEnd = taskDefIdMap[currentActivityId]
+        taskDefIdMap[currentActivityId] = undefined
+
+        this.addEvent(currentActivityId, { assignee, assigneeEnd }, 'pending')
+
         this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`).classList.add('activiti-node-at')
+      })
+      for (let k in taskDefIdMap) {
+        taskDefIdMap[k] && this.addEvent(k, taskDefIdMap[k])
       }
     } catch (error) {
       console.log('setTaskErr:', error)
@@ -132,7 +139,11 @@ export default {
       this.zoomValue = scale
     })
   },
+  deactivated() {
+    this.msgV = false
+  },
   beforeDestroy() {
+    this.msgV = false
     this.svgPanzoom && this.svgPanzoom.dispose()
   },
   methods: {
@@ -148,6 +159,9 @@ export default {
       this.svgC.setAttribute('width', Number(width) + 10)
       this.svgC.setAttribute('height', Number(height) + 10)
       this.svgC.setAttribute('viewBox', viewBox)
+
+      let marker = this.svgC.querySelector('defs marker')
+      marker && (this.markerId = marker.getAttribute('id'))
     },
     setTaskRecord(obj) {
       let { resouceTaskDefId: from, targetTaskDefId: to, seqDefid: line, type: type } = obj
@@ -176,6 +190,7 @@ export default {
       let path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
       path.setAttribute('class', 'activiti-line-reject')
       path.setAttribute('d', d)
+      path.style.markerEnd = `url('#${this.markerId}')`
       this.svgC.appendChild(path)
 
       if (msg) {
@@ -218,24 +233,24 @@ export default {
       }
       return rect
     },
-    addEvent(id, list = [], type) {
+    addEvent(id, list, type) {
       let task = this.svgW.querySelector(`[data-element-id="${id}"]`)
       task.addEventListener('mouseenter', () => {
         if (type === 'pending') {
-          this.assignee = list
-          this.assigneeEnd = undefined
+          this.assignee = list.assignee
+          this.assigneeEnd = list.assigneeEnd
         } else {
           this.assignee = undefined
           this.assigneeEnd = list
         }
         this.$nextTick(() => {
-          setTimeout(() => {
-            tipShow(task, this.$refs['msgEl'])
-          }, 100)
+          this.$refs['title-pop'].doDestroy()
+          this.$refs['title-pop'].referenceElm = task
+          this.msgV = true
         })
       })
       task.addEventListener('mouseleave', () => {
-        tipHide(task)
+        this.msgV = false
       })
     },
     scaleMinus() {
@@ -368,14 +383,13 @@ setRejectLink(from, to) {
   height: 100%;
   overflow: auto;
 }
-.n20-approval-img-por .activiti-msg {
-  display: none;
-}
+
 .activiti-msg th,
 .activiti-msg td {
   padding: 6px 8px;
-  border: 1px solid var(--border-color-light);
+  border: 1px solid var(--border-color-base);
 }
+
 .activiti-svg-zoom {
   position: absolute;
   z-index: 9;

package/src/directives/VTitle/index.js

@@ -35,30 +35,22 @@ function tipInit(Vue) {
   }).$mount(el)
 }
 
-export function tipShow(el, popC) {
-  let _C = undefined
-  if (popC) {
-    _C = popC
-  } else if (el.$tooltipTitle) {
+function tipShow(el) {
+  let text = undefined
+  if (el.$tooltipTitle) {
     if (!el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth) {
-      _C = el.$tooltipTitle
+      text = el.$tooltipTitle
     }
   } else {
     let _input = el.querySelector('.el-input__inner')
     if (_input && _input.clientWidth < _input.scrollWidth) {
-      _C = _input.value
+      text = _input.value
     }
   }
 
-  if (_C) {
+  if (text) {
     let popEl = document.querySelector('.' + popClass)
-    if (_C.nodeName) {
-      popEl.innerText = ''
-      _C = _C.cloneNode(true)
-      popEl.appendChild(_C)
-    } else {
-      popEl.innerText = _C
-    }
+    popEl.innerText = text
 
     if (tooltip.$refs['title-pop'].referenceElm !== el) {
       tooltip.$refs['title-pop'].doDestroy()
@@ -69,7 +61,7 @@ export function tipShow(el, popC) {
   }
 }
 
-export function tipHide(el) {
+function tipHide(el) {
   if (tooltip.$refs['title-pop'].referenceElm === el) {
     tooltip.visible = false
   }