feat:资产领用、归还、我的、资产明细中的批量复制bug修改

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

@@ -48,16 +48,22 @@ layui.config({
 	    cols: [[
 	    	{ type: myUseAssetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' },
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' },
-			{ field: 'name', title: '资产名称', width: 120 },
-			{ field: 'specifications', title: '资产规格', width: 140 },
+			// { field: 'name', title: '资产名称', width: 120 },
+			{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
+					return getNotUndefinedVal(d.assetMation?.name);
+				}},
+			{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
+					return getNotUndefinedVal(d.assetMation?.specifications);
+				}},
+			// { field: 'specifications', title: '资产规格', width: 140 },
 			{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
-				return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
+				return '<img src="' + systemCommonUtil.getFilePath(d.assetMation?.assetImg) + '" class="photo-img" lay-event="assetImg">';
 			}},
 			{ 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: 'specifications', title: '资产规格', align: 'left', width: 120 },
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
 				return getNotUndefinedVal(d.assetAdminMation?.name);
 			}},

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

@@ -48,13 +48,17 @@ layui.config({
 	    cols: [[
 	    	{ type: assetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' },
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' },
-			{ field: 'name', title: '资产名称', width: 120 },
-			{ field: 'specifications', title: '资产规格', width: 140 },
+			{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
+				return getNotUndefinedVal(d.assetMation?.name);
+			}},
+			{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
+				return getNotUndefinedVal(d.assetMation?.specifications);
+			}},
 			{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
-				return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
+				return '<img src="' + systemCommonUtil.getFilePath(d.assetMation?.assetImg) + '" class="photo-img" lay-event="assetImg">';
 			}},
 			{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
-				return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation?.typeId);
 			}},
 			{ field: 'assetNum', title: '资产编号', width: 160 },
 			{ field: 'storageArea', title: '存放区域', width: 200 },

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

@@ -42,11 +42,12 @@ layui.config({
                 assetId: getNotUndefinedVal($("#assetId").attr(initTableChooseUtil.chooseInputDataIdKey)),
                 state: $("#state").val(),
                 limit: $("#number").val(),
+                number:$("#number").val(),
                 page: 1
             }
             AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetReportCodeList", params: params, type: 'json', method: 'POST', callback: function (json) {
                 $("#barCode").val(json.rows.join('\n'));
-                $("#tips").html("共计获取个" + json.total + "条形码");
+                $("#tips").html("共计获取" + json.total + "个条形码");
             }});
         }
         return false;

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

@@ -23,12 +23,14 @@ layui.config({
 		limit: getLimit(),
 		cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-			{ field: 'name', title: '资产名称', align: 'left', width: 120 },
+			{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
+					return getNotUndefinedVal(d.assetMation?.name);
+				}},
 			{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
-				return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
+				return '<img src="' + systemCommonUtil.getFilePath(d.assetMation.assetImg) + '" class="photo-img" lay-event="assetImg">';
 			}},
 			{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
-				return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation.typeId);
 			}},
 			{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
 			{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {

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

@@ -15,7 +15,7 @@ layui.config({
     var $ = layui.$;
     var id = GetUrlParam("id");
 
-    // 资产采购订单转资产采购入库
+    // 根据仓库id获取仓库级别信息
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelValById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
             let data = json.bean;
             // 仓库级别的值的【编辑布局】

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

@@ -10,7 +10,11 @@ layui.config({
         fsTree = layui.fsTree,
         form = layui.form,
         table = layui.table;
+    // tableTree = layui.tableTreeDj;
     var ztree;
+    var id = GetUrlParam("id");
+    var objectKey = GetUrlParam("objectKey")
+    var objectId = GetUrlParam("objectId")
 
     // 下拉按钮
     var dropdown = new Dropdown();
@@ -20,7 +24,7 @@ layui.config({
     /********* tree 处理   start *************/
     fsTree.render({
         id: "treeDemo",
-        url: sysMainMation.erpBasePath + "queryDepotLevelById",
+        url: sysMainMation.erpBasePath + "queryDepotLevelById?id=" + id,
         checkEnable: false,
         showLine: false,
         showIcon: true,
@@ -59,17 +63,7 @@ layui.config({
             limit: getLimit(),
             cols: [[
                 { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
-                // { field: 'name', title: '名称', rowspan: '2', align: 'left', width: 300, templet: function (d) {
-                //     return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
-                // }},
                 { field: 'number', title: '编号', rowspan: '2', align: 'left', width: 350 },
-                // { field: 'warehousing', title: '仓储费', rowspan: '2', align: 'left', width: 150 },
-                // { field: 'truckage', title: '搬运费', rowspan: '2', align: 'left', width: 150 },
-                // // { field: 'isDefault', title: '是否默认', rowspan: '2', align: 'left', width: 100 },
-                // { field: 'isDefault', title: '是否默认', width: 100, align: "center", templet: function (d) {
-                //     // return shopUtil.getMealOrderWhetherGiveName(d);
-                //     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonIsDefault", 'id', d.isDefault, 'name');
-                // }},
                 { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', align: 'left', width: 120 },
                 { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
                 { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
@@ -234,11 +228,11 @@ layui.config({
     });
 
     function loadTable() {
-        tableTree.reload("messageTable", {where: getTableParams()});
+        table.reload("messageTable", {where: getTableParams()});
     }
 
     function getTableParams() {
-        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+        return $.extend(true, {objectKey:objectKey,objectId:objectId}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('turnIocatorManage', {});

erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html

@@ -13,7 +13,7 @@
     <div class="winui-toolbar">
         <div class="winui-tool">
             <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1656776769966"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1720752315835"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn">新增仓库级别的值</language></button>
         </div>
     </div>
 
@@ -62,6 +62,7 @@
     <script type="text/javascript" src="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.js"></script>
     <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.all.min.js"></script>
     <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.exhide.min.js"></script>
+    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/fuzzysearch.js"></script>
     <script src="../../js/commonFile/fileConsoleListCommon.js"></script>
     <script type="text/javascript">
         layui.config({base: '../../js/turnIocatorManage/'}).use('turnIocatorManage');