From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2

---
 igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml |  109 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
index babae32..edb1af7 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
@@ -19,7 +19,7 @@
           <Property name="valueProperty">name</Property>
         </Property>
       </PropertyDef>
-      <PropertyDef name="customerId">
+      <PropertyDef name="noticeId">
         <Property></Property>
         <Property name="label">鍙戣揣鍗曚綅</Property>
       </PropertyDef>
@@ -41,8 +41,8 @@
           <Property name="mapValues">
             <Collection>
               <Entity>
-                <Property name="name"/>
-                <Property name="value"/>
+                <Property name="name"></Property>
+                <Property name="value"></Property>
               </Entity>
               <Entity>
                 <Property name="name">鍑哄簱</Property>
@@ -112,12 +112,6 @@
       <Property name="labelWidth">100</Property>
       <Property name="labelAlign">right</Property>
       <AutoFormElement>
-        <Property name="name">depotId</Property>
-        <Property name="property">depotId</Property>
-        <Property name="trigger">autoMappingDropDown2</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
         <Property name="name">type</Property>
         <Property name="property">type</Property>
         <Editor/>
@@ -125,8 +119,14 @@
       <AutoFormElement>
         <Property name="name">customerName</Property>
         <Property name="property">customerName</Property>
-        <Property name="trigger">ddCustomer</Property>
+        <Property name="trigger">ddNotice</Property>
         <Property name="editable">false</Property>
+        <Editor/>
+      </AutoFormElement>
+      <AutoFormElement>
+        <Property name="name">depotId</Property>
+        <Property name="property">depotId</Property>
+        <Property name="trigger">autoMappingDropDown2</Property>
         <Editor/>
       </AutoFormElement>
       <AutoFormElement>
@@ -306,20 +306,15 @@
           <Property name="property">netWeight</Property>
           <Property name="align">center</Property>
         </DataColumn>
-        <DataColumn>
-          <Property name="property">deSum</Property>
-          <Property name="align">center</Property>
-          <Property name="name">deSum</Property>
-        </DataColumn>
-        <DataColumn name="deWet">
-          <Property name="property">deWet</Property>
-          <Property name="caption">姘村垎</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
         <DataColumn name="settleWeight">
           <Property name="property">settleWeight</Property>
           <Property name="caption">缁撶畻閲嶉噺</Property>
           <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">completeTime</Property>
+          <Property name="align">center</Property>
+          <Property name="name">completeTime</Property>
         </DataColumn>
       </DataGrid>
     </Container>
@@ -380,5 +375,79 @@
         </DataGrid>
       </Container>
     </CustomDropDown>
+    <CustomDropDown id="ddNotice">
+      <ClientEvent name="onOpen">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var type = data.get(&quot;type&quot;);&#xD;
+if(type){&#xD;
+	view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{type: type}).flushAsync();&#xD;
+}else{&#xD;
+	$alert(&quot;璇峰厛閫夋嫨鍑哄叆搴撶被鍨�&quot;)&#xD;
+}&#xD;
+</ClientEvent>
+      <Property name="minHeight">400</Property>
+      <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
+      <Property name="minWidth">1000</Property>
+      <Property name="autoOpen">true</Property>
+      <Container layout="regionPadding:5">
+        <DataSet id="dsNotice">
+          <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
+          <Property name="dataType">[dtNoticeDto]</Property>
+          <Property name="parameter"/>
+        </DataSet>
+        <Container layout="hbox regionPadding:5">
+          <TextEditor id="key3">
+            <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
+            <Property name="width">200</Property>
+          </TextEditor>
+          <Button>
+            <ClientEvent name="onClick">var key = view.get(&quot;#key3.value&quot;);&#xD;
+var type = &quot;${request.getParameter('type')}&quot;;&#xD;
+view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{key: key,type: type}).flushAsync();</ClientEvent>
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="iconClass">fa fa-search</Property>
+          </Button>
+          <Button>
+            <ClientEvent name="onClick">var data = view.get(&quot;#dsNotice.data:#&quot;);&#xD;
+if(data){&#xD;
+	view.get(&quot;#ddNotice&quot;).close(data.toJSON());&#xD;
+}</ClientEvent>
+            <Property name="iconClass">fa fa-check</Property>
+            <Property name="caption">纭畾</Property>
+          </Button>
+        </Container>
+        <DataGrid>
+          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsNotice.data:#&quot;);&#xD;
+if(data){&#xD;
+	view.get(&quot;#ddNotice&quot;).close(data.toJSON());&#xD;
+}</ClientEvent>
+          <Property name="dataSet">dsNotice</Property>
+          <Property name="readOnly">true</Property>
+          <DataColumn name="name">
+            <Property name="property">name</Property>
+            <Property name="align">center</Property>
+            <Property name="width">100</Property>
+          </DataColumn>
+          <DataColumn>
+            <Property name="property">customerName</Property>
+            <Property name="align">center</Property>
+            <Property name="name">customerName</Property>
+            <Property name="width">240</Property>
+          </DataColumn>
+          <DataColumn name="foodVariety">
+            <Property name="property">foodVariety</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="year">
+            <Property name="property">year</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="contractName">
+            <Property name="property">contractName</Property>
+            <Property name="align">center</Property>
+            <Property name="width">300</Property>
+          </DataColumn>
+        </DataGrid>
+      </Container>
+    </CustomDropDown>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3