定额安装费排序

modules/all_models/compleRation_installFeeItem.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  *
@@ -9,13 +9,14 @@
  */
 
 /*
-* 补充定额库用户新增安装增加费费用项
-*
-* */
-const mongoose = require('mongoose');
+ * 补充定额库用户新增安装增加费费用项
+ *
+ * */
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
 //补充安装增加费-费用项
-const installFeeItemSchema = new Schema({
+const installFeeItemSchema = new Schema(
+  {
     userId: String,
     compilationId: String,
     ID: String,
@@ -23,7 +24,10 @@ const installFeeItemSchema = new Schema({
     feeType: String, //费用类型
     position: String, //记取位置
     section: [],
-    deleted: false
-}, {versionKey: false});
+    deleted: false,
+    seq: Number,
+  },
+  { versionKey: false }
+);
 
-mongoose.model('complementary_ration_installation', installFeeItemSchema, 'complementary_ration_installation');
+mongoose.model("complementary_ration_installation", installFeeItemSchema, "complementary_ration_installation");

modules/all_models/installation_fee.js

@@ -5,10 +5,11 @@ import mongoose from "mongoose";
 let Schema = mongoose.Schema;
 
 //安装增加费-费用规则
-let feeRuleSchema = new Schema({
+let feeRuleSchema = new Schema(
+  {
     ID: String,
     sectionId: String, //分册章节id
-    feeItemId:String,
+    feeItemId: String,
     code: String,
     rule: String,
     base: String,
@@ -16,36 +17,49 @@ let feeRuleSchema = new Schema({
     labour: Number,
     material: Number,
     machine: Number,
-    position: String,//记取位置
-    billID:String//记取位置对应的清单ID
-},{versionKey:false,_id: false});
+    position: String, //记取位置
+    billID: String, //记取位置对应的清单ID
+  },
+  { versionKey: false, _id: false }
+);
 
 //安装增加费-分册章节
-let installSectionSchema = new Schema({
+let installSectionSchema = new Schema(
+  {
     ID: String,
     feeItemId: String,
     feeRuleId: String,
-    name: String
-},{versionKey:false,_id: false});
+    name: String,
+    seq: Number,
+  },
+  { versionKey: false, _id: false }
+);
 
 //安装增加费-费用项
-let installFeeItemSchema = new Schema({
+let installFeeItemSchema = new Schema(
+  {
     ID: String,
     feeItem: String, //费用项
     feeType: String, //费用类型
-    position: String,//记取位置
-    billID:String,//记取位置对应的清单ID
-    isCal: {type: Number,default:0}//是否记取0:false 1:true
-},{versionKey:false,_id: false});
+    position: String, //记取位置
+    billID: String, //记取位置对应的清单ID
+    isCal: { type: Number, default: 0 }, //是否记取0:false 1:true
+    seq: Number,
+  },
+  { versionKey: false, _id: false }
+);
 
-let installationFeeSchema = new Schema({
-    ID:String,
-    libID:Number,
-    libName:String,
-    projectID:String,
-    installFeeItem:[installFeeItemSchema],
-    installSection:[installSectionSchema],
-    feeRule:[feeRuleSchema]
-},{versionKey:false});
+let installationFeeSchema = new Schema(
+  {
+    ID: String,
+    libID: Number,
+    libName: String,
+    projectID: String,
+    installFeeItem: [installFeeItemSchema],
+    installSection: [installSectionSchema],
+    feeRule: [feeRuleSchema],
+  },
+  { versionKey: false }
+);
 
-mongoose.model("installation_fee",installationFeeSchema,"installation_fee");
+mongoose.model("installation_fee", installationFeeSchema, "installation_fee");

modules/all_models/stdRation_installFeeItem.js

@@ -2,17 +2,21 @@
  * Created by Zhong on 2018/3/22.
  */
 /*标准定额库-安装费用项*/
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
 //标准安装增加费-费用项
-const installFeeItemSchema = new Schema({
+const installFeeItemSchema = new Schema(
+  {
     rationRepId: Number,
     ID: String,
     feeItem: String, //费用项
     feeType: String, //费用类型
     position: String, //记取位置
     section: [],
-    deleted: false
-}, {versionKey: false});
+    deleted: false,
+    seq: Number,
+  },
+  { versionKey: false }
+);
 
-mongoose.model('std_ration_lib_installation', installFeeItemSchema, 'std_ration_lib_installation');
+mongoose.model("std_ration_lib_installation", installFeeItemSchema, "std_ration_lib_installation");

modules/all_models/stdRation_installSection.js

@@ -2,28 +2,32 @@
  * Created by Zhong on 2018/3/22.
  */
 /*标准定额库-安装分册章节*/
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
 //安装增加费-费用规则
 const feeRuleSchema = new Schema({
-    ID: String,
-    code: String,
-    rule: String,
-    base: String,
-    feeRate: Number,
-    labour: Number,
-    material: Number,
-    machine: Number
+  ID: String,
+  code: String,
+  rule: String,
+  base: String,
+  feeRate: Number,
+  labour: Number,
+  material: Number,
+  machine: Number,
 });
 
 //标准安装增加费-分册章节
-const installSectionSchema = new Schema({
+const installSectionSchema = new Schema(
+  {
     rationRepId: Number,
     ID: String,
     feeItemId: String,
     name: String,
     feeRule: [feeRuleSchema],
-    deleted: false
-}, {versionKey: false});
+    seq: Number,
+    deleted: false,
+  },
+  { versionKey: false }
+);
 
-mongoose.model('std_ration_lib_installationSection', installSectionSchema, 'std_ration_lib_installationSection');
+mongoose.model("std_ration_lib_installationSection", installSectionSchema, "std_ration_lib_installationSection");

modules/ration_repository/controllers/installation_controller.js

@@ -1,42 +1,42 @@
 /**
  * Created by Zhong on 2018/1/24.
  */
-import BaseController from '../../common/base/base_controller';
-import InstallationDao from '../models/installation';
+import BaseController from "../../common/base/base_controller";
+import InstallationDao from "../models/installation";
 
 let installationDao = new InstallationDao();
-let callback = function(req,res,err,message, data){
-    res.json({error: err, message: message, data: data});
+let callback = function (req, res, err, message, data) {
+  res.json({ error: err, message: message, data: data });
 };
 
-class InstallationController extends BaseController{
-    getInstallation(req, res){
-        let data = JSON.parse(req.body.data);
-        installationDao.getInstallation(data.rationRepId, function (err, data) {
-            callback(req, res, err, '', data);
-        });
-    }
+class InstallationController extends BaseController {
+  getInstallation(req, res) {
+    let data = JSON.parse(req.body.data);
+    installationDao.getInstallation(data.rationRepId, function (err, data) {
+      callback(req, res, err, "", data);
+    });
+  }
 
-    updateSection(req, res){
-        let data = JSON.parse(req.body.data);
-        installationDao.updateSection(data.updateData, function (err, data) {
-            callback(req, res, err, '', data);
-        });
-    }
+  updateSection(req, res) {
+    let data = JSON.parse(req.body.data);
+    installationDao.updateSection(data.updateData, function (err, data) {
+      callback(req, res, err, "", data);
+    });
+  }
 
-    updateFeeItem(req, res){
-        let data = JSON.parse(req.body.data);
-        installationDao.updateFeeItem(data.updateData, function (err, data) {
-            callback(req, res, err, '', data);
-        });
-    }
+  updateFeeItem(req, res) {
+    let data = JSON.parse(req.body.data);
+    installationDao.updateFeeItem(data.updateData, function (err, data) {
+      callback(req, res, err, "", data);
+    });
+  }
 
-    batchUpdateInst(req, res){
-        let data = JSON.parse(req.body.data);
-        installationDao.batchUpdateInst(data.rationSection, data.inst, function (err, data) {
-            callback(req, res, err, '', data);
-        });
-    }
+  batchUpdateInst(req, res) {
+    let data = JSON.parse(req.body.data);
+    installationDao.batchUpdateInst(data.rationSection, data.inst, function (err, data) {
+      callback(req, res, err, "", data);
+    });
+  }
 }
 
-export default InstallationController;
+export default InstallationController;

package.json

@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
+    "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "bluebird": "^3.5.0",
     "cheerio": "^1.0.0-rc.3",
@@ -39,6 +40,7 @@
   },
   "scripts": {
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd operation.js",
-    "dev_server": "SET NODE_ENV=qa&& babel-node operation.js"
+    "dev_server": "SET NODE_ENV=qa&& babel-node operation.js",
+    "dev_server_WC": "SET NODE_ENV=qa_wc&& babel-node operation.js"
   }
 }