n20-common-lib 2.7.55 → 2.7.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.55",
+  "version": "2.7.57",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalCard/index.vue

@@ -55,9 +55,77 @@
             {{ '加签审批人：' | $lc }}{{ item.addTaskName }}
           </div>
           <template v-if="item.resultName !== '撤回' || showCtdMsg">
-            <div v-if="item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
+            <div v-if="item.subProcInitId" class="n20-description-c n20-description-bgc m-t p-a-s">
+                <span class="color-primary pointer" @click="seeApproveChild(item.subProcInitId)">{{item.suggestion}}<i class="n20-icon-shouqizhedie f-s-m"></i></span>
+
+              <div class="n20-approve-wrap-children" v-if="showChildTimeline">
+                <el-timeline :reverse="true">
+                  <el-timeline-item v-for="(row, i) in approvalChildrenData" :key="i" :type="row | typeF(status)" :hide-timestamp="true">
+                    <div class="n20-time">
+                      <div>{{ row.endTime | dataF }}</div>
+                      <div>{{ row.endTime | timeF }}</div>
+                    </div>
+                    <div>
+                      <div v-if="row.result === 0" class="flex-box flex-v">
+                        <div v-title="row.assignee" class="w-full n20-worker p-r-s text-ellipsis" :show-overflow-tooltip="true">
+                          {{ row.assignee }}
+                        </div>
+                      </div>
+                      <div v-if="row.result === 5" class="flex-box">
+                        <div class="result-left-name" :class="row | typeF(status, 'color-')">{{ $lc(row.resultName) }}</div>
+                      </div>
+                      <div v-else class="flex-box">
+                        <div class="result-left-name" :class="row | typeF(status, 'color-')">{{ $lc(row.resultName) }}</div>
+                        <div
+                          v-title="row.assignee"
+                          class="flex-box flex-item n20-worker m-r-s text-ellipsis"
+                          :show-overflow-tooltip="true"
+                        >
+                          <div
+                            v-title="row.memberName"
+                            :show-overflow-tooltip="true"
+                            class="flex-item n20-worker m-r-s text-ellipsis"
+                            style="width: 250px"
+                          >
+                            {{ row.memberName }}
+                          </div>
+                          <div
+                            v-title="row.roleName"
+                            class="flex-item n20-worker text-ellipsis"
+                            :show-overflow-tooltip="true"
+                            style="width: 250px"
+                          >
+                            {{ row.roleName }}
+                          </div>
+                          <div
+                            v-if="row.result !== 0"
+                            v-title="row.assignee"
+                            class="n20-worker text-ellipsis"
+                            style="width: 180px"
+                            :show-overflow-tooltip="true"
+                          >
+                            <span class="worker-icon n20-icon-user"></span>{{ row.assignee }}
+                          </div>
+                        </div>
+                      </div>
+                      <div v-if="row.ccUserName" class="n20-description-c m-t">{{ '抄送人：' | $lc }}{{ row.ccUserName }}</div>
+                      <div v-if="row.addTaskName" class="n20-description-c m-t">
+                        {{ '加签审批人：' | $lc }}{{ row.addTaskName }}
+                    </div>
+                      <template v-if="row.resultName !== '撤回' || showCtdMsg">
+                        <div v-if="row.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
+                          <span v-if="row.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
+                          <span>{{ row.suggestion }} </span>
+                        </div>
+                      </template>
+                    </div>
+                  </el-timeline-item>
+                </el-timeline>
+              </div>
+            </div>
+            <div v-if="!item.subProcInitId && item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
               <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
-              <span>{{ item.suggestion }}</span>
+              <span>{{ item.suggestion }} </span>
             </div>
             <div v-if="item.flowHisFileList" class="n20-description-c n20-description-bgc m-t p-a-s">
               <span>{{ '附件信息' | $lc }}：</span>
@@ -214,6 +282,8 @@ export default {
       }
     }
     return {
+      showChildTimeline:false,
+      approvalChildrenData:[],
       // 显示撤回意见,默认不显示
       showCtdMsg: window._approvalExtend['card.countermand.suggestion'] === true,
       visibleP: false,
@@ -225,59 +295,71 @@ export default {
       seeRow: {}
     }
   },
-  created() {
+ async created() {
     if (this.procInstId) {
-      axios
+     const data =await this.getProcInstData(this.procInstId)
+      this.approvalData.push(...data)
+    }
+  },
+  methods: {
+   async seeApproveChild(id) {
+     this.showChildTimeline = !this.showChildTimeline
+     if (this.showChildTimeline) {
+       const data =await this.getProcInstData(id)
+       this.approvalChildrenData =  data
+     } else {
+       this.approvalChildrenData = []
+     }
+
+    },
+   async getProcInstData(procInstId) {
+     const {data} = await axios
         .get(
           `/bems/activiti/sample/Q003?r=${Math.random()}`,
           {
-            procInstId: this.procInstId
+            procInstId
           },
           { loading: !this.hideLoading }
         )
-        .then(({ data = [] }) => {
-          let approvalData = []
-          data.forEach((item) => {
-            let _item = {
-              endTime: item.endTime || '',
-              assignee: item.assignee,
-              suggestion: item.suggestion,
-              roleName: item.roleName,
-              flowHisFileList: item.flowHisFileList || null, //附件信息
-              ccUserName: item.ccUserName, // 抄送人
-              addTaskName: item.addTaskName, // 加签审批人
-              memberName: item.memberName // 审批人单位
-            }
-            let resultName = item.optResult || ''
-            resultName = resultName.split('-')
-            resultName = resultName[resultName.length - 1]
-            _item.resultName = resultName === $lc('推进') ? $lc('批准') : 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
-            }
+     let approvalData = []
+      data?.forEach((item) => {
+       let _item = {
+         endTime: item.endTime || '',
+         assignee: item.assignee,
+         suggestion: item.suggestion,
+         roleName: item.roleName,
+         flowHisFileList: item.flowHisFileList || null, //附件信息
+         ccUserName: item.ccUserName, // 抄送人
+         addTaskName: item.addTaskName, // 加签审批人
+         memberName: item.memberName, // 审批人单位
+         subProcInitId:item.subProcInitId // 子流程id
+       }
+       let resultName = item.optResult || ''
+       resultName = resultName.split('-')
+       resultName = resultName[resultName.length - 1]
+       _item.resultName = resultName === $lc('推进') ? $lc('批准') : 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)
-          console.log(this.approvalData)
-        })
-    }
-  },
-  methods: {
+       approvalData.push(_item)
+     })
+      return approvalData
+    },
     async preview(row) {
       this.visibleP = true
       this.seeRow = row

package/src/components/SelectTree/SelectTreeLazy.vue

@@ -180,7 +180,11 @@ export default {
   },
   methods: {
     showOpt() {
-      if (this.showd) return
+      if (this.showd) {
+        this.filterFn(this.value)
+        return
+
+      }
 
       this.showd = true
 
@@ -247,6 +251,7 @@ export default {
       this.$emit('change', this.value)
     },
     filterNode(value, data) {
+
       if (!value) return true
       let lK = this.props.label
       return data[lK].indexOf(value) !== -1

package/src/plugins/Sign/NetSM3/index.js

@@ -223,16 +223,13 @@ export async function getSign(plain, dn) {
   await MessageBox.prompt('请输入PIN码', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    inputType: 'password',
+    inputType: 'password'
   })
     .then(({ value }) => {
       return performSign(plainText, value).then((signedData) => {
         answer = signedData
       })
     })
-    .catch(() => {
-      resolve()
-    })
   return answer
 }