ソースを参照

feat: 工料机编辑器增加排序号

zhangweicheng 2 ヶ月 前
コミット
1c5f36a29e

+ 7 - 2
modules/all_models/stdGlj_glj.js

@@ -33,6 +33,7 @@ const std_glj = new Schema(
       default: {},
     },
     gljClass: Number,
+    classSeq: Number,
     gljType: Number,
     shortName: String,
     unit: String,
@@ -47,5 +48,9 @@ const std_glj = new Schema(
   { versionKey: false }
 );
 
-mongoose.model('std_glj_lib_gljList', std_glj, 'std_glj_lib_gljList');
-mongoose.model('std_glj_lib_gljList_backup', std_glj, 'std_glj_lib_gljList_backup');
+mongoose.model("std_glj_lib_gljList", std_glj, "std_glj_lib_gljList");
+mongoose.model(
+  "std_glj_lib_gljList_backup",
+  std_glj,
+  "std_glj_lib_gljList_backup"
+);

+ 14 - 6
modules/all_models/stdGlj_gljClass.js

@@ -2,16 +2,24 @@
  * Created by Zhong on 2018/3/22.
  */
 /*标准工料机分类树*/
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
-const std_gljClass = new Schema({
+const std_gljClass = new Schema(
+  {
     repositoryId: Number,
     ID: Number,
     ParentID: Number,
     NextSiblingID: Number,
     Name: String,
-    deleted: Boolean
-}, { versionKey: false });
+    deleted: Boolean,
+    classSeq: Number,
+  },
+  { versionKey: false }
+);
 
-mongoose.model('std_glj_lib_gljClass', std_gljClass, 'std_glj_lib_gljClass');
-mongoose.model('std_glj_lib_gljClass_backup', std_gljClass, 'std_glj_lib_gljClass_backup');
+mongoose.model("std_glj_lib_gljClass", std_gljClass, "std_glj_lib_gljClass");
+mongoose.model(
+  "std_glj_lib_gljClass_backup",
+  std_gljClass,
+  "std_glj_lib_gljClass_backup"
+);

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

@@ -56,6 +56,7 @@ let repositoryGljObj = {
   treeObj: null,
   workBook: null,
   gljCurTypeId: -1,
+  gljCurClassSeq: 0,
   currentRepositoryId: -1,
   currentCache: null,
   parentNodeIds: {},
@@ -493,7 +494,6 @@ let repositoryGljObj = {
       cache: false,
       timeout: 20000,
       success: function (result, textStatus, status) {
-        debugger;
         if (status.status == 200) {
           zTreeHelper.createTree(result.data, gljSetting, "repositoryTree", me);
           zTreeHelper.createTree(
@@ -504,6 +504,7 @@ let repositoryGljObj = {
           );
           if (result.data && result.data.length > 0) {
             me.gljCurTypeId = result.data[0].ID;
+            me.gljCurClassSeq = result.data[0].classSeq;
           } else {
             //重新创建库?
             gljTypeTreeOprObj.addRootNode();
@@ -1247,6 +1248,7 @@ let repositoryGljObj = {
     }
     if (!me.parentNodeIds["_pNodeId_" + me.gljCurTypeId]) {
       rObj.gljClass = me.gljCurTypeId;
+      rObj.classSeq = me.gljCurClassSeq;
     }
     if (updateArr.length > 0 || addArr.length > 0) {
       me.currentEditingGlj = null;
@@ -1837,6 +1839,7 @@ let repositoryGljObj = {
     //pasteObj.basePrice = !isNaN(parseFloat(pasteObj.basePrice)) && (pasteObj.basePrice && typeof pasteObj.basePrice !== 'undefined') ? parseFloat(pasteObj.basePrice) : 0;
     if (!me.parentNodeIds["_pNodeId_" + me.gljCurTypeId]) {
       pasteObj.gljClass = me.gljCurTypeId;
+      pasteObj.classSeq = me.gljCurClassSeq;
     }
     return true;
   },

+ 1 - 0
web/maintain/std_glj_lib/js/gljClassTree.js

@@ -730,6 +730,7 @@ let gljClassTreeObj = {
     }
     let gljTypeId = node.data.ID;
     re.gljCurTypeId = node.data.ID;
+    re.gljCurClassSeq = node.data.classSeq;
     re.addGljObj = null;
     sheetCommonObj.cleanSheet(that.workBook.getSheet(0), that.setting, 10);
     if (re.parentNodeIds["_pNodeId_" + gljTypeId]) {