Browse Source

2个bug修复

laiguoran 5 years atrás
parent
commit
d203298eef
2 changed files with 3 additions and 14 deletions
  1. 2 2
      app/controller/stage_controller.js
  2. 1 12
      app/public/js/material.js

+ 2 - 2
app/controller/stage_controller.js

@@ -1092,7 +1092,7 @@ module.exports = app => {
                 ctx.redirect('/tender/' + ctx.tender.id + '/measure/stage/' + ctx.params.order);
             }
         }
- 
+
         /**
          * 审核比较 页面 (Get)
          * @param ctx
@@ -1147,7 +1147,7 @@ module.exports = app => {
                 await this._getStageAuditViewData(ctx);
                 const renderData = await this._getDefaultRenderData(ctx);
                 renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.stage.bwtz);
-                await this.layout('stage/bwtz.ejs', renderData);
+                await this.layout('stage/bwtz.ejs', renderData, 'stage/audit_modal.ejs');
             } catch (err) {
                 this.log(err);
                 ctx.redirect('/tender/' + ctx.tender.id + '/measure/stage/' + ctx.params.order);

+ 1 - 12
app/public/js/material.js

@@ -242,8 +242,7 @@ $(document).ready(() => {
                 const select = SpreadJsObj.getSelectObject(info.sheet);
                 const col = info.sheet.zh_setting.cols[info.col];
                 // 未改变值则不提交
-                const validText = info.editingText ? trimInvalidChar(info.editingText) : null;
-                console.log(validText);
+                const validText = !isNaN(info.editingText) ? info.editingText : (info.editingText ? trimInvalidChar(info.editingText) : null);
                 const orgValue = select[col.field];
                 if (orgValue == validText || ((!orgValue || orgValue === '') && (validText === ''))) {
                     SpreadJsObj.reLoadRowData(info.sheet, info.row);
@@ -653,13 +652,3 @@ $(document).ready(() => {
         }
     });
 });
-//
-// const pasteExpr = function (e, obj) {
-//     let text = e.clipboardData.getData('text');
-//     e.preventDefault();
-//     text = trimInvalidChar(_.trim(text));
-//     const start = obj.selectionStart, end = obj.selectionEnd;
-//     obj.value = obj.value.substr(0, start) + text + obj.value.substring(end, obj.value.length);
-//     obj.selectionStart = start + text.length;
-//     obj.selectionEnd = start + text.length;
-// };