浏览代码

//表冲突,先注释掉奥林的std_glj_lib_map.js代码

zhongzewei 7 年之前
父节点
当前提交
ee52422e2f
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 2 1
      modules/common/std/schemas/std_glj_lib_map.js
  2. 0 2
      web/maintain/std_glj_lib/js/gljComponent.js

+ 2 - 1
modules/common/std/schemas/std_glj_lib_map.js

@@ -5,6 +5,7 @@
  * @date 2017/8/16
  * @version
  */
+/*
 import mongoose from "mongoose";
 
 let Schema = mongoose.Schema;
@@ -33,4 +34,4 @@ let modelSchema = {
 };
 
 let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
-export {model as default, collectionName as collectionName};
+export {model as default, collectionName as collectionName};*/

+ 0 - 2
web/maintain/std_glj_lib/js/gljComponent.js

@@ -303,7 +303,6 @@ let gljComponentOprObj = {
             let row = info.cellRange.row;
             for(let i = 0; i < items.length; i++){
                 if(row + i < that.currentComponent.length){
-                    console.log(1)
                     let currentObj = that.currentComponent[row + i];
                     if(items[i].consumeAmt.trim().length > 0 && items[i].consumeAmt !== currentObj.consumeAmt){
                         isChange = true;
@@ -320,7 +319,6 @@ let gljComponentOprObj = {
                     }
                 }
                 else{
-                    console.log(2);
                     me.workBook.getSheet(0).setValue(row + i, info.cellRange.col, '');
                 }
             }