From 323ee86aabb415f7d46594b228a7cddca40bea25 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 29 十二月 2025 14:33:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml | 320 ++++++++++++++++++++++++++++-------------------------
1 files changed, 169 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 738e5bc..174c171 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
@@ -100,6 +100,18 @@
<Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtWordProcess">
+ <Property name="creationType">com.fzzy.work.domain.WorkOrderProcess</Property>
+ <PropertyDef name="orderId">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="action">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property/>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:10">
<ClientEvent name="onReady">query= function(){
@@ -148,7 +160,27 @@
}
//鐐瑰嚮璇︾粏
showDetail = function(){
+ var tabIndex = view.get("#tabMain.currentIndex");
+ var cur = view.get("#dsMain.data:#");
+ var dialog = view.get("#dialogMain");
+ if(1 == tabIndex){
+ cur = view.get("#dsMain2.data:#");
+ dialog = view.get("#dialogMain");
+ }
+ dialog.show();

+ var orderId = cur.get("id");
+ //璧嬪�肩粰瀹℃壒
+ view.get("#dsWordProcess").set("data",{orderId:orderId});
+ //鍘嗗彶璁板綍
+ view.get("#iFrameProcess").set("path","com.fzzy.work.WorkProcess.d?orderId="+orderId);
+ //涓氬姟淇℃伅
+ if(cur.get("businessUrl")){
+ var url = cur.get("businessUrl")+"?businessId="+cur.get("businessId")+"&orderId="+orderId;
+ view.get("#iFrameBiz").set("path",url);
+ }else{
+ view.get("#iFrameBiz").set("path","/work/no-business?orderId="+orderId);
+ }
}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
@@ -169,6 +201,10 @@
<DataSet id="dsQuery">
<ClientEvent name="onReady">self.insert({});</ClientEvent>
<Property name="dataType">dtParam</Property>
+ </DataSet>
+ <DataSet id="dsWordProcess">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtWordProcess</Property>
</DataSet>
<HtmlContainer layoutConstraint="top ">
<Property name="content"><style>
@@ -504,11 +540,16 @@
</Container>
<Dialog id="dialogMain" layout="regionPadding:8">
<Property name="closeable">false</Property>
- <Property name="caption">鍏ュ簱閫氱煡鍗�</Property>
- <Property name="width">1200</Property>
+ <Property name="caption">宸ュ崟璇︾粏</Property>
<Property name="iconClass">fa fa-tasks</Property>
+ <Property name="height">95%</Property>
+ <Property name="width">95%</Property>
+ <Property name="showCaptionBar">false</Property>
+ <Property name="style">
+ <Property name="background-color">#e6e6e6</Property>
+ </Property>
<Buttons>
- <Button id="btnOk">
+ <Button>
<ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
if(result){
$alert(result);
@@ -517,165 +558,142 @@
$notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
self.get("parent").hide();
});</ClientEvent>
- <Property name="caption">淇濆瓨</Property>
+ <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">view.get("#updateSave").execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }
+ $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
+ self.get("parent").hide();
+});</ClientEvent>
+ <Property name="caption">杞氦</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="exClassName">btn2</Property>
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
self.get("parent").hide();</ClientEvent>
- <Property name="caption">鍙栨秷</Property>
+ <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>
- <Container>
- <AutoForm layoutConstraint="top ">
- <Property name="dataSet">dsMain</Property>
- <Property name="showHint">false</Property>
- <Property name="cols">210,*,210</Property>
- <Control/>
- <AutoFormElement>
- <Property name="name">name</Property>
- <Property name="property">name</Property>
- <Property name="editorType">Label</Property>
- <Property name="showLabel">false</Property>
- <Property name="showHint">false</Property>
- <Property name="className">f-title</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">id</Property>
- <Property name="property">id</Property>
- <Property name="editorType">Label</Property>
- <Property name="showHint">false</Property>
- <Property name="labelAlign">right</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">name</Property>
- <Property name="property">name</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <Property name="editorType">RadioGroup</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">year</Property>
- <Property name="property">year</Property>
- <Property name="trigger">defaultYearDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">unitName</Property>
- <Property name="property">unitName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">targetNumber</Property>
- <Property name="property">targetNumber</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeNumber</Property>
- <Property name="property">completeNumber</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeStatus</Property>
- <Property name="property">completeStatus</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">auditStatus</Property>
- <Property name="property">auditStatus</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">contract</Property>
- <Property name="property">contract</Property>
- <Editor/>
- </AutoFormElement>
- <Label>
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">娉細鐩戠閫氱煡鍗曪紝鍙～鍐欒川鎶煎悎鍚屽悕绉�</Property>
- </Label>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</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.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
- <Property name="exClassName">h-tip</Property>
- <Property name="contentOverflow">hidden</Property>
- </HtmlContainer>
- </AutoForm>
- </Container>
+ <TabControl>
+ <ControlTab>
+ <Property name="caption">宸ュ崟淇℃伅</Property>
+ <Property name="iconClass">fa fa-edit</Property>
+ <Container>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="readOnly">true</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">title</Property>
+ <Property name="property">title</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">description</Property>
+ <Property name="property">description</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizType</Property>
+ <Property name="property">bizType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">status</Property>
+ <Property name="property">status</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">assigneeName</Property>
+ <Property name="property">assigneeName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createUserName</Property>
+ <Property name="property">createUserName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">receiveTime</Property>
+ <Property name="property">receiveTime</Property>
+ <Property name="labelWidth">140</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ <GroupBox>
+ <Property name="caption">宸ュ崟瀹℃壒/澶勭悊</Property>
+ <Property name="collapseable">false</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsWordProcess</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="showLabel">false</Property>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor>
+ <TextArea>
+ <Property name="blankText">-- 瀹℃壒/澶勭悊璇存槑 --</Property>
+ </TextArea>
+ </Editor>
+ </AutoFormElement>
+ <HtmlContainer layoutConstraint="colSpan:3">
+ <Property name="content">1.宸ュ崟璇︾粏涓氬姟瑙併�愪笟鍔′俊鎭�戞煡鐪嬨��<br></Property>
+ <Property name="exClassName">h-tip</Property>
+ <Property name="contentOverflow">hidden</Property>
+ </HtmlContainer>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ </Container>
+ </ControlTab>
+ <ControlTab>
+ <Property name="caption">涓氬姟淇℃伅</Property>
+ <Property name="iconClass">fa fa-file-o</Property>
+ <IFrame id="iFrameBiz"/>
+ </ControlTab>
+ <ControlTab>
+ <Property name="caption">瀹℃壒璁板綍</Property>
+ <Property name="iconClass">fa fa-history</Property>
+ <IFrame id="iFrameProcess">
+ <Property name="path">com.fzzy.work.WorkProcess.d</Property>
+ </IFrame>
+ </ControlTab>
+ </TabControl>
</Children>
<Tools/>
</Dialog>
--
Gitblit v1.9.3