add billID to ration glj ,send shortName to project glj

modules/ration_glj/facade/ration_glj_facade.js

@@ -157,6 +157,7 @@ function createNewRecord(ration_glj) {
     newRecoed.from=ration_glj.from?ration_glj.from:undefined;
     newRecoed.createType=ration_glj.createType?ration_glj.createType:undefined;
     newRecoed.shortName = ration_glj.shortName;
+    newRecoed.billsItemID=ration_glj.billsItemID,
     newRecoed.type = ration_glj.type;
     newRecoed.repositoryId = ration_glj.repositoryId;
     newRecoed.projectGLJID=ration_glj.projectGLJID;
@@ -622,6 +623,7 @@ function getGLJSearchInfo(ration_glj) {
         project_id: ration_glj.projectID,
         code: ration_glj.code,
         name: ration_glj.name,
+        shortName:ration_glj.shortName,
         specs: ration_glj.specs,
         unit: ration_glj.unit,
         type: ration_glj.type,

modules/ration_glj/models/ration_glj.js

@@ -17,6 +17,7 @@ var ration_glj = new Schema({
     specs:String,
     unit:String,
     shortName:String,
+    billsItemID: Number,
     type:Number,
     quantity:Number,
     customQuantity:Number,

web/building_saas/main/js/models/ration_glj.js

@@ -182,6 +182,7 @@ var ration_glj = {
                     newGLJ.projectID = newRation.projectID;
                     newGLJ.GLJID = temdata.gljId;
                     newGLJ.rationID = newRation.ID;
+                    newGLJ.billsItemID=newRation.billsItemID,
                     newGLJ.rationItemQuantity= temdata.consumeAmt;
                     newGLJ.quantity=temdata.consumeAmt;
                     newGLJ.glj_repository_id=data.rationRepId;
@@ -327,6 +328,7 @@ var ration_glj = {
                   projectID:ration.projectID,
                   GLJID:glj.ID,
                   rationID:ration.ID,
+                  billsItemID:ration.billsItemID,
                   rationItemQuantity:0,
                   quantity:0,
                   name:glj.name,

web/building_saas/main/js/views/fee_rate_view.js

@@ -302,7 +302,7 @@ var feeRateObject={
                 var offset=hitinfo.cellRect.x+hitinfo.cellRect.width-6;
                 var imageMagin=3;
                 var imageHeight = hitinfo.cellRect.height-2*imageMagin;
-                var imageWidth = imageHeight* 4/3;
+                var imageWidth = hitinfo.cellRect.width*2/7;
                 if(hitinfo.x<offset&&hitinfo.x>offset-imageWidth){
                     me.showSelectModal(hitinfo);
                 }