资产管理整改

admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js

@@ -23,13 +23,13 @@ layui.config({
  	    form.on('submit(formAddBean)', function (data) {
  	        if (winui.verifyForm(data.elem)) {
  	        	var params = {
-        			assetName: $("#assetName").val(),
+					name: $("#name").val(),
 					numberPrefix: $("#numberPrefix").val(),
         			specifications: $("#specifications").val(),
 					readPrice: $("#readPrice").val(),
-					describe: $("#describe").val(),
+					remark: $("#remark").val(),
 					typeId: $("#typeId").val(),
-					enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
+					enclosureInfo: JSON.stringify({enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload')}),
 					assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl")
  	        	};
 				if (isNull(params.assetImg)) {

admin-assistant/src/main/resources/template/js/assetManage/assetManageChoose.js

@@ -48,7 +48,7 @@ layui.config({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    url: flowableBasePath + 'queryAllAssetMationToChoose',
+	    url: flowableBasePath + 'asset001',
 	    where: getTableParams(),
 		even: true,
 	    page: true,
@@ -57,13 +57,13 @@ layui.config({
 	    cols: [[
 	    	{ type: assetCheckType ? 'checkbox' : 'radio', fixed: 'left'},
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
-			{ field: 'assetName', title: '资产名称', width: 120, templet: function (d) {
-				return '<a lay-event="assetlistdetails" class="notice-title-click">' + d.assetName + '</a>';
+			{ field: 'name', title: '资产名称', width: 120, templet: function (d) {
+				return '<a lay-event="assetlistdetails" class="notice-title-click">' + d.name + '</a>';
 			}},
 			{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
 				return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
 			}},
-			{ field: 'typeId', title: '资产类型', width: 100 },
+			{ field: 'typeName', title: '资产类型', width: 100 },
 			{ field: 'numberPrefix', title: '资产编号前缀', width: 140 },
 			{ field: 'readPrice', title: '参考价', width: 80 },
 		]],

admin-assistant/src/main/resources/template/js/assetManage/assetManageDetails.js

@@ -14,11 +14,12 @@ layui.config({
 	    showGrid({
 		 	id: "showForm",
 		 	url: flowableBasePath + "asset006",
-		 	params: {rowId: parent.rowId},
+		 	params: {id: parent.rowId},
 		 	pagination: false,
+			method: 'GET',
 			template: $("#beanTemplate").html(),
 		 	ajaxSendLoadBefore: function(hdb, json) {
-				json.bean.describe = stringManipulation.textAreaShow(json.bean.describe);
+				json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
 		 	},
 		 	ajaxSendAfter:function (json) {
 		 		$("#assetImg").attr("src", fileBasePath + json.bean.assetImg);

admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js

@@ -13,8 +13,9 @@ layui.config({
 
 	    showGrid({
 		 	id: "showForm",
-		 	url: flowableBasePath + "asset004",
-		 	params: {rowId: parent.rowId},
+		 	url: flowableBasePath + "asset006",
+		 	params: {id: parent.rowId},
+			method: 'GET',
 		 	pagination: false,
 		 	template: $("#beanTemplate").html(),
 		 	ajaxSendLoadBefore: function(hdb) {
@@ -42,13 +43,13 @@ layui.config({
 		 	        if (winui.verifyForm(data.elem)) {
 		 	        	var params = {
 	 	        			id: parent.rowId,
-							assetName: $("#assetName").val(),
+							name: $("#name").val(),
 							numberPrefix: $("#numberPrefix").val(),
 							specifications: $("#specifications").val(),
 							readPrice: $("#readPrice").val(),
-							describe: $("#describe").val(),
+							remark: $("#remark").val(),
 							typeId: $("#typeId").val(),
-							enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
+							enclosureInfo: JSON.stringify({enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload')}),
 							assetImg: $("#assetImg").find("input[type='hidden'][name='upload']").attr("oldurl")
 						};
 						if (isNull(params.assetImg)) {

admin-assistant/src/main/resources/template/js/assetManage/assetManageList.js

@@ -28,13 +28,13 @@ layui.config({
 		limit: getLimit(),
 		cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-			{ field: 'assetName', title: '资产名称', width: 120, templet: function (d) {
-				return '<a lay-event="assetlistdetails" class="notice-title-click">' + d.assetName + '</a>';
+			{ field: 'name', title: '资产名称', width: 120, templet: function (d) {
+				return '<a lay-event="assetlistdetails" class="notice-title-click">' + d.name + '</a>';
 			}},
 			{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
 				return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
 			}},
-			{ field: 'typeId', title: '资产类型', width: 100 },
+			{ field: 'typeName', title: '资产类型', width: 100 },
 			{ field: 'id', title: '明细', align: 'center', width: 80, templet: function (d) {
 				return '<a lay-event="assetReport" class="notice-title-click">明细</a>';
 			}},
@@ -98,7 +98,7 @@ layui.config({
 	function assetlistdelet(data) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
 			layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "asset003", params: {rowId: data.id}, type: 'json', callback: function (json) {
+            AjaxPostUtil.request({url: flowableBasePath + "asset003", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
 				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
 				loadassetTable();
     		}});

admin-assistant/src/main/resources/template/tpl/assetManage/assetManageAdd.html

@@ -12,7 +12,7 @@
 		    <div class="layui-form-item layui-col-xs12">
 		        <label class="layui-form-label">资产名称<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="assetName" name="assetName" win-verify="required" placeholder="请输入资产名称" class="layui-input"/>
+		            <input type="text" id="name" name="name" win-verify="required" placeholder="请输入资产名称" class="layui-input"/>
 		            <div class="layui-form-mid layui-word-aux">新增的资产，状态默认为正常。</div>
 		        </div>
 		    </div>
@@ -51,7 +51,7 @@
 		    <div class="layui-form-item layui-col-xs12">
 		        <label class="layui-form-label">相关描述</label>
 		        <div class="layui-input-block">
-		        	<textarea id="describe" name="describe" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
+		        	<textarea id="remark" name="remark" placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
 		        </div>
 		    </div>
 		    <div class="layui-form-item layui-col-xs12">

admin-assistant/src/main/resources/template/tpl/assetManage/assetManageDetails.html

@@ -18,7 +18,7 @@
 		<div class="layui-form-item layui-col-xs12">
 			<label class="layui-form-label">资产名称：</label>
 			<div class="layui-input-block ver-center">
-				{{assetName}}
+				{{name}}
 			</div>
 		</div>
 		<div class="layui-form-item layui-col-xs12">
@@ -30,7 +30,7 @@
 		<div class="layui-form-item layui-col-xs6">
 			<label class="layui-form-label">资产类型：</label>
 			<div class="layui-input-block ver-center">
-				{{typeId}}
+				{{typeName}}
 			</div>
 		</div>
 		<div class="layui-form-item layui-col-xs6">
@@ -54,7 +54,7 @@
 		<div class="layui-form-item layui-col-xs12">
 			<label class="layui-form-label">相关描述：</label>
 			<div class="layui-input-block ver-center">
-				{{describe}}
+				{{remark}}
 			</div>
 		</div>
 		<div class="layui-form-item layui-col-xs12">

admin-assistant/src/main/resources/template/tpl/assetManage/assetManageEdit.html

@@ -18,7 +18,7 @@
 		<div class="layui-form-item layui-col-xs12">
 			<label class="layui-form-label">资产名称<i class="red">*</i></label>
 			<div class="layui-input-block">
-				<input type="text" id="assetName" name="assetName" win-verify="required" placeholder="请输入资产名称" class="layui-input" value="{{assetName}}"/>
+				<input type="text" id="name" name="name" win-verify="required" placeholder="请输入资产名称" class="layui-input" value="{{name}}"/>
 				<div class="layui-form-mid layui-word-aux">新增的资产，状态默认为正常。</div>
 			</div>
 		</div>
@@ -57,7 +57,7 @@
 		<div class="layui-form-item layui-col-xs12">
 			<label class="layui-form-label">相关描述</label>
 			<div class="layui-input-block">
-				<textarea id="describe" name="describe"  placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200">{{roomAddDesc}}</textarea>
+				<textarea id="remark" name="remark"  placeholder="请输入相关描述" class="layui-textarea" style="height: 100px;" maxlength="200">{{remark}}</textarea>
 			</div>
 		</div>
 		<div class="layui-form-item layui-col-xs12">