Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

modules/all_models/bills_template.js

@@ -36,6 +36,8 @@ let BillsTemplateSchema = {
     engineering: Number,
     //计算基数
     calcBase: String,
+    itemCharacterText: String,
+    jobContentText: String,
     //费率ID
     feeRateID:Number
 };

modules/all_models/bills_template_items.js

@@ -34,6 +34,8 @@ let BillsTemplateSchema = {
     libID: {type:String,index:true},
     //计算基数
     calcBase: String,
+    itemCharacterText: String,
+    jobContentText: String,
     //费率ID
     feeRateID:Number,
     quantity: String,

package.json

@@ -23,6 +23,8 @@
     "uuid": "^3.1.0"
   },
   "dependencies": {
+    "axios": "^0.21.1",
+    "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "bluebird": "^3.5.0",
     "jszip": "^3.1.3",

web/maintain/bill_template_lib/js/bills_template_edit.js

@@ -112,7 +112,44 @@ let TEMPLATE_BILLS_SETTING = {
             "hAlign":3,
             "font":"Arail",
         }
-    }, {
+    },
+    {
+      width: 200,
+      readOnly: locked,
+      head: {
+        titleNames: ["计价规则"],
+        spanCols: [1],
+        spanRows: [1],
+        vAlign: [1],
+        hAlign: [1],
+        font: ["Arial"],
+      },
+      data: {
+        field: "itemCharacterText",
+        vAlign: 0,
+        hAlign: 3,
+        font: "Arail",
+      },
+    },
+    {
+      width: 200,
+      readOnly: locked,
+      head: {
+        titleNames: ["计价内容"],
+        spanCols: [1],
+        spanRows: [1],
+        vAlign: [1],
+        hAlign: [1],
+        font: ["Arial"],
+      },
+      data: {
+        field: "jobContentText",
+        vAlign: 0,
+        hAlign: 3,
+        font: "Arail",
+      },
+    },
+    {
         "width":250,
         "readOnly":locked,
         "head":{