【ADM】资产类型迁移到数据字典

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

@@ -23,21 +23,10 @@ layui.config({
  		
  		// 采购日期
  		laydate.render({elem: '#purchaseTime', type: 'date', max: getYMDFormatDate(), trigger: 'click'});
- 		
- 		//资产类型
- 		showGrid({
-		 	id: "typeId",
-		 	url: flowableBasePath + "assettype006",
-		 	params: {},
-		 	pagination: false,
-		 	template: getFileContent('tpl/template/select-option-must.tpl'),
-		 	ajaxSendLoadBefore: function(hdb){
-		 	},
-		 	ajaxSendAfter:function (json) {
-		 		form.render('select');
-		 	}
-		});
- 		
+
+		// 资产类型
+		sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", '', form);
+
  		//资产来源
  		showGrid({
 		 	id: "fromId",

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

@@ -36,22 +36,10 @@ layui.config({
 		 		
 		 		// 采购日期
 		 		laydate.render({elem: '#purchaseTime', type: 'date', max: getFormatDate(), trigger: 'click'});
-		 		
-		 		// 资产类型
-		 		showGrid({
-				 	id: "typeId",
-				 	url: flowableBasePath + "assettype006",
-				 	params: {},
-				 	pagination: false,
-				 	template: getFileContent('tpl/template/select-option-must.tpl'),
-				 	ajaxSendLoadBefore: function(hdb){
-				 	},
-				 	ajaxSendAfter:function(j){
-				 		$("#typeId").val(json.bean.typeId);
-				 		form.render('select');
-				 	}
-				});
-		 		
+
+				// 资产类型
+				sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", json.bean.typeId, form);
+
 		 		//资产来源
 		 		showGrid({
 				 	id: "fromId",

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js

@@ -25,23 +25,18 @@ layui.config({
 		$("#useName").html(data.bean.userName);
 	});
 
-	initTypeHtml();
-
-	//初始化资产类别
-	function initTypeHtml() {
-		AjaxPostUtil.request({url: flowableBasePath + "assettype006", params: {}, type: 'json', callback: function(json) {
-			initFromHtml();
-			typeHtml = getDataUseHandlebars(selOption, json); //加载类别数据
-			//渲染
-			form.render();
-			addRow();
-		}});
-	}
-	//初始化资产来源
+	// 资产类型
+	sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) {
+		typeHtml = getDataUseHandlebars(selOption, data);
+	});
+
+	initFromHtml();
+	// 初始化资产来源
 	function initFromHtml() {
 		AjaxPostUtil.request({url: flowableBasePath + "assetfrom006", params: {}, type: 'json', async:false, callback: function(json) {
 			fromHtml = getDataUseHandlebars(selOption, json); //加载资产来源数据
 			matchingLanguage();
+			addRow();
 			form.render();
 		}});
 	}

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js

@@ -39,14 +39,14 @@ layui.config({
 
 	//初始化资产类别
 	function initTypeHtml() {
-		AjaxPostUtil.request({url: flowableBasePath + "assettype006", params: {}, type: 'json', callback: function(json) {
-			initFromHtml();
-			typeHtml = getDataUseHandlebars(selOption, json); //加载类别数据
-			//渲染
-			form.render();
-			//加载表格数据
-			initTableAssetList();
-		}});
+		// 资产类型
+		sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) {
+			typeHtml = getDataUseHandlebars(selOption, data);
+		});
+		// 加载表格数据
+		initTableAssetList();
+
+		initFromHtml();
 	}
 
 	//初始化资产来源
@@ -101,7 +101,6 @@ layui.config({
 		var noError = false; //循环遍历表格数据时，是否有其他错误信息
 		$.each(rowTr, function(i, item) {
 			var rowNum = $(item).attr("trcusid").replace("tr", "");
-			var assetNum = parseInt($("#assetNum" + rowNum).html());
 			if(isNull($("#managementImg" + rowNum).find("input[type='hidden'][name='upload']").attr("oldurl"))){
 				winui.window.msg('资产图片不能为空！', {icon: 2, time: 2000});
 				noError = true;

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnAdd.js

@@ -25,57 +25,56 @@ layui.config({
 	});
 	initTypeHtml();
 
-	// 初始化资产类别
 	function initTypeHtml() {
-		AjaxPostUtil.request({url: flowableBasePath + "assettype006", params: {}, type: 'json', callback: function(json) {
-			typeHtml = getDataUseHandlebars(selOption, json); //加载类别数据
-			// 渲染
-			form.render();
-			//类型加载变化事件
-			form.on('select(selectTypeProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("typeId", "");
-				var thisRowValue = data.value;
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					if(inPointArray(thisRowValue, assetList)) {
-						//类型对应的资产存在js对象中
-						var list = getListPointArray(thisRowValue, assetList);
-						resetAssetList(thisRowNum, list); //重置选择行的资产列表
-					} else {
-						//类型对应的资产不存在js对象中
-						AjaxPostUtil.request({url: flowableBasePath + "asset026", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
-							assetList.push({
-								id: thisRowValue,
-								list: json.rows
-							});
-							resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
-						}});
-					}
-				}
-			});
-
-			//商品加载变化事件
-			form.on('select(selectAssetarProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("assetId", "");
-				var thisRowValue = data.value;
-				var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					var list = getListPointArray(thisRowTypeChooseId, assetList);
-					$.each(list, function(i, item) {
-						if(item.id === thisRowValue) {
-							$("#specificationsName" + thisRowNum).html(item.specificationsName);
-							$("#assetNum" + thisRowNum).html(item.assetNum);
-							return false;
-						}
-					});
+		// 资产类型
+		sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) {
+			typeHtml = getDataUseHandlebars(selOption, data);
+		});
+		form.render();
+		//类型加载变化事件
+		form.on('select(selectTypeProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("typeId", "");
+			var thisRowValue = data.value;
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				if(inPointArray(thisRowValue, assetList)) {
+					//类型对应的资产存在js对象中
+					var list = getListPointArray(thisRowValue, assetList);
+					resetAssetList(thisRowNum, list); //重置选择行的资产列表
 				} else {
-					$("#specificationsName" + thisRowNum).html(""); //重置规格为空
-					$("#assetNum" + thisRowNum).html(""); //重置编号为空
+					//类型对应的资产不存在js对象中
+					AjaxPostUtil.request({url: flowableBasePath + "asset026", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
+						assetList.push({
+							id: thisRowValue,
+							list: json.rows
+						});
+						resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
+					}});
 				}
-			});
-			//初始化一行数据
-			addRow();
-			matchingLanguage();
-		}});
+			}
+		});
+
+		//商品加载变化事件
+		form.on('select(selectAssetarProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("assetId", "");
+			var thisRowValue = data.value;
+			var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				var list = getListPointArray(thisRowTypeChooseId, assetList);
+				$.each(list, function(i, item) {
+					if(item.id === thisRowValue) {
+						$("#specificationsName" + thisRowNum).html(item.specificationsName);
+						$("#assetNum" + thisRowNum).html(item.assetNum);
+						return false;
+					}
+				});
+			} else {
+				$("#specificationsName" + thisRowNum).html(""); //重置规格为空
+				$("#assetNum" + thisRowNum).html(""); //重置编号为空
+			}
+		});
+		// 初始化一行数据
+		addRow();
+		matchingLanguage();
 	}
 
 	skyeyeEnclosure.init('enclosureUpload');

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnEdit.js

@@ -37,57 +37,55 @@ layui.config({
 		matchingLanguage();
 	}});
 
-	//初始化资产类别
 	function initTypeHtml() {
-		AjaxPostUtil.request({url: flowableBasePath + "assettype006", params: {}, type: 'json', callback: function(json) {
-			typeHtml = getDataUseHandlebars(selOption, json); //加载类别数据
-			//渲染
-			form.render();
-			//类型加载变化事件
-			form.on('select(selectTypeProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("typeId", "");
-				var thisRowValue = data.value;
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					if(inPointArray(thisRowValue, assetList)) {
-						//类型对应的资产存在js对象中
-						var list = getListPointArray(thisRowValue, assetList);
-						resetAssetList(thisRowNum, list); //重置选择行的资产列表
-					} else {
-						//类型对应的资产不存在js对象中
-						AjaxPostUtil.request({url: flowableBasePath + "asset026", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
-							assetList.push({
-								id: thisRowValue,
-								list: json.rows
-							});
-							resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
-						}});
-					}
-				}
-			});
-
-			//商品加载变化事件
-			form.on('select(selectAssetarProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("assetId", "");
-				var thisRowValue = data.value;
-				var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					var list = getListPointArray(thisRowTypeChooseId, assetList);
-					$.each(list, function(i, item) {
-						if(item.id === thisRowValue) {
-							$("#specificationsName" + thisRowNum).html(item.specificationsName);
-							$("#assetNum" + thisRowNum).html(item.assetNum);
-							return false;
-						}
-					});
+		// 资产类型
+		sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) {
+			typeHtml = getDataUseHandlebars(selOption, data);
+		});
+		form.render();
+		//类型加载变化事件
+		form.on('select(selectTypeProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("typeId", "");
+			var thisRowValue = data.value;
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				if(inPointArray(thisRowValue, assetList)) {
+					//类型对应的资产存在js对象中
+					var list = getListPointArray(thisRowValue, assetList);
+					resetAssetList(thisRowNum, list); //重置选择行的资产列表
 				} else {
-					$("#specificationsName" + thisRowNum).html(""); //重置规格为空
-					$("#assetNum" + thisRowNum).html(""); //重置库存为空
+					//类型对应的资产不存在js对象中
+					AjaxPostUtil.request({url: flowableBasePath + "asset026", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
+						assetList.push({
+							id: thisRowValue,
+							list: json.rows
+						});
+						resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
+					}});
 				}
-			});
-			//加载表格数据
-			initTableAssetList();
+			}
+		});
 
-		}});
+		//商品加载变化事件
+		form.on('select(selectAssetarProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("assetId", "");
+			var thisRowValue = data.value;
+			var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				var list = getListPointArray(thisRowTypeChooseId, assetList);
+				$.each(list, function(i, item) {
+					if(item.id === thisRowValue) {
+						$("#specificationsName" + thisRowNum).html(item.specificationsName);
+						$("#assetNum" + thisRowNum).html(item.assetNum);
+						return false;
+					}
+				});
+			} else {
+				$("#specificationsName" + thisRowNum).html(""); //重置规格为空
+				$("#assetNum" + thisRowNum).html(""); //重置库存为空
+			}
+		});
+		//加载表格数据
+		initTableAssetList();
 	}
 
 	//加载表格数据

admin-assistant/src/main/resources/template/js/assetManageType/assetManageTypeAdd.js

-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui'], function (exports) {
-	winui.renderColor();
-	layui.use(['form'], function (form) {
-		var index = parent.layer.getFrameIndex(window.name);
-	    var $ = layui.$;
-	    
-	    matchingLanguage();
- 		form.render();
- 	    form.on('submit(formAddBean)', function (data) {
- 	        if (winui.verifyForm(data.elem)) {
- 	        	var params = {
- 	        		typeName: $("#typeName").val()
- 	        	};
- 	        	AjaxPostUtil.request({url: flowableBasePath + "assettype002", params: params, type: 'json', callback: function (json) {
-					parent.layer.close(index);
-					parent.refreshCode = '0';
-	 	   		}});
- 	        }
- 	        return false;
- 	    });
- 	    
-	    $("body").on("click", "#cancle", function() {
-	    	parent.layer.close(index);
-	    });
-	});
-});
\ No newline at end of file

admin-assistant/src/main/resources/template/js/assetManageType/assetManageTypeEdit.js

-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui'], function (exports) {
-	winui.renderColor();
-	layui.use(['form'], function (form) {
-		var index = parent.layer.getFrameIndex(window.name);
-	    var $ = layui.$;
-	    
-	    showGrid({
-		 	id: "showForm",
-		 	url: flowableBasePath + "assettype004",
-		 	params: {rowId: parent.rowId},
-		 	pagination: false,
-		 	template: getFileContent('tpl/assetManageType/assetManageTypeEditTemplate.tpl'),
-		 	ajaxSendLoadBefore: function(hdb){
-		 	},
-		 	ajaxSendAfter:function (json) {
-		 		matchingLanguage();
-		 		form.render();
-		 	    form.on('submit(formEditBean)', function (data) {
-		 	        if (winui.verifyForm(data.elem)) {
-		 	        	var params = {
-	 	        			rowId: parent.rowId,
-	 	        			typeName: $("#typeName").val()
-	 	 	        	};
-	 	 	        	AjaxPostUtil.request({url: flowableBasePath + "assettype005", params: params, type: 'json', callback: function (json) {
-							parent.layer.close(index);
-							parent.refreshCode = '0';
-	 		 	   		}});
-		 	        }
-		 	        return false;
-		 	    });
-		 	}
-		});
-
-	    $("body").on("click", "#cancle", function() {
-	    	parent.layer.close(index);
-	    });
-	});
-});
\ No newline at end of file

admin-assistant/src/main/resources/template/js/assetManageType/assetManageTypeList.js

-var rowId = "";
-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
-	
-	winui.renderColor();
-	
-	var $ = layui.$,
-		form = layui.form,
-		table = layui.table;
-	
-	// 新增类别
-	authBtn('1596981316446');
-	
-	showAssettypeList();
-	// 资产类型列表
-    function showAssettypeList(){
-		table.render({
-		    id: 'assettypeTable',
-		    elem: '#assettypeTable',
-		    method: 'post',
-		    url: flowableBasePath + 'assettype001',
-		    where: getTableParams(),
-		    even: true,
-		    page: true,
-		    limits: getLimits(),
-	    	limit: getLimit(),
-		    cols: [[
-		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
-		        { field: 'typeName', title: '类型名称', width: 170 },
-		        { field: 'state', title: '状态', width: 100, align: 'center', templet: function (d) {
-		        	if(d.state == '0'){
-		        		return "<span class='state-new'>新建</span>";
-		        	}else if(d.state == '1'){
-		        		return "<span class='state-up'>线上</span>";
-		        	}else if(d.state == '2'){
-		        		return "<span class='state-down'>线下</span>";
-		        	} else {
-		        		return "参数错误";
-		        	}
-		        }},
-		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#assettypetableBar'}
-		    ]],
-		    done: function(){
-		    	matchingLanguage();
-		    }
-		});
-	}
-	
-	table.on('tool(assettypeTable)', function (obj) {
-        var data = obj.data;
-        var layEvent = obj.event;
-        if (layEvent === 'assettypedelete'){ //删除
-        	assettypedelet(data);
-        }else if (layEvent === 'assettypeedit'){	//编辑
-        	assettypeedit(data);
-        }else if (layEvent === 'assettypeup'){	//上线
-        	assettypeup(data);
-        }else if (layEvent === 'assettypedown'){	//下线
-        	assettypedown(data);
-        }else if (layEvent === 'assettypetop'){	//上移
-        	assettypetopOne(data);
-        }else if (layEvent === 'assettypelower'){	//下移
-        	assettypelowerOne(data);
-        }
-    });
-	
-	form.render();
-	
-	// 删除
-	function assettypedelet(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 + "assettype003", params:{rowId: data.id}, type: 'json', callback: function (json) {
-				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
-				loadassettypeTable();
-    		}});
-		});
-	}
-
-	// 新增
-	$("body").on("click", "#assettypeaddBean", function() {
-    	_openNewWindows({
-			url: "../../tpl/assetManageType/assetManageTypeAdd.html", 
-			title: "新增资产类型",
-			pageId: "assetManageTypeAdd",
-			area: ['60vw', '30vh'],
-			callBack: function(refreshCode){
-				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-				loadassettypeTable();
-			}});
-    });
-	
-	// 编辑
-	function assettypeedit(data){
-		rowId = data.id;
-		_openNewWindows({
-			url: "../../tpl/assetManageType/assetManageTypeEdit.html", 
-			title: "编辑资产类型",
-			pageId: "assetManageTypeEdit",
-			area: ['60vw', '30vh'],
-			callBack: function(refreshCode){
-				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-				loadassettypeTable();
-			}});
-	}
-	
-	// 上线
-	function assettypeup(data, obj){
-		var msg = obj ? '确认将【' + obj.data.typeName + '】上线吗？' : '确认将选中数据上线吗？';
-		layer.confirm(msg, { icon: 3, title: '上线操作' }, function (index) {
-			layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "assettype007", params:{rowId: data.id}, type: 'json', callback: function (json) {
-				winui.window.msg("上线成功", {icon: 1, time: 2000});
-				loadassettypeTable();
-    		}});
-		});
-	}
-	
-	// 下线
-	function assettypedown(data, obj){
-		var msg = obj ? '确认将【' + obj.data.typeName + '】下线吗？' : '确认将选中数据下线吗？';
-		layer.confirm(msg, { icon: 3, title: '下线操作' }, function (index) {
-			layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "assettype008", params:{rowId: data.id}, type: 'json', callback: function (json) {
-				winui.window.msg("下线成功", {icon: 1, time: 2000});
-				loadassettypeTable();
-    		}});
-		});
-	}
-	
-	// 上移
-	function assettypetopOne(data){
-		AjaxPostUtil.request({url: flowableBasePath + "assettype009", params:{rowId: data.id}, type: 'json', callback: function (json) {
-			winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
-			loadassettypeTable();
-		}});
-	}
-	
-	// 下移
-	function assettypelowerOne(data){
-		AjaxPostUtil.request({url: flowableBasePath + "assettype010", params:{rowId: data.id}, type: 'json', callback: function (json) {
-			winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
-			loadassettypeTable();
-		}});
-	}
-	
-    $("body").on("click", "#assettypereloadTable", function() {
-    	loadassettypeTable();
-    });
-    
-    // 搜索表单
-	$("body").on("click", "#assettypeSearch", function() {
-    	table.reload("assettypeTable", {page: {curr: 1}, where: getTableParams()});
-	});
-    
-    function loadassettypeTable(){
-    	table.reload("assettypeTable", {where: getTableParams()});
-    }
-    
-    function getTableParams(){
-    	return {
-    		typeName:$("#typeName").val(),
-    		typeState:$("#typeState").val()
-    	};
-    }
-    
-    exports('assetManageTypeList', {});
-});

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseAdd.js

@@ -24,57 +24,57 @@ layui.config({
 	});
 	initTypeHtml();
 
-	//初始化资产类别
 	function initTypeHtml() {
-		AjaxPostUtil.request({url: flowableBasePath + "assettype006", params: {}, type: 'json', callback: function(json) {
-			typeHtml = getDataUseHandlebars(selOption, json); //加载类别数据
-			matchingLanguage();
-			//渲染
-			form.render();
-			//类型加载变化事件
-			form.on('select(selectTypeProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("typeId", "");
-				var thisRowValue = data.value;
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					if(inPointArray(thisRowValue, assetList)) {
-						//类型对应的资产存在js对象中
-						var list = getListPointArray(thisRowValue, assetList);
-						resetAssetList(thisRowNum, list); //重置选择行的资产列表
-					} else {
-						//类型对应的资产不存在js对象中
-						AjaxPostUtil.request({url: flowableBasePath + "asset011", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
-							assetList.push({
-								id: thisRowValue,
-								list: json.rows
-							});
-							resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
-						}});
-					}
-				}
-			});
-
-			//商品加载变化事件
-			form.on('select(selectAssetarProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("assetId", "");
-				var thisRowValue = data.value;
-				var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					var list = getListPointArray(thisRowTypeChooseId, assetList);
-					$.each(list, function(i, item) {
-						if(item.id === thisRowValue) {
-							$("#specificationsName" + thisRowNum).html(item.specificationsName);
-							$("#assetNum" + thisRowNum).html(item.assetNum);
-							return false;
-						}
-					});
+		// 资产类型
+		sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) {
+			typeHtml = getDataUseHandlebars(selOption, data);
+		});
+		matchingLanguage();
+		//渲染
+		form.render();
+		//类型加载变化事件
+		form.on('select(selectTypeProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("typeId", "");
+			var thisRowValue = data.value;
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				if(inPointArray(thisRowValue, assetList)) {
+					//类型对应的资产存在js对象中
+					var list = getListPointArray(thisRowValue, assetList);
+					resetAssetList(thisRowNum, list); //重置选择行的资产列表
 				} else {
-					$("#specificationsName" + thisRowNum).html(""); //重置规格为空
-					$("#assetNum" + thisRowNum).html(""); //重置编号为空
+					//类型对应的资产不存在js对象中
+					AjaxPostUtil.request({url: flowableBasePath + "asset011", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
+						assetList.push({
+							id: thisRowValue,
+							list: json.rows
+						});
+						resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
+					}});
 				}
-			});
-			//初始化一行数据
-			addRow();
-		}});
+			}
+		});
+
+		//商品加载变化事件
+		form.on('select(selectAssetarProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("assetId", "");
+			var thisRowValue = data.value;
+			var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				var list = getListPointArray(thisRowTypeChooseId, assetList);
+				$.each(list, function(i, item) {
+					if(item.id === thisRowValue) {
+						$("#specificationsName" + thisRowNum).html(item.specificationsName);
+						$("#assetNum" + thisRowNum).html(item.assetNum);
+						return false;
+					}
+				});
+			} else {
+				$("#specificationsName" + thisRowNum).html(""); //重置规格为空
+				$("#assetNum" + thisRowNum).html(""); //重置编号为空
+			}
+		});
+		//初始化一行数据
+		addRow();
 	}
 
 	skyeyeEnclosure.init('enclosureUpload');

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseEdit.js

@@ -36,57 +36,55 @@ layui.config({
 		matchingLanguage();
 	}});
 
-	// 初始化资产类别
 	function initTypeHtml() {
-		AjaxPostUtil.request({url: flowableBasePath + "assettype006", params: {}, type: 'json', callback: function(json) {
-			typeHtml = getDataUseHandlebars(selOption, json); //加载类别数据
-			//渲染
-			form.render();
-			//类型加载变化事件
-			form.on('select(selectTypeProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("typeId", "");
-				var thisRowValue = data.value;
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					if(inPointArray(thisRowValue, assetList)) {
-						//类型对应的资产存在js对象中
-						var list = getListPointArray(thisRowValue, assetList);
-						resetAssetList(thisRowNum, list); //重置选择行的资产列表
-					} else {
-						//类型对应的资产不存在js对象中
-						AjaxPostUtil.request({url: flowableBasePath + "asset011", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
-							assetList.push({
-								id: thisRowValue,
-								list: json.rows
-							});
-							resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
-						}});
-					}
-				}
-			});
-
-			//商品加载变化事件
-			form.on('select(selectAssetarProperty)', function(data) {
-				var thisRowNum = data.elem.id.replace("assetId", "");
-				var thisRowValue = data.value;
-				var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
-				if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-					var list = getListPointArray(thisRowTypeChooseId, assetList);
-					$.each(list, function(i, item) {
-						if(item.id === thisRowValue) {
-							$("#specificationsName" + thisRowNum).html(item.specificationsName);
-							$("#assetNum" + thisRowNum).html(item.assetNum);
-							return false;
-						}
-					});
+		// 资产类型
+		sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) {
+			typeHtml = getDataUseHandlebars(selOption, data);
+		});
+		form.render();
+		//类型加载变化事件
+		form.on('select(selectTypeProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("typeId", "");
+			var thisRowValue = data.value;
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				if(inPointArray(thisRowValue, assetList)) {
+					//类型对应的资产存在js对象中
+					var list = getListPointArray(thisRowValue, assetList);
+					resetAssetList(thisRowNum, list); //重置选择行的资产列表
 				} else {
-					$("#specificationsName" + thisRowNum).html(""); //重置规格为空
-					$("#assetNum" + thisRowNum).html(""); //重置库存为空
+					//类型对应的资产不存在js对象中
+					AjaxPostUtil.request({url: flowableBasePath + "asset011", params: {typeId: thisRowValue}, type: 'json', callback: function(json) {
+						assetList.push({
+							id: thisRowValue,
+							list: json.rows
+						});
+						resetAssetList(thisRowNum, json.rows); //重置选择行的资产列表
+					}});
 				}
-			});
-			//加载表格数据
-			initTableAssetList();
+			}
+		});
 
-		}});
+		//商品加载变化事件
+		form.on('select(selectAssetarProperty)', function(data) {
+			var thisRowNum = data.elem.id.replace("assetId", "");
+			var thisRowValue = data.value;
+			var thisRowTypeChooseId = $("#typeId" + thisRowNum).val();
+			if(!isNull(thisRowValue) && thisRowValue != '请选择') {
+				var list = getListPointArray(thisRowTypeChooseId, assetList);
+				$.each(list, function(i, item) {
+					if(item.id === thisRowValue) {
+						$("#specificationsName" + thisRowNum).html(item.specificationsName);
+						$("#assetNum" + thisRowNum).html(item.assetNum);
+						return false;
+					}
+				});
+			} else {
+				$("#specificationsName" + thisRowNum).html(""); //重置规格为空
+				$("#assetNum" + thisRowNum).html(""); //重置库存为空
+			}
+		});
+		// 加载表格数据
+		initTableAssetList();
 	}
 
 	//加载表格数据

admin-assistant/src/main/resources/template/tpl/assetManageType/assetManageTypeAdd.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div style="padding:20px; margin:0 auto;">
-	    <form class="layui-form" action="" id="showForm">
-		    <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="typeName" name="typeName" win-verify="required" placeholder="请输入类型名称" class="layui-input"/>
-		        </div>
-		    </div>
-		    <div class="layui-form-item layui-col-xs12">
-		        <div class="layui-input-block">
-		            <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-		            <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
-		        </div>
-		    </div>
-	    </form>
-	</div>
-	<script src="../../assets/lib/layui/layui.js"></script>
-   	<script src="../../assets/lib/layui/custom.js"></script>
-   	<script type="text/javascript">
-        layui.config({base: '../../js/assetManageType/'}).use('assetManageTypeAdd');
-    </script>
-</body>
-</html>
\ No newline at end of file

admin-assistant/src/main/resources/template/tpl/assetManageType/assetManageTypeEdit.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div style="padding:20px; margin:0 auto;">
-	    <form class="layui-form" action="" id="showForm">
-	        
-	    </form>
-	</div>
-	<script src="../../assets/lib/layui/layui.js"></script>
-   	<script src="../../assets/lib/layui/custom.js"></script>
-   	<script type="text/javascript">
-        layui.config({base: '../../js/assetManageType/'}).use('assetManageTypeEdit');
-    </script>
-</body>
-</html>
\ No newline at end of file

admin-assistant/src/main/resources/template/tpl/assetManageType/assetManageTypeEditTemplate.tpl

-{{#bean}}
-    <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="typeName" name="typeName" win-verify="required" placeholder="请输入类型名称" class="layui-input" value="{{typeName}}"/>
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs12">
-        <div class="layui-input-block">
-            <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-            <button class="winui-btn" lay-submit lay-filter="formEditBean"><language showName="com.skyeye.save"></language></button>
-        </div>
-    </div>
-{{/bean}}
\ No newline at end of file

admin-assistant/src/main/resources/template/tpl/assetManageType/assetManageTypeList.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div style="margin:0 auto; height: 100%;">
-		<div class="txtcenter" style="margin:0 auto; padding-top: 10px;">
-		    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-		        <div class="layui-form-item">
-		            <div class="layui-inline">
-		                <label class="layui-form-label">类型名称</label>
-		                <div class="layui-input-inline">
-		                    <input type="text" id="typeName" name="typeName" placeholder="请输入资产类型名称" class="layui-input" />
-		                </div>
-						<label class="layui-form-label">状态</label>
-						<div class="layui-input-inline">
-							<select id="typeState" name="typeState">
-								<option value="">全部</option>
-								<option value="0">新建</option>
-								<option value="1">线上</option>
-								<option value="2">线下</option>
-							</select>
-						</div>
-						<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-		                <button class="layui-btn list-form-search" type="button" id="assettypeSearch"><language showName="com.skyeye.search2"></language></button>
-		            </div>
-		        </div>
-		    </form>
-		</div>
-	    <div class="winui-toolbar">
-	        <div class="winui-tool" style="text-align: left;">
-	            <button id="assettypereloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-	            <button id="assettypeaddBean" class="winui-toolbtn" auth="1596981316446"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
-	        </div>
-	    </div>
-	    <div style="margin:auto 10px;">
-	        <table id="assettypeTable" lay-filter="assettypeTable"></table>
-	        <script type="text/html" id="assettypetableBar">
-				{{# if(d.state == 0 || d.state == 2){ }}
-					{{# if(auth('1596981326010')){ }}
-            			<a class="layui-btn layui-btn-xs" lay-event="assettypeedit"><language showName="com.skyeye.editBtn"></language></a>
-					{{# } }}
-					{{# if(auth('1596981334977')){ }}
-            			<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="assettypedelete"><language showName="com.skyeye.deleteBtn"></language></a>
-					{{# } }}
-					{{# if(auth('1596981344183')){ }}
-            			<a class="layui-btn layui-btn-xs" lay-event="assettypeup">上线</a>
-					{{# } }}
-				{{# } }}
-				{{# if(d.state == 1){ }}
-					{{# if(auth('1596981352203')){ }}
-						<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="assettypedown">下线</a>
-					{{# } }}
-				{{# } }}
-         		{{# if(d.orderBy != 1 && auth('1596981358611')){ }}
-					<a class="layui-btn layui-btn-xs" lay-event="assettypetop">上移</a>
-				{{# } }}
-				{{# if(auth('1596981366076')){ }}
-					<a class="layui-btn layui-btn-xs" lay-event="assettypelower">下移</a>
-		 		{{# } }}
-        	</script>
-	    </div>
-	</div>
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/assetManageType/'}).use('assetManageTypeList');
-    </script>
-</body>
-</html>
\ No newline at end of file

web/src/main/resources/template/json/sysDictData.json

@@ -32,6 +32,7 @@
     "pmProjectDiscussType": {"name": "PM-项目讨论板分类", "key": "PM_PROJECT_DISCUSS_TYPE"},
     "pmTaskType": {"name": "PM-任务分类", "key": "PM_TASK_TYPE"},
 
-    "admAssetArticlesType": {"name": "ADM-用品类别", "key": "ADM_ASSET_ARTICLES_TYPE"}
+    "admAssetArticlesType": {"name": "ADM-用品类别", "key": "ADM_ASSET_ARTICLES_TYPE"},
+    "admAssetType": {"name": "ADM-资产类型", "key": "ADM_ASSET_TYPE"}
 
 }