Parcourir la source

feat: 后台定额库编辑器,子目换算新增“显示编办” (#GLY-6553)

vian il y a 1 jour
Parent
commit
e6aa012cb5
2 fichiers modifiés avec 17 ajouts et 7 suppressions
  1. 2 1
      modules/all_models/stdRation_coe.js
  2. 15 6
      web/maintain/ration_repository/js/coe.js

+ 2 - 1
modules/all_models/stdRation_coe.js

@@ -29,7 +29,8 @@ const coeListSchema = new Schema({
     original_code: String,               //原人材机编码
     option_codes: String,                //可选人材机编码
     option_list: [Schema.Types.Mixed],//下拉列表选项
-    coes: [coeSchema]
+    coes: [coeSchema],
+    displayCompilation: String, // 显示编办
 }, { versionKey: false });
 
 mongoose.model('std_ration_lib_coe_list', coeListSchema, 'std_ration_lib_coe_list');

+ 15 - 6
web/maintain/ration_repository/js/coe.js

@@ -46,8 +46,8 @@ $(document).ready(function () {
     function () {
       //refreshAfterZmhs(false);
       let leftContentWidth = parseFloat(
-          $("#leftContent")[0].style.width.replace("%", "")
-        ),
+        $("#leftContent")[0].style.width.replace("%", "")
+      ),
         mainContentWidth = parseFloat(
           $("#mainContent")[0].style.width.replace("%", "")
         );
@@ -101,8 +101,8 @@ $(document).ready(function () {
       mainContentKey = `${moduleName}${$("#mainContent").attr("id")}Width`,
       zmhsContentKey = `${moduleName}${$("#rightContent").attr("id")}Width`;
     let zmhsWidth = getLocalCache(zmhsContentKey)
-        ? getLocalCache(zmhsContentKey)
-        : $("#rightContent")[0].style.width,
+      ? getLocalCache(zmhsContentKey)
+      : $("#rightContent")[0].style.width,
       mainContentWidth = $("#mainContent")[0].style.width,
       leftContentWidth;
     zmhsWidth = parseFloat(zmhsWidth.replace("%", ""));
@@ -347,6 +347,15 @@ let coeOprObj = {
         vAlign: "center",
         readOnly: false,
       },
+      {
+        headerName: "显示编办",
+        headerWidth: 180,
+        dataCode: "displayCompilation",
+        dataType: "String",
+        hAlign: "left",
+        vAlign: "center",
+        readOnly: false,
+      },
     ],
   },
   buildSheet: function (container) {
@@ -647,7 +656,7 @@ let coeOprObj = {
             me.coeSelInit(target.row);
           }
           return {
-            callback: function () {},
+            callback: function () { },
             items: {
               getReference: {
                 name: "查找引用",
@@ -1059,7 +1068,7 @@ let gljAdjOprObj = {
         if (
           args.row < me.currentGljAdjList.length &&
           args.editingText.toString().trim() !==
-            me.currentGljAdjList[args.row][dataCode]
+          me.currentGljAdjList[args.row][dataCode]
         ) {
           let updateObj = me.currentGljAdjList[args.row];
           if (