n20-common-lib 2.5.10 → 2.5.12

package/package.json

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

package/src/components/ApprovalRecord/index.vue

@@ -1,6 +1,6 @@
 /* 审批记录 */
 <template>
-  <div v-if="buttonMode">
+  <div v-if="approvalMode === 'dialog' || !approvalMode">
     <expandableWrap :title="'审批记录' | $lc" :show-expand="false" :icon="false">
       <template slot="tips">
         <el-button plain size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
@@ -47,7 +47,7 @@
 import expandableWrap from '../Expandable/main.vue'
 import approvalCard from '../ApprovalCard/index.vue'
 import approvalImg from './approvalImg.vue'
-
+import getJsonc from '../../assets/getJsonc'
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -68,13 +68,19 @@ export default {
   data() {
     return {
       cardV: false,
-      imgV: false
+      imgV: false,
+      approvalMode: undefined
     }
   },
   computed: {
     procInstIdC() {
       return this.procInstId || this.$route.query.processInstanceId
     }
+  },
+  mounted() {
+    getJsonc('/server-config.jsonc').then(({ approvalMode }) => {
+      this.approvalMode = approvalMode
+    })
   }
 }
 </script>

package/src/components/LoginTemporary/form.vue

@@ -248,9 +248,7 @@ export default {
       immediate: true
     }
   },
-  mounted() {
-    console.log(this.showForgetBtn)
-  },
+  mounted() {},
   methods: {
     // 忘记密码
     forgetPw() {

package/src/components/LoginTemporary/indexN.vue

@@ -321,7 +321,8 @@ export default {
       },
       sltSys: {},
       loginBg: 'none',
-      inspectionV: false
+      inspectionV: false,
+      isImageCode: undefined
     }
   },
   computed: {
@@ -380,6 +381,9 @@ export default {
       }
 
       return form
+    },
+    imgCode() {
+      return this.isImageCode ?? this.showImageCode
     }
   },
   watch: {
@@ -402,6 +406,7 @@ export default {
     // window.addEventListener('resize', this.setWrapSty)
 
     this.init()
+    this.getIsImgCode()
     localStorage.removeItem('pageInType')
     localStorage.setItem('pageInSystemNo', this.form.SYSTEM_LIST[0].NO)
   },
@@ -409,6 +414,13 @@ export default {
     // window.removeEventListener('resize', this.setWrapSty)
   },
   methods: {
+    getIsImgCode() {
+      axios
+        .get(`/bems/prod_1.0/uas/api/authorization/isimgcode`, null, { loading: false, onMsg: true })
+        .then(({ data }) => {
+          this.isImageCode = data
+        })
+    },
     async loginThenT() {
       if (this.sltSys?.NO) {
         localStorage.setItem('pageInSystemNo', this.sltSys.NO)