n20-common-lib 2.3.1 → 2.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/ApprovalButtons/index.vue +9 -2
- package/src/components/LoginTemporary/form.vue +2 -1
- package/style/index.css +3 -3
- package/style/index.css.map +1 -1
- package/theme/blue.css +3 -3
- package/theme/cctcRed.css +3 -3
- package/theme/green.css +3 -3
- package/theme/lightBlue.css +3 -3
- package/theme/orange.css +3 -3
- package/theme/purple.css +3 -3
- package/theme/red.css +3 -3
- package/theme/yellow.css +3 -3
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* 审批按钮组 */
|
|
2
2
|
<template>
|
|
3
3
|
<div>
|
|
4
|
-
<el-form label-position="right" :label-width="_lang === 'zh' ? '
|
|
4
|
+
<el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '6em' : '10em'">
|
|
5
5
|
<div v-if="taskId && showBtn" class="flex-box">
|
|
6
6
|
<el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
|
|
7
7
|
<el-input
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
</el-form-item>
|
|
52
52
|
</div>
|
|
53
53
|
<div class="flex-box">
|
|
54
|
-
<el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" style="width: 70%">
|
|
54
|
+
<el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
|
|
55
55
|
<el-input
|
|
56
56
|
ref="msg-input"
|
|
57
57
|
v-model="messageC"
|
|
@@ -169,6 +169,10 @@ export default {
|
|
|
169
169
|
type: Object,
|
|
170
170
|
default: () => ({})
|
|
171
171
|
},
|
|
172
|
+
required: {
|
|
173
|
+
type: Boolean,
|
|
174
|
+
default: false
|
|
175
|
+
},
|
|
172
176
|
signText: {
|
|
173
177
|
type: String,
|
|
174
178
|
default: undefined
|
|
@@ -425,6 +429,9 @@ export default {
|
|
|
425
429
|
},
|
|
426
430
|
// 审批
|
|
427
431
|
approvalFn() {
|
|
432
|
+
if (this.required && !this.messageC) {
|
|
433
|
+
return this.errMsgFn($lc('批准'))
|
|
434
|
+
}
|
|
428
435
|
if (this.addTaskList.length > 0 && !this.addTaskType) {
|
|
429
436
|
return this.addErrFn()
|
|
430
437
|
}
|
|
@@ -429,7 +429,8 @@ export default {
|
|
|
429
429
|
if (checkCert) {
|
|
430
430
|
this.loadingAdd()
|
|
431
431
|
let { getSign } = await import('../../plugins/Sign')
|
|
432
|
-
let
|
|
432
|
+
let signVersion = process.env.VUE_APP_NetSign_VERSION || window.VUE_APP_NetSign_VERSION
|
|
433
|
+
let signPro = getSign(username + userDn, userDn, signVersion)
|
|
433
434
|
|
|
434
435
|
uDnPro.catch(this.getImgCode)
|
|
435
436
|
sign = await signPro
|