n20-common-lib 2.4.42 → 2.4.43

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -482,7 +482,9 @@ export default {
     // 审批
     approvalFn() {
       if (this.required && !this.messageC) {
-        return this.errMsgFn($lc('批准'))
+        return this.errMsgFn(
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
+        )
       }
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
@@ -490,7 +492,10 @@ export default {
 
       this.beforeFn(this.beforeRatify, () => {
         axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
-          this.thenMsg(data, $lc('批准'))
+          this.thenMsg(
+            data,
+            this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
+          )
         })
       })
     },

package/src/components/LoginTemporary/form.vue

@@ -468,9 +468,13 @@ export default {
             }
           )
           .then((res) => {
+            this.loadingSub()
             this.loginAfter(res.data)
           })
-          .catch(this.getImgCode)
+          .catch(() => {
+            this.loadingSub()
+            this.getImgCode()
+          })
 
         return
       }

package/src/components/LoginTemporary/indexN.vue

@@ -487,7 +487,7 @@ export default {
             }
           })
           .finally(() => {
-            localStorage.setItem('SYSTEM_LIST', JSON.stringify(this.form.SYSTEM_LIST))
+            localStorage.setItem('SYSTEM_LIST', JSON.stringify(this.form.SYSTEM_LIST.filter((item) => item.OPEN)))
             resolve()
           })
       })

package/src/components/WorkCard/index.vue

@@ -64,6 +64,12 @@ export default {
 .work-card ::v-deep .el-badge__content {
   line-height: 14px;
 }
+.work-card .el-badge__content.is-fixed {
+  position: absolute;
+  top: 0;
+  right: -1px;
+  transform: scale(0.7) translateY(-50%) translateX(100%);
+}
 
 .work-card--empty-title {
   color: #cacaca;