From 72a67eb9ba942e632c11906093c5cd14e364eed7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutHand.view.xml | 16 +
fzzy-igdss-web/src/main/resources/templates/system/user/add.html | 2
fzzy-igdss-web/src/main/resources/templates/inout/check.html | 9
fzzy-igdss-web/src/main/resources/templates/index-topnav.html | 9
fzzy-igdss-web/src/main/resources/static/inout/inout-check.js | 24 +
fzzy-igdss-web/src/main/resources/templates/system/user/edit.html | 21
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot1.view.xml | 466 +++++++++++++++++++++++++++++++
fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js | 24 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 3
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 253 ----------------
fzzy-igdss-web/src/main/resources/templates/index.html | 9
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 16 +
fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js | 32 ++
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml | 2
fzzy-igdss-web/src/main/resources/application.yml | 2
fzzy-igdss-web/src/main/resources/templates/inout/weight2.html | 2
16 files changed, 617 insertions(+), 273 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
index 278207c..7759d90 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
@@ -83,20 +83,8 @@
}else{
$notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑浠撳簱鈥︹��");
}</ClientEvent>
- <Property name="caption">淇℃伅淇敼</Property>
+ <Property name="caption">淇敼</Property>
<Property name="exClassName">btn2</Property>
- <Property name="width">100</Property>
- <Property name="iconClass">fa fa-pencil-square-o</Property>
- </ToolBarButton>
- <ToolBarButton>
- <ClientEvent name="onClick">var select = view.get("#dataGridDepot").get("selection");
- if(select){
- view.get("#depotdialog2").show();
- }else{
- $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑浠撳簱鈥︹��");
- }</ClientEvent>
- <Property name="caption">搴撳瓨淇敼</Property>
- <Property name="exClassName">btn4</Property>
<Property name="width">100</Property>
<Property name="iconClass">fa fa-pencil-square-o</Property>
</ToolBarButton>
@@ -391,248 +379,9 @@
</Children>
<Tools/>
</Dialog>
- <Dialog id="depotdialog2" layout="regionPadding:8">
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="caption">浠撳簱淇℃伅</Property>
- <Property name="width">80%</Property>
- <Property name="height">90%</Property>
- <Property name="closeable">false</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">//鍚屾椂鎻愪氦鍘嗗彶涔�
- var data = view.get("#dataSetdepot.data:#");
- view.get("#updateactionSave2").execute(function(result){
- if(result){
- $notify(result);
- }else{
- self.get("parent").hide();
- query();
- }
- });</ClientEvent>
- <Property name="caption">淇濆瓨</Property>
- <Property name="iconClass">fa fa-check-circle</Property>
- <Property name="exClassName">btn1</Property>
- <Property name="width">120</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var cur = view.get("#dataSetdepot.data:#");
- if(cur) cur.cancel();
- self.get("parent").hide();</ClientEvent>
- <Property name="caption">鍙栨秷</Property>
- <Property name="exClassName">btn3</Property>
- <Property name="iconClass">fa fa-times-circle</Property>
- <Property name="width">120</Property>
- </Button>
- </Buttons>
- <Children>
- <FieldSet layout="padding:5">
- <Property name="caption">鍩烘湰淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dataSetdepot</Property>
- <Property name="readOnly">false</Property>
- <Property name="labelSeparator"> : </Property>
- <Property name="labelAlign">right</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
- <Property name="labelWidth">80</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">id</Property>
- <Property name="property">id</Property>
- <Property name="readOnly">true</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 绯荤粺鑷姩鐢熸垚 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">name</Property>
- <Property name="property">name</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">storageMax</Property>
- <Property name="property">storageMax</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">storeType</Property>
- <Property name="property">storeType</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">depotStatus</Property>
- <Property name="property">depotStatus</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">depotType</Property>
- <Property name="property">depotType</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">storeKeeperName</Property>
- <Property name="property">storeKeeperName</Property>
- <Property name="trigger">triggerUserList</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">orderNum</Property>
- <Property name="property">orderNum</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:4">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- <FieldSet layout="padding:5">
- <Property name="caption">鍌ㄧ伯淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dataSetdepot</Property>
- <Property name="readOnly">false</Property>
- <Property name="labelSeparator"> : </Property>
- <Property name="labelAlign">right</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
- <Property name="labelWidth">80</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">storageReal</Property>
- <Property name="property">storageReal</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">foodLevel</Property>
- <Property name="property">foodLevel</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">foodYear</Property>
- <Property name="property">foodYear</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">storeDate</Property>
- <Property name="property">storeDate</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- <FieldSet layout="padding:5">
- <Property name="caption">鍏朵粬淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dataSetdepot</Property>
- <Property name="readOnly">false</Property>
- <Property name="labelSeparator"> : </Property>
- <Property name="labelAlign">right</Property>
- <Property name="cols">*,*,*,*,*,*,*,*</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">length</Property>
- <Property name="property">length</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">width</Property>
- <Property name="property">width</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">height</Property>
- <Property name="property">height</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">bulkWeight</Property>
- <Property name="property">bulkWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">perWet</Property>
- <Property name="property">perWet</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">perImpurity</Property>
- <Property name="property">perImpurity</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">checkDate</Property>
- <Property name="property">checkDate</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- </Children>
- <Tools/>
- </Dialog>
<UpdateAction id="updateactionSave">
<Property name="executingMessage">姝ｅ湪鎵ц涓�..</Property>
<Property name="dataResolver">depotPR#saveOrUpdate</Property>
- <UpdateItem>
- <Property name="dataSet">dataSetdepot</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="alias">data</Property>
- </UpdateItem>
- </UpdateAction>
- <UpdateAction id="updateactionSave2">
- <Property name="executingMessage">姝ｅ湪鎵ц涓�..</Property>
- <Property name="dataResolver">depotPR#saveOrUpdate2</Property>
<UpdateItem>
<Property name="dataSet">dataSetdepot</Property>
<Property name="dataPath">[#current]</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot1.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot1.view.xml
new file mode 100644
index 0000000..90227b5
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot1.view.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dataTypeUser">
+ <Property name="creationType">com.ruoyi.common.core.domain.entity.SysUser</Property>
+ <PropertyDef name="loginName">
+ <Property name="dataType">String</Property>
+ <Property name="label">鐢ㄦ埛鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="userName">
+ <Property name="dataType">String</Property>
+ <Property name="label">涓枃鍚�</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:10">
+ <ClientEvent name="onReady">
+
+/**
+ * 鏌ヨ
+ */
+query = function(){
+ //閫氳繃搴撳尯id鏉ュ姞杞戒粨鍌ㄦ暟鎹�
+ var parentId = "${request.getParameter('parentId')}";
+ view.get("#dataSetdepot").set("parameter",{parentId: parentId}).flushAsync();
+};
query();
+
+
+showDlg=function(){
+ var select = view.get("#dataGridDepot").get("selection");
+ if(select){
+ view.get("#depotdialog").show();;
+ }else{
+ $notify("璇峰厛閫夋嫨鏁版嵁鈥︹��");
+ }
+};
+
+renderId = function(arg){
+ var txt = arg.data.getText("id");
+ if(!txt) return true;
+ var htm = "<a href='javascript:;' onClick='showDlg()' >"+txt+"</a>";
+ arg.dom.innerHTML = htm;
+}
+
+renderName = function(arg){
+ var txt = arg.data.getText("name");
+ if(!txt) return true;
+ var htm = "<a href='javascript:;' onClick='showDlg()' >"+txt+"</a>";
+ arg.dom.innerHTML = htm;
+}
+</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dataSetdepot">
+ <Property name="dataProvider">depotPR#getData</Property>
+ <Property name="dataType">[dtDepot]</Property>
+ <Property name="loadMode">manual</Property>
+ </DataSet>
+ <DataSet id="dataSetUser">
+ <Property name="dataType">[dataTypeUser]</Property>
+ <Property name="dataProvider">sysUserPR#loadUser</Property>
+ </DataSet>
+ <Container>
+ <Property name="className">c-param</Property>
+ <ToolBar>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var select = view.get("#dataGridDepot").get("selection");
+ if(select){
+ view.get("#depotdialog2").show();
+ }else{
+ $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑浠撳簱鈥︹��");
+ }</ClientEvent>
+ <Property name="caption">搴撳瓨淇敼</Property>
+ <Property name="exClassName">btn4</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-pencil-square-o</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <Property name="caption">鍒锋柊缂撳瓨</Property>
+ <Property name="exClassName">btn4</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="width">100</Property>
+ <Property name="action">ajaxRefreshCache</Property>
+ </ToolBarButton>
+ </ToolBar>
+ <DataGrid id="dataGridDepot" layoutConstraint="padding:8">
+ <ClientEvent name="onDataRowClick">view.get("#dataGridDepot").set("selection",arg.data);</ClientEvent>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="selectionMode">singleRow</Property>
+ <Property name="readOnly">true</Property>
+ <RowSelectorColumn/>
+ <RowNumColumn/>
+ <DataColumn name="id">
+ <ClientEvent name="onRenderCell">renderId(arg);</ClientEvent>
+ <Property name="property">id</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">renderName(arg);</ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="deptId">
+ <Property name="property">deptId</Property>
+ <Property name="align">left</Property>
+ </DataColumn>
+ <DataColumn name="depotStatus">
+ <Property name="property">depotStatus</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="storageReal">
+ <Property name="property">storageReal</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
+ <DataColumn name="foodYear">
+ <Property name="property">foodYear</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="storeDate">
+ <Property name="property">storeDate</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="storeKeeperName">
+ <Property name="property">storeKeeperName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="depotType">
+ <Property name="property">depotType</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="depotdialog2" layout="regionPadding:8">
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="caption">浠撳簱淇℃伅</Property>
+ <Property name="width">80%</Property>
+ <Property name="height">90%</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">//鍚屾椂鎻愪氦鍘嗗彶涔�
+ var data = view.get("#dataSetdepot.data:#");
+ view.get("#updateactionSave2").execute(function(result){
+ if(result){
+ $notify(result);
+ }else{
+ self.get("parent").hide();
+ query();
+ }
+ });</ClientEvent>
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">120</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dataSetdepot.data:#");
+ if(cur) cur.cancel();
+ self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">120</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="labelWidth">80</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Property name="readOnly">true</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- 绯荤粺鑷姩鐢熸垚 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storageMax</Property>
+ <Property name="property">storageMax</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storeType</Property>
+ <Property name="property">storeType</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">depotStatus</Property>
+ <Property name="property">depotStatus</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">depotType</Property>
+ <Property name="property">depotType</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storeKeeperName</Property>
+ <Property name="property">storeKeeperName</Property>
+ <Property name="trigger">triggerUserList</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">orderNum</Property>
+ <Property name="property">orderNum</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍌ㄧ伯淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="labelWidth">80</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storageReal</Property>
+ <Property name="property">storageReal</Property>
+ <Property name="readOnly">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodYear</Property>
+ <Property name="property">foodYear</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">storeDate</Property>
+ <Property name="property">storeDate</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍏朵粬淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*,*,*,*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">length</Property>
+ <Property name="property">length</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">width</Property>
+ <Property name="property">width</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">height</Property>
+ <Property name="property">height</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">bulkWeight</Property>
+ <Property name="property">bulkWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">perWet</Property>
+ <Property name="property">perWet</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">perImpurity</Property>
+ <Property name="property">perImpurity</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">checkDate</Property>
+ <Property name="property">checkDate</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateactionSave2">
+ <Property name="executingMessage">姝ｅ湪鎵ц涓�..</Property>
+ <Property name="dataResolver">depotPR#saveOrUpdate2</Property>
+ <UpdateItem>
+ <Property name="dataSet">dataSetdepot</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="alias">data</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxRefreshCache">
+ <Property name="service">depotPR#flushCache</Property>
+ <Property name="successMessage">鍒锋柊鎴愬姛锛�</Property>
+ <Property name="confirmMessage">纭畾瑕佸埛鏂扮紦瀛樹箞锛�</Property>
+ </AjaxAction>
+ <YearDropDown id="yearDropDown1"/>
+ <DataSetDropDown id="triggerUserList">
+ <Property name="dataSet">dataSetUser</Property>
+ <Property name="property">userName</Property>
+ <Property name="assignmentMap">storeKeeperName=userName,storeKeeper=loginName</Property>
+ </DataSetDropDown>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">500</Property>
+ <Property name="assignmentMap">foodLocation=name</Property>
+ <Property name="minWidth">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">30</Property>
+ <Property name="dataType">[dtArea]</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 鍚嶇О --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+ view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+arg.processDefault = true;</ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
+ <ListDropDown id="listOri">
+ <Property name="items">涓�,鍗�,瑗�,鍖�,涓滃寳,涓滃崡,瑗垮崡,瑗垮寳</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index 916771f..26ca548 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -72,6 +72,7 @@
*/
@DataResolver
@Transactional
+ @Log(title = "搴撳瓨绠＄悊", businessType = BusinessType.UPDATE,bizType = BizTypeEnum.SYS)
public String saveOrUpdate2(Depot data) {
Depot depot = new Depot();
@@ -87,7 +88,7 @@
*/
@Expose
@Transactional
- @Log(title = "搴撳尯绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
+ @Log(title = "浠撳簱绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public void deleteDepot(Depot data) {
Depot depot = new Depot();
BeanUtils.copyProperties(data, depot);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutHand.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutHand.view.xml
index ed73b78..909355d 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutHand.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutHand.view.xml
@@ -4,6 +4,9 @@
<Context/>
<Model>
<DataType name="dtMain">
+ <ClientEvent name="onDataChange">if(arg.property =="depotId"){
+ autoByDepot(arg.newValue);
+}
</ClientEvent>
<Property name="creationType">com.fzzy.igds.data.InoutData</Property>
<PropertyDef name="id">
<Property></Property>
@@ -315,6 +318,16 @@
view.get("#dsMain").set("parameter",TYPE).flushAsync();
};
flush();
+ 
+ //鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
+ autoByDepot = function(depotId){
+ view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
+ if(result){
+ var data = view.get("#dsMain.data:#");
+ data.set("foodVariety",result.foodVariety);
+ }
+ });
+ };

/**
* 鏁版嵁淇濆瓨鎻愪氦
@@ -950,5 +963,8 @@
<Property name="async">true</Property>
<Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
</AjaxAction>
+ <AjaxAction id="ajaxGetDepot">
+ <Property name="service">depotPR#getDepot</Property>
+ </AjaxAction>
</View>
</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index 7e517c5..360db0b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -4,6 +4,9 @@
<Context/>
<Model>
<DataType name="dtMain">
+ <ClientEvent name="onDataChange">if(arg.property =="depotId"){
+ autoByDepot(arg.newValue);
+}
</ClientEvent>
<Property name="creationType">com.fzzy.igds.domain.InoutRecord</Property>
<PropertyDef name="id">
<Property></Property>
@@ -422,6 +425,16 @@
}else{
$notify("璇烽�夋嫨鏁版嵁鈥︹��");
}
+};
+
+//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
+autoByDepot = function(depotId){
+ view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
+ if(result){
+ var data = view.get("#dataGridMain").get("selection");
+ data.set("foodVariety",result.foodVariety);
+ }
+ });
};

//寮傚父鎵ц
@@ -1203,5 +1216,8 @@
<Property name="service">inoutDataPR#analysisExcel</Property>
<Property name="executingMessage">姝ｅ湪鎵ц瑙ｆ瀽鈥︹��</Property>
</AjaxAction>
+ <AjaxAction id="ajaxGetDepot">
+ <Property name="service">depotPR#getDepot</Property>
+ </AjaxAction>
</View>
</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
index 0036934..d46534a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
@@ -38,7 +38,7 @@
<Property name="dataProvider">companyPR#getCompanyByUserType</Property>
</DataSet>
<DataTree>
- <ClientEvent name="onDataRowDoubleClick">var curNode = self.get("currentNode");
+ <ClientEvent name="onDataRowClick">var curNode = self.get("currentNode");
if(curNode.get("hasChild")){
curNode.expand();
$notify("璇烽�夋嫨搴撳尯鈥︹��");
diff --git a/fzzy-igdss-web/src/main/resources/application.yml b/fzzy-igdss-web/src/main/resources/application.yml
index 2ab0496..2442184 100644
--- a/fzzy-igdss-web/src/main/resources/application.yml
+++ b/fzzy-igdss-web/src/main/resources/application.yml
@@ -20,7 +20,7 @@
# Spring鍩虹閰嶇疆
spring:
profiles:
- active: pro
+ active: dev
main:
allow-bean-definition-overriding: true
thymeleaf:
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/inout-check.js b/fzzy-igdss-web/src/main/resources/static/inout/inout-check.js
index bb78ad3..ee5ac48 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/inout-check.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/inout-check.js
@@ -35,6 +35,11 @@
}
});
+ //鐩戝惉浠撳簱閫夋嫨
+ layui.form.on('select(depotId)', function (data) {
+ updateDepot(data.value);
+ });
+
// 鍒濆鍖栬〃鍗曟暟鎹�
renderTable();
});
@@ -43,6 +48,25 @@
showProgress();
});
+//鏍规嵁閫夋嫨浠撳簱鏄剧ず绮鍝佺
+function updateDepot(depotId) {
+ var selectDepot;
+ $.each(depot, function (index, data) {
+ if (data.id === depotId) {
+ selectDepot = data;
+ return false;
+ }
+ });
+
+ if (selectDepot) {
+ form.val("form-detail", {
+ foodVariety: selectDepot.foodVariety,
+ foodLevel: selectDepot.foodLevel
+ });
+ form.render();
+ }
+}
+
/**
* 鎺у埗娴佺▼鐜妭鏄剧ず
*/
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js
index d7906d8..4031ce7 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js
@@ -29,6 +29,12 @@
}
});
+
+ //鐩戝惉浠撳簱閫夋嫨,閫夋嫨鍚庤嚜鍔ㄨ皟鐢ㄤ粨搴撶殑绮鍝佺淇℃伅
+ form.on('select(select_depotId)', function (obj) {
+ updateFoodVarietyByDepot(obj.value);
+ })
+
});
//鏄剧ず娴佺▼鐜妭
@@ -63,6 +69,24 @@
});
};
+//鏍规嵁閫夋嫨鐨勪粨搴撲俊鎭�,鏇存柊绮鍝佺
+function updateFoodVarietyByDepot(selectId) {
+ var selectDepot;
+ $.each(listDepot, function (index, data) {
+ if (data.id === selectId) {
+ selectDepot = data;
+ return false;
+ }
+ });
+
+ if (selectDepot) {
+ form.val("form-data", {
+ foodVariety: selectDepot.foodVariety
+ });
+ form.render();
+ }
+}
+
/**
* 绉伴噸鍙婃姄鎷�
*/
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js
index 5814b78..3db4f2e 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight2.js
@@ -42,6 +42,11 @@
}
});
+ //鐩戝惉浠撳簱閫夋嫨,閫夋嫨鍚庤嚜鍔ㄨ皟鐢ㄤ粨搴撶殑绮鍝佺淇℃伅
+ form.on('select(select_depotId)', function (obj) {
+ updateFoodVarietyByDepot(obj.value);
+ })
+
// 鍒濆鍖栬〃鍗曟暟鎹�
renderTable();
});
@@ -89,6 +94,24 @@
"background": "#eff4f6"
});
layer.close(index);
+}
+
+//鏍规嵁閫夋嫨鐨勪粨搴撲俊鎭�,鏇存柊绮鍝佺
+function updateFoodVarietyByDepot(selectId) {
+ var selectDepot;
+ $.each(listDepot, function (index, data) {
+ if (data.id === selectId) {
+ selectDepot = data;
+ return false;
+ }
+ });
+
+ if (selectDepot) {
+ form.val("form-data", {
+ foodVariety: selectDepot.foodVariety
+ });
+ form.render();
+ }
}
// 娓叉煋琛ㄥ崟鏁版嵁
@@ -250,6 +273,8 @@
area: ['1283px', '815px'],
cancel: function (index, layero) {
$("#weightDetail").css("display", "none");
+ // 鍒濆鍖栬〃鍗曟暟鎹�
+ renderTable();
},
shade: 0,
scrollbar: 0,
@@ -281,6 +306,8 @@
area: ['1283px', '815px'],
cancel: function (index, layero) {
$("#weightDetail").css("display", "none");
+ // 鍒濆鍖栬〃鍗曟暟鎹�
+ renderTable();
},
shade: 0,
scrollbar: 0,
@@ -606,6 +633,7 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(recordData),
success: function (result) {
+ layer.close(index);
if (result.code != "0000") {
alertError(result.msg);
} else {
@@ -614,11 +642,13 @@
notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
//绗竴娆＄О閲嶅悗锛屽埛鏂伴〉闈�
if (recordData.recordWeight <= 0.0) {
+ layer.closeAll();
+ // 鍒濆鍖栬〃鍗曟暟鎹�
+ renderTable();
$("#form-data")[0].reset();
form.render();
}
}
- layer.close(index);
},
error: function () {
layer.close(index);
diff --git a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
index 6fa52cc..2906f13 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -366,6 +366,7 @@
var dept = [[${dept}]];
var deptId = [[${deptId}]];
var showDeptList = [[${showDeptList}]];
+var showDeptListTag = false;
if(lockscreen){window.top.location=ctx+"lockscreen";}
// 鐨偆缂撳瓨
var skin = storage.get("skin");
@@ -418,9 +419,13 @@
* 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
*/
function showDepotAreaSelect() {
+ if(showDeptListTag){
+ return false;
+ }
if(showDeptList === "N"){
return false;
}
+ showDeptListTag = true;
layer.open({
type: 2,
title: '閫夋嫨搴撳尯',
@@ -428,7 +433,9 @@
offset: ['50px', '1350px'],
shade: 0,
content: "com.fzzy.igds.SelectDept.d",
- closeBtn: 1
+ end: function(){ // 鍏抽棴灞傚悗鐨勫洖璋�
+ showDeptListTag = false;
+ }
});
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index ea3d78f..c673d44 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -204,6 +204,7 @@
var dept = [[${dept}]];
var deptId = [[${deptId}]];
var showDeptList = [[${showDeptList}]];
+ var showDeptListTag = false;
if (lockscreen) {
window.top.location = ctx + "lockscreen";
}
@@ -270,9 +271,13 @@
* 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
*/
function showDepotAreaSelect() {
+ if(showDeptListTag){
+ return false;
+ }
if(showDeptList === "N"){
return false;
}
+ showDeptListTag = true;
layer.open({
type: 2,
title: '閫夋嫨搴撳尯',
@@ -280,7 +285,9 @@
offset: ['50px', '1350px'],
shade: 0,
content: "com.fzzy.igds.SelectDept.d",
- closeBtn: 1
+ end: function(){ // 鍏抽棴灞傚悗鐨勫洖璋�
+ showDeptListTag = false;
+ }
});
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/check.html b/fzzy-igdss-web/src/main/resources/templates/inout/check.html
index 1503557..4285ef8 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/check.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/check.html
@@ -296,6 +296,9 @@
//鎵�灞炲垎搴�
var deptId = [[${deptId}]];
+ //浠撳簱淇℃伅
+ var depot = [[${listDepot}]];
+
var inoutProgress = [[${inoutProgress}]];
</script>
@@ -347,7 +350,7 @@
<div class="layui-form-item">
<label class="layui-form-label">瑁呭嵏浠撳簱</label>
<div class="layui-input-block">
- <select name="depotId" id="depotId" lay-filter="select_depot">
+ <select name="depotId" id="depotId" lay-filter="depotId">
<option value=""></option>
<option th:each="depot,depotSet:${listDepot}"
th:value="${depot.id}" th:text="${depot.name}"></option>
@@ -368,7 +371,7 @@
<div class="layui-form-item">
<label class="layui-form-label">寰�鏉ュ崟浣�</label>
<div class="layui-input-block">
- <select name="depotId" id="customerName" lay-filter="select_depot">
+ <select name="customerName" id="customerName" lay-filter="select_depot">
</select>
</div>
</div>
@@ -388,7 +391,7 @@
</div>
<div class="layui-col-xs6">
<div class="layui-form-item">
- <label class="layui-form-label red">绮绛夌骇</label>
+ <label class="layui-form-label">绮绛夌骇</label>
<div class="layui-input-block">
<select id="foodLevel" name="foodLevel" lay-filter="select_foodLevel">
<option value=""></option>
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
index 543000a..eec2795 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
@@ -205,7 +205,7 @@
<div class="layui-col-xs4 layui-text-right">
<input type="button" style="border-radius: 50px;background-color: #1c84c6 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="鎼滅储" class="qyzj-top-btn layui-btn btn-blue" onclick="flushData()"/>
<input type="button" style="border-radius: 50px;background-color: #f8ac59 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="閲嶇疆" class="qyzj-top-btn layui-btn btn-red" onclick="resetForm()"/>
- <input type="button" style="border-radius: 50px;background-color: #1ab394 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="鐧昏" class="qyzj-top-btn layui-btn btn-group" onclick="quickRegister()"/>
+ <input type="button" style="border-radius: 50px;background-color: #1ab394 !important;width: 94px;height: 32px;line-height: 32px;font-size: 14px;" value="绉伴噸" class="qyzj-top-btn layui-btn btn-group" onclick="quickRegister()"/>
</div>
</form>
diff --git a/fzzy-igdss-web/src/main/resources/templates/system/user/add.html b/fzzy-igdss-web/src/main/resources/templates/system/user/add.html
index 90e38e6..3331c5f 100644
--- a/fzzy-igdss-web/src/main/resources/templates/system/user/add.html
+++ b/fzzy-igdss-web/src/main/resources/templates/system/user/add.html
@@ -100,7 +100,7 @@
</div>
</div>
</div>
- <div class="row">
+ <div class="row" style="display: none">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">宀椾綅锛�</label>
diff --git a/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html b/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html
index 076bf9f..4a0601a 100644
--- a/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html
+++ b/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html
@@ -77,13 +77,14 @@
</div>
</div>
<div class="row">
+
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label">宀椾綅锛�</label>
+ <label class="col-sm-4 control-label">瑙掕壊锛�</label>
<div class="col-sm-8">
- <select id="post" class="form-control select2-multiple" multiple>
- <option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
- </select>
+ <label th:each="role:${roles}" class="check-box">
+ <input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
+ </label>
</div>
</div>
</div>
@@ -98,14 +99,14 @@
</div>
</div>
</div>
- <div class="row">
- <div class="col-sm-6">
+ <div class="row" style="display: none">
+ <div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label">瑙掕壊锛�</label>
+ <label class="col-sm-4 control-label">宀椾綅锛�</label>
<div class="col-sm-8">
- <label th:each="role:${roles}" class="check-box">
- <input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
- </label>
+ <select id="post" class="form-control select2-multiple" multiple>
+ <option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
+ </select>
</div>
</div>
</div>
--
Gitblit v1.9.3