Explorar el Código

定额库系数调整,工料机ID换成工料机Code。

Chenshilong hace 8 años
padre
commit
5820ecfbdc

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

@@ -11,7 +11,7 @@ var counter = require('../../../public/counter/counter');
 var coeSchema = mongoose.Schema({
     coeType: String,                // 系数类型,指作用范围:
                                     // 单个(如:111量0.001)、人工类、材料类、机械类、全部(如:定额×0.925)。
-    gljID: Number,                  // 要调整的工料机ID(当coeType=0时有效)
+    gljCode: String,                  // 要调整的工料机Code(当coeType=0时有效)
     operator: String,               // 运算符(*、+、-、=)
     amount: String,                 // 调整的量
     _id: false

+ 4 - 4
web/maintain/ration_repository/js/coe.js

@@ -38,7 +38,7 @@ var coeList = {
     ],
     colDefContent: [
         {name: "coeType", displayName: "类型", size: 100, hAlign: "center"},
-        {name: "gljID", displayName: "工料机ID", size: 100, hAlign: "center",formatter: "00000000"},
+        {name: "gljCode", displayName: "工料机编号", size: 100, hAlign: "center",formatter: "00000000"},
         {name: "operator", displayName: "操作符", size: 60, hAlign: "center"},
         {name: "amount", displayName: "数量", size: 80, hAlign: "right"}
     ],
@@ -51,7 +51,7 @@ var coeList = {
         me.detailSpread = sheetObj.create($('#contentSpread')[0], me.colDefContent, me.datas[0].coes);
 
         var coeType = new GC.Spread.Sheets.CellTypes.ComboBox();
-        coeType.items(["单个","全部","人工类","材料类","机械类"]);
+        coeType.items(["单个","定额","人工","材料","机械"]);
         me.detailSpread.getSheet(0).getRange(-1, 0, -1, 1).cellType(coeType);
 
         var operType = new GC.Spread.Sheets.CellTypes.ComboBox();
@@ -139,7 +139,7 @@ var coeList = {
             obj.ID = me.tempID;
             if (obj.name == undefined){obj.name = '';};     // 生成属性,令属性存储顺序一致
             if (obj.content == undefined){obj.content = '';};
-            obj.coes = [{coeType:"全部", operator:"*", amount: "0"}];
+            obj.coes = [{coeType:"定额", operator:"*", amount: "0"}];
             me.datas[row] = obj;
 
             me.save([obj],[],[]);
@@ -178,7 +178,7 @@ var coeList = {
             var curType = curDetailData.coeType;
             if (curType !== '单个'){
                 me.detailSpread.suspendPaint();
-                curDetailData.gljID = null;
+                curDetailData.gljCode = null;
                 me.detailSpread.resumePaint();
             };