Explorar el Código

附注条件体验调整。

Chenshilong hace 8 años
padre
commit
0808eae319

+ 1 - 1
modules/ration_repository/models/coe.js

@@ -23,7 +23,7 @@ var coeListSchema = mongoose.Schema({
     name: String,                       // 名称
     content: String,                    // 说明
     coes: [coeSchema]
-});
+}, {versionKey: false});
 
 var coeListModel = db.model("coeLists",coeListSchema, "coeLists")
 

+ 7 - 10
web/maintain/ration_repository/js/coe.js

@@ -32,7 +32,7 @@ var coeList = {
     tempID: -999999,       // 本地新增一条数据给的默认ID,用作标记,服务端返回新ID后替换该ID
 
     colDefMain: [
-        {name: "ID", displayName: "编号", size: 60, hAlign: "center", readOnly: true},
+        {name: "ID", displayName: "ID", size: 60, hAlign: "center", readOnly: true},
         {name: "name", displayName: "名称", size: 280},
         {name: "content", displayName: "内容", size: 250}
     ],
@@ -137,6 +137,8 @@ var coeList = {
         if (obj.ID == undefined){           // 空行录入,即新增
             obj.libID = me.libID;
             obj.ID = me.tempID;
+            if (obj.name == undefined){obj.name = '';};     // 生成属性,令属性存储顺序一致
+            if (obj.content == undefined){obj.content = '';};
             obj.coes = [{coeType:"全部", operator:"*", amount: "0"}];
             me.datas[row] = obj;
 
@@ -148,7 +150,7 @@ var coeList = {
             var sheet = me.mainSpread.getSheet(0);
             me.showNullRow(sheet);
         }
-        else{                               // 正常修改
+        else{ // 正常修改
             me.save([],[],[obj]);
         };
     },
@@ -172,7 +174,7 @@ var coeList = {
         var detailDatas = me.datas[mainRow].coes;
         var curDetailData = detailDatas[detailRow];
 
-        if (curDetailData !== undefined){       // 如果是空白行输入,curDetailData为undefined。
+        if (curDetailData !== undefined){       // 当在空白行输入时,curDetailData为undefined。
             var curType = curDetailData.coeType;
             if (curType !== '单个'){
                 me.detailSpread.suspendPaint();
@@ -180,13 +182,8 @@ var coeList = {
                 me.detailSpread.resumePaint();
             };
 
-            if (curDetailData.operator == undefined){
-                curDetailData.operator = "*";
-            };
-
-            if (curDetailData.amount == undefined){
-                curDetailData.amount = "0";
-            };
+            if (curDetailData.operator == undefined){ curDetailData.operator = "*"; } ;
+            if (curDetailData.amount == undefined){ curDetailData.amount = "0"; } ;
         };
 
 /*        var curType = args.sheet.getValue(detailRow, 0);