Explorar o código

增加字段shortName

zhongzewei %!s(int64=8) %!d(string=hai) anos
pai
achega
28fdfc3c86

+ 1 - 0
modules/ration_repository/models/glj_repository.js

@@ -26,6 +26,7 @@ var gljSchema = mongoose.Schema({
     name: String,
     specs: String,
     unit: String,
+    shortName: String,
     basePrice: Number,
     gljClass: Number, //这个是UI显示上的详细分类,对应gljTypeSchema
     gljType: Number  //人工,材料,机械

+ 1 - 0
public/web/sheet/sheet_common.js

@@ -157,6 +157,7 @@ var sheetCommonObj = {
                 items.forEach(function(item){
                     if(sheet.getValue(row, col) === item.text){
                         rst[setting.header[col].dataCode] = item.value;
+                        rst.shortName = repositoryGljObj.distTypeTree.distTypes[repositoryGljObj.distTypeTree.prefix + item.value].data.shortName;
                     }
                 });
             }

+ 6 - 0
web/maintain/bills_lib/html/neirong.html

@@ -287,7 +287,13 @@
                         crossedDatas.push(crossedData);
                     }
                 }
+                console.log(`uncD`);
+                console.log(uncrossedDatas);
+                console.log(`cD`);
+                console.log(crossedDatas);
                 let encapDatas = tools.encapTotalJobsDatas(sheet, totalJobs, uncrossedDatas, crossedDatas);
+                console.log(`encapD`);
+                console.log(encapDatas);
                 if(encapDatas.updateDatas.length > 0 || encapDatas.createDatas.length >0){
                     jobsAjax.pasteJobs(encapDatas, function(datas){
                         pasteController.pasteJobsFront(sheet, totalJobs,datas);