Переглянути джерело

1. 查询章节定额,应排序
2. 定额库 & 清单规则,界面显示调整

MaiXinRong 7 роки тому
батько
коміт
15804af3a1

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

@@ -47,7 +47,7 @@ var counter = require('../../../public/counter/counter');
 var rationItemDAO = function(){};
 
 rationItemDAO.prototype.getRationItemsBySection = function(sectionId,callback){
-    rationItemModel.find({"sectionId": sectionId, "$or": [{"isDeleted": null}, {"isDeleted": false} ]},function(err,data){
+    rationItemModel.find({"sectionId": sectionId, "$or": [{"isDeleted": null}, {"isDeleted": false} ]}, null, {sort: {code: 1}}, function(err,data){
         if(err) callback(true, "Fail to get items", "")
         else callback(false,"Get items successfully", data);
     })

+ 5 - 5
web/building_saas/main/js/views/std_bills_lib.js

@@ -218,7 +218,7 @@ var billsLibObj = {
         ],
         "defaultRowHeight": 21,
         "cols":[{
-            "width":150,
+            "width":160,
             "readOnly": true,
             "head":{
                 "titleNames":["项目编码"],
@@ -235,7 +235,7 @@ var billsLibObj = {
                 "font":"Arial"
             }
         }, {
-            "width":120,
+            "width":150,
             "readOnly": true,
             "head":{
                 "titleNames":["项目名称"],
@@ -252,7 +252,7 @@ var billsLibObj = {
                 "font":"Arial"
             }
         }, {
-            "width":40,
+            "width":50,
             "readOnly": true,
             "head":{
                 "titleNames":["计量单位"],
@@ -295,7 +295,7 @@ var billsLibObj = {
         "headRowHeight":[25],
         "defaultRowHeight": 21,
         "cols":[{
-            "width":200,
+            "width":160,
             "readOnly":true,
             "head":{
                 "titleNames":["工作内容"],
@@ -319,7 +319,7 @@ var billsLibObj = {
         "headRowHeight":[25],
         "defaultRowHeight": 21,
         "cols":[{
-            "width":200,
+            "width":160,
             "readOnly":true,
             "head":{
                 "titleNames":["项目特征"],

+ 5 - 5
web/building_saas/main/js/views/std_ration_lib.js

@@ -131,7 +131,7 @@ var rationLibObj = {
         "defaultRowHeight": 21,
         "treeCol": 0,
         "cols":[{
-            "width":300,
+            "width":400,
             "readOnly": true,
             "head":{
                 "titleNames":["名称"],
@@ -155,7 +155,7 @@ var rationLibObj = {
         "headRowHeight":[20],
         "defaultRowHeight": 21,
         "cols":[{
-            "width":100,
+            "width":60,
             "readOnly": true,
             "head":{
                 "titleNames":["编码"],
@@ -172,7 +172,7 @@ var rationLibObj = {
                 "font":"Arial"
             }
         }, {
-            "width":180,
+            "width":220,
             "readOnly": true,
             "head":{
                 "titleNames":["名称"],
@@ -189,7 +189,7 @@ var rationLibObj = {
                 "font":"Arial"
             }
         }, {
-            "width":50,
+            "width":55,
             "readOnly":true,
             "head":{
                 "titleNames":["单位"],
@@ -206,7 +206,7 @@ var rationLibObj = {
                 "font":"Arial"
             }
         }, {
-            "width":80,
+            "width":60,
             "readOnly":true,
             "head":{
                 "titleNames":["基价"],