feat:修改库位管理

admin-assistant/src/main/resources/template/js/assetReportManage/assetReportMyUseChoose.js

@@ -52,6 +52,7 @@ layui.config({
 			{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
 					return getNotUndefinedVal(d.assetMation?.name);
 				}},
+			{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
 			{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
 					return getNotUndefinedVal(d.assetMation?.specifications);
 				}},
@@ -62,7 +63,7 @@ layui.config({
 			{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
 				return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
 			}},
-			{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
+
 			// { field: 'specifications', title: '资产规格', align: 'left', width: 120 },
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
 				return getNotUndefinedVal(d.assetAdminMation?.name);
@@ -72,7 +73,7 @@ layui.config({
 	    done: function(res) {
 	    	matchingLanguage();
 
-			initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入资产名称，资产编号", function () {
+			initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入资产编号", function () {
 				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
 			});
 			if (myUseAssetReportCheckType) {

admin-assistant/src/main/resources/template/js/myHasMation/myAssetManagement.js

@@ -23,6 +23,7 @@ layui.config({
 		limit: getLimit(),
 		cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'assetNum', title: '资产编号', align: 'left', width: 200 },
 			{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
 					return getNotUndefinedVal(d.assetMation?.name);
 				}},
@@ -32,7 +33,6 @@ layui.config({
 			{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
 				return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation.typeId);
 			}},
-			{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
 				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},
@@ -40,7 +40,7 @@ layui.config({
 		]],
 		done: function(json) {
 			matchingLanguage();
-			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入资产名称，资产编号", function () {
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入资产编号", function () {
 				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
 			});
 		}

erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js

 
+
+var rowId = "";
+
+var parentNode = null;
+
+
 layui.config({
     base: basePath,
     version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'dropdown', 'fsCommon', 'fsTree', 'table', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj','jquery', 'winui', 'dropdown', 'fsCommon', 'fsTree', 'table', 'form'], function (exports) {
     winui.renderColor();
     var $ = layui.$,
         fsTree = layui.fsTree,
         form = layui.form,
-        table = layui.table;
+        // table = layui.table;
+        tableTree = layui.tableTreeDj;
     var ztree;
     var id = GetUrlParam("id");
     var objectKey = GetUrlParam("objectKey")
@@ -50,7 +57,7 @@ layui.config({
     }
 
     function initLoadTable() {
-        table.render({
+        tableTree.render({
             id: 'messageTable',
             elem: '#messageTable',
             method: 'post',
@@ -71,12 +78,18 @@ layui.config({
             done: function(json) {
                 matchingLanguage();
                 initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入编号", function () {
-                    table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+                    tableTree.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
                 });
             }
-        });
+        }
+        // , {
+        //     keyId: 'id',
+        //     keyPid: 'parentId',
+        //     title: 'dictName',
+        // }
+        );
 
-        table.on('tool(messageTable)', function (obj) {
+        tableTree.getTable().on('tool(messageTable)', function (obj) {
             var data = obj.data;
             var layEvent = obj.event;
             if (layEvent === 'edit') { //编辑