From d3d12e212470904e54affe5ec8c06c672607cab9 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期一, 14 八月 2023 17:13:29 +0800 Subject: [PATCH] 功能优化 --- igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml | 229 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 184 insertions(+), 45 deletions(-) diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml index 71d6772..c34851b 100644 --- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml +++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml @@ -128,10 +128,11 @@ <PropertyDef name="kqdm"> <Property></Property> <Property name="label">搴撳尯浠g爜</Property> - </PropertyDef> - <PropertyDef name="kqmc"> - <Property></Property> - <Property name="label">搴撳尯鍚嶇О</Property> + <Property name="mapping"> + <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property> + <Property name="keyProperty">id</Property> + <Property name="valueProperty">name</Property> + </Property> </PropertyDef> <PropertyDef name="dwdm"> <Property></Property> @@ -153,9 +154,18 @@ <Property></Property> <Property name="label">妫�瀹氬崟浣�</Property> </PropertyDef> + <PropertyDef name="jdjg"> + <Property></Property> + <Property name="label">妫�瀹氱粨鏋�</Property> + </PropertyDef> + <PropertyDef name="remark"> + <Property></Property> + <Property name="label">澶囨敞</Property> + </PropertyDef> <PropertyDef name="zhgxsj"> - <Property name="dataType">Date</Property> + <Property name="dataType">DateTime</Property> <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property> + <Property name="readOnly">true</Property> </PropertyDef> </DataType> </Model> @@ -173,6 +183,7 @@ <DataSet id="dsCheck"> <Property name="dataType">[dtCheck]</Property> <Property name="dataProvider">deptDevicePR#pageCheck</Property> + <Property name="pageSize">15</Property> </DataSet> <Container layout="regionPadding:10" layoutConstraint="top"> <Property name="exClassName">bg-color</Property> @@ -212,12 +223,14 @@ </Button> <Button layoutConstraint="right"> <ClientEvent name="onClick">//鏄剧ず璁板綍
 -view.get("#iFrame").reload();
 +var entity = view.get("#dsMain.data:#");
 +var code = entity.get("sbbh");
 +view.get("#dsCheck").set("parameter",{code:code}).flushAsync();
 view.get("#dialogCheck").show();</ClientEvent> <Property name="caption">鏌ョ湅妫�淇褰�</Property> <Property name="exClassName">btn-flush</Property> <Property name="iconClass">fa fa-bars</Property> - <Property name="visible">false</Property> + <Property name="visible">true</Property> </Button> </Container> <Container layout="regionPadding:10" layoutConstraint="center"> @@ -373,16 +386,6 @@ <Editor/> </AutoFormElement> <AutoFormElement> - <Property name="name">dwdm</Property> - <Property name="property">dwdm</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">kqmc</Property> - <Property name="property">kqmc</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> <Property name="name">sbbh</Property> <Property name="property">sbbh</Property> <Editor/> @@ -441,25 +444,11 @@ </Children> <Tools/> </Dialog> - <UpdateAction id="uaSave"> - <Property name="dataResolver">deptDevicePR#saveDeptDevice</Property> - <UpdateItem> - <Property name="dataSet">dsMain</Property> - <Property name="dataPath">[#current]</Property> - <Property name="validateData">false</Property> - </UpdateItem> - </UpdateAction> - <AjaxAction id="ajaxDel"> - <Property name="service">deptDevicePR#delDeptDevice</Property> - <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property> - </AjaxAction> - <AjaxAction id="ajaxDelCheck"> - <Property name="service">deptDevicePR#delCheck</Property> - <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property> - </AjaxAction> - <Dialog id="dialogCheck"> + <Dialog id="dialogCheck" layout="regionPadding:10"> <Property name="width">90%</Property> <Property name="height">90%</Property> + <Property name="caption">璁惧妫�淇褰�</Property> + <Property name="closeable">false</Property> <Buttons> <Button layoutConstraint="center"> <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent> @@ -468,14 +457,30 @@ </Button> </Buttons> <Children> - <Container> - <Button> - <ClientEvent name="onClick">view.get("#dsMain").insert();</ClientEvent> + <Container layout="regionPadding:10" layoutConstraint="top"> + <Property name="exClassName">bg-color</Property> + <Button layoutConstraint="left"> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#")
 +view.get("#dsCheck").insert({
 + sbbh:data.get("sbbh"),
 + kqdm:data.get("kqdm"),
 + kqmc:data.get("kqmc"),
 + sbyqmc:data.get("sbyqmc"),
 + sbyqdm:data.get("sbyqdm")
 +});
 +view.get("#addCheck").show();</ClientEvent> <Property name="caption">鏂板</Property> <Property name="exClassName">btn-normal</Property> <Property name="iconClass">fa fa-plus</Property> </Button> - <Button> + <Button layoutConstraint="left"> + <ClientEvent name="onClick">var dialog= view.get("#addCheck");
 +dialog.show();</ClientEvent> + <Property name="caption">缂栬緫</Property> + <Property name="exClassName">btn-warm</Property> + <Property name="iconClass">fa fa-pencil</Property> + </Button> + <Button layoutConstraint="left"> <ClientEvent name="onClick">var cur = view.get("#dsCheck.data:#");
 if(!cur) return;
 view.get("#ajaxDelCheck").set("parameter",cur).execute(function(result){
 @@ -491,41 +496,175 @@ <Property name="iconClass">fa fa-trash-o</Property> </Button> </Container> - <Container> + <Container layout="regionPadding:10" layoutConstraint="center"> + <Property name="exClassName">bg-color</Property> <DataGrid id="dgCheck"> + <ClientEvent name="onDataRowDoubleClick">var dialog= view.get("#addCheck");
 +dialog.show();</ClientEvent> <Property name="dataSet">dsCheck</Property> <Property name="readOnly">true</Property> + <RowNumColumn/> <DataColumn name="sbbh"> <Property name="property">sbbh</Property> + <Property name="align">center</Property> </DataColumn> <DataColumn name="kqdm"> <Property name="property">kqdm</Property> - </DataColumn> - <DataColumn name="kqmc"> - <Property name="property">kqmc</Property> - </DataColumn> - <DataColumn name="dwdm"> - <Property name="property">dwdm</Property> + <Property name="align">center</Property> + <Property name="width">260</Property> </DataColumn> <DataColumn name="sbyqmc"> <Property name="property">sbyqmc</Property> + <Property name="align">center</Property> </DataColumn> <DataColumn name="sbyqdm"> <Property name="property">sbyqdm</Property> + <Property name="align">center</Property> </DataColumn> <DataColumn name="jdsj"> <Property name="property">jdsj</Property> + <Property name="align">center</Property> </DataColumn> <DataColumn name="jddw"> <Property name="property">jddw</Property> + <Property name="align">center</Property> + </DataColumn> + <DataColumn name="jdjg"> + <Property name="property">jdjg</Property> + <Property name="align">center</Property> + </DataColumn> + <DataColumn name="remark"> + <Property name="property">remark</Property> + <Property name="align">center</Property> </DataColumn> <DataColumn name="zhgxsj"> <Property name="property">zhgxsj</Property> + <Property name="align">center</Property> </DataColumn> </DataGrid> + </Container> + <Container layout="regionPadding:10" layoutConstraint="bottom"> + <Property name="exClassName">bg-color</Property> + <DataPilot layoutConstraint="right"> + <Property name="dataSet">dsCheck</Property> + <Property name="itemCodes">pageSize,pages</Property> + </DataPilot> </Container> </Children> <Tools/> </Dialog> + <Dialog id="addCheck"> + <Property name="closeable">false</Property> + <Property name="caption">妫�淇褰曚俊鎭�</Property> + <Property name="width">60%</Property> + <Property name="iconClass">fa fa-tasks</Property> + <Buttons> + <Button> + <ClientEvent name="onClick">view.get("#ajaxSave").execute(function(result){
 + if(result){
 + $alert(result);
 + }else{
 + $notify("淇濆瓨鎴愬姛锛侊紒");
 + view.get("#addCheck").hide();
 + }
 +});</ClientEvent> + <Property name="caption">纭畾</Property> + <Property name="iconClass">fa fa-check</Property> + </Button> + <Button> + <ClientEvent name="onClick">view.get("#dsCheck.data:#").cancel();
 +self.get("parent").hide();</ClientEvent> + <Property name="caption">鍙栨秷</Property> + <Property name="iconClass">fa fa-times</Property> + </Button> + </Buttons> + <Children> + <AutoForm> + <Property name="dataSet">dsCheck</Property> + <Property name="cols">*,*</Property> + <Property name="labelAlign">right</Property> + <Property name="labelSeparator">锛�</Property> + <Property name="labelWidth">150</Property> + <AutoFormElement> + <Property name="name">sbbh</Property> + <Property name="property">sbbh</Property> + <Property name="readOnly">true</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">kqdm</Property> + <Property name="property">kqdm</Property> + <Property name="readOnly">true</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">sbyqmc</Property> + <Property name="property">sbyqmc</Property> + <Property name="readOnly">true</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">sbyqdm</Property> + <Property name="property">sbyqdm</Property> + <Property name="readOnly">true</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">jdsj</Property> + <Property name="property">jdsj</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">jddw</Property> + <Property name="property">jddw</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">zhgxsj</Property> + <Property name="property">zhgxsj</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">jdjg</Property> + <Property name="property">jdjg</Property> + <Property name="trigger">listDropYN</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">remark</Property> + <Property name="property">remark</Property> + <Editor/> + </AutoFormElement> + </AutoForm> + </Children> + <Tools/> + </Dialog> + <UpdateAction id="uaSave"> + <Property name="dataResolver">deptDevicePR#saveDeptDevice</Property> + <UpdateItem> + <Property name="dataSet">dsMain</Property> + <Property name="dataPath">[#current]</Property> + <Property name="validateData">false</Property> + </UpdateItem> + </UpdateAction> + <UpdateAction id="ajaxSave"> + <Property name="dataResolver">deptDevicePR#saveCheck</Property> + <UpdateItem> + <Property name="dataSet">dsCheck</Property> + <Property name="dataPath">[#current]</Property> + <Property name="validateData">false</Property> + </UpdateItem> + </UpdateAction> + <AjaxAction id="ajaxDel"> + <Property name="service">deptDevicePR#delDeptDevice</Property> + <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property> + </AjaxAction> + <AjaxAction id="ajaxDelCheck"> + <Property name="service">deptDevicePR#delCheck</Property> + <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property> + </AjaxAction> + <ListDropDown id="listDropYN"> + <Property name="items">鍚堟牸,涓嶅悎鏍�</Property> + </ListDropDown> </View> </ViewConfig> -- Gitblit v1.9.3