Browse Source

负数format问题

MaiXinRong 1 year ago
parent
commit
588416dd6a
2 changed files with 4 additions and 2 deletions
  1. 1 0
      app/controller/measure_controller.js
  2. 3 2
      app/extend/helper.js

+ 1 - 0
app/controller/measure_controller.js

@@ -70,6 +70,7 @@ module.exports = app => {
                 const order = JSON.parse(ctx.request.body.data).order;
                 const tenderId = ctx.params.id;
                 const stageInfo = await ctx.service.stage.getDataByCondition({ tid: tenderId, order });
+                await ctx.service.stage.loadStageUser(stageInfo);
                 await ctx.service.stage.loadStageAuditViewData(stageInfo);
                 ctx.body = { err: 0, msg: '', data: stageInfo };
             } catch (error) {

+ 3 - 2
app/extend/helper.js

@@ -952,7 +952,8 @@ module.exports = {
         return overWan ? getWan(overWan) + '万' + getWan(noWan) : getWan(num);
     },
     formatNum(num, pattern) {
-        const strarr = num ? num.toString().split('.') : ['0'];
+        const minus = num > 0 ? '' : '-'
+        const strarr = num ? Math.abs(num).toString().split('.') : ['0'];
         const fmtarr = pattern ? pattern.split('.') : [''];
         let retstr = '';
 
@@ -1002,7 +1003,7 @@ module.exports = {
                     break;
             }
         }
-        return retstr.replace(/^,+/, '').replace(/\.$/, '');
+        return minus + retstr.replace(/^,+/, '').replace(/\.$/, '');
     },
 
     dateTran(time, style = 'YYYY年MM月DD日 HH:mm') {