n20-common-lib 2.17.15 → 2.17.18

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.17.15",
3
+ "version": "2.17.18",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div class="approve-msg-slt tips">
2
+ <div class="approve-msg-slt showAppOpi-tips">
3
3
  <!-- <el-select
4
4
  v-model="approveMsgSlt"
5
5
  class="w-100p"
@@ -326,7 +326,7 @@ export default {
326
326
  </script>
327
327
 
328
328
  <style>
329
- .tips {
329
+ .showAppOpi-tips {
330
330
  text-align: right;
331
331
  margin-right: 60px;
332
332
  margin-top: -24px;
@@ -195,6 +195,57 @@
195
195
  </div>
196
196
  </div>
197
197
  </div>
198
+ <div
199
+ v-if="row.flowHisFileList"
200
+ class="n20-description-c n20-description-bgc"
201
+ style="margin-top: 0 !important"
202
+ >
203
+ <span>{{ '附件信息' | $lc }}:</span>
204
+ <div class="flex-box">
205
+ <div
206
+ v-for="(res, i) in row.flowHisFileList"
207
+ :key="i"
208
+ class="m-a-ss color-primary pointer"
209
+ @click="preview(res)"
210
+ >
211
+ {{ res.fileName }}
212
+ </div>
213
+ </div>
214
+ <Dialog
215
+ v-drag
216
+ class="p-a-0"
217
+ :title="'附件预览' | $lc"
218
+ :visible.sync="visibleP"
219
+ top="2vh"
220
+ width="96%"
221
+ :close-on-click-modal="false"
222
+ @close="closeSee"
223
+ >
224
+ <span class="file-upload-table_preview-pn">
225
+ <el-button plain size="mini" @click="downFile(seeRow)">下载</el-button>
226
+ </span>
227
+ <div v-if="visibleP" class="p-a" style="height: 82vh">
228
+ <!-- <ViewerImg v-if="imgType.test(previewName)" :options="viewerOptions" style="height: 100%">
229
+ <img :src="previewUrl" :alt="previewName" style="display: none" />
230
+ </ViewerImg> -->
231
+ <component
232
+ :is="previewSameOrg ? 'object' : 'div'"
233
+ :key="previewUrl"
234
+ :data="previewUrl"
235
+ style="width: 100%; height: 100%"
236
+ >
237
+ <div class="flex-column flex-c flex-v" style="height: 100%">
238
+ <i class="el-icon-s-release" style="font-size: 60px; color: #999"></i>
239
+ <span style="margin-top: 16px">
240
+ {{ '不支持在线预览,请' | $lc
241
+ }}<el-link type="primary" @click="downFile(seeRow)">{{ '下载' | $lc }}</el-link
242
+ >{{ '到本地查看' | $lc }}
243
+ </span>
244
+ </div>
245
+ </component>
246
+ </div>
247
+ </Dialog>
248
+ </div>
198
249
  </template>
199
250
  </div>
200
251
  </el-timeline>
@@ -93,7 +93,13 @@ vxeTable.formats.mixin({
93
93
  // 四舍五入金额,每隔3位逗号分隔,默认2位数
94
94
  formatAmount({ cellValue }) {
95
95
  if (cellValue || cellValue === 0) {
96
- return numerify(cellValue, '0,0.00')
96
+ // 判断是否为字符串类数字
97
+ if (/^-?\d+(\.\d+)?$/.test(cellValue)) {
98
+ return numerify(cellValue, '0,0.00')
99
+ } else {
100
+ return cellValue
101
+ }
102
+ // return numerify(cellValue, '0,0.00')
97
103
  } else {
98
104
  return '--'
99
105
  }