From 8077450be04d3dac223f154a9e0c41a361c62886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 8 Jan 2023 16:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yi-sqlsugar-dev.db                        | Bin 286720 -> 286720 bytes
 .../ERP/Purchase/PurchaseGetListOutput.cs     |   1 +
 .../ERP/Purchase/PurchaseCreateInput.cs       |   2 ++
 .../ERP/Purchase/PurchaseUpdateInput.cs       |   2 ++
 .../ERP/Entitys/PurchaseEntity.cs             |   5 +++++
 .../src/views/ERP/purchase/index.vue          |  12 ++++++++++--
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 66fd5c135e8c98ea34dbce32bd0d7a75b94c6951..44d722e3cbbbffc4b57ff513c6d7e35a89e0b6f7 100644
GIT binary patch
delta 1622
zcmZvcZA@EL7{|}Kr`+D&%f07TSW89drLdNl!tRS@z}y@xxEN<J>IY4bl`SL~f+o1=
zV$^mlgv4#ZNl0D7j1qLykw_#`)DPf3X`(aH=m%nAMkq=&nTbXdvx(0=x3?|P=Jw_3
z`JMmsf1dM_Uh}8d{I6B}dl5npz}tOk7vmQ0J(K(>iRYiy6tNM}8QQF@Dv!(Ca!Rf&
zf3N(I^sO{3-Vvw8#wEY%5v!h7RNfy82kTnU5vC&qj^nc*^khDJ33oSlXhwTiLhrH?
zZTs6h46`#aEEo9hJU{Ty<x!6De#Tq-yAp}E_Rd5{M`!lVi`ZL66#7uctKk~R8Kcvw
zTV;D#5)~=sgvSA<pdxv4XbNYCrntFB$_V|DE&+apW|nSoO%0GMjJ-Un4ppE)f9%@8
zxQa~Ov~=CretmB1?d8pt_m_X;JSvI#Zp?VeflBEqsZAo{_u_*1iujlq_1*T}0KwC~
zR6Hi}h!;X34h#Okaju(;s~mhE{`<O$wq~zxU0%&yIGdX|hmUEN)fjc?3S6YIOBZqn
zHOp+-o7XKNkxLeJQxoTGx~aj{<?=3i)B;`9#YaplUcbvQo{fyF1lDQxp8qu*afO*-
zMnicH4Z<m>Tg-9YF2@Xo+Wsrd3~R0~Gt6KxT+q$S+J;-hMcqAslzn_%wROvuI2GMj
zYz1^8XquMMSnEnVmTlgaW_+<1LDR}kO5|k^i79->`xfql1znWw4VB6-V~lMmC&1B?
z0PQUV(B}pxa5`CE5^#}{0N0fSNXrMTm~cseYRgIX)mrib4$=`M$Tty<D!(Y#lxLJ?
zx<=2)H^Jr?@`FbusItZiae}~y-F;y|`SxRP=2qQkHP{)_^)A@iZ0J}o?DzB>G=#<X
z!e_R*jdbG_oQVLcNA*My0{uq%l#N)%K~XGZaaYGtDoLW-2b(2<)G%61a>xhMtF0Q_
zq`LwDn4s)hG@aRPwnzBac4T-Wu1k@wBY~br^ed=+iM~rO(ckG7Jr6xN#m>HvKWS3t
z(*2}63RRT5_T6^d`&x86Z0{N0@?pYjcda4%wKA=oke`ra(rM`cTFX==$yITDbe}g^
zQ-dd3vl~hBFs_Pg$w!Aq2ggR9OKQ&#j-4DH9BVXny(zoz1o=)D30**RgMLmIz}1_y
z{cghZsG=ei7}$C8Psk0I2|Qafi`$b^RUC{_HrChCqoSj5F>Fs>fRW5bibOzb9nnAN
zPjnr$zGM})=4A*gVPJ>N<0QiSph*}18i%V6s^;iCqTkSYnDz$kk8^Ol1zW-bcsTe2
zASXw3-Te8T)y<W3ZYsO^>2&Us>D=O!^CNEGg?T!<3a)J0*j$<2MbBSx=w*%jl~(3;
U9UlWbY}$vaCz<uAp4)x@0$2pI4FCWD

delta 585
zcmZoTAlPs~aDud;1p@<v8xX^Q{6rmNMvKOTtqF`v@@06q{xa}S<=5id&lke`lDD2$
zgl8p>9rtDK46eVM1qJSMZU0-v$j&Om!=K8)|AqfK|1JKr{0I0q^DpC{$=}0Y&tJr!
z3RLIHKe_%rTYGjt<M!-+ra1wu4E%TaHv=V>^H1OWo=H<hiIJU+L0VFhK`cgnbzGAG
zgOP!ev4Mf%%Snr#E!_6BxA|#n_qGpAECS53-0f4@nXN&Fa&K?vX0BynmgVc1&c1*V
zB<98kvS@ps9CI<FIM7QRd|C`Z7ft8S=2zo;&9|B_k53DzOo(s0mL9VsW4#tLCmVw@
zgEBJ*hgghZL&+fl218>*BPcQgvY|}Ahto`$fNIr^c_C`$b%Cyg$r>7iv;du~Yhb8r
zV60$hW@TUiL_l4Jj366~d6_^qsGpq<v;pilAYovr2iIh12-n2)oeSi0{+Spd3UqlR
zI3%afw`aCi<6&lFgt?j-$^koziJO^?6K2~s2WB<}p&JbR=lLe{CGke^s&iLxTQl64
zE|I{zVzPpO1Xok2KD)TAEMrUU_EQPWzKq-TlbEmavN7^MV&H!SwDSi4^hfo~O50fi
Xn7{M0PW%q^_$C3ChV3i@EPwm~SiG78

diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs
index c6cc5c75..27b3c5e5 100644
--- a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs
+++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs
@@ -16,6 +16,7 @@ namespace Yi.Framework.DtoModel.ERP.Purchase
         public long TotalMoney { get; set; }
         public long PaidMoney { get; set; }
 
+        public string? Remarks { get; set; }
         public string SupplierName { get; set; } = string.Empty;
         public PurchaseStateEnum PurchaseState { get; set; }
 
diff --git a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs
index 7de37c45..8e80a6ce 100644
--- a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs
+++ b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs
@@ -16,6 +16,8 @@ namespace Yi.Framework.DtoModel.ERP.Purchase
         public DateTime? NeedTime { get; set; }
         public string Buyer { get; set; } = string.Empty;
 
+        public string? Remarks { get; set; }
+
         public long SupplierId { get; set; }
 
         public List<PurchaseDetailsCreateUpdateInput>? PurchaseDetails { get; set; }
diff --git a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs
index 88f05610..d63ed7dc 100644
--- a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs
+++ b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs
@@ -16,6 +16,8 @@ namespace Yi.Framework.DtoModel.ERP.Purchase
         public string? Buyer { get; set; }
         public long TotalMoney { get; set; }
         public long PaidMoney { get; set; }
+
+        public string? Remarks { get; set; }
         public PurchaseStateEnum PurchaseState { get; set; }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs
index 7a9dffc4..13ec61e8 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs
@@ -57,6 +57,11 @@ namespace Yi.Framework.Model.ERP.Entitys
         /// </summary>
         public float PaidMoney { get; set; }
 
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remarks { get; set; }
+
         /// <summary>
         /// 采购状态
         /// </summary>
diff --git a/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue b/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue
index 8c6a5b0b..bedefe85 100644
--- a/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue
+++ b/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue
@@ -459,7 +459,7 @@
               <el-input  placeholder="请输入物料" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="创建时间" style="width: 308px">
               <el-date-picker
                 value-format="YYYY-MM-DD"
@@ -470,6 +470,13 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item>
+          <el-button type="primary" icon="Search" 
+          >查询</el-button
+        >
+      </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -493,7 +500,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="备注" prop="remarks">
+        <el-form-item label="订单备注" prop="remarks">
           {{ form.remarks }}
         </el-form-item>
       </el-form>
@@ -669,6 +676,7 @@ function handleGet(row) {
   getListByPurchaseId(row.id).then((response) => {
     form.value.purchaseDetails = response.data;
   });
+  form.value.remarks=row.remarks;
   openDetails.value = true;
 }