瀏覽代碼

feat: 公路编办“全国公路(2018)”、“山东公路养护(2024)”,新增材料除税功能。

zhangweicheng 1 年之前
父節點
當前提交
39515624d6
共有 2 個文件被更改,包括 2506 次插入1874 次删除
  1. 19 15
      modules/all_models/stdGlj_glj.js
  2. 2487 1859
      web/maintain/std_glj_lib/js/glj.js

+ 19 - 15
modules/all_models/stdGlj_glj.js

@@ -2,23 +2,24 @@
  * Created by Zhong on 2018/3/22.
  */
 /*标准工料机*/
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
 //标准工料机的组成物只来自标准工料机
 const std_gljComponent = new Schema(
-    {
-        ID: Number,
-        consumeAmt: Number,
-        consumeAmtProperty: {
-            type: Schema.Types.Mixed,
-            default: {}
-        }
+  {
+    ID: Number,
+    consumeAmt: Number,
+    consumeAmtProperty: {
+      type: Schema.Types.Mixed,
+      default: {},
     },
-    { _id: false },
-    { versionKey: false }
+  },
+  { _id: false },
+  { versionKey: false }
 );
 
-const std_glj = new Schema({
+const std_glj = new Schema(
+  {
     deleted: Boolean,
     repositoryId: Number,
     ID: Number,
@@ -26,9 +27,10 @@ const std_glj = new Schema({
     name: String,
     specs: String,
     basePrice: Number,
+    taxRate: Number,
     priceProperty: {
-        type: Schema.Types.Mixed,
-        default: {}
+      type: Schema.Types.Mixed,
+      default: {},
     },
     gljClass: Number,
     gljType: Number,
@@ -41,6 +43,8 @@ const std_glj = new Schema({
     offSiteTransportLossRate: Number, //场外运输损耗率
     handlingLossRate: Number, //每增一次装卸损耗率
     lossRate: Number, // 损耗率
-}, { versionKey: false });
+  },
+  { versionKey: false }
+);
 
-mongoose.model('std_glj_lib_gljList', std_glj, 'std_glj_lib_gljList');
+mongoose.model("std_glj_lib_gljList", std_glj, "std_glj_lib_gljList");

文件差異過大導致無法顯示
+ 2487 - 1859
web/maintain/std_glj_lib/js/glj.js