n20-common-lib 2.9.56 → 2.9.58

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -157,7 +157,7 @@
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
       <!-- 特殊会签按钮 START -->
       <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{ '通 过' | $lc }}</el-button>
-      <el-button v-if="authList.includes('refuse')" type="primary" @click="rejectFn">{{ '拒 绝' | $lc }}</el-button>
+      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ '拒 绝' | $lc }}</el-button>
       <!-- END -->
       <el-button v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
         '批 准' | $lc
@@ -628,7 +628,7 @@ export default {
     // 驳回
     rejectFn() {
       if (!this.messageC) {
-        return this.errMsgFn($lc('驳回'))
+        return this.errMsgFn(this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回'))
       }
       this.beforeFn(this.beforeReject, () => {
         axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
@@ -670,7 +670,6 @@ export default {
       this.approvalFn()
     },
     async checkFlowFn() {
-      debugger
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')

package/src/components/ApprovalCard/index.vue

@@ -59,7 +59,7 @@
               <div
                 v-if="item.result !== 0 && item.appOrPc !== null && item.appOrPc !== '' && item.appOrPc !== undefined"
               >
-                {{ item.appOrPc === '1' ? 'PC端审批' : 'App端审批' | $lc }}
+                {{ item.appOrPc === '1' ? 'PC端审批' : item.appOrPc === '2' ? '外部系统审批' : 'App端审批' | $lc }}
               </div>
               <div v-if="item.showConnect === '1'" class="m-l-s">
                 <span class="pointer color-ccc f-s-s" @click="seeDetail(item)"