fix: 车船税库、费率库，新增编码（GLY-6260）

modules/all_models/std_fee_rate_libs.js

@@ -8,71 +8,93 @@
 import mongoose from "mongoose";
 
 let Schema = mongoose.Schema;
-let collectionName = 'std_fee_rate_libs';
-const oprSchema = require('../all_schemas/opr_schema');
+let collectionName = "std_fee_rate_libs";
+const oprSchema = require("../all_schemas/opr_schema");
 
-let optionSchema = new Schema({
-    name:String,
-    value:String,
-    selected:Boolean
-}, {_id: false});
-let subRecord = new Schema({
-    ID:Number,
-    name:String,
-    amount: Number,//倍数
+let optionSchema = new Schema(
+  {
+    name: String,
+    value: String,
+    selected: Boolean,
+  },
+  { _id: false }
+);
+let subRecord = new Schema(
+  {
+    ID: Number,
+    name: String,
+    amount: Number, //倍数
     value: Number,
-}, {_id: false});
+  },
+  { _id: false }
+);
 
-let recordSchema = new Schema({
-    ID:Number,
-    name:String,
-    editable:Boolean,
-    step: Number,//每增加的步数
-    amount: Number,//倍数
+let recordSchema = new Schema(
+  {
+    ID: Number,
+    name: String,
+    editable: Boolean,
+    step: Number, //每增加的步数
+    amount: Number, //倍数
     value: Number,
-    subList:[subRecord],
-    optionList:[optionSchema]
-}, {_id: false});
+    subList: [subRecord],
+    optionList: [optionSchema],
+  },
+  { _id: false }
+);
 
-let valueMapSchema = new Schema({
-    ID:String,
-    value:Number
-}, {_id: false});
+let valueMapSchema = new Schema(
+  {
+    ID: String,
+    value: Number,
+  },
+  { _id: false }
+);
 
-let subFeeRatesSchema = new Schema({
-    recodes :[recordSchema],
-    valueMaps:[valueMapSchema],
-}, {_id: false});
+let subFeeRatesSchema = new Schema(
+  {
+    recodes: [recordSchema],
+    valueMaps: [valueMapSchema],
+  },
+  { _id: false }
+);
 
-let ratesSchema = new Schema({
+let ratesSchema = new Schema(
+  {
     ID: Number,
     ParentID: Number,
     name: String,
     rate: Number,
     memo: String,
-    sum:Boolean,
-    subFeeRate:subFeeRatesSchema
-}, {_id: false});
+    sum: Boolean,
+    subFeeRate: subFeeRatesSchema,
+  },
+  { _id: false }
+);
 
 let modelSchema = {
-    // 自增id
-    ID: String,
-    // 工程所在地
-    region: String,
-    // 标准名称
-    libName: String,
-    //编办ID
-    compilationId: {
-        type: String,
-        index: true
-    },
-    compilationName:String,
-    // 费率数据
-    rates: {type:[ratesSchema],default:[]},
-    creator: String,
-    createDate: Number,
-    recentOpr: [oprSchema]
+  // 自增id
+  ID: String,
+  // 工程所在地
+  region: String,
+  // 标准名称
+  libName: String,
+  //编码
+  code: String,
+  //编办ID
+  compilationId: {
+    type: String,
+    index: true,
+  },
+  compilationName: String,
+  // 费率数据
+  rates: { type: [ratesSchema], default: [] },
+  creator: String,
+  createDate: Number,
+  recentOpr: [oprSchema],
 };
 
- mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
-
+mongoose.model(
+  collectionName,
+  new Schema(modelSchema, { versionKey: false, collection: collectionName })
+);

modules/all_models/vehicle_vessel_tax_lib.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  *
@@ -9,18 +9,26 @@
  */
 
 /*
-* 车船税编辑器
-* */
-const mongoose = require('mongoose');
+ * 车船税编辑器
+ * */
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
-const oprSchema = require('../all_schemas/opr_schema');
+const oprSchema = require("../all_schemas/opr_schema");
 
-const vehicleVesselTaxLib = new Schema({
+const vehicleVesselTaxLib = new Schema(
+  {
     ID: String,
     name: String,
     creator: String,
     createDate: Date,
-    recentOpr: [oprSchema]
-}, {versionKey: false});
+    recentOpr: [oprSchema],
+    code: String,
+  },
+  { versionKey: false }
+);
 
-mongoose.model('std_vehicleVesselTax_lib', vehicleVesselTaxLib, 'std_vehicleVesselTax_lib');
+mongoose.model(
+  "std_vehicleVesselTax_lib",
+  vehicleVesselTaxLib,
+  "std_vehicleVesselTax_lib"
+);

modules/fee_rate_lib/facade/fee_rate_facade.js

@@ -4,47 +4,51 @@
 
 import mongoose from "mongoose";
 
-const uuidV1 = require('uuid/v1');
+const uuidV1 = require("uuid/v1");
 let moment = require("moment");
-let feeRateModel = mongoose.model('std_fee_rate_libs');
+let feeRateModel = mongoose.model("std_fee_rate_libs");
 let compilationModel = mongoose.model("compilation");
-const _ = require('lodash');
+const _ = require("lodash");
 
 let feeRateLib = {
-    findByCondition:async function(conditions,options,single=true){
-        if(single == true){
-            return await feeRateModel.findOne(conditions,options);
-        }else {
-            return await  feeRateModel.find(conditions,options);
-        }
-    },
-    addLib : async function (data){
-        let now = new Date().getTime();
-        let dateStr = moment(now).format('YYYY-MM-DD HH:mm:ss');
-        //取编办信息
-        let compilation = await compilationModel.findOne({_id:data.compilationId});
-        if(compilation){
-            let newLib = {
-                creator: data.userAccount,
-                createDate: now,
-                recentOpr: [{operator: data.userAccount, operateDate: dateStr}],
-                libName: data.name,
-                compilationId: data.compilationId,
-                compilationName: compilation.name,
-            };
-            newLib.ID = uuidV1();
-            return await feeRateModel.create(newLib);
-        }else {
-            throw  new Error("没有找到该编办！");
-        }
-
-    },
-    saveLib:async function(param) {
-        return await feeRateModel.findOneAndUpdate(param.query,param.data,{new:true});
-    },
-    deleteLibByID:async function(ID){
-        return await feeRateModel.deleteOne({ID:ID});
-    },
+  findByCondition: async function (conditions, options, single = true) {
+    if (single == true) {
+      return await feeRateModel.findOne(conditions, options);
+    } else {
+      return await feeRateModel.find(conditions, options);
+    }
+  },
+  addLib: async function (data) {
+    let now = new Date().getTime();
+    let dateStr = moment(now).format("YYYY-MM-DD HH:mm:ss");
+    //取编办信息
+    let compilation = await compilationModel.findOne({
+      _id: data.compilationId,
+    });
+    if (compilation) {
+      let newLib = {
+        creator: data.userAccount,
+        createDate: now,
+        recentOpr: [{ operator: data.userAccount, operateDate: dateStr }],
+        libName: data.name,
+        code: data.code,
+        compilationId: data.compilationId,
+        compilationName: compilation.name,
+      };
+      newLib.ID = uuidV1();
+      return await feeRateModel.create(newLib);
+    } else {
+      throw new Error("没有找到该编办！");
+    }
+  },
+  saveLib: async function (param) {
+    return await feeRateModel.findOneAndUpdate(param.query, param.data, {
+      new: true,
+    });
+  },
+  deleteLibByID: async function (ID) {
+    return await feeRateModel.deleteOne({ ID: ID });
+  },
 };
 
-export default feeRateLib
+export default feeRateLib;

modules/vehicleVessel_lib/facade/vvTax_facade.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  *
@@ -9,56 +9,66 @@
  */
 
 import mongoose from "mongoose";
-const uuidV1 = require('uuid/v1');
+const uuidV1 = require("uuid/v1");
 let moment = require("moment");
-const vvTaxLibModel = mongoose.model('std_vehicleVesselTax_lib');
-const vvTaxModel = mongoose.model('std_vehicleVesselTax_items');
-
+const vvTaxLibModel = mongoose.model("std_vehicleVesselTax_lib");
+const vvTaxModel = mongoose.model("std_vehicleVesselTax_items");
 
 let vvTaxLib = {
-    findByCondition:async function(conditions,withData=false,single=true){
-        if(single == true){
-            let lib = await vvTaxLibModel.findOne(conditions);
-            if (withData) {
-                lib._doc.data = await vvTaxModel.find({libID: conditions.ID}, {_id: 0, libID:0, ID: 0});
-            }
-            return lib._doc;
-        }else {
-            return await  vvTaxLibModel.find(conditions);
-        }
-    },
-    addLib : async function (data){
-        let now = new Date().getTime();
-        let dateStr = moment(now).format('YYYY-MM-DD HH:mm:ss');
-        let newLib = {
-            creator: data.userAccount,
-            createDate: now,
-            recentOpr: [{operator: data.userAccount, operateDate: dateStr}],
-            name: data.name,
-        };
-        newLib.ID = uuidV1();
-        return await vvTaxLibModel.create(newLib);
-    },
-    saveLib:async function(param) {
-        if (param.edit) {//更改保存车船税具体数据
-            await vvTaxModel.deleteMany({libID: param.query.ID});
-            let tasks = [];
-            for (let data of param.data.data) {
-                data.libID = param.query.ID;
-                data.ID = uuidV1();
-                tasks.push({insertOne: {document: data}});
-            }
-            if (tasks.length > 0) {
-                await vvTaxModel.bulkWrite(tasks);
-            }
-        } else {
-            return await vvTaxLibModel.findOneAndUpdate(param.query,param.data,{new:true});
-        }
-    },
-    deleteLibByID:async function(ID){
-        await vvTaxLibModel.deleteOne({ID: ID});
-        return await vvTaxModel.deleteMany({libID: ID});
-    },
+  findByCondition: async function (
+    conditions,
+    withData = false,
+    single = true
+  ) {
+    if (single == true) {
+      let lib = await vvTaxLibModel.findOne(conditions);
+      if (withData) {
+        lib._doc.data = await vvTaxModel.find(
+          { libID: conditions.ID },
+          { _id: 0, libID: 0, ID: 0 }
+        );
+      }
+      return lib._doc;
+    } else {
+      return await vvTaxLibModel.find(conditions);
+    }
+  },
+  addLib: async function (data) {
+    let now = new Date().getTime();
+    let dateStr = moment(now).format("YYYY-MM-DD HH:mm:ss");
+    let newLib = {
+      creator: data.userAccount,
+      createDate: now,
+      recentOpr: [{ operator: data.userAccount, operateDate: dateStr }],
+      name: data.name,
+      code: data.code,
+    };
+    newLib.ID = uuidV1();
+    return await vvTaxLibModel.create(newLib);
+  },
+  saveLib: async function (param) {
+    if (param.edit) {
+      //更改保存车船税具体数据
+      await vvTaxModel.deleteMany({ libID: param.query.ID });
+      let tasks = [];
+      for (let data of param.data.data) {
+        data.libID = param.query.ID;
+        data.ID = uuidV1();
+        tasks.push({ insertOne: { document: data } });
+      }
+      if (tasks.length > 0) {
+        await vvTaxModel.bulkWrite(tasks);
+      }
+    } else {
+      return await vvTaxLibModel.findOneAndUpdate(param.query, param.data, {
+        new: true,
+      });
+    }
+  },
+  deleteLibByID: async function (ID) {
+    await vvTaxLibModel.deleteOne({ ID: ID });
+    return await vvTaxModel.deleteMany({ libID: ID });
+  },
 };
 
-export default vvTaxLib;
+export default vvTaxLib;

web/maintain/fee_rate_lib/html/main.html

@@ -24,6 +24,7 @@
                             <thead>
                                 <tr>
                                     <th>库名称</th>
+                                    <th width="200">编码</th>
                                     <th width="160">费用定额</th>
                                     <th width="160">添加时间</th>
                                     <th width="70">操作</th>
@@ -34,6 +35,7 @@
                                 <tr class="libTr">
                                     <td id="<%= lib.ID%>"><a
                                             href="/feeRate/edit/<%= lib.ID%>?locked=true"><%= lib.libName%></a></td>
+                                    <td id="<%= lib.ID%>_code"><%= lib.code%></td>
                                     <td><%= lib.compilationName%></td>
                                     <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
                                     <td>
@@ -76,6 +78,10 @@
                         <small class="form-text text-danger" id="nameError" style="display: none">请输入费率标准库名称。</small>
                     </div>
                     <div class="form-group">
+                        <label>编码</label>
+                        <input id="code" name="code" class="form-control" placeholder="请输入编码" type="text">
+                    </div>
+                    <div class="form-group">
                         <label>编办名称</label>
                         <select id="compilationSels" name="compilationId" class="form-control"></select>
                     </div>
@@ -106,6 +112,8 @@
                         <label>标准费率库名称</label>
                         <input id="renameText" class="form-control" placeholder="输入名称" type="text" value="">
                         <small class="form-text text-danger" id="renameError" style="display: none">请输入名称。</small>
+                        <label>编码</label>
+                        <input id="editCode" class="form-control" placeholder="输入编码" type="text" value="">
                         <input id="libID" type="hidden">
                     </div>
                 </form>

web/maintain/fee_rate_lib/js/fee_rate.js

@@ -2,85 +2,95 @@
  * Created by zhang on 2018/9/11.
  */
 
-$(document).ready(function() {
-    $('#add').on('show.bs.modal',async function () {
-        await initCompilationSelect();
-    });
+$(document).ready(function () {
+  $("#add").on("show.bs.modal", async function () {
+    await initCompilationSelect();
+  });
 
-    // 保存按钮
-    $("#addLibs").click(async function() {
-        let name = $('#name').val();
-        if(name==''){
-            $("#nameError").show();
-            return;
-        }else {
-            $("#addLibs").attr("disabled",true);//防止重复提交
-            $("#addLibForm").submit();
-        }
-    });
+  // 保存按钮
+  $("#addLibs").click(async function () {
+    let name = $("#name").val();
+    if (name == "") {
+      $("#nameError").show();
+      return;
+    } else {
+      $("#addLibs").attr("disabled", true); //防止重复提交
+      $("#addLibForm").submit();
+    }
+  });
 
-    $("#rename").click(async function() {
-        let libID = $("#libID").val();
-        let name = $('#renameText').val();
-        if(libID!=''){
-            if(name ==''){
-                $("#renameError").show();
-                return;
-            }else {
-                try {
-                    let newFeeRate = await ajaxPost("/feeRate/saveLib",{query:{ID:libID},data:{libName:name}});
-                    $("#"+libID).children("a").text(newFeeRate.libName);
-                    $("#edit").modal('hide');
-                }catch(err) {
-                    console.log(err);
-                }
-            }
+  $("#rename").click(async function () {
+    let libID = $("#libID").val();
+    let name = $("#renameText").val();
+    let code = $("#editCode").val();
+    if (libID != "") {
+      if (name == "") {
+        $("#renameError").show();
+        return;
+      } else {
+        try {
+          let newFeeRate = await ajaxPost("/feeRate/saveLib", {
+            query: { ID: libID },
+            data: { libName: name, code },
+          });
+          $("#" + libID)
+            .children("a")
+            .text(newFeeRate.libName);
+          $("#" + libID + "_code").text(newFeeRate.code);
+          $("#edit").modal("hide");
+        } catch (err) {
+          console.log(err);
         }
-    });
+      }
+    }
+  });
 
-    $("#delete").click(async function() {
-        let libID = $("#libID_del").val();
-        let delCount = parseInt($("#delCount").val());
-        delCount = delCount+1;
-        $("#delCount").val(delCount);
-        if(delCount == 3){
-            if(libID!=""){
-                try {
-                    let result = await ajaxPost("/feeRate/deleteLibByID",{ID:libID});
-                    if(result.ok){
-                        $("#"+libID).parent(".libTr").remove();
-                    }
-                    $("#del").modal('hide');
-                }catch (err){
-                    console.log(err);
-                }
-            }
+  $("#delete").click(async function () {
+    let libID = $("#libID_del").val();
+    let delCount = parseInt($("#delCount").val());
+    delCount = delCount + 1;
+    $("#delCount").val(delCount);
+    if (delCount == 3) {
+      if (libID != "") {
+        try {
+          let result = await ajaxPost("/feeRate/deleteLibByID", { ID: libID });
+          if (result.ok) {
+            $("#" + libID)
+              .parent(".libTr")
+              .remove();
+          }
+          $("#del").modal("hide");
+        } catch (err) {
+          console.log(err);
         }
-    });
+      }
+    }
+  });
 
-    // 锁定、解锁
-    $('.lock').click(function () {
-        lockUtil.handleLockClick($(this));
-    });
+  // 锁定、解锁
+  $(".lock").click(function () {
+    lockUtil.handleLockClick($(this));
+  });
 });
 
-async function getFeeRateLib (ID) {
-    try {
-        let lib = await ajaxPost("/feeRate/findLib",{ID:ID});
-        if(lib){
-            $("#renameText").val(lib.libName);
-            $("#libID").val(ID);
-            $("#edit").modal({show:true});
-        }else {
-            alert("没有找到材料库");
-        }
-    }catch (err){
-        console.log(err);
+async function getFeeRateLib(ID) {
+  try {
+    let lib = await ajaxPost("/feeRate/findLib", { ID: ID });
+    if (lib) {
+      $("#renameText").val(lib.libName);
+      $("#editCode").val(lib.code);
+      $("#libID").val(ID);
+      $("#edit").modal({ show: true });
+    } else {
+      alert("没有找到材料库");
     }
+  } catch (err) {
+    console.log(err);
+  }
 }
 
-function showDeleteModal(ID){
-    $("#libID_del").val(ID);
-    $("#delCount").val(0);
-    $("#del").modal({show:true});
-}
+function showDeleteModal(ID) {
+  $("#libID_del").val(ID);
+  $("#delCount").val(0);
+  $("#del").modal({ show: true });
+}

web/maintain/vehicleVesselTax_lib/html/main.html

@@ -5,11 +5,12 @@
                 <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
-                            <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>
+                            <thead><tr><th >库名称</th><th width="200">编码</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>
                             <tbody id="showArea">
                             <% for(let lib of vvTaxLibs){ %>
                             <tr class="libTr">
                                 <td id="<%= lib.ID%>"><a href="/vvTax/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
+                                <td id="<%= lib.ID%>_code"><%= lib.code%></td>
                                 <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
                                 <td>
                                     <a class="lock-btn-control disabled" href="javascript:;" style="color: #0275d8" onclick='getVVTaxLib("<%= lib.ID%>")' title="编辑"><i class="fa fa-pencil-square-o"></i></a>
@@ -43,6 +44,8 @@
                         <label>库名称</label>
                         <input id="name" name="name" class="form-control" placeholder="请输入车船税库名称" type="text">
                         <small class="form-text text-danger" id="nameError" style="display: none">请输入车船税库名称。</small>
+                        <label>编码</label>
+                        <input id="code" name="code" class="form-control" placeholder="请输入编码" type="text">
                     </div>
                     <input type="hidden" name = "userAccount" value="<%= userAccount%>">
                 </form>
@@ -71,6 +74,8 @@
                         <label>车船税库名称</label>
                         <input id="renameText" class="form-control" placeholder="输入名称" type="text" value="">
                         <small class="form-text text-danger" id="renameError" style="display: none">请输入名称。</small>
+                        <label>编码</label>
+                        <input id="editCode" name="editCode" class="form-control" placeholder="请输入编码" type="text">
                         <input id="libID" type="hidden">
                     </div>
                 </form>

web/maintain/vehicleVesselTax_lib/js/vvTax.js

@@ -1,80 +1,90 @@
 /**
  * Created by zhang on 2018/9/3.
  */
-$(document).ready(function() {
-    // 保存按钮
-    $("#addLibs").click(async function() {
-        let name = $('#name').val();
-        if(name==''){
-            $("#nameError").show();
-            return;
-        }else {
-            $("#addLibs").attr("disabled",true);//防止重复提交
-            $("#addLibForm").submit();
-        }
-    });
+$(document).ready(function () {
+  // 保存按钮
+  $("#addLibs").click(async function () {
+    let name = $("#name").val();
+    if (name == "") {
+      $("#nameError").show();
+      return;
+    } else {
+      $("#addLibs").attr("disabled", true); //防止重复提交
+      $("#addLibForm").submit();
+    }
+  });
 
-    $("#rename").click(async function() {
-        let libID = $("#libID").val();
-        let name = $('#renameText').val();
-        if(libID!=''){
-            if(name ==''){
-                $("#renameError").show();
-                return;
-            }else {
-                try {
-                    let newVVTax = await ajaxPost("/vvTax/saveLib",{query:{ID:libID},data:{name:name}});
-                    $("#"+libID).children("a").text(newVVTax.name);
-                    $("#edit").modal('hide');
-                }catch(err) {
-                    console.log(err);
-                }
-            }
+  $("#rename").click(async function () {
+    let libID = $("#libID").val();
+    let name = $("#renameText").val();
+    let code = $("#editCode").val();
+    if (libID != "") {
+      if (name == "") {
+        $("#renameError").show();
+        return;
+      } else {
+        try {
+          let newVVTax = await ajaxPost("/vvTax/saveLib", {
+            query: { ID: libID },
+            data: { name: name, code: code },
+          });
+          $("#" + libID)
+            .children("a")
+            .text(newVVTax.name);
+          $("#" + libID + "_code").text(newVVTax.code);
+          $("#edit").modal("hide");
+        } catch (err) {
+          console.log(err);
         }
-    });
+      }
+    }
+  });
 
-    $("#delete").click(async function() {
-        let libID = $("#libID_del").val();
-        let delCount = parseInt($("#delCount").val());
-        delCount = delCount+1;
-        $("#delCount").val(delCount);
-        if(delCount == 3){
-            if(libID!=""){
-                try {
-                    let result = await ajaxPost("/vvTax/deleteLibByID",{ID:libID});
-                    if(result.ok){
-                        $("#"+libID).parent(".libTr").remove();
-                    }
-                    $("#del").modal('hide');
-                }catch (err){
-                    console.log(err);
-                }
-            }
+  $("#delete").click(async function () {
+    let libID = $("#libID_del").val();
+    let delCount = parseInt($("#delCount").val());
+    delCount = delCount + 1;
+    $("#delCount").val(delCount);
+    if (delCount == 3) {
+      if (libID != "") {
+        try {
+          let result = await ajaxPost("/vvTax/deleteLibByID", { ID: libID });
+          if (result.ok) {
+            $("#" + libID)
+              .parent(".libTr")
+              .remove();
+          }
+          $("#del").modal("hide");
+        } catch (err) {
+          console.log(err);
         }
-    });
-    // 锁定、解锁
-    $('.lock').click(function () {
-        lockUtil.handleLockClick($(this));
-    });
+      }
+    }
+  });
+  // 锁定、解锁
+  $(".lock").click(function () {
+    lockUtil.handleLockClick($(this));
+  });
 });
 
-async function getVVTaxLib (ID) {
-    try {
-        let lib = await ajaxPost("/vvTax/findLib",{ID:ID});
-        if(lib){
-            $("#renameText").val(lib.name);
-            $("#libID").val(ID);
-            $("#edit").modal({show:true});
-        }else {
-            alert("没有车船税库");
-        }
-    }catch (err){
-        console.log(err);
+async function getVVTaxLib(ID) {
+  try {
+    let lib = await ajaxPost("/vvTax/findLib", { ID: ID });
+    if (lib) {
+      $("#renameText").val(lib.name);
+      $("#editCode").val(lib.code);
+      $("#libID").val(ID);
+      $("#edit").modal({ show: true });
+    } else {
+      alert("没有车船税库");
     }
+  } catch (err) {
+    console.log(err);
+  }
 }
 
-function showDeleteModal(ID){
-    $("#libID_del").val(ID);
-    $("#delCount").val(0);
-    $("#del").modal({show:true});
-}
+function showDeleteModal(ID) {
+  $("#libID_del").val(ID);
+  $("#delCount").val(0);
+  $("#del").modal({ show: true });
+}