Bläddra i källkod

feat: 人材机库编辑器,新增损耗率

vian 1 år sedan
förälder
incheckning
2f2f70575b
2 ändrade filer med 12 tillägg och 4 borttagningar
  1. 4 3
      modules/all_models/stdGlj_glj.js
  2. 8 1
      web/maintain/std_glj_lib/js/glj.js

+ 4 - 3
modules/all_models/stdGlj_glj.js

@@ -14,8 +14,8 @@ const std_gljComponent = new Schema(
             default: {}
         }
     },
-    {_id: false},
-    {versionKey: false}
+    { _id: false },
+    { versionKey: false }
 );
 
 const std_glj = new Schema({
@@ -40,6 +40,7 @@ const std_glj = new Schema({
     purchaseStorageRate: Number, //采购保管费率
     offSiteTransportLossRate: Number, //场外运输损耗率
     handlingLossRate: Number, //每增一次装卸损耗率
-},{versionKey: false});
+    lossRate: Number, // 损耗率
+}, { versionKey: false });
 
 mongoose.model('std_glj_lib_gljList', std_glj, 'std_glj_lib_gljList');

+ 8 - 1
web/maintain/std_glj_lib/js/glj.js

@@ -223,6 +223,7 @@ let repositoryGljObj = {
             }
         }
         let tailHeaders = [
+            { headerName: "损耗率", headerWidth: 90, dataCode: "lossRate", dataType: "Number", hAlign: "center", vAlign: "center" },
             { headerName: "毛重系数", headerWidth: 90, dataCode: "grossWeightCoe", dataType: "Number", hAlign: "center", vAlign: "center" },
             { headerName: "采购保管费率", headerWidth: 90, dataCode: "purchaseStorageRate", dataType: "Number", hAlign: "center", vAlign: "center" },
             { headerName: "场外运输损耗率", headerWidth: 100, dataCode: "offSiteTransportLossRate", dataType: "Number", hAlign: "center", vAlign: "center" },
@@ -836,7 +837,7 @@ let repositoryGljObj = {
                             args.sheet.setValue(args.row, args.col, _.find(me.distTypeTree.comboDatas, { value: me.currentGlj.gljType }).text);
                         });
                         return;
-                    } else if (me.feeDataCode.includes(dataCode) && rObj[dataCode] !== me.currentEditingGlj[dataCode]) {
+                    } else if ((me.feeDataCode.includes(dataCode) || dataCode === 'lossRate') && rObj[dataCode] !== me.currentEditingGlj[dataCode]) {
                         if (isNaN(rObj[dataCode])) {
                             args.sheet.setValue(args.row, args.col, me.currentEditingGlj[dataCode] ? me.currentEditingGlj[dataCode] : '');
                             alert(`${me.setting.header[args.col].headerName}只能输入数值!`);
@@ -1216,6 +1217,9 @@ let repositoryGljObj = {
         if (typeof pasteObj.unit !== 'undefined') {
             tempObj.unit = pasteObj.unit;
         }
+        if (typeof pasteObj.lossRate !== 'undefined' && !isNaN(pasteObj.lossRate)) {
+            tempObj.lossRate = pasteObj.lossRate;
+        }
         if (typeof pasteObj.gljType !== 'undefined') {
             let isExsit = false;
             for (let i = 0; i < me.distTypeTree.comboDatas.length; i++) {
@@ -1341,6 +1345,9 @@ let repositoryGljObj = {
                 }
             }
         }
+        if (typeof pasteObj.lossRate !== 'undefined' && isNaN(pasteObj[feeCode])) {
+            return false;
+        }
         for (let feeCode of me.feeDataCode) {
             if (typeof pasteObj[feeCode] !== 'undefined' && (isNaN(pasteObj[feeCode]) || me.getParentType(pasteObj.gljType) !== 2)) {
                 return false;