From e4609e7ea92f3939802fafc15fd784213ed00b5f Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 20 七月 2023 21:06:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index 36e41ab..bf6cbc1 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -185,6 +185,22 @@
 &#xD;
 		}&#xD;
 	});&#xD;
+}&#xD;
+&#xD;
+//鍒犻櫎闄勪欢&#xD;
+delFile = function(){&#xD;
+	var entity = view.get(&quot;#dgFiles&quot;).getCurrentItem();&#xD;
+	view.get(&quot;#ajaxDelFile&quot;).set(&quot;parameter&quot;,{&#xD;
+		fileName:entity.get(&quot;fileName&quot;),&#xD;
+		createTime:entity.get(&quot;createTime&quot;)&#xD;
+	}).execute(function(result){&#xD;
+		if(result){&#xD;
+			$alert(result);&#xD;
+		}else{&#xD;
+			entity.remove();&#xD;
+			$alert(&quot;鍒犻櫎鎴愬姛锛�&quot;);&#xD;
+		}&#xD;
+	});&#xD;
 }</ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
     <Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
@@ -747,6 +763,16 @@
               <DataColumn name="fileName">
                 <Property name="property">fileName</Property>
               </DataColumn>
+              <DataColumn>
+                <ClientEvent name="onRenderCell">arg.dom.innerHTML = &quot;&lt;a href='javascript:;' onClick='delFile()'>鍒犻櫎&lt;/a>&quot;;&#xD;
+</ClientEvent>
+                <Property name="property">fileId</Property>
+                <Property name="name">fileId</Property>
+                <Property name="align">center</Property>
+                <Property name="caption">鎿嶄綔</Property>
+                <Property name="readOnly">true</Property>
+                <Property name="width">80</Property>
+              </DataColumn>
             </DataGrid>
           </Children>
         </FieldSet>
@@ -890,9 +916,9 @@
     <UploadAction id="uploadImg">
       <ClientEvent name="beforeFileUploaded">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
 var plateNum = data.get(&quot;plateNum&quot;);&#xD;
+var bizTag = &quot;EMPTY&quot;;&#xD;
 self.set(&quot;parameter&quot;,{&#xD;
-	plateNum:plateNum,&#xD;
-	bizTag:&quot;EMPTY_WEIGHT&quot;&#xD;
+	bizTag: bizTag&#xD;
 })</ClientEvent>
       <ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�&#xD;
 var mainData = view.get(&quot;#dsMain.data&quot;);&#xD;
@@ -902,8 +928,9 @@
       <ClientEvent name="beforeFileUploaded">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
 if(data){&#xD;
 	var plateNum = data.get(&quot;plateNum&quot;);&#xD;
+    var bizTag = &quot;EMPTY&quot;;&#xD;
 	self.set(&quot;parameter&quot;,{&#xD;
-		plateNum:plateNum&#xD;
+        bizTag:bizTag&#xD;
 	})&#xD;
 }</ClientEvent>
       <Property name="maxFileSize">20MB</Property>
@@ -916,9 +943,9 @@
       <ClientEvent name="beforeFileUploaded">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
 &#xD;
 var plateNum = data.get(&quot;plateNum&quot;);&#xD;
+var bizTag = &quot;FULL&quot;;&#xD;
 self.set(&quot;parameter&quot;,{&#xD;
-	plateNum:plateNum,&#xD;
-	bizTag:&quot;FULL_WEIGHT&quot;&#xD;
+	bizTag: bizTag&#xD;
 })</ClientEvent>
       <ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�&#xD;
 var mainData = view.get(&quot;#dsMain.data&quot;);&#xD;
@@ -928,8 +955,9 @@
       <ClientEvent name="beforeFileUploaded">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
 if(data){&#xD;
 	var plateNum = data.get(&quot;plateNum&quot;);&#xD;
+    var bizTag = &quot;FULL&quot;;&#xD;
 	self.set(&quot;parameter&quot;,{&#xD;
-		plateNum:plateNum&#xD;
+        bizTag:bizTag&#xD;
 	})&#xD;
 }</ClientEvent>
       <Property name="maxFileSize">20MB</Property>
@@ -942,9 +970,9 @@
       <ClientEvent name="beforeFileUploaded">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
 &#xD;
 var plateNum = data.get(&quot;plateNum&quot;);&#xD;
+var bizTag = &quot;HANDLE&quot;;&#xD;
 self.set(&quot;parameter&quot;,{&#xD;
-	plateNum:plateNum,&#xD;
-	bizTag:&quot;HAND&quot;&#xD;
+	bizTag: bizTag&#xD;
 })</ClientEvent>
       <ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�&#xD;
 var mainData = view.get(&quot;#dsMain.data&quot;);&#xD;
@@ -954,8 +982,9 @@
       <ClientEvent name="beforeFileUploaded">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
 if(data){&#xD;
 	var plateNum = data.get(&quot;plateNum&quot;);&#xD;
+    var bizTag = &quot;HANDLE&quot;;&#xD;
 	self.set(&quot;parameter&quot;,{&#xD;
-		plateNum:plateNum&#xD;
+        bizTag:bizTag&#xD;
 	})&#xD;
 }</ClientEvent>
       <Property name="maxFileSize">20MB</Property>
@@ -964,5 +993,10 @@
       <Property name="fileResolver">inoutDataPR#uploadImage</Property>
       <Filters/>
     </UploadAction>
+    <AjaxAction id="ajaxDelFile">
+      <Property name="service">inoutDataPR#delImage</Property>
+      <Property name="async">true</Property>
+      <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
+    </AjaxAction>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3