diff --git a/admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js b/admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js index 377bd38ddf78157531d0268f195aab8132c0a7ab..5fa2f607ce3efcabb6aa8cccf37b0fa49619d5e8 100644 --- a/admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js +++ b/admin-assistant/src/main/resources/template/js/assetManage/assetManageAdd.js @@ -27,19 +27,8 @@ layui.config({ // 资产类型 sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", '', form); - //资产来源 - showGrid({ - id: "fromId", - url: flowableBasePath + "assetfrom006", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option-must.tpl'), - ajaxSendLoadBefore: function(hdb){ - }, - ajaxSendAfter:function (json) { - form.render('select'); - } - }); + // 资产来源 + sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], 'select', "fromId", '', form); skyeyeEnclosure.init('enclosureUpload'); matchingLanguage(); diff --git a/admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js b/admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js index 14c1c1472ea3af7b43e54be784b8dc2e4448c86d..654fcf3fba5df8f29a72cdf1a5feac503a7e752e 100644 --- a/admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js +++ b/admin-assistant/src/main/resources/template/js/assetManage/assetManageEdit.js @@ -40,20 +40,8 @@ layui.config({ // 资产类型 sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], 'select', "typeId", json.bean.typeId, form); - //资产来源 - showGrid({ - id: "fromId", - url: flowableBasePath + "assetfrom006", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option-must.tpl'), - ajaxSendLoadBefore: function(hdb){ - }, - ajaxSendAfter:function(j){ - $("#fromId").val(json.bean.fromId); - form.render('select'); - } - }); + // 资产来源 + sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], 'select', "fromId", json.bean.fromId, form); // 初始化上传 $("#assetImg").upload(systemCommonUtil.uploadCommon003Config('assetImg', 6, json.bean.assetImg, 1)); diff --git a/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromAdd.js b/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromAdd.js deleted file mode 100644 index 57f80892e1d293b444b42c75a52b735e6477f7b8..0000000000000000000000000000000000000000 --- a/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromAdd.js +++ /dev/null @@ -1,32 +0,0 @@ - -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 = { - fromName: $("#fromName").val() - }; - AjaxPostUtil.request({url: flowableBasePath + "assetfrom002", 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 diff --git a/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromEdit.js b/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromEdit.js deleted file mode 100644 index 9f8fb12337528d27d30cce71fa8474efc6090333..0000000000000000000000000000000000000000 --- a/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromEdit.js +++ /dev/null @@ -1,44 +0,0 @@ - -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 + "assetfrom004", - params: {rowId:parent.rowId}, - pagination: false, - template: getFileContent('tpl/assetManageFrom/assetManageFromEditTemplate.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, - fromName: $("#fromName").val() - }; - AjaxPostUtil.request({url: flowableBasePath + "assetfrom005", 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 diff --git a/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromList.js b/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromList.js deleted file mode 100644 index e169b92598df55e008184564ddf7506452631c8f..0000000000000000000000000000000000000000 --- a/admin-assistant/src/main/resources/template/js/assetManageFrom/assetManageFromList.js +++ /dev/null @@ -1,173 +0,0 @@ -var rowId = ""; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - table = layui.table; - - // 新增来源 - authBtn('1596982401332'); - - showAssetfromList(); - // 资产来源管理开始 - function showAssetfromList(){ - table.render({ - id: 'assetfromTable', - elem: '#assetfromTable', - method: 'post', - url: flowableBasePath + 'assetfrom001', - where: getTableParams(), - even: true, - page: true, - limits: getLimits(), - limit: getLimit(), - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'}, - { field: 'fromName', title: '来源名称', width: 170 }, - { field: 'state', title: '状态', width: 100, align: 'center', templet: function (d) { - if(d.state == '0'){ - return "新建"; - }else if(d.state == '1'){ - return "线上"; - }else if(d.state == '2'){ - return "线下"; - } else { - return "参数错误"; - } - }}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#assetfromtableBar'} - ]], - done: function(){ - matchingLanguage(); - } - }); - } - - table.on('tool(assetfromTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'assetfromdelete'){ //删除 - assetfromdelet(data); - }else if (layEvent === 'assetfromedit'){ //编辑 - assetfromedit(data); - }else if (layEvent === 'assetfromup'){ //上线 - assetfromup(data); - }else if (layEvent === 'assetfromdown'){ //下线 - assetfromdown(data); - }else if (layEvent === 'assetfromtop'){ //上移 - assetfromtopOne(data); - }else if (layEvent === 'assetfromlower'){ //下移 - assetfromlowerOne(data); - } - }); - - form.render(); - - // 删除 - function assetfromdelet(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 + "assetfrom003", params:{rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadassetfromTable(); - }}); - }); - } - - // 新增资产来源 - $("body").on("click", "#assetfromaddBean", function() { - _openNewWindows({ - url: "../../tpl/assetManageFrom/assetManageFromAdd.html", - title: "新增资产来源", - pageId: "assetManageFromAdd", - area: ['60vw', '30vh'], - callBack: function(refreshCode){ - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadassetfromTable(); - }}); - }); - - // 编辑资产来源 - function assetfromedit(data){ - rowId = data.id; - _openNewWindows({ - url: "../../tpl/assetManageFrom/assetManageFromEdit.html", - title: "编辑资产来源", - pageId: "assetManageFromEdit", - area: ['60vw', '30vh'], - callBack: function(refreshCode){ - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadassetfromTable(); - }}); - } - - // 上线 - function assetfromup(data, obj){ - var msg = obj ? '确认将【' + obj.data.fromName + '】上线吗？' : '确认将选中数据上线吗？'; - layer.confirm(msg, { icon: 3, title: '上线操作' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "assetfrom007", params:{rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg("上线成功", {icon: 1, time: 2000}); - loadassetfromTable(); - }}); - }); - } - - // 下线 - function assetfromdown(data, obj){ - var msg = obj ? '确认将【' + obj.data.fromName + '】下线吗？' : '确认将选中数据下线吗？'; - layer.confirm(msg, { icon: 3, title: '下线操作' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "assetfrom008", params:{rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg("下线成功", {icon: 1, time: 2000}); - loadassetfromTable(); - }}); - }); - } - - // 上移 - function assetfromtopOne(data){ - AjaxPostUtil.request({url: flowableBasePath + "assetfrom009", params:{rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadassetfromTable(); - }}); - } - - // 下移 - function assetfromlowerOne(data){ - AjaxPostUtil.request({url: flowableBasePath + "assetfrom010", params:{rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadassetfromTable(); - }}); - } - - // 刷新来源数据 - $("body").on("click", "#assetfromreloadTable", function() { - loadassetfromTable(); - }); - - // 刷新来源列表数据 - function loadassetfromTable(){ - table.reload("assetfromTable", {where: getTableParams()}); - } - - // 搜索来源列表表单 - $("body").on("click", "#assetfromSearch", function() { - table.reload("assetfromTable", {page: {curr: 1}, where: getTableParams()}); - }); - - function getTableParams(){ - return { - fromName:$("#fromName").val(), - fromState:$("#fromState").val() - }; - } - - exports('assetManageFromList', {}); -}); diff --git a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js index 330d5a25842f611e0f22b7de8b7b56828f18970e..1dee7871881988d8a4babf088df1205e8b08c3fa 100644 --- a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js +++ b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js @@ -1,6 +1,4 @@ -var assetList = new Array(); //资产集合 - // 资产采购 layui.config({ base: basePath, @@ -13,8 +11,7 @@ layui.config({ var $ = layui.$, form = layui.form; var rowNum = 1; //表格的序号 - var typeHtml = ""; - var fromHtml = ""; + var typeHtml = "", fromHtml = ""; var purchasetableTemplate = $("#purchasetableTemplate").html(); var selOption = getFileContent('tpl/template/select-option.tpl'); @@ -30,16 +27,14 @@ layui.config({ 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(); - }}); - } + // 资产来源 + sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], function (data) { + fromHtml = getDataUseHandlebars(selOption, data); + }); + + addRow(); + matchingLanguage(); + form.render(); skyeyeEnclosure.init('enclosureUpload'); // 保存为草稿 diff --git a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js index b469e411338f7cbde5ae6393984d9c3e40d3acb0..84bb54560b58f849d84ff1a684db3a4fae51772a 100644 --- a/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js +++ b/admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js @@ -1,6 +1,4 @@ -var assetList = new Array(); //资产集合 - // 资产采购 layui.config({ base: basePath, @@ -12,8 +10,8 @@ layui.config({ var index = parent.layer.getFrameIndex(window.name); var $ = layui.$, form = layui.form; - var rowNum = 1; //表格的序号 - var typeHtml = ""; + var rowNum = 1; + var typeHtml = "", fromHtml = ""; var usetableTemplate = $("#usetableTemplate").html(); var selOption = getFileContent('tpl/template/select-option.tpl'); @@ -33,31 +31,24 @@ layui.config({ $(".typeOne").removeClass("layui-hide"); } sTableData = json.bean.goods; - initTypeHtml(); - matchingLanguage(); - }}); - //初始化资产类别 - function initTypeHtml() { // 资产类型 sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetType"]["key"], function (data) { typeHtml = getDataUseHandlebars(selOption, data); }); - // 加载表格数据 - initTableAssetList(); - initFromHtml(); - } + // 资产来源 + sysDictDataUtil.queryDictDataListByDictTypeCode(sysDictData["admAssetFrom"]["key"], function (data) { + fromHtml = getDataUseHandlebars(selOption, data); + }); - //初始化资产来源 - function initFromHtml() { - AjaxPostUtil.request({url: flowableBasePath + "assetfrom006", params: {}, type: 'json', async:false, callback: function(json) { - fromHtml = getDataUseHandlebars(selOption, json); //加载资产来源数据 - form.render(); - }}); - } + // 加载表格数据 + initTableAssetList(); + matchingLanguage(); + form.render(); + }}); - //加载表格数据 + // 加载表格数据 function initTableAssetList() { $.each(sTableData, function(i, item) { addDataRow(item); diff --git a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromAdd.html b/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromAdd.html deleted file mode 100644 index 693fa1020ac29976426d12cf86e8a55e335f7425..0000000000000000000000000000000000000000 --- a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromAdd.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
-
- - -
-
-
-
- - - - - \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEdit.html b/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEdit.html deleted file mode 100644 index 0ce1116257054a1a255eee24a36667d37f0e93a8..0000000000000000000000000000000000000000 --- a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEdit.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEditTemplate.tpl b/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEditTemplate.tpl deleted file mode 100644 index f7e01244f26608b93b89c8cddcbd3e39376a1bf2..0000000000000000000000000000000000000000 --- a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromEditTemplate.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{#bean}} -
- -
- -
-
-
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromList.html b/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromList.html deleted file mode 100644 index cd7c6d5f27edc5661994ac20798778a4ea6225bf..0000000000000000000000000000000000000000 --- a/admin-assistant/src/main/resources/template/tpl/assetManageFrom/assetManageFromList.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - -
-
-
-
-
- -
- -
- -
- -
- - -
-
-
-
-
-
- - -
-
-
-
- -
-
- - - - - \ No newline at end of file diff --git a/web/src/main/resources/template/json/sysDictData.json b/web/src/main/resources/template/json/sysDictData.json index 9b799dc5ff0619e10eae58bd098077cd44d2883c..69ee0e4a88bf5b95b4c2ebfc6ec8e06d409d026d 100644 --- a/web/src/main/resources/template/json/sysDictData.json +++ b/web/src/main/resources/template/json/sysDictData.json @@ -33,6 +33,7 @@ "pmTaskType": {"name": "PM-任务分类", "key": "PM_TASK_TYPE"}, "admAssetArticlesType": {"name": "ADM-用品类别", "key": "ADM_ASSET_ARTICLES_TYPE"}, - "admAssetType": {"name": "ADM-资产类型", "key": "ADM_ASSET_TYPE"} + "admAssetType": {"name": "ADM-资产类型", "key": "ADM_ASSET_TYPE"}, + "admAssetFrom": {"name": "ADM-资产来源", "key": "ADM_ASSET_FROM"} }