From c7e9e47f7b75dd0a88c929d7fb0713e5f638fdf1 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:11 +0800
Subject: [PATCH] 调整工单审核功能，调整出入库工单排序
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml | 410 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 259 insertions(+), 151 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
index c7e3aae..ba41e4b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -81,6 +81,12 @@
</PropertyDef>
<PropertyDef name="node">
<Property></Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("workOrderPR#triggerNode").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ <Property name="label">娴佺▼鐜妭</Property>
</PropertyDef>
<PropertyDef name="createById">
<Property></Property>
@@ -131,6 +137,9 @@
<Property name="dataType">Date</Property>
<Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
+ <PropertyDef name="scope">
+ <Property></Property>
+ </PropertyDef>
</DataType>
<DataType name="dtWordProcess">
<Property name="creationType">com.fzzy.work.domain.WorkOrderProcess</Property>
@@ -142,6 +151,7 @@
</PropertyDef>
<PropertyDef name="remark">
<Property></Property>
+ <Property name="label">瀹℃壒寤鸿</Property>
</PropertyDef>
<PropertyDef name="id">
<Property></Property>
@@ -163,20 +173,39 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">query= function(){
+ <ClientEvent name="onReady">view.TAG = 1;
+query= function(){
var param = view.get("#dsQuery.data");
var tabIndex = view.get("#tabMain.currentIndex");
+ param.set("scope","all");
if(0 == tabIndex){
- view.get("#dsMain").set("parameter",param).flushAsync();
- }else{
- view.get("#dsMain2").set("parameter",param).flushAsync();
+ param.set("scope","self");
}
+ view.get("#dsMain").set("parameter",param).flushAsync();
}
+//姹囨�讳俊鎭�
+summaryCount = function(){
+ view.get("#ajaxSummary").execute(function(result){
+ //console.log(result);
+ jQuery('#child-num1').text(result.selfTodo);
+ jQuery('#child-num2').text(result.assignTodo);
+ jQuery('#child-num3').text(result.todayTodo);
+ jQuery('#child-num4').text(result.sumTodo);
+ });
+}
+
+summaryCount();
+ 
+query();

//瀹ｄ紶鎿嶄綔
renderCell1 = function(arg,self){
+ var tabIndex = view.get("#tabMain.currentIndex");
var data = arg.data;
- var htm = "<a onClick='audit()' class='a-btn1'>鎸囨淳</a>&nbsp;|&nbsp;<a onClick='showDetail()' class='a-btn2'>璇︾粏</a>";
+ var htm = "<a onClick='selectUser()' class='a-btn1'>鎸囨淳</a>&nbsp;|&nbsp;<a onClick='showDetail()' class='a-btn2'>璇︾粏</a>";
+ if(1 == tabIndex){
+ htm = "<a onClick='showDetail()' class='a-btn2'>璇︾粏</a>";
+ }
arg.dom.innerHTML = htm;
};

@@ -203,17 +232,14 @@
arg.dom.innerHTML = htm;
}

-//鐐瑰嚮瀹℃牳
-audit = function(){
- 
-}
//鐐瑰嚮璇︾粏
showDetail = function(){
var tabIndex = view.get("#tabMain.currentIndex");
var cur = view.get("#dsMain.data:#");
var dialog = view.get("#dialogMain");
+ view.get('#btnTodo').set('disabled',false);
if(1 == tabIndex){
- cur = view.get("#dsMain2.data:#");
+ view.get('#btnTodo').set('disabled',true);
}
dialog.show();

@@ -229,13 +255,11 @@
}
}
//鎵ц瀹℃壒
-todo = function(action){
+todo = function(){
var cur = view.get("#dsMain.data:#");
var process = view.get("#dsProcess.data");
process.set("orderId", cur.get("id"));
- process.set("action", action);
process.set("node", cur.get("node"));
- 
var remark = process.get('remark');
if(!remark){
$notify("璇峰～鍐欏鎵规剰瑙佲�︹��");
@@ -243,33 +267,38 @@
}
view.get("#ajaxTodo").set('parameter',process).execute(function(result){
if('200' != result.code){
- $alert(result.msg);
+ view.get('#dialogTodo').hide();
+ $alert(result.message);
}else{
$alert("鎵ц鎴愬姛锛�");
view.get('#dialogTodo').hide();
+ view.get("#dialogMain").hide();
+ query();
}
});
}
cancelTodo = function(){
var process = view.get("#dsProcess.data");
+ process.set("action",null);
process.set('remark',null);
+ process.set('assigneeId',null);
+ process.set('assigneeName',null);
view.get('#dialogTodo').hide();
+ view.get('#dialogSelectUser').hide();
+}
+selectUser = function(){
+ var process = view.get("#dsProcess.data");
+ process.set('action','transfer')
+ view.get("#dialogSelectUser").show();
}
</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<ClientEvent name="onLoadData">$notify("鏁版嵁鍔犺浇瀹屾垚鈥︹��");</ClientEvent>
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">workOrderPR#pageQuery</Property>
+ <Property name="dataProvider">workOrderPR#pageQueryByUserType</Property>
<Property name="pageSize">10</Property>
- <Property name="loadMode">lazy</Property>
- </DataSet>
- <DataSet id="dsMain2">
- <ClientEvent name="onLoadData">$notify("鏁版嵁鍔犺浇瀹屾垚鈥︹��");</ClientEvent>
- <Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">workOrderPR#pageQuery2</Property>
- <Property name="pageSize">10</Property>
- <Property name="loadMode">lazy</Property>
+ <Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dsQuery">
<ClientEvent name="onReady">self.insert({});</ClientEvent>
@@ -368,35 +397,35 @@

<!-- 蹇嵎鏂瑰紡 -->
<div class="parent">
- 
+ 
<div class="child">
<div class="console-link-block">
- <div class="console-link-block-num">0</div>
- <div class="console-link-block-text">浠婃棩宸ュ崟缁熻</div>
+ <div class="console-link-block-num" id="child-num1">0</div>
+ <div class="console-link-block-text">鎴戠殑寰呭姙宸ュ崟</div>
<img class="console-icon" src="/img/icon-wj.png">
</div>
</div>

<div class="child">
<div class="console-link-block bg2">
- <div class="console-link-block-num">0</div>
- <div class="console-link-block-text">浠婃棩寰呭畬鎴愬伐鍗�</div>
+ <div class="console-link-block-num" id="child-num2">0</div>
+ <div class="console-link-block-text">鎴戠殑鎸囨淳宸ュ崟</div>
<img class="console-icon" src="/img/icon-wj2.png">
</div>
</div>

<div class="child">
<div class="console-link-block bg3">
- <div class="console-link-block-num">0</div>
- <div class="console-link-block-text">鎬诲伐鍗曠粺璁�</div>
+ <div class="console-link-block-num" id="child-num3">0</div>
+ <div class="console-link-block-text">浠婃棩宸ュ崟</div>
<img class="console-icon" src="/img/icon-tj.png">
</div>
</div>

<div class="child">
- <div class="console-link-block bg4">
- <div class="console-link-block-num">0</div>
- <div class="console-link-block-text">鎬绘湭瀹屾垚宸ュ崟</div>
+ <div class="console-link-block bg5">
+ <div class="console-link-block-num" id="child-num4">0</div>
+ <div class="console-link-block-text">鎬诲緟鍔炲伐鍗�</div>
<img class="console-icon" src="/img/icon-tj2.png">
</div>
</div>
@@ -412,7 +441,7 @@
<Property name="margin-top">10px</Property>
</Property>
<AutoForm>
- <Property name="cols">*,*,*,*,90,90</Property>
+ <Property name="cols">*,300,300,90,90,*</Property>
<Property name="dataSet">dsQuery</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
@@ -420,11 +449,6 @@
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
<Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">name</Property>
- <Property name="property">name</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -454,9 +478,93 @@
<Container>
<Property name="className">c-data</Property>
<TabControl id="tabMain">
+ <ClientEvent name="onTabChange">if(view.TAG) query();</ClientEvent>
<ControlTab>
- <Property name="caption">鍏ㄩ儴</Property>
+ <Property name="caption">鎴戠殑宸ュ崟</Property>
<Property name="iconClass">fa fa-th-large</Property>
+ <Property name="width">150</Property>
+ <Container>
+ <DataGrid layoutConstraint="padding:8">
+ <ClientEvent name="onDataRowClick">self.set("selection",arg.data);</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="selectionMode">singleRow</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="fixedColumnCount">3</Property>
+ <RowSelectorColumn/>
+ <RowNumColumn>
+ <Property name="width">50</Property>
+ <Property name="caption">搴忓彿</Property>
+ </RowNumColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
+ <Property name="caption">鎿嶄綔</Property>
+ <Property name="width">160</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn name="id">
+ <Property name="property">id</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="deptId">
+ <Property name="property">deptId</Property>
+ <Property name="width">250</Property>
+ </DataColumn>
+ <DataColumn name="title">
+ <Property name="property">title</Property>
+ <Property name="width">300</Property>
+ </DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">renderStatus(arg);</ClientEvent>
+ <Property name="property">status</Property>
+ <Property name="width">120</Property>
+ <Property name="align">center</Property>
+ <Property name="name">status</Property>
+ </DataColumn>
+ <DataColumn name="node">
+ <Property name="property">node</Property>
+ <Property name="width">120</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="bizType">
+ <Property name="property">bizType</Property>
+ <Property name="width">120</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="assigneeName">
+ <Property name="property">assigneeName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
+ <DataColumn name="receiveTime">
+ <Property name="property">receiveTime</Property>
+ <Property name="width">150</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="createUserName">
+ <Property name="property">createUserName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
+ <DataColumn name="createTime">
+ <Property name="property">createTime</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
+ </DataGrid>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </ToolBar>
+ </Container>
+ </ControlTab>
+ <ControlTab>
+ <Property name="caption">鍏ㄩ儴宸ュ崟</Property>
+ <Property name="iconClass">fa fa-history</Property>
<Property name="width">150</Property>
<Container>
<DataGrid layoutConstraint="padding:8">
@@ -497,6 +605,11 @@
<Property name="align">center</Property>
<Property name="name">status</Property>
</DataColumn>
+ <DataColumn name="node">
+ <Property name="property">node</Property>
+ <Property name="width">120</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn name="bizType">
<Property name="property">bizType</Property>
<Property name="width">120</Property>
@@ -528,84 +641,6 @@
<DataPilot layoutConstraint="right">
<Property name="itemCodes">pageSize,pages</Property>
<Property name="dataSet">dsMain</Property>
- </DataPilot>
- </ToolBar>
- </Container>
- </ControlTab>
- <ControlTab>
- <Property name="caption">宸茬粨鏉�</Property>
- <Property name="iconClass">fa fa-history</Property>
- <Property name="width">150</Property>
- <Container>
- <DataGrid layoutConstraint="padding:8">
- <ClientEvent name="onDataRowClick">self.set("selection",arg.data);</ClientEvent>
- <Property name="dataSet">dsMain2</Property>
- <Property name="readOnly">true</Property>
- <Property name="selectionMode">singleRow</Property>
- <Property name="readOnly">true</Property>
- <Property name="fixedColumnCount">3</Property>
- <RowSelectorColumn/>
- <RowNumColumn>
- <Property name="width">50</Property>
- <Property name="caption">搴忓彿</Property>
- </RowNumColumn>
- <DataColumn>
- <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
- <Property name="caption">鎿嶄綔</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
- <Editor/>
- </DataColumn>
- <DataColumn name="id">
- <Property name="property">id</Property>
- <Property name="width">180</Property>
- </DataColumn>
- <DataColumn name="deptId">
- <Property name="property">deptId</Property>
- <Property name="width">250</Property>
- </DataColumn>
- <DataColumn name="title">
- <Property name="property">title</Property>
- <Property name="width">300</Property>
- </DataColumn>
- <DataColumn>
- <ClientEvent name="onRenderCell">renderStatus(arg);</ClientEvent>
- <Property name="property">status</Property>
- <Property name="width">120</Property>
- <Property name="align">center</Property>
- <Property name="name">status</Property>
- </DataColumn>
- <DataColumn name="bizType">
- <Property name="property">bizType</Property>
- <Property name="width">120</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="assigneeName">
- <Property name="property">assigneeName</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="receiveTime">
- <Property name="property">receiveTime</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="createUserName">
- <Property name="property">createUserName</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="createTime">
- <Property name="property">createTime</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- </DataGrid>
- <ToolBar layoutConstraint="bottom">
- <Fill/>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain2</Property>
</DataPilot>
</ToolBar>
</Container>
@@ -689,25 +724,17 @@
</AutoForm>
<ToolBar>
<Fill/>
- <ToolBarButton>
- <ClientEvent name="onClick">view.get("#dialogTodo").show();
-</ClientEvent>
- <Property name="caption">澶勭悊</Property>
- <Property name="width">80</Property>
+ <ToolBarButton id="btnTodo">
+ <Property name="caption">宸ュ崟瀹℃壒</Property>
<Property name="exClassName">btn1</Property>
<Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="menu">menus</Property>
+ <Property name="width">120</Property>
</ToolBarButton>
<ToolBarButton>
- <Property name="caption">杞氦</Property>
- <Property name="width">80</Property>
- <Property name="exClassName">btn2</Property>
- <Property name="iconClass">fa fa-check-circle</Property>
- </ToolBarButton>
- <ToolBarButton>
- <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
-view.get("#dialogMain").hide();</ClientEvent>
+ <ClientEvent name="onClick">view.get("#dialogMain").hide();</ClientEvent>
<Property name="caption">鍏抽棴</Property>
- <Property name="width">80</Property>
+ <Property name="width">120</Property>
<Property name="exClassName">btn3</Property>
<Property name="iconClass">fa fa-times-circle</Property>
</ToolBarButton>
@@ -731,15 +758,6 @@
</Children>
<Tools/>
</Dialog>
- <UpdateAction id="updateSave">
- <UpdateItem>
- <Property name="dataPath">[#current]</Property>
- <Property name="dataSet">dsMain</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
- </AjaxAction>
<Dialog id="dialogTodo">
<Property name="width">600</Property>
<Property name="caption">瀹℃壒澶勭悊</Property>
@@ -747,22 +765,15 @@
<Property name="iconClass">fa fa-bookmark</Property>
<Buttons>
<Button>
- <ClientEvent name="onClick">todo('pass');</ClientEvent>
- <Property name="caption">閫氳繃</Property>
+ <ClientEvent name="onClick">todo();</ClientEvent>
+ <Property name="caption">纭畾</Property>
<Property name="iconClass">fa fa-check</Property>
<Property name="exClassName">btn1</Property>
<Property name="width">90</Property>
</Button>
<Button>
- <ClientEvent name="onClick">todo('refuse');</ClientEvent>
- <Property name="caption">鎷掔粷</Property>
- <Property name="exClassName">btn4</Property>
- <Property name="iconClass">fa fa-times</Property>
- <Property name="width">90</Property>
- </Button>
- <Button>
<ClientEvent name="onClick">cancelTodo();</ClientEvent>
- <Property name="caption">鍙栨秷鎿嶄綔</Property>
+ <Property name="caption">鍙栨秷</Property>
<Property name="iconClass">fa fa-times</Property>
<Property name="exClassName">btn3</Property>
<Property name="width">90</Property>
@@ -794,5 +805,102 @@
<Property name="service">workOrderPR#todo</Property>
<Property name="executingMessage">澶勭悊涓�︹��</Property>
</AjaxAction>
+ <DataSet id="dsSysUser">
+ <Property name="dataType">[dtSysUser]</Property>
+ <Property name="dataProvider">commonPR#listUserByCurUserType</Property>
+ </DataSet>
+ <DataSetDropDown id="selectUser">
+ <Property name="dataSet">dsSysUser</Property>
+ <Property name="property">userName</Property>
+ <Property name="assignmentMap">assigneeId=loginName,assigneeName=userName</Property>
+ </DataSetDropDown>
+ <Dialog id="dialogSelectUser">
+ <Property name="width">600</Property>
+ <Property name="caption">鎸囧畾/杞澶勭悊浜�</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-bookmark</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">todo();</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">90</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">cancelTodo();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="width">90</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <AutoForm>
+ <Property name="cols">*</Property>
+ <Property name="dataSet">dsProcess</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">assigneeName</Property>
+ <Property name="property">assigneeName</Property>
+ <Property name="trigger">selectUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor>
+ <TextArea>
+ <Property name="blankText">-- 濉啓瀹℃壒寤鸿 --</Property>
+ <Property name="height">100</Property>
+ </TextArea>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">assigneeId</Property>
+ <Property name="property">assigneeId</Property>
+ <Property name="visible">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <AjaxAction id="ajaxSummary">
+ <Property name="service">workOrderPR#pageSummary</Property>
+ </AjaxAction>
+ <Menu id="menus">
+ <MenuItem>
+ <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
+process.set('action','pass')
+view.get("#dialogTodo").show();</ClientEvent>
+ <Property name="caption">瀹℃壒閫氳繃</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">selectUser();</ClientEvent>
+ <Property name="caption">杞氦澶勭悊</Property>
+ <Property name="iconClass">fa fa-repeat</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
+process.set('action','refuse')
+view.get("#dialogTodo").show();</ClientEvent>
+ <Property name="caption">瀹℃壒鎷掔粷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </MenuItem>
+ <Separator/>
+ <MenuItem>
+ <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
+process.set('action','error')
+view.get("#dialogTodo").show();</ClientEvent>
+ <Property name="caption">寮傚父澶勭悊</Property>
+ <Property name="iconClass">fa fa-tags</Property>
+ <Property name="tip">寮傚父宸ュ崟澶勭悊--鐩存帴娴佺▼缁撴潫</Property>
+ </MenuItem>
+ </Menu>
</View>
</ViewConfig>
--
Gitblit v1.9.3