From 08000305684ec0c758090fbb5cbd85132218fcef Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
index 2540992..70d512c 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
@@ -25,7 +25,7 @@
       <PropertyDef name="dwdm">
         <Property></Property>
         <Property name="label">鍗曚綅浠ｇ爜</Property>
-        <Property name="required">true</Property>
+        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="sqxzrq">
         <Property name="dataType">Date</Property>
@@ -142,7 +142,7 @@
       </PropertyDef>
       <PropertyDef name="lqsj">
         <Property name="dataType">Date</Property>
-        <Property name="label">棰嗗彇鏃堕棿鏃堕棿</Property>
+        <Property name="label">棰嗗彇鏃堕棿</Property>
         <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="updateTime">
@@ -211,6 +211,12 @@
       <PropertyDef name="lw">
         <Property name="dataType">Double</Property>
         <Property name="label">绮俯</Property>
+        <Property name="displayFormat">#0.000鈩�</Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="cw">
+        <Property name="dataType">Double</Property>
+        <Property name="label">浠撴俯</Property>
         <Property name="displayFormat">#0.000鈩�</Property>
         <Property name="required">true</Property>
       </PropertyDef>
@@ -385,11 +391,17 @@
         <Property name="parameter">
           <Entity>
             <Property name="xzbm">$${this.xzbm}</Property>
-            <Property name="deptId">$${this.deptId}</Property>
-            <Property name="tbrq">$${this.tbrq}</Property>
           </Entity>
         </Property>
       </Reference>
+      <PropertyDef name="dtlId">
+        <Property></Property>
+        <Property name="label">dtlId</Property>
+      </PropertyDef>
+      <PropertyDef name="wayId">
+        <Property></Property>
+        <Property name="label">wayId</Property>
+      </PropertyDef>
     </DataType>
     <DataType name="dtPeople">
       <Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
@@ -634,6 +646,8 @@
         <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
 if(data){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
+}else{&#xD;
+	$alert(&quot;璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�&quot;);&#xD;
 }</ClientEvent>
         <Property name="caption">缂栬緫</Property>
         <Property name="exClassName">btn-warm</Property>
@@ -913,6 +927,11 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
+                <Property name="name">lqsj</Property>
+                <Property name="property">lqsj</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">updateTime</Property>
                 <Property name="property">updateTime</Property>
                 <Editor/>
@@ -995,6 +1014,11 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
+                <Property name="name">cw</Property>
+                <Property name="property">cw</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
                 <Property name="name">cnsd</Property>
                 <Property name="property">cnsd</Property>
                 <Editor/>

--
Gitblit v1.9.3