added my rations modules and webs files ,as well as some lines in server.js

modules/rations/RationDB/Schemas.js

@@ -7,25 +7,10 @@ var RationLibMapSchema = mongoose.Schema({
 })
 
 var connectMap = function(callBack){
-    var db = mongoose.createConnection("localhost","rationLibMap");
+    var db = mongoose.createConnection("192.168.1.184","rationLibMap",60666);
     callBack(db);
 }
 
-/*var connectDB = function(str,callBack){//查找rationLibMap数据库找出ID，按ID查找需要连接的数据库
-    var db = mongoose.createConnection("localhost","rationLibMap");
-    var LibMapModel = db.model("rationlibmaps",RationLibMapSchema);
-   LibMapModel.find({DisplayName:str}, function(err, data){
-           if (data.length) {
-               var DBName = data[0].DBName;
-               var db = mongoose.createConnection("localhost",DBName);
-               callBack(db);
-           }
-           else {
-               var newDB = new LibMapModel({DisplayName: str,DBName:str});
-               newDB.save();
-           }
-    })
-}*/
 
 
 

modules/rations/RationDB/interfaces.js

@@ -10,7 +10,7 @@ var callback = function(req,res,err,data){
     else
     if(err){
         res.status(500)
-        res.json({success:false,error:"e"});
+        res.json({success:false,error:err});
     }
     else{
         res.status(204);
@@ -42,7 +42,7 @@ inserts.RationSectionInsert = function(req,res){//find and updata;
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length) {
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost", realRationName);
+                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
                 var RationTreeModel = db.model("rationtrees", Schemas.RationTreeSchema);
                 RationTreeModel.find({"SectionID":rationSection.SectionID},function(err,data){
                     if(data.length){
@@ -75,15 +75,23 @@ inserts.RationItemsInsert = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var GLJListModel =db.model("rationitems",Schemas.RationItemsSchema);
-                new GLJListModel(rationItem).save(function(err){
-                    if(err){
-                        callback(req,res,"",false);
-                    }else{
-                        callback(req,res,false,"");
-                    }
+                //加控制语句
+                GLJListModel.find({"RationCode":rationItem.RationCode},function(err,data){
+                    if(data.length)
+                        callback(req,res,"定额号重复！",false)
+                    else
+                    new GLJListModel(rationItem).save(function(err){
+                        if(err){
+                            callback(req,res,"",false);
+                        }else{
+                            callback(req,res,false,"");
+                        }
+                    })
                 })
+
+
             }
         })
     })
@@ -97,15 +105,20 @@ inserts.GLJListInsert = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
-                new GLJListModel(glj).save(function(err){
-                    if(err){
-                        callback(req,res,"",false);
-                    }else{
-                        callback(req,res,false,"");
-                    }
+                GLJListModel.find({"GLJCode":glj.GLJCode},function(err,data){
+                    if(data.length) callback(req,res,"工料机号重复！",false)
+                    else
+                        new GLJListModel(glj).save(function(err){
+                            if(err){
+                                callback(req,res,"新增工料机错误！",false);
+                            }else{
+                                callback(req,res,false,"");
+                            }
+                        })
                 })
+
             }
         })
     })
@@ -118,15 +131,20 @@ inserts.RationGLJInsert = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var GLJListModel =db.model("rationgljs",Schemas.RationGLJSchema);
-                new GLJListModel(rationGLJ).save(function(err){
-                    if(err){
-                        callback(req,res,"",false);
-                    }else{
-                        callback(req,res,false,data);
-                    }
+                GLJListModel.find({"RationCode":rationGLJ.RationCode,"GLJCode":rationGLJ.GLJCode},function(err,data){
+                    if(data.length) callback(req,res,"不可在一条定额下套用相同定额多次",false)
+                    else
+                        new GLJListModel(rationGLJ).save(function(err){
+                            if(err){
+                                callback(req,res,"",false);
+                            }else{
+                                callback(req,res,false,data);
+                            }
+                        })
                 })
+
             }
         })
     })
@@ -143,7 +161,7 @@ inserts.TempRationTreeInsert = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var RationTreeModel =db.model("rationtrees",Schemas.RationTreeSchema);
                 for(i=0;i<rationTempTree.length;i++){
                     var node ={}
@@ -173,7 +191,7 @@ searchs.getRationTree = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var RationTreeModel =db.model("rationtrees",Schemas.RationTreeSchema);
                 RationTreeModel.find({},function(err,data){
                     if(data.length)
@@ -209,7 +227,7 @@ searchs.getGLJList = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
                 GLJListModel.find({},function(err,data){
                     if(data.length)
@@ -237,17 +255,13 @@ searchs.getGLJByCode = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
                 GLJListModel.find({"GLJCode":gljCode},function(err,data){
                     if(data.length)
-                    {
                         callback(req,res,false,data);
-                    }
                     else
-                    {
-                        callback(req,res,"",false)
-                    }
+                        callback(req,res,"无此工料机",false)
                 })
             }
         })
@@ -261,7 +275,7 @@ searchs.getRationGLJItems = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                var db = mongoose.createConnection("localhost",realRationName);
+                var db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var RationGLJModel =db.model("rationgljs",Schemas.RationGLJSchema);
                 RationGLJModel.find({"RationCode":rationCode},function(err,rationglj){
                     if(rationglj.length) callback(req,res,false,rationglj);
@@ -280,7 +294,7 @@ searchs.getGLJ = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
                 GLJListModel.find({"GLJCode":GLJCode},function(err,data){
                     if(data.length)
@@ -304,7 +318,7 @@ searchs.getRationsBySectionID = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var GLJListModel =db.model("rationitems",Schemas.RationItemsSchema);
                 GLJListModel.find({"SectionID":sectionID},function(err,data){
                     if(data.length)
@@ -320,6 +334,30 @@ searchs.getRationsBySectionID = function(req,res){
         })
     });
 }
+searchs.getRationByCode = function(req,res){
+    var DBName = req.body.rationName;
+    var rationCode =req.body.RationCode ;
+    Schemas.connectMap(function(db){
+        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
+        LibMapModel.find({"DisplayName":DBName},function(err,data){
+            if(data.length){
+                var realRationName = data[0].DBName;
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
+                var RationModel =db.model("rationitems",Schemas.RationItemsSchema);
+                RationModel.find({"RationCode":rationCode},function(err,data){
+                    if(data.length)
+                    {
+                        callback(req,res,false,data);
+                    }
+                    else
+                    {
+                        callback(req,res,"",false)
+                    }
+                })
+            }
+        })
+    });
+}
 removes.deleteRationLibs = function(req,res){//只删除了映射表内容  级联操作待完成
     var rationName = req.body.rationName;
     Schemas.connectMap(function(db){
@@ -338,7 +376,7 @@ removes.deleteRationSection =function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length) {
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost", realRationName);
+                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
                 var RationTreeModel = db.model("rationtrees", Schemas.RationTreeSchema);
                 RationTreeModel.remove({"SectionID":sectionID},function(err){
                     if(err){callback(req,res,"删除错误",false);}
@@ -356,7 +394,7 @@ removes.deleteGLJItem = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length) {
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost", realRationName);
+                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
                 var gljListModel = db.model("gljlists", Schemas.GLJListSchema);
                 gljListModel.remove({"GLJCode":gljItem},function(err){
                     if(err){callback(req,res,"删除错误",false);}
@@ -375,7 +413,7 @@ removes.deleteRation = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length) {
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost", realRationName);
+                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
                 var rationModel = db.model("rationitems",Schemas.RationItemsSchema);
                 rationModel.remove({"RationCode":delvalue},function(err){
                     if(err) callback(req,res,"err",false)
@@ -399,7 +437,7 @@ removes.deleteRationGLJ = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length) {
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost", realRationName);
+                db = mongoose.createConnection("192.168.1.184", realRationName,60666);
                 var rationModel = db.model("rationgljs",Schemas.RationGLJSchema);
                 rationModel.remove({"GLJCode":delvalue},function(err){
                     if(err)
@@ -433,7 +471,7 @@ updates.updateGLJItem = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
 
                 var GLJListModel =db.model("gljlists",Schemas.GLJListSchema);
                 GLJListModel.update({"GLJCode":GLJCode},glj,function(err){
@@ -453,7 +491,7 @@ updates.updateRationItem = function(req,res){
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var RationModel =db.model("rationitems",Schemas.RationItemsSchema);
                 RationModel.update({"RationCode":rationCode},rationItem,function(err){
                     if(err) callback(req,res,"err",false)
@@ -465,18 +503,39 @@ updates.updateRationItem = function(req,res){
 }
 updates.updateRGLJAmount = function(req,res){
     var DBName = req.body.rationName;
-    var gljCode = req.body.GLJCode;
-    var amount =JSON.parse(req.body.Amount);
+    var rationCode = req.body.RationCode;
+    var gljCdoe = req.body.GLJCode
+    var Amount = req.body.Amount;
     Schemas.connectMap(function(db){
         var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
         LibMapModel.find({"DisplayName":DBName},function(err,data){
             if(data.length){
                 var realRationName = data[0].DBName;
-                db = mongoose.createConnection("localhost",realRationName);
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
                 var RationModel =db.model("rationgljs",Schemas.RationGLJSchema);
-                RationModel.update({"GLJCode":gljCode},{$set:{"Amount":amount}},function(err){
+                RationModel.update({"RationCode":rationCode,"GLJCode":gljCdoe},{$set:{'Amount':Amount}},function(err){
+                    if(err) callback(req,res,"err",false)
+                    else callback(req,res,false,"ok");
+                })
+            }
+        })
+    })
+}
+updates.setRationBasePrice = function(req,res){
+    var DBName = req.body.rationName;
+    var rationCode = req.body.rationCode;
+    var basePrice = req.body.BasePrice;
+    Schemas.connectMap(function(db){
+        var LibMapModel = db.model("rationlibmaps",Schemas.RationLibMapSchema);
+        LibMapModel.find({"DisplayName":DBName},function(err,data){
+            if(data.length){
+                var realRationName = data[0].DBName;
+                db = mongoose.createConnection("192.168.1.184",realRationName,60666);
+                var RationModel =db.model("rationitems",Schemas.RationItemsSchema);
+                RationModel.update({"RationCode":rationCode},{$set:{'BasePrice':basePrice}},function(err){
                     if(err) callback(req,res,"err",false)
                     else callback(req,res,false,"ok");
+
                 })
             }
         })

web/rations/rations_route.js

@@ -1,22 +1,28 @@
 var express = require("express");
-var _rootDir = __dirname;
 var apiRouter =express.Router();
+var _rootDir = __dirname;
+
+var path = require('path');
+var htmlPath = path.join(__dirname,'../../../','web/rations/');
+apiRouter.get('/', function(req, res) {
+        res.redirect('/main');
+});
 
-var RationInterface = require(_rootDir+"/modules/rations/RationDB/interfaces");
+var RationInterface = require("../RationDB/interfaces");
 apiRouter.get("/main",function(req,res){
-    res.sendfile(_rootDir+"/web/rations/main.html");
+    res.render("rations/main.html");
 })
 
 apiRouter.get('/rationLib', function (req, res) {
-    res.sendFile(_rootDir+"/web/rations/dinge.html");
+    res.render("rations/dinge.html");
 });
 
 apiRouter.get('/gongliao', function (req, res) {
-    res.sendFile(_rootDir+"/web/rations/gongliao.html");
+    res.render("rations/gongliao.html");
 });
 
 apiRouter.get('/fuzhu', function (req, res) {
-    res.sendFile(_rootDir+"/web/rations/fuzhu.html");
+    res.render("rations/fuzhu.html");
 });
 apiRouter.post("/addRationName",RationInterface.insert.RationLibInsert);
 apiRouter.post("/getRationTree",RationInterface.search.getRationTree);
@@ -41,5 +47,7 @@ apiRouter.post("/deleteRationGLJ",RationInterface.remove.deleteRationGLJ);
 apiRouter.post("/editRation",RationInterface.remove.deleteRationGLJ);
 apiRouter.post("/editRGLJAmount",RationInterface.update.updateRGLJAmount);
 apiRouter.post("/editRationItem",RationInterface.update.updateRationItem);
+apiRouter.post("/getRationByCode",RationInterface.search.getRationByCode);
+apiRouter.post("/setRationBasePrice",RationInterface.update.setRationBasePrice);
 
 module.exports = apiRouter;

server.js

@@ -46,7 +46,7 @@ app.use('/', pmRouter);
 //zhangenping add 2017.0.13-----------------------------------------begin
 app.use(express.static(_rootDir+"/web"));
 app.use(express.static(_rootDir+"/lib"));
-var rations_Router = require(_rootDir+"/web/ration/rations_route");
+var rations_Router = require("./modules/rations/routes/rations_route");
 app.use("/ration",rations_Router);
 //-----------------------------------------------------------------end
 app.get('/main',  function(req, res) {

web/rations/dinge.html

@@ -227,7 +227,7 @@
                     </div>
                     <div class="form-group">
                       <label>基价</label>
-                      <input class="form-control" id="jijia" placeholder="输入基价" type="number">
+                      <input class="form-control" id="jijia" placeholder="输入基价" type="number" value=0 disabled = true>
                     </div>
                     <div class="form-group">
                       <label>显示名称（以%s表示参数）</label>
@@ -522,7 +522,7 @@
                     </div>
                     <div class="form-group">
                       <label>基价</label>
-                      <input class="form-control" placeholder="输入基价" type="number" value="880.84" id="ERjijia">
+                      <input class="form-control" placeholder="输入基价" type="number" value="0" id="ERjijia" disabled = true>
                     </div>
                     <div class="form-group">
                       <label>显示名称（以%s表示参数）</label>
@@ -896,6 +896,9 @@ var setting = {
         showRenameBtn: showRenameBtn
     },
     data: {
+        keep:{
+            leaf:true
+        },
         simpleData: {
             enable: true
         }
@@ -1122,14 +1125,8 @@ $("#gongliao").attr('href', "/ration/gongliao" + "?rationname=" + rationName);
 $("#rationAdd").click(function(){
     var section = treeObj.getSelectedNodes();
     var rationItem = {};
-    var $tr = $('<tr><td></td><td><a href="#"></a></td><td></td><td></td><td></td><td></td><td></td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td> </tr>');
-    var td1,td2,td3,td4,td5,td6,a;
     var code,name,danwei,jijia,xsname,qfzy;
-    td1 = $("td:eq(1)",$tr);td2 = $("td:eq(2)",$tr);td3 = $("td:eq(3)",$tr);td4 = $("td:eq(4)",$tr);td5 = $("td:eq(5)",$tr);td6 = $("td:eq(6)",$tr),a=$("a",td1);
     code = $("#code").val();name = $("#name").val();danwei=$("#danwei").val();jijia = $("#jijia").val();xsname = $("#xsname").val();qfzy=$("#qfzy").val();
-    a.text(code);td2.text(name);td3.text(danwei);td4.text(jijia);td5.text(xsname);td6.text(qfzy);
-    $tr.appendTo("#rationTbody");
-    bindRationClick();
     rationItem.RationCode = code;
     rationItem.RationName = name;
     rationItem.Unit = danwei;
@@ -1139,7 +1136,8 @@ $("#rationAdd").click(function(){
     rationItem.Caption = xsname;
     rationItem.FeeType = Number(qfzy)
     saveRationItem(rationItem);
-    bindRationDelete()
+/*    bindRationDelete()
+    bindRationClick();*/
 })
 //保存定额条目Ajax函数
 function saveRationItem(obj){
@@ -1152,10 +1150,11 @@ function saveRationItem(obj){
         cache:false,
         timeout:1000,
         success:function(result){
-
+            getRationItems(properties.selectedSection);
         },
-        error:function(){
-
+        error: function(jqXHR, textStatus, errorThrown){
+          var err = JSON.parse(jqXHR.responseText);
+            alert(err.error);
         }
     })
 }
@@ -1199,7 +1198,6 @@ function showRationItems(data){
 //绑定点击定额号
 function bindRationClick(){
     var tr = $("#rationTbody tr");
-
     var td = $("td:eq(1)",tr);
     td.each(function() {
         var a;
@@ -1270,7 +1268,7 @@ function bindRationGLJDelete(){
         })
     })
 }
-//为每条定额绑定删除事件
+//为每条定额绑定编辑事件
 function bindRationEdit(){
     $("#rationTbody tr").each(function() {
         var td7,td1,a2;
@@ -1281,8 +1279,26 @@ function bindRationEdit(){
         a2.click(function(){
             properties.Edit = "ration";
             properties.EditParam =str;
-         //   $("#delType").val("rationGLJ");
-         //   $("#delParam").val(str);
+            $.ajax({
+                type:"POST",
+                url:"http://localhost:6060/ration/getRationByCode",
+                data:{"rationName": rationName,"RationCode":str},
+                dataType:"json",
+                cache:false,
+                timeout:5000,
+                success:function(result){
+                    var ration = result.data[0];
+                    $("#ERcode").val(ration.RationCode).attr("disabled",true);
+                    $("#ERname").val(ration.RationName);
+                    $("#ERdanwei").find("option:selected").text(ration.Unit);
+                    $("#ERjijia").val(ration.BasePrice).attr("disabled",true);
+                    $("#ERxsmc").val(ration.Caption);
+                    $("#ERqfzy").val(ration.FeeType);
+                },
+                error:function(err){
+                }
+            })
+
         })
     })
 }
@@ -1297,11 +1313,15 @@ function bindRGLJAmountEdit(){
         a2 = $("input", td5);
 
         a2.blur(function () {
+            if(isNaN(a2.val()))
+            alert("请输入数值!");
+            else
             $.ajax({
                 type:"POST",
                 url:"http://localhost:6060/ration/editRGLJAmount",
                 dataType:"json",
-                data:{"rationName":rationName,"GLJCode":str,"Amount":Number(a2.val())},
+                data:{"rationName":rationName,"GLJCode":str,"RationCode":value,"Amount":Number(a2.val())},
+
                 cache:false,
                 timeout:50000,
                 success:function(result){
@@ -1314,25 +1334,10 @@ function bindRGLJAmountEdit(){
             })
         })
     })
+
 }
-//为每条定额工料机绑定编辑事件
-/*function bindRationGLJEdit(){
-    $("#rationGLJTbody tr").each(function() {
-        var td7, td1, a2;
-        td7 = $("td:eq(7)", $(this));
-        td1 = $("td:eq(1)", $(this));
-        var str = td1.text();
-        a2 = $("a:eq(0)", td7);
-        a2.click(function () {
-            properties.Edit = "rationGLJ";
-            properties.EditParam = str;
-            //   $("#delType").val("rationGLJ");
-            //   $("#delParam").val(str);
-        })
-    })
-}*/
-//点击编辑定额
 $("#Rbianji").click(function(){//设置定额号不可编辑
+
     var ERcode,ERname,ERdanwei,ERjijia,ERxsmc,ERqfzy,ration={};
     ERcode=$("#ERcode").val();
     ERname=$("#ERname").val();
@@ -1364,39 +1369,7 @@ $("#Rbianji").click(function(){//设置定额号不可编辑
         }
     })
 })
-/*$("#RGbianji").click(function(){
-    var ERGcode,ERGname,ERGdanwei,ERGjijia,ERGxh,ERGleixing,rationGLJ={};
-    ERGcode=$("#ERGcode").val();
-    ERGname=$("#ERGname").val();
-    ERGdanwei=$("#ERGdanwei").val();
-    ERGjijia=$("#ERGjijia").val();
-    ERGxh = $("#ERGxh").val();
-    ERGleixing=$("#ERGleixing").val();
-    rationGLJ.RationCode = $("#gljparam").val();
-    rationGLJ.GLJCode = ERGcode;
-    rationGLJ.Amount = ERGxh;
-    ration. = Number(ERjijia);
-    ration.SectionID = properties.selectedSection;
-    ration.ContentID = 0;
-    ration.Caption = ERxsmc;
-    ration.FeeType =Number(ERqfzy);
-    var rationItem = JSON.stringify(ration);
-    $.ajax({
-        type:"POST",
-        url:"http://localhost:6060/ration/editRationItem",
-        dataType:"json",
-        data:{"rationName":rationName,"RationCode":properties.EditParam,"newRation":rationItem},
-        cache:false,
-        timeout:50000,
-        success:function(result){
-            getRationItems(properties.selectedSection);
-        },
-        error:function(iqXHR,textStatus,errorThrown){
-            alert("error "+textStatus+" "+errorThrown);
-        }
-    })
-})*/
-//为每条定额绑定编辑事件
+//为每条定额绑定删除事件
 function bindRationDelete(){
     $("#rationTbody tr").each(function() {
         var td7, a1,td1,a2;
@@ -1467,19 +1440,36 @@ function showRationGLJ(obj){
         dexh = obj[i].dexh;
         Baseprice = Baseprice + Number(jijia)*Number(dexh);
         leixing =obj[i].GLJ.Type;
-        var $tr = $('<tr><td></td><td></td><td></td><td></td><td></td><td><input></td><td></td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#editBglj" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td> </tr>')
+        var $tr = $('<tr><td></td><td></td><td></td><td></td><td></td><td><input></td><td></td><td> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td> </tr>')
+        //<a href="javacript:void(0);" data-toggle="modal" data-target="#editBglj" title="编辑"><i class="fa fa-pencil-square-o"></i></a>
         var td0,td1,td2,td3,td4,td5,td6,a;
         td0 = $("td:eq(0)",$tr), td1 = $("td:eq(1)",$tr);td2 = $("td:eq(2)",$tr);td3 = $("td:eq(3)",$tr);td4 = $("td:eq(4)",$tr);td5 = $("td:eq(5)",$tr);a=$("input",td5);td6 = $("td:eq(6)",$tr);
         td0.text(i); td1.text(code);td2.text(name);td3.text(danwei);td4.text(jijia);a.val(dexh);td6.text(leixing)
         $tr.appendTo("#bglj tbody");
-
     }
     var s = $("#gljparam").val()
     $("#rationTbody tr").each(function(){
         var td = $("td:eq(1)",$(this))
         var s1 = td.text();
-        if ( s  == s1)
-            td.next().next().next().text(Baseprice)
+
+        if ( s  == s1){
+            td.next().next().next().text(Baseprice.toFixed(2));
+            $.ajax({
+                type:"POST",
+                url:"http://localhost:6060/ration/setRationBasePrice",
+                data:{"rationName": rationName,"rationCode":s,"BasePrice":Baseprice.toFixed(2)},
+                dataType:"json",
+                cache:false,
+                timeout:1000,
+                success:function(result){
+
+                },
+                error:function(err){
+
+                }
+            })
+        }
+
     })
     bindRGLJAmountEdit();
     bindRationGLJDelete();
@@ -1502,7 +1492,9 @@ $("#bt-glj").click(function(){
         success:function(result){
            getRationGLJItems($("#gljparam").val())
         },
-        error:function(){
+        error:function(err){
+            var error = JSON.parse(err.responseText);
+            alert(error.error);
         }
     })
 })
@@ -1518,13 +1510,14 @@ $("#bt-inputCode").blur(function(){
         timeout:5000,
         success:function(result){
           var glj = result.data[0];
-            $("#gljName").val(glj.GLJName);
-           // $("#gljdw").text(glj.Unit);
-            $("#gljdw").find("option:selected").text(glj.Unit);
-            $("#gljdj").val(glj.BasePrice);
-            $("#gljlx").val(glj.Type);
+            $("#gljName").val(glj.GLJName).attr("disabled",true);
+            $("#gljdw").find("option:selected").text(glj.Unit).attr("disabled","disabled");
+            $("#gljdj").val(glj.BasePrice).attr("disabled",true);
+            $("#gljlx").val(glj.Type).attr("disabled","disabled");
         },
         error:function(err){
+            var error = JSON.parse(err.responseText);
+            alert(error.error);
         }
     })
 })

web/rations/gongliao.html

@@ -371,13 +371,13 @@ $("#deleteGLJ").click(function(){
     })
 })
 function addGLJItems(){
-    var $tr = $('<tr> <td></td> <td></td> <td></td> <td></td> <td></td> <td></td> <td>人工</td> <td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td> </tr>');
-    var td1,td2,td3,td4,td5,td6;
+  //  var $tr = $('<tr> <td></td> <td></td> <td></td> <td></td> <td></td> <td></td> <td>人工</td> <td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td> </tr>');
+   // var td1,td2,td3,td4,td5,td6;
     var code,name,guige,danwei,jijia,leixin;
-    td1 = $("td:eq(1)",$tr);td2 = $("td:eq(2)",$tr);td3 = $("td:eq(3)",$tr);td4 = $("td:eq(4)",$tr);td5 = $("td:eq(5)",$tr);td6 = $("td:eq(6)",$tr);
+   // td1 = $("td:eq(1)",$tr);td2 = $("td:eq(2)",$tr);td3 = $("td:eq(3)",$tr);td4 = $("td:eq(4)",$tr);td5 = $("td:eq(5)",$tr);td6 = $("td:eq(6)",$tr);
     code = $("#gljcode").val();name = $("#gljname").val();guige = $("#gljgg").val();danwei=$("#gljdw").val();jijia = $("#gljjj").val();leixin = $("#gljlx").val();
-    td1.text(code);td2.text(name);td3.text(guige);td4.text(danwei);td5.text(jijia);td6.text(leixin)
-    $tr.appendTo("tbody");
+  //  td1.text(code);td2.text(name);td3.text(guige);td4.text(danwei);td5.text(jijia);td6.text(leixin)
+  //  $tr.appendTo("tbody");
         var gljItem = {}
         gljItem.GLJCode = code;
         gljItem.GLJName = name;
@@ -403,10 +403,11 @@ function saveGLJ(glj){
             cache:false,
             timeout:1000,
             success:function(result){
-
+                getGLJ();
             },
-            error:function(){
-
+            error:function(err){
+                var error = JSON.parse(err.responseText)
+                alert(error.error);
             }
             })