n20-common-lib 2.9.65 → 2.9.68

package/package.json

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

package/src/components/ApprovalButtons/setRejectToProp.vue

@@ -16,6 +16,21 @@
           </el-radio>
         </template>
       </el-table-column>
+      <el-table-column :label="'单位名称' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">
+          {{ row.memberName }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="'角色名称' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">
+          {{ row.roleName }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="'人员名称' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">
+          {{ row.userName }}
+        </template>
+      </el-table-column>
       <el-table-column :label="'节点名称' | $lc" align="center" show-overflow-tooltip>
         <template slot-scope="{ row }">
           {{ row.taskName }}
@@ -33,8 +48,8 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
+import { $lc } from '../../utils/i18n/index'
 import ClPage from '../PageLayout/page.vue'
 export default {
   components: {

package/src/components/HandlingAdvice/index.vue

@@ -8,7 +8,14 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="reason" type="textarea" rows="5" class="w-100p" />
+          <el-input
+            v-model="reason"
+            type="textarea"
+            :rows="rows"
+            :show-word-limit="showWordLimit"
+            :maxlength="maxlength"
+            class="w-100p"
+          />
         </el-form-item>
       </el-form>
       <span slot="footer">
@@ -31,7 +38,20 @@ export default {
     beforeSubmit: {
       type: Function,
       default: undefined
-    }
+    },
+    maxlength: {
+      type: Number,
+      default: 150
+    },
+    showWordLimit: {
+      type: Boolean,
+      default: true
+    },
+    rows: {
+      type: Number,
+      default: 5
+    },
+    
   },
   data() {
     return {

package/src/i18n.json

@@ -2860,14 +2860,14 @@
     "vi": "Tên"
   },
   "请输入用户姓名": {
-    "en": "xxx",
-    "th": "โปรดใส่ชื่อผู้ใช้",
+    "en": "Please enter the user name",
+    "th": "โปรดป้อนชื่อผู้ใช้",
     "vi": "Vui lòng nhập tên người dùng"
   },
   "单位名称": {
-    "en": "Please enter user name",
-    "th": "โปรดเลือกชื่อบริษัท",
-    "vi": "Vui lòng nhập tên người dùng"
+    "en": "Company name",
+    "th": "ชื่อบริษัท",
+    "vi": "Tên công ty"
   },
   "请输入单位名称": {
     "en": "Please enter the company name",
@@ -2875,9 +2875,14 @@
     "vi": "Vui lòng nhập tên công ty"
   },
   "角色名称": {
-    "en": "Please enter the role name",
-    "th": "โปรดป้อนชื่อหน่วยงาน",
-    "vi": "Vui lòng nhập tên vai trò"
+    "en": "Role name",
+    "th": "ชื่อหน่วยงาน",
+    "vi": "Tên vai trò"
+  },
+  "人员名称": {
+    "en": "User name",
+    "th": "ชื่อผู้ใช้",
+    "vi": "Tên người dùng"
   },
   "请输入角色名称": {
     "en": "Please enter the role name",
@@ -3455,4 +3460,4 @@
     "th": "การอนุมัติบน App",
     "vi": "Phe duyệt bằng App"
   }
-}
+}

package/src/plugins/Sign/index.js

@@ -139,16 +139,14 @@ export function getCert(dn) {
         })
       })
     } else if (signType === 'ItrusSign') {
-      importG('ItrusSign', () => import(/*webpackChunkName: "ItrusSign"*/ './Itrus/index.js')).then(
-        ({ itrusGetCert }) => {
-          try {
-            const itrusGetCert = itrusGetCert(dn)
-            resolve(itrusGetCert)
-          } catch (error) {
-            reject()
-          }
+      importG('ItrusSign', () => import(/*webpackChunkName: "ItrusSign"*/ './Itrus/index.js')).then(({ getCert }) => {
+        try {
+          const itrusGetCert = getCert(dn)
+          resolve(itrusGetCert)
+        } catch (error) {
+          reject()
         }
-      )
+      })
     }
   })
 }