fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -99,14 +99,13 @@ <Property name="label">完成数量</Property> <Property name="displayFormat">#0.0 KG</Property> </PropertyDef> <PropertyDef name="auditStatus"> <PropertyDef name="auditUser"> <Property></Property> <Property name="label">审核状态</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStatusType").getResult()}</Property> <Property name="keyProperty">dictValue</Property> <Property name="valueProperty">dictLabel</Property> </Property> <Property name="label">审核人</Property> </PropertyDef> <PropertyDef name="auditDate"> <Property name="dataType">DateTime</Property> <Property name="label">审批时间</Property> </PropertyDef> <PropertyDef name="completeStatus"> <Property></Property> @@ -161,6 +160,30 @@ <Property name="valueProperty">name</Property> </Property> <Property name="visible">true</Property> </PropertyDef> <PropertyDef name="auditStatus"> <Property></Property> <Property name="label">审核状态</Property> <Property name="mapping"> <Property name="mapValues"> <Collection> <Entity> <Property name="name">监管审核</Property> <Property name="code">10</Property> </Entity> <Entity> <Property name="name">银行审核</Property> <Property name="code">20</Property> </Entity> <Entity> <Property name="name">已审核</Property> <Property name="code">30</Property> </Entity> </Collection> </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> </DataType> </Model> @@ -299,7 +322,6 @@ <Property name="iconClass">fa fa-refresh</Property> <Property name="width">100</Property> <Property name="tip">完成量默认统计到昨天，查看实时完成量请点击“实时核算”按钮</Property> <Property name="ignored">true</Property> </ToolBarButton> <ToolBarButton layoutConstraint="left"> <ClientEvent name="onClick">
 @@ -315,20 +337,6 @@ <Property name="exClassName">btn2</Property> <Property name="width">120</Property> <Property name="iconClass">fa fa-print</Property> </ToolBarButton> <Separator/> <ToolBarButton layoutConstraint="left"> <ClientEvent name="onClick">var select = view.get("#dataGridMain").get("selection");
 if(select){
 view.get("#iFrameFlowHis").set("path","/work/flow-his2?businessId="+select.get("id"));
 view.get("#dialogHis").show();
 }else{
 $notify("请选择需要查看的数据……");
 }</ClientEvent> <Property name="caption">审批记录</Property> <Property name="exClassName">btn4</Property> <Property name="iconClass">fa fa-th-list</Property> <Property name="width">120</Property> </ToolBarButton> <Fill/> </ToolBar> @@ -384,10 +392,11 @@ <Property name="align">center</Property> <Property name="width">100</Property> </DataColumn> <DataColumn name="auditStatus"> <Property name="property">auditStatus</Property> <Property name="width">100</Property> <DataColumn> <Property name="property">updateBy</Property> <Property name="align">center</Property> <Property name="name">updateBy</Property> <Property name="width">120</Property> </DataColumn> <DataColumn> <Property name="property">createTime</Property> @@ -412,10 +421,7 @@ <Property name="iconClass">fa fa-tasks</Property> <Buttons> <Button id="btnOk"> <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 data.set('unitName',data.getText('deptId'));
 
 view.get("#updateSave").execute(function(result){
 <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
 if(result.code != '200'){
 $alert(result.message);
 return;
 @@ -479,7 +485,6 @@ <Property name="property">type</Property> <Property name="trigger">autoMappingDropDown1</Property> <Property name="editorType">RadioGroup</Property> <Property name="showHint">false</Property> <Editor/> </AutoFormElement> <AutoFormElement id="formItemBank"> @@ -510,13 +515,7 @@ <Property name="trigger">defaultYearDropDown</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">createTime</Property> <Property name="property">createTime</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">customerName</Property> <Property name="property">customerName</Property> <Editor/> @@ -528,6 +527,11 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">unitName</Property> <Property name="property">unitName</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">createBy</Property> <Property name="property">createBy</Property> <Editor/> @@ -535,7 +539,6 @@ <AutoFormElement> <Property name="name">createTime</Property> <Property name="property">createTime</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:3"> @@ -578,10 +581,21 @@ <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">auditUser</Property> <Property name="property">auditUser</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">auditDate</Property> <Property name="property">auditDate</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <HtmlContainer layoutConstraint="colSpan:3"> <Property name="content">1.入库通知单作为入库作业的前置条件，必须配置，否则无法进行入库作业。<br>
 2.单据类型=库区通知单，表示库区自己作业业务，不受监管管理。<br>
 3.单据类型=质押监管通知单，单据必须填写监督银行。</Property> <Property name="content">1.出库通知单作为出库作业的前置条件，必须配置，否则无法进行入库作业。<br>
 2.单据类型=库区通知单，表示库区自己作业业务，不受监管管理。</Property> <Property name="exClassName">h-tip</Property> <Property name="contentOverflow">hidden</Property> </HtmlContainer> @@ -632,18 +646,5 @@ <AjaxAction id="recalculate"> <Property name="service">inoutNoticePR#updateSumNoticeOut</Property> </AjaxAction> <Dialog id="dialogHis"> <Property name="width">80%</Property> <Property name="height">80%</Property> <Property name="iconClass">fa fa-th-list</Property> <Property name="caption">审批记录</Property> <Buttons/> <Children> <IFrame id="iFrameFlowHis"> <Property name="path">/work/flow-his?businessId=1</Property> </IFrame> </Children> <Tools/> </Dialog> </View> </ViewConfig> fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -484,7 +484,7 @@ <DataColumn> <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent> <Property name="caption">操作</Property> <Property name="width">80</Property> <Property name="width">160</Property> <Property name="align">center</Property> <Editor/> </DataColumn> fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
@@ -66,7 +66,7 @@ //设备数据 model.addAttribute("cameraList", commonManager.listCameraData()); //库区数据 model.addAttribute("deptList", commonManager.listDeptData(null)); model.addAttribute("deptList", commonManager.listDeptData(defaultCompany)); //业务类型数据 List<Map<String, String>> bizTypeList = new ArrayList<>(); for (WarnType type : WarnType.values()) { fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
@@ -59,7 +59,7 @@ //设备数据 model.addAttribute("cameraList", commonManager.listCameraData()); //库区数据 model.addAttribute("deptList", commonManager.listDeptData(null)); model.addAttribute("deptList", commonManager.listDeptData(defaultCompany)); //公司数据 model.addAttribute("companyList", companies); //默认查询公司数据 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
@@ -1,6 +1,7 @@ package com.fzzy.sys.controller.system; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.domain.Dept; import com.fzzy.igds.service.CoreCompanyService; import com.fzzy.igds.service.CoreDeptService; import com.ruoyi.common.annotation.Log; @@ -52,6 +53,13 @@ return deptList; } @PostMapping("/getDeptByUserType") @ResponseBody public List<Dept> getDeptByUserType(@RequestBody String parentId) { List<Dept> deptByUserType = coreDeptService.getDeptByUserType(parentId); return deptByUserType; } /** * 新增部门 */ fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
@@ -1,6 +1,41 @@ var layer; var laypage; // 监听收储公司 Select2 变化 $(document).ready(function() { // 监听收储公司下拉框变化 $('select[name="key"]').on('change', function() { var selectedParentId = $(this).val(); if(selectedParentId) { getSelectData(selectedParentId); } else { // 如果清空了收储公司选择，也清空库区选项 var $deptSelect = $('select[name="deptId"]'); $deptSelect.empty() .append('<option value="">所有</option>') .select2({ placeholder: "请选择库区", allowClear: true, width: 'resolve' }); } }); // 在点击库区下拉框时，仅验证而不发起新请求 $('select[name="deptId"]').on('select2:opening', function(e) { var selectedParentId = $('select[name="key"]').val(); if(!selectedParentId) { e.preventDefault(); layer.msg('请先选择收储公司'); return false; } // 不在此处发起请求，依赖 change 事件时的预加载 return true; }); }); $(function () { // 初始化分页 layui.use(['laypage', 'layer'], function () { @@ -15,6 +50,72 @@ initImagePreview(); }); // 修改 getSelectData 函数，支持 Select2 的数据格式 function getSelectData(parentId) { if(!parentId) { return layer.msg('请选择收储公司'); } $.ajax({ url: "../../system/dept-new/getDeptByUserType", type: 'POST', dataType: "json", contentType: "application/json;charset=UTF-8", data: parentId, success: function (response) { if (response) { deptList = response; // 重新初始化 Select2 或更新选项 updateDeptSelect2Options(deptList); } else { layer.msg(response.msg || '数据加载失败'); } }, error: function (xhr, status, error) { layer.msg('数据加载失败'); } }); } // 更新 Select2 下拉框选项 function updateDeptSelect2Options(deptList) { var $deptSelect = $('select[name="deptId"]'); // 保存当前选中的值 var currentVal = $deptSelect.val(); // 清空现有选项 $deptSelect.empty(); // 添加"所有"选项 $deptSelect.append('<option value="">所有</option>'); // 添加动态数据选项 if(deptList && deptList.length > 0) { deptList.forEach(function(dept) { $deptSelect.append('<option value="' + dept.id + '">' + dept.kqmc + '</option>'); }); } // 重新初始化 Select2 $deptSelect.select2({ placeholder: "请选择库区", allowClear: true, width: 'resolve' }); // 恢复之前的选择 if(currentVal) { $deptSelect.val(currentVal).trigger('change'); } } /** * 初始化分页组件 */ fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
@@ -1,6 +1,40 @@ var layer; var laypage; // 监听收储公司 Select2 变化 $(document).ready(function() { // 监听收储公司下拉框变化 $('select[name="key"]').on('change', function() { var selectedParentId = $(this).val(); if(selectedParentId) { getSelectData(selectedParentId); } else { // 如果清空了收储公司选择，也清空库区选项 var $deptSelect = $('select[name="deptId"]'); $deptSelect.empty() .append('<option value="">所有</option>') .select2({ placeholder: "请选择库区", allowClear: true, width: 'resolve' }); } }); // 在点击库区下拉框时，仅验证而不发起新请求 $('select[name="deptId"]').on('select2:opening', function(e) { var selectedParentId = $('select[name="key"]').val(); if(!selectedParentId) { e.preventDefault(); layer.msg('请先选择收储公司'); return false; } // 不在此处发起请求，依赖 change 事件时的预加载 return true; }); }); $(function () { // 初始化分页 layui.use(['laypage', 'layer'], function () { @@ -15,6 +49,67 @@ initImagePreview(); }); // 修改 getSelectData 函数，支持 Select2 的数据格式 function getSelectData(parentId) { if(!parentId) { return layer.msg('请选择收储公司'); } $.ajax({ url: "../../system/dept-new/getDeptByUserType", type: 'POST', dataType: "json", contentType: "application/json;charset=UTF-8", data: parentId, success: function (response) { if (response) { deptList = response; // 重新初始化 Select2 或更新选项 updateDeptSelect2Options(deptList); } else { layer.msg(response.msg || '数据加载失败'); } }, error: function (xhr, status, error) { layer.msg('数据加载失败'); } }); } // 更新 Select2 下拉框选项 function updateDeptSelect2Options(deptList) { var $deptSelect = $('select[name="deptId"]'); // 保存当前选中的值 var currentVal = $deptSelect.val(); // 清空现有选项 $deptSelect.empty(); // 添加"所有"选项 $deptSelect.append('<option value="">所有</option>'); // 添加动态数据选项 if(deptList && deptList.length > 0) { deptList.forEach(function(dept) { $deptSelect.append('<option value="' + dept.id + '">' + dept.kqmc + '</option>'); }); } // 重新初始化 Select2 $deptSelect.select2({ placeholder: "请选择库区", allowClear: true, width: 'resolve' }); // 恢复之前的选择 if(currentVal) { $deptSelect.val(currentVal).trigger('change'); } } /** * 初始化分页组件 */ fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
@@ -298,7 +298,11 @@ htm += ' 审批动作：'+item.action; htm += ' 经办人：'+item.assigneeName; htm += '</div>'; if(item.remark){ htm += '<div class="status-change">' + item.remark + '</div>'; }else{ htm += '<div class="status-change">' + '' + '</div>'; } htm += '<div class="time-info">' + item.createTime + '</div>'; htm += '</div></div>'; }
