diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html index 27c7dc2..223399f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html @@ -863,9 +863,9 @@ 单位：[[${sysuser.dept.deptName}]] - - 日期： - + 密品种类：[[${tdPropertyManager.secretsType}]] + + 日期： 所属市州 @@ -943,6 +943,20 @@ } }); }); + //密品种类 + var examinestateDatas = [[${@dict.getType('sys_secrets_type')}]]; + var examinestateToFind = []; + document.querySelectorAll('.secretsType').forEach(function(element) { + examinestateToFind.push(element.innerHTML); + }); + examinestateToFind.forEach(function(value) { + const foundObject = examinestateDatas.find(obj => obj.dictValue === value); + document.querySelectorAll('.secretsType').forEach(function(element) { + if (element.innerHTML === value) { + element.innerHTML = foundObject ? foundObject.dictLabel : ""; + } + }); + }); setTimeout(()=>{ $.ajax({ url: ctx + "system/area/getAllList", diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/printEment.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/printEment.html new file mode 100644 index 0000000..3b12713 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/printEment.html @@ -0,0 +1,771 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
[[${sysuser.dept.deptName}]]密品统计信息表
单位：[[${sysuser.dept.deptName}]]密品种类：[[${tdPropertyManager.secretsType}]]日期：
所属市州所属区县登记人员[[${tdPropertyManager.recoverName}]]
使用部门[[${tdPropertyManager.useDepart}]]使用人员[[${tdPropertyManager.userName}]]登记时间[[${tdPropertyManager.recoverDate}]]
接收时间[[${tdPropertyManager.useDate}]]登记编号[[${tdPropertyManager.useId}]]密品总数[[${tdPropertyManager.propertyNum}]]
密品编号名称用途备注
[[${propertynum.id}]][[${propertynum.name}]][[${propertynum.purposes}]][[${propertynum.remark}]]
+ + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html index 3dd5f48..2b660a9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html @@ -128,6 +128,7 @@ var printFlag = [[${@permission.hasPermi('system:propertynum:print')}]]; var removeFlag = [[${@permission.hasPermi('system:property:remove')}]]; var listFlag = [[${@permission.hasPermi('system:property:list')}]]; + var sysSecretsTypeDatas = [[${@dict.getType('sys_secrets_type')}]]; var prefix = ctx + "system/propertynum"; let datas = [] $.ajax({ @@ -221,6 +222,13 @@ field: 'useDepart', title: '使用部门' }, + { + field: 'secretsType', + title: '密品分类', + formatter: function(value, row, index) { + return $.table.selectDictLabel(sysSecretsTypeDatas, value); + } + }, { field: 'userName', title: '使用人员' @@ -238,7 +246,8 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('打印 '); + var rowData = encodeURIComponent(JSON.stringify(row)); + actions.push('打印 '); return actions.join(''); } }] @@ -246,9 +255,16 @@ $.table.init(options); }); /*密品列表-详细*/ - function print(useId) { - var url = prefix + '/print/' + useId; - $.modal.openTab("打印", url); + function print(element) { + var rowData = $(element).data('row'); + var row = JSON.parse(decodeURIComponent(rowData)); + if (row.secretsType == '1'){ + var url = prefix + '/print/' + row.useId; + $.modal.openTab("打印", url); + }else{ + var url = prefix + '/printEment/' + row.useId; + $.modal.openTab("打印", url); + } } var myChart = echarts.init(document.getElementById('leftMain')); axios.post(prefix + '/countInfo').then(response => {