bills template

modules/templates/controllers/bills_template_controller.js

@@ -1,44 +0,0 @@
-/**
- * 清单模板控制器
- * Created by Mai on 2017/4/17.
- */
-
-import BillsTemplateModel from "../../templates/models/bills_template_model";
-
-let callback = function(req, res, err, message, data){
-    res.json({error: err, message: message, data: data});
-};
-
-class BillsTemplateController {
-    /**
-     * 清单模板编辑页面
-     * @param req
-     * @param res
-     */
-    async index(req, res) {
-        let id = req.query.id;
-        let billsTemplateModel = new BillsTemplateModel();
-        let billsTemplateData = await billsTemplateModel.getTemplateData(id);
-
-        let renderData = {
-            valuationId: id,
-            billsTemplateData: billsTemplateData,
-            layout: 'users/views/layout/layout'
-        };
-        res.render('maintain/templates/html/bills', renderData);
-    };
-
-    async updateBillsTemplate (req, res) {
-        let data = JSON.parse(req.body.data);
-        let billsTemplateModel = new BillsTemplateModel();
-        let result = await billsTemplateModel.updateTemplate(data.user_id, data.valuationId, data.updateData);
-
-        if (result) {
-            callback(req, res, 0, '', data);
-        } else {
-            callback(req, res, 1, '更新数据错误', null);
-        }
-    };
-};
-
-export default BillsTemplateController;

modules/templates/routes/bills_template_router.js

@@ -1,26 +0,0 @@
-/**
- * Created by Mai on 2017/4/17.
- */
-
-import Express from "express";
-import baseController from './../../common/base/base_controller.js';
-import billsTemplateController from './../controllers/bills_template_controller';
-
-const router = Express.Router();
-const BaseController = new baseController();
-const BillsTemplateController = new billsTemplateController();
-
-module.exports = function (app) {
-    app.get('/template/bills/:id', BaseController.auth, BaseController.init, BillsTemplateController.index);
-
-    router.post('/updateBillsTemplate', BaseController.auth, BaseController.init, BillsTemplateController.updateBillsTemplate);
-    app.use('/template/bills/api', router);
-}
-
-
-
-
-
-
-
-

modules/users/controllers/compilation_controller.js

@@ -11,7 +11,7 @@ import STDRationLibMapModel from "../../common/std/std_ration_lib_map_model";
 import STDBillLibListsModel from "../../common/std/std_bills_lib_lists_model";
 import STDGLJLibMapModel from "../../common/std/std_glj_lib_map_model";
 import {default as EngineeringConst, List as EngineeringList} from "../../common/const/engineering";
-import BillsTemplateModel from "../../templates/models/bills_template_model";
+import BillsTemplateModel from "../models/bills_template_model";
 
 class CompilationController extends BaseController {
 
@@ -383,13 +383,14 @@ class CompilationController extends BaseController {
         let section = request.params.section;
         let data = JSON.parse(request.body.data);
 
+        console.log(data);
         let billsTemplateModel = new BillsTemplateModel();
         let result = await billsTemplateModel.updateTemplate(valuationId, data);
 
         if (result) {
-            callback(request, response, 0, '', data);
+            response.json({error: 0, message: '', data: data});
         } else {
-            callback(request, response, 1, '更新数据错误', null);
+            response.json({error: 1, message: '更新数据错误', data: null});
         }
     }
 

modules/templates/models/bills_template_model.js

@@ -46,17 +46,23 @@ class BillsTemplateModel extends BaseModel {
     async updateTemplate (valuationId, datas) {
         try {
             for (let data of datas) {
-                data.valuationId = valuationId;
+                data.data.valuationId = valuationId;
                 let condition = {valuationId: valuationId, ID: data.data.ID}, result;
-                if (data.updateType === 'update') {
+                if (data.type === 'update') {
                     result = await this.db.update(condition, data.data);
-                } else if (data.updateType === 'new') {
+                    if (result === undefined || result.ok ===undefined || !result.ok) {
+                        throw '更新数据错误';
+                    }
+                } else if (data.type === 'new') {
                     result = await this.db.create(data.data);
-                } else if (data.updateType === 'delete') {
+                    if (!result) {
+                        throw '新增数据错误';
+                    }
+                } else if (data.type === 'delete') {
                     result = await this.db.delete(condition);
-                }
-                if (result === undefined || result.ok ===undefined || !result.ok) {
-                    throw '更新数据错误';
+                    if (result === undefined || result.ok ===undefined || !result.ok) {
+                        throw '删除数据错误';
+                    }
                 }
             }
             return true;

modules/users/models/compilation_model.js

@@ -73,6 +73,7 @@ class CompilationModel extends BaseModel {
 
         this.setScene('add');
         data.create_time = new Date().getTime();
+        console.log(data);
         result = this.db.create(data);
         return result;
     }

web/users/js/compilation.js

@@ -246,9 +246,6 @@ function initCompilation() {
     let rationLibData = rationList === undefined ? [] : JSON.parse(rationList);
     let gljLibData = gljList === undefined ? [] : JSON.parse(gljList);
 
-    if (billListData.length <= 0 || rationLibData.length <= 0 || gljLibData.length <= 0) {
-        return false;
-    }
     // 初始化 造价书列设置
     colSpread = TREE_SHEET_HELPER.createNewSpread($('#main-tree-col')[0]);
     let billsTemplateTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1});
@@ -256,6 +253,10 @@ function initCompilation() {
     TREE_SHEET_HELPER.loadSheetHeader(JSON.parse(mainTreeCol), colSpread.getActiveSheet());
     TREE_SHEET_HELPER.showTreeData(JSON.parse(mainTreeCol), colSpread.getActiveSheet(), billsTemplateTree);
 
+    if (billListData.length <= 0 || rationLibData.length <= 0 || gljLibData.length <= 0) {
+        return false;
+    }
+
     // 标准清单
     let html = '';
     for(let tmp of billListData) {

web/users/js/template.js

@@ -190,7 +190,7 @@ $(document).ready(function () {
         } else {
             updateData = controller.tree.getInsertData();
         }
-        if (updateData.updateData.length > 0) {
+        if (updateData.length > 0) {
             CommonAjax.post(updateUrl, updateData, function (data) {
                 controller.insert();
                 controller.showTreeData();