n20-common-lib 2.22.57 → 2.22.58

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/ApprovalButtons/index.vue +24 -24
  3. package/src/components/ApprovalButtons/indexApp.vue +24 -24
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.22.57",
3
+ "version": "2.22.58",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
package/src/components/ApprovalButtons/index.vue CHANGED
@@ -162,39 +162,39 @@
162
162
  </div>
163
163
  <!-- 审批按钮 -->
164
164
  <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
165
- <el-button type="primary" @click="showAdvancePop">{{ btnsNames['approval'] }}</el-button>
166
- <el-button type="primary" @click="approvalToV = true">{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button>
167
- <el-button plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
168
- <el-button plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
169
- <el-button type="danger" plain @click="discardFn">{{ btnsNames['discard'] }}</el-button>
165
+ <el-button type="primary" @click="showAdvancePop">{{ $lc(btnsNames['approval']) }}</el-button>
166
+ <el-button type="primary" @click="approvalToV = true">{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button>
167
+ <el-button plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button>
168
+ <el-button plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
169
+ <el-button type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
170
170
  <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
171
171
  </div>
172
172
 
173
173
  <div v-else-if="!authList.includes('byAddTask')" class="text-c">
174
174
  <!-- 特殊会签按钮 START -->
175
175
  <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
176
- btnsNames['pass']
176
+ $lc(btnsNames['pass'])
177
177
  }}</el-button>
178
- <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
179
- <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
178
+ <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ $lc(btnsNames['refuse']) }}</el-button>
179
+ <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ $lc(btnsNames['takeOff']) }}</el-button>
180
180
  <!-- END -->
181
181
  <el-button v-if="authList.includes('approval')" type="primary" @click="showAdvancePop">{{
182
- btnsNames['approval']
182
+ $lc(btnsNames['approval'])
183
183
  }}</el-button>
184
184
  <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
185
- {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
185
+ {{ $lc(btnsNames['approval']) }}{{ '并审批下一条' | $lc }}</el-button
186
186
  >
187
187
  <el-button v-if="showApprovalTo && showApproveTo" type="primary" @click="approvalToV = true"
188
- >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
188
+ >{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button
189
189
  >
190
- <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
191
- <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
190
+ <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button>
191
+ <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
192
192
  <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
193
- btnsNames['rejectPre']
193
+ $lc(btnsNames['rejectPre'])
194
194
  }}</el-button>
195
195
 
196
196
  <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
197
- btnsNames['discard']
197
+ $lc(btnsNames['discard'])
198
198
  }}</el-button>
199
199
  <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
200
200
  </div>
@@ -515,14 +515,14 @@ export default {
515
515
  checkSum: 0,
516
516
  mustUploadWidget: false,
517
517
  btnsNames: {
518
- pass: this.$l('通过'),
519
- refuse: this.$l('拒绝'),
520
- takeOff: this.$l('请假'),
521
- reject: this.$l('驳回至申请人'),
522
- rejectPre: this.$l('驳回至上一节点'),
523
- approval: this.$l('批 准'),
524
- discard: this.$l('作 废'),
525
- rejectTo: this.$l('驳回至')
518
+ pass: '通过',
519
+ refuse: '拒绝',
520
+ takeOff: '请假',
521
+ reject: '驳回至申请人',
522
+ rejectPre: '驳回至上一节点',
523
+ approval: '批 准',
524
+ discard: '作 废',
525
+ rejectTo: '驳回至'
526
526
  }
527
527
  }
528
528
  },
@@ -714,7 +714,7 @@ export default {
714
714
  // 自定义按钮
715
715
  if (data.customBtnName && data.customBtnName.length > 0) {
716
716
  data.customBtnName.forEach((item) => {
717
- this.btnsNames[item.key] = item.optionName
717
+ this.$set(this.btnsNames, item.key, item.optionName)
718
718
  })
719
719
  }
720
720
  let { taskDefKey, menuAuthority } = data
package/src/components/ApprovalButtons/indexApp.vue CHANGED
@@ -117,11 +117,11 @@
117
117
  </div>
118
118
  <!-- 审批按钮 -->
119
119
  <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
120
- <el-button type="primary" @click="showAdvancePop">{{ btnsNames['approval'] }}</el-button>
121
- <!-- <el-button type="primary" @click="approvalToV = true">{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button>
122
- <el-button plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button> -->
123
- <el-button plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
124
- <!-- <el-button type="danger" plain @click="discardFn">{{ btnsNames['discard'] }}</el-button>
120
+ <el-button type="primary" @click="showAdvancePop">{{ $lc(btnsNames['approval']) }}</el-button>
121
+ <!-- <el-button type="primary" @click="approvalToV = true">{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button>
122
+ <el-button plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button> -->
123
+ <el-button plain @click="rejectFn">{{ $lc(btnsNames['reject']) }}</el-button>
124
+ <!-- <el-button type="danger" plain @click="discardFn">{{ $lc(btnsNames['discard']) }}</el-button>
125
125
  <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button> -->
126
126
  </div>
127
127
 
@@ -129,30 +129,30 @@
129
129
  <div v-if="!approveBtns" style="text-align: center; font-size: 18px">{{ $lc('请点击左上角返回处，进入OA待办页面') }}</div>
130
130
  <!-- 特殊会签按钮 START -->
131
131
  <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
132
- btnsNames['pass']
132
+ $lc(btnsNames['pass'])
133
133
  }}</el-button>
134
- <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
135
- <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
134
+ <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ $lc(btnsNames['refuse']) }}</el-button>
135
+ <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ $lc(btnsNames['takeOff']) }}</el-button>
136
136
  <!-- END -->
137
137
  <el-button v-if="authList.includes('approval') && approveBtns" type="primary" @click="showAdvancePop">{{
138
- btnsNames['approval']
138
+ $lc(btnsNames['approval'])
139
139
  }}</el-button>
140
140
  <!-- <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
141
- {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
141
+ {{ $lc(btnsNames['approval']) }}{{ '并审批下一条' | $lc }}</el-button
142
142
  >
143
143
  <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true"
144
- >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
144
+ >{{ $lc(btnsNames['approval']) }}{{ '至' | $lc }}</el-button
145
145
  >
146
- <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button> -->
146
+ <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ $lc(btnsNames['rejectTo']) }}</el-button> -->
147
147
  <el-button v-if="authList.includes('reject') && approveBtns" plain @click="rejectFn">{{
148
- btnsNames['reject']
148
+ $lc(btnsNames['reject'])
149
149
  }}</el-button>
150
150
  <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
151
- btnsNames['rejectPre']
151
+ $lc(btnsNames['rejectPre'])
152
152
  }}</el-button>
153
153
 
154
154
  <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
155
- btnsNames['discard']
155
+ $lc(btnsNames['discard'])
156
156
  }}</el-button>
157
157
  <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button> -->
158
158
  </div>
@@ -471,14 +471,14 @@ export default {
471
471
  checkSum: 0,
472
472
  mustUploadWidget: false,
473
473
  btnsNames: {
474
- pass: this.$l('通过'),
475
- refuse: this.$l('拒绝'),
476
- takeOff: this.$l('请假'),
477
- reject: this.$l('驳回'),
478
- rejectPre: this.$l('驳回至上一节点'),
479
- approval: this.$l('批 准'),
480
- discard: this.$l('作 废'),
481
- rejectTo: this.$l('驳回至')
474
+ pass: '通过',
475
+ refuse: '拒绝',
476
+ takeOff: '请假',
477
+ reject: '驳回',
478
+ rejectPre: '驳回至上一节点',
479
+ approval: '批 准',
480
+ discard: '作 废',
481
+ rejectTo: '驳回至'
482
482
  },
483
483
  approveBtns: true
484
484
  }
@@ -620,7 +620,7 @@ export default {
620
620
  // 自定义按钮
621
621
  if (data.customBtnName && data.customBtnName.length > 0) {
622
622
  data.customBtnName.forEach((item) => {
623
- this.btnsNames[item.key] = item.optionName
623
+ this.$set(this.btnsNames, item.key, item.optionName)
624
624
  })
625
625
  }
626
626
  let { taskDefKey, menuAuthority } = data