From 4ff771b8a617c6e93e8f4ae30192e1fa2725dc49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Fri, 6 Jan 2023 18:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ERP/PurchaseDetailsController.cs          |  12 +
 .../yi-sqlsugar-dev.db                        | Bin 286720 -> 286720 bytes
 .../ERP/Purchase/PurchaseGetListOutput.cs     |   2 +
 .../PurchaseDetailsCreateUpdateInput.cs       |  13 +
 .../ERP/IPurchaseDetailsService.cs            |   2 +
 .../ERP/Entitys/PurchaseDetailsEntity.cs      |  16 +-
 .../Yi.Framework.Model.csproj                 |   2 +-
 .../ERP/PurchaseDetailsService.cs             |   6 +
 .../ERP/PurchaseService.cs                    |   5 +-
 .../src/api/erp/purchaseDetailsApi.js         |   6 +
 .../src/views/ERP/purchase/index.vue          | 604 ++++++++++++------
 11 files changed, 480 insertions(+), 188 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs
index f8c9dafd..f0f01a55 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs
@@ -26,8 +26,20 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
         {
             var result = await _purchaseDetailsService.PageListAsync(input, page);
             return Result.Success().SetData(result);
+
+
         }
 
+        [HttpGet]
+        [Route("{id}")]
+        public async Task<Result> GetListByPurchaseId(long id)
+        {
+            var result = await _purchaseDetailsService.GetListByPurchaseIdAsync(id);
+            return Result.Success().SetData(result);
+        }
+
+
+
         /// <summary>
         /// 单查
         /// </summary>
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 508e029b9bf5fecc68a1e2d26a91869d1b27a207..66fd5c135e8c98ea34dbce32bd0d7a75b94c6951 100644
GIT binary patch
delta 1205
zcmZuwOK1~87@nD}$u|3#jZL%JCb3DS7Aj5m)ohxAg|t2{#e*J-1}sRyP*4%<L5dqI
zl7dQoP(o2b>$7^2puvN-_Mivx<W1-?v9*d9uLWnbNxE%Zb{W3qd;I_WGudTtcG-I?
z2otwMLojh=?9CW_axTPrHUXZ)-TV@NoLlEi&c`mY2bgcn8P8_HE3A3~8CGz4yV}L*
zelP^AhxVtlyJD&Q$0<16l}O4)vQLQ_dZJ%3;u)rqJk@pt*<`|$le!)=jD(Ufl#Hj5
zd~prc$*Pvr<(RIk@%}zN)7(ft{rS{N#TmzwvYu2EF<t44_v=P+aSEQKLM$E!_%Hr}
zzvHiX85i&~JdbZ+6JNmNq`8CmuKC9mvzieA%Tg}rPg}(bfU$v9i~u|~u)+k;oSUD8
z#rat@ah?h@xj8r0>E~pQV}G)r*vIT;c7zQv8_YW<X9X~(9A;d=MN1Nbv_v-U(ywWO
zvexpn0M_p;lpnn<-Mm`5b{#&Cls?Rqp1zkujS5s#l<&VNKUlIAV3n~Iy}_yiZe@^G
ztPFE|h*-_&ZEIA3|7D0B)d*>)ASKiV&NlqjguMYGplOpdj%dQ19Nm)=nzog{28W_z
zg(XR(@*0V9+65vV{u*V=2RVI2V$)jVY}vqy&C%-aA{6yCa)8qZQPGy26f%8hH3$`t
zanx%>h54Dh`ym`4Gd{#yhsd-C8@7*11)z`vz@P(wwmKlYDA~Z?pnwBVq5~km1He`X
z06qddWZuMq)Z3C5+o|6^n(qeW(C6_4-p6n7ulTckH>q|vZ>DIE3v_BhMANR?$W>WY
z$)_pSOV%D)=~1<aLavoeUQJcVfBi7$Pj_V(Rs=BMCLW?DQ5BEL(EthFCRXBgam7=E
m!(VJM6pAln)CpK@%EEitXI})m){kZ6&J_l!VqvgpB=Qd!woGLJ

delta 176
zcmZoTAlPs~aDp_W(L@<%Mx(}rtqF`v@<lj!Rx<EU<=5id&lke`lDD2$glFYuL4k=p
z+gH{wMl)|`F<_p}-#)*ear^v!rqlvvA>QDr?98e_CF;D}gL#=ZGBFGBi%(})U<8T1
z=9^sqo^86UJo9q_Honyi{Ac;6^Jnv`@xA6-4V0eFw|%u9b0nhx8~<ho{xAH``ELPL
Y9N^y!l$*~F(%Qb$o_YIDdlq*E09xfXy8r+H

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 241b623e..c6cc5c75 100644
--- a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs
+++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs
@@ -18,5 +18,7 @@ namespace Yi.Framework.DtoModel.ERP.Purchase
 
         public string SupplierName { get; set; } = string.Empty;
         public PurchaseStateEnum PurchaseState { get; set; }
+
+     
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs
index c81d02dc..b02aeea5 100644
--- a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs
+++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Model.Base;
+using Yi.Framework.Model.ERP.Entitys;
 
 namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
 {
@@ -16,5 +17,17 @@ namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
         public long TotalNumber { get; set; } 
         public long CompleteNumber { get; set; }
         public string? Remarks { get; set; }
+
+        public long PurchaseId { get; set; }
+
+    }
+
+    public static class PurchaseDetailsCreateUpdateInputExtensions
+    {
+        public static List<PurchaseDetailsCreateUpdateInput> SetPurchaseId(this List<PurchaseDetailsCreateUpdateInput> purchaseDetailsEntities, long purchaseId)
+        {
+            purchaseDetailsEntities.ForEach(u => u.PurchaseId = purchaseId);
+            return purchaseDetailsEntities;
+        }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs
index 981fddfc..aa7dc699 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs
@@ -12,5 +12,7 @@ namespace Yi.Framework.Interface.ERP
     public interface IPurchaseDetailsService : ICrudAppService<PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>
     {
         Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page);
+
+        Task<List<PurchaseDetailsGetListOutput>> GetListByPurchaseIdAsync(long purchaseId);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs
index d5adaeb9..f6f36bc5 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs
@@ -20,7 +20,7 @@ namespace Yi.Framework.Model.ERP.Entitys
         /// </summary>
         [JsonConverter(typeof(ValueToStringConverter))]
         [SugarColumn(IsPrimaryKey = true)]
-        public long Id { get; set; } 
+        public long Id { get; set; }
 
         /// <summary>
         /// 租户id
@@ -35,28 +35,28 @@ namespace Yi.Framework.Model.ERP.Entitys
         /// <summary>
         /// 物料id
         /// </summary>
-        public long MaterialId { get; set; } 
+        public long MaterialId { get; set; }
 
 
         /// <summary>
         /// 物料名称
         /// </summary>
-        public string MaterialName { get; set; }=string.Empty;
+        public string MaterialName { get; set; } = string.Empty;
 
         /// <summary>
         /// 物料单位
         /// </summary>
-        public string MaterialUnit { get; set; }=string.Empty ;
+        public string MaterialUnit { get; set; } = string.Empty;
 
 
         /// <summary>
         /// 单价
         /// </summary>
-        public float UnitPrice { get; set; } 
+        public float UnitPrice { get; set; }
         /// <summary>
         /// 总数量
         /// </summary>
-        public long TotalNumber { get; set; } 
+        public long TotalNumber { get; set; }
         /// <summary>
         /// 已完成数量
         /// </summary>
@@ -65,5 +65,9 @@ namespace Yi.Framework.Model.ERP.Entitys
         /// 备注
         /// </summary>
         public string? Remarks { get; set; }
+
+
+
     }
+
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
index fae07b7d..d6f5a635 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="NEST" Version="7.16.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.3.43-preview03" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.3.43-preview04" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs
index 3cd9d361..9d3c461e 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs
@@ -16,6 +16,12 @@ namespace Yi.Framework.Service.ERP
 {
     public class PurchaseDetailsService : CrudAppService<PurchaseDetailsEntity, PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>, IPurchaseDetailsService
     {
+        public async Task<List<PurchaseDetailsGetListOutput>> GetListByPurchaseIdAsync(long purchaseId)
+        {
+           var data= await Repository._DbQueryable.Where(u => u.PurchaseId == purchaseId).ToListAsync();
+            return await MapToGetListOutputDtos(data);
+        }
+
         public async Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page)
         {
             RefAsync<int> totalNumber = 0;
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs
index 782319ec..7940ebc7 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Yi.Framework.Common.Attribute;
 using Yi.Framework.Common.Models;
 using Yi.Framework.DtoModel.ERP.Purchase;
+using Yi.Framework.DtoModel.ERP.PurchaseDetails;
 using Yi.Framework.Interface.ERP;
 using Yi.Framework.Model.Base;
 using Yi.Framework.Model.ERP.Entitys;
@@ -49,7 +50,9 @@ namespace Yi.Framework.Service.ERP
                 TryToSetTenantId(entity);
                 var purchaseId = await Repository.InsertReturnSnowflakeIdAsync(entity);
                 entity.Id = purchaseId;
-                await _purchaseDetailsService.CreateAsync(input.PurchaseDetails);
+
+
+                await _purchaseDetailsService.CreateAsync(input.PurchaseDetails.SetPurchaseId(purchaseId));
                 uow.Commit();
             }
             return await MapToGetListOutputDtoAsync(entity); ;
diff --git a/Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js b/Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js
index 1bcbb35d..e4e89b9c 100644
--- a/Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js
+++ b/Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js
@@ -1,4 +1,10 @@
 import request from '@/utils/request'
+export function getListByPurchaseId(id){
+  return request({
+    url: `/purchaseDetails/getListByPurchaseId/${id}`,
+    method: 'get'
+  })
+}
 
 // 分页查询
 export function listData(query) {
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 e2d28b26..8c6a5b0b 100644
--- a/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue
+++ b/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue
@@ -1,18 +1,42 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
       <el-form-item label="供应商名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入供应商名称" clearable style="width: 240px"
-          @keyup.enter="handleQuery" prop="name" />
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入供应商名称"
+          clearable
+          style="width: 240px"
+          @keyup.enter="handleQuery"
+          prop="name"
+        />
       </el-form-item>
       <el-form-item label="采购单编号" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入采购单编号" clearable style="width: 240px"
-          @keyup.enter="handleQuery" prop="code" />
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入采购单编号"
+          clearable
+          style="width: 240px"
+          @keyup.enter="handleQuery"
+          prop="code"
+        />
       </el-form-item>
 
       <el-form-item label="采购员" prop="buyer">
-        <el-input v-model="queryParams.code" placeholder="请输入采购员" clearable style="width: 240px"
-          @keyup.enter="handleQuery" prop="buyer" />
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入采购员"
+          clearable
+          style="width: 240px"
+          @keyup.enter="handleQuery"
+          prop="buyer"
+        />
       </el-form-item>
       <!-- <el-form-item label="状态" prop="isDeleted">
             <el-select
@@ -40,49 +64,126 @@
             ></el-date-picker>
           </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['erp:purchase:add']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['erp:purchase:add']"
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['erp:purchase:edit']">修改</el-button>
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['erp:purchase:edit']"
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['erp:purchase:remove']">删除</el-button>
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['erp:purchase:remove']"
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="Download" @click="handleExport"
-          v-hasPermi="['erp:purchase:export']">导出</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['erp:purchase:export']"
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
 
       <!-----------------------这里开始就是数据表单的全部列------------------------>
       <el-table-column label="采购单号" align="center" prop="code" />
 
-      <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="供应商"
+        align="center"
+        prop="supplierName"
+        :show-overflow-tooltip="true"
+      />
 
-      <el-table-column label="需求时间" align="center" prop="needTime" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="需求时间"
+        align="center"
+        prop="needTime"
+        :show-overflow-tooltip="true"
+      />
 
-      <el-table-column label="采购员" align="center" prop="buyer" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="采购员"
+        align="center"
+        prop="buyer"
+        :show-overflow-tooltip="true"
+      />
 
-      <el-table-column label="总共金额" align="center" prop="totalMoney" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="总共金额"
+        align="center"
+        prop="totalMoney"
+        :show-overflow-tooltip="true"
+      />
 
-      <el-table-column label="已支付金额" align="center" prop="paidMoney" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="已支付金额"
+        align="center"
+        prop="paidMoney"
+        :show-overflow-tooltip="true"
+      />
 
-      <el-table-column label="采购状态" align="center" prop="purchaseState" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="采购状态"
+        align="center"
+        prop="purchaseState"
+        :show-overflow-tooltip="true"
+      >
+    
+      <template #default="scope">
+        <el-tag>{{purchaseStateComputed(scope.row.purchaseState)}}</el-tag>
+       </template>
 
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" />
+    </el-table-column>
+
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remarks"
+        :show-overflow-tooltip="true"
+      />
       <!-- <el-table-column label="状态" align="center" prop="isDeleted">
             <template #default="scope">
               <dict-tag
@@ -107,24 +208,53 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:article:edit']">查看</el-button>
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleGet(scope.row)"
+            v-hasPermi="['erp:purchase:edit']"
+            >查看</el-button
+          >
 
-          <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:article:edit']">修改</el-button>
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['erp:purchase:edit']"
+            >修改</el-button
+          >
 
-          <el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['business:article:remove']">结束</el-button>
-          <el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['business:article:remove']">删除</el-button>
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['erp:purchase:remove']"
+            >结束</el-button
+          >
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['erp:purchase:remove']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- ---------------------这里是新增和更新的对话框--------------------- -->
     <el-dialog :title="title" v-model="open" width="1200px" append-to-body>
@@ -138,81 +268,100 @@
 
           <el-col :span="8">
             <el-form-item label="供应商" prop="supplierName">
-              <el-select v-model="form.supplierId" filterable placeholder="请选择供应商">
-    <el-option
-      v-for="item in supplierList"
-      :key="item.id"
-      :label="item.name"
-      :value="item.id"
-    />
-  </el-select>
+              <el-select
+                v-model="form.supplierId"
+                filterable
+                placeholder="请选择供应商"
+              >
+                <el-option
+                  v-for="item in supplierList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="采购单员" prop="buyer">
-              <el-input v-model="form.buyer" placeholder="请输入采购单员" /> </el-form-item>
+              <el-input v-model="form.buyer" placeholder="请输入采购单员" />
+            </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="需求时间" prop="needTime">
               <el-date-picker
-        v-model="form.needTime"
-        type="date"
-        placeholder="选择一个日期"
-        size="default"
-      />
+                v-model="form.needTime"
+                type="date"
+                placeholder="选择一个日期"
+                size="default"
+              />
             </el-form-item>
           </el-col>
 
           <el-col :offset="8" :span="8">
             <el-form-item label="总金额">
-             {{showTotalMoney}}
+              {{ showTotalMoney }}
             </el-form-item>
           </el-col>
-
-
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="物料信息">
               <el-table :data="form.purchaseDetails" border style="width: 100%">
-
-                <el-table-column  width="90">
+                <el-table-column width="90">
                   <template #default="scope">
-                    <el-button @click="delMaterialRow(scope.$index)"  icon="Delete" type="danger" size="small">删除</el-button>
+                    <el-button
+                      @click="delMaterialRow(scope.$index)"
+                      icon="Delete"
+                      type="danger"
+                      size="small"
+                      >删除</el-button
+                    >
                   </template>
                 </el-table-column>
                 <el-table-column type="index" label="序号" width="60" />
                 <el-table-column prop="materialName" label="物料" width="180" />
                 <el-table-column prop="materialUnit" label="单位" width="180" />
-                <el-table-column prop="unitPrice" label="单价" width="180" >
-      <template #default="scope">
-        <el-input
-
-        v-model="scope.row.unitPrice"/>
-      </template>
-                </el-table-column>
-                <el-table-column prop="totalNumber" label="采购数量" width="180" >
+                <el-table-column prop="unitPrice" label="单价" width="180">
                   <template #default="scope">
-        <el-input v-model="scope.row.totalNumber"/>
-      </template>
-
+                    <el-input v-model="scope.row.unitPrice" />
+                  </template>
                 </el-table-column>
-                <el-table-column prop="remarks" label="备注" >
+                <el-table-column
+                  prop="totalNumber"
+                  label="采购数量"
+                  width="180"
+                >
                   <template #default="scope">
-        <el-input
-
-        v-model="scope.row.remarks"/>
-      </template>
+                    <el-input v-model="scope.row.totalNumber" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="remarks" label="备注">
+                  <template #default="scope">
+                    <el-input v-model="scope.row.remarks" />
+                  </template>
                 </el-table-column>
               </el-table>
-              <el-button class="form-add-btn" type="primary" icon="CirclePlus" plain @click="materialHandleAdd">添加物料</el-button>
+              <el-button
+                class="form-add-btn"
+                type="primary"
+                icon="CirclePlus"
+                plain
+                @click="materialHandleAdd"
+                >添加物料</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" :rows="5"></el-input>
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            placeholder="请输入内容"
+            :rows="5"
+          ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -224,42 +373,137 @@
     </el-dialog>
 
     <!-- ---------------------这里是新增物料的对话框--------------------- -->
-    <el-dialog title="添加物料" v-model="openMaterial" width="800px" append-to-body>
-      <el-form :model="queryMaterialParams" ref="queryMaterialRef" :inline="true" label-width="70px">
-      <el-form-item label="物料名称" prop="name">
-        <el-input v-model="queryMaterialParams.name" placeholder="请输入物料名称" clearable style="width: 150px"
-          @keyup.enter="handleMaterialQuery" prop="name" />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="code">
-        <el-input v-model="queryMaterialParams.code" placeholder="请输入物料编码" clearable style="width: 150px"
-          @keyup.enter="handleMaterialQuery" prop="code" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleMaterialQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetMaterialQuery">重置</el-button>
-      </el-form-item>
-      <!-- 物料表单 -->
-      <el-table
-    style="width: 100%"
-    :data="materialList"
-    @selection-change="materialHandleSelectionChange"
-  >
-    <el-table-column type="selection" width="55" />
-    <el-table-column property="code" label="物料编码"  />
-    <el-table-column property="name" label="物料信息"  />
-    <el-table-column property="unitName" label="物料单位"  />
-    
-  </el-table>
-  <pagination v-show="materialTotal > 0" :total="materialTotal" v-model:page="queryMaterialParams.pageNum"
-      v-model:limit="queryMaterialParams.pageSize" @pagination="getMaterialList" />
-</el-form>
-<template #footer>
+    <el-dialog
+      title="添加物料"
+      v-model="openMaterial"
+      width="800px"
+      append-to-body
+    >
+      <el-form
+        :model="queryMaterialParams"
+        ref="queryMaterialRef"
+        :inline="true"
+        label-width="70px"
+      >
+        <el-form-item label="物料名称" prop="name">
+          <el-input
+            v-model="queryMaterialParams.name"
+            placeholder="请输入物料名称"
+            clearable
+            style="width: 150px"
+            @keyup.enter="handleMaterialQuery"
+            prop="name"
+          />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="code">
+          <el-input
+            v-model="queryMaterialParams.code"
+            placeholder="请输入物料编码"
+            clearable
+            style="width: 150px"
+            @keyup.enter="handleMaterialQuery"
+            prop="code"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleMaterialQuery"
+            >搜索</el-button
+          >
+          <el-button icon="Refresh" @click="resetMaterialQuery">重置</el-button>
+        </el-form-item>
+        <!-- 物料表单 -->
+        <el-table
+          style="width: 100%"
+          :data="materialList"
+          @selection-change="materialHandleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column property="code" label="物料编码" />
+          <el-table-column property="name" label="物料信息" />
+          <el-table-column property="unitName" label="物料单位" />
+        </el-table>
+        <pagination
+          v-show="materialTotal > 0"
+          :total="materialTotal"
+          v-model:page="queryMaterialParams.pageNum"
+          v-model:limit="queryMaterialParams.pageSize"
+          @pagination="getMaterialList"
+        />
+      </el-form>
+      <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
+          <el-button type="primary" @click="submitMaterialForm"
+            >确 定</el-button
+          >
           <el-button @click="materialCancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
+
+    <!-- ---------------------这里是采购订单详情对话框--------------------- -->
+    <el-dialog
+      title="订单详情"
+      v-model="openDetails"
+      width="1200px"
+      append-to-body
+    >
+      <el-form
+        ref="dataDetailsRef"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="物料" prop="code">
+              <el-input  placeholder="请输入物料" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="创建时间" style="width: 308px">
+              <el-date-picker
+                value-format="YYYY-MM-DD"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="物料信息">
+              <el-table :data="form.purchaseDetails" border style="width: 100%" >
+                <el-table-column type="index" label="序号" width="60" align="center"  />
+                <el-table-column prop="materialName" label="物料" width="180" align="center" />
+                <el-table-column prop="materialUnit" label="单位" width="180" align="center" />
+                <el-table-column prop="unitPrice" label="单价" width="180" align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="totalNumber"
+                  label="采购数量"
+                  width="180"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column prop="remarks" label="备注" >
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remarks">
+          {{ form.remarks }}
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
     
@@ -271,27 +515,26 @@ import {
   addData,
   updateData,
 } from "@/api/erp/purchaseApi";
-import
-{
-  allData as supplierlAllData
-} from "@/api/erp/supplierApi";
-import {
-  listData as materialListData
-} from "@/api/erp/materialApi";
+import { allData as supplierlAllData } from "@/api/erp/supplierApi";
+import { listData as materialListData } from "@/api/erp/materialApi";
+import { getListByPurchaseId } from "@/api/erp/purchaseDetailsApi";
+
 import { ref } from "@vue/reactivity";
 import { computed } from "@vue/runtime-core";
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
+//详情物料对话框
+const openDetails = ref(false);
+
 //添加物料对话框
-const openMaterial=ref(false);
-const materialList= ref([]);
+const openMaterial = ref(false);
+const materialList = ref([]);
 const materialTotal = ref(0);
-const materialMultipleSelection=ref([]);
+const materialMultipleSelection = ref([]);
 
 //选择框供应商
-const supplierList=ref([]);
-
+const supplierList = ref([]);
 
 const dataList = ref([]);
 const open = ref(false);
@@ -305,9 +548,9 @@ const title = ref("");
 const dateRange = ref([]);
 const data = reactive({
   form: {
-    supplierId:undefined,
-    totalMoney:0,
-    purchaseDetails:[]
+    supplierId: undefined,
+    totalMoney: 0,
+    purchaseDetails: [],
   },
   queryParams: {
     pageNum: 1,
@@ -316,7 +559,7 @@ const data = reactive({
     code: undefined,
     buyer: undefined,
   },
-  queryMaterialParams:{
+  queryMaterialParams: {
     pageNum: 1,
     pageSize: 10,
     name: undefined,
@@ -328,7 +571,7 @@ const data = reactive({
   },
 });
 
-const { queryParams, form, queryMaterialParams,rules } = toRefs(data);
+const { queryParams, form, queryMaterialParams, rules } = toRefs(data);
 /** 查询列表 */
 function getList() {
   loading.value = true;
@@ -416,107 +659,108 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
-function handleExport() { }
-
+function handleExport() {}
 
+/** 查看详情 */
+function handleGet(row) {
+  getListByPurchaseId(row.id).then((response) => {
+    form.value.purchaseDetails = response.data;
+  });
+  openDetails.value = true;
+}
 
 //-------------这里开始是物料对话框的数据-----------
 /** 物料查询列表 */
 function getMaterialList() {
-  materialListData(proxy.addDateRange(queryMaterialParams.value, dateRange.value)).then(
-    (response) => {
-      materialList.value = response.data.data;
-      materialTotal.value = response.data.total;
-    }
-  );
+  materialListData(
+    proxy.addDateRange(queryMaterialParams.value, dateRange.value)
+  ).then((response) => {
+    materialList.value = response.data.data;
+    materialTotal.value = response.data.total;
+  });
 }
 /** 表单改变选择 */
-function materialHandleSelectionChange(select)
-{
-  materialMultipleSelection.value=select
+function materialHandleSelectionChange(select) {
+  materialMultipleSelection.value = select;
 }
 /** 打开对话框 */
-function materialHandleAdd()
-{
+function materialHandleAdd() {
   getMaterialList();
-  openMaterial.value=true;
+  openMaterial.value = true;
 }
 /** 搜索 */
-function handleMaterialQuery()
-{
+function handleMaterialQuery() {
   getMaterialList();
 }
 /**重置表单 */
-function resetMaterialQuery()
-{
+function resetMaterialQuery() {
   proxy.resetForm("queryMaterialRef");
   handleMaterialQuery();
 }
 /** 提交物料表单 */
-function submitMaterialForm()
-{
-if(materialMultipleSelection.value.length>0)
-{
-  const purchaseDetailsList=  materialMultipleSelection.value.map(u=>{
-      return {materialName:u.name,materialUnit:u.unitName}
-    })
-
-  form.value.purchaseDetails.push(...purchaseDetailsList)
-  materialCancel()
-
-}
-else
-{
-
-  proxy.$modal.msgError("请选择至少一个物料");
-}
-
+function submitMaterialForm() {
+  if (materialMultipleSelection.value.length > 0) {
+    const purchaseDetailsList = materialMultipleSelection.value.map((u) => {
+      return { materialName: u.name, materialUnit: u.unitName };
+    });
 
+    form.value.purchaseDetails.push(...purchaseDetailsList);
+    materialCancel();
+  } else {
+    proxy.$modal.msgError("请选择至少一个物料");
+  }
 }
 /** 取消对话框 */
-function materialCancel()
-{
-  openMaterial.value=false
+function materialCancel() {
+  openMaterial.value = false;
 }
 
 /** 删除物料行 */
-function delMaterialRow(index)
-{
-
- form.value.purchaseDetails.splice(index, 1);
+function delMaterialRow(index) {
+  form.value.purchaseDetails.splice(index, 1);
 }
 // watch(data.form, (newValue, oldValue) => {
 // console.log(newValue.purchaseDetails,999)
 //       }
 //       , { immdiate: true })
 /** 计算属性：实时计算展示的价格 */
-const showTotalMoney =computed(()=>{
-  let res=0;
-   form.value.purchaseDetails.forEach(details => {
-    if(details.unitPrice!=undefined && details.totalNumber!=undefined) 
-   {res+=  details.unitPrice*details.totalNumber} 
-   });
-   return res;
-})
+const showTotalMoney = computed(() => {
+  let res = 0;
+  form.value.purchaseDetails.forEach((details) => {
+    if (details.unitPrice != undefined && details.totalNumber != undefined) {
+      res += details.unitPrice * details.totalNumber;
+    }
+  });
+  return res;
+});
 
+const  purchaseStateEnum=[
+
+{key:"build",name:"新建"},
+{key:"run",name:"进行中"},
+{key:"complete",name:"已完成"},
+{key:"end",name:"已结束"},
+]
+/** 计算属性：采购订单状态 */
+const purchaseStateComputed= computed(()=>
+(purchaseState) => { 
+return  purchaseStateEnum[purchaseState].name
+});
 //-------------这里开始是供货商的数据-----------
 /** 供货商查询列表 */
 function getSupplierList() {
-  supplierlAllData().then(
-    (response) => {
-      supplierList.value = response.data;
-    }
-  );
+  supplierlAllData().then((response) => {
+    supplierList.value = response.data;
+  });
 }
 getList();
 getSupplierList();
 </script>
 <style scoped>
-.form-add-btn{
-
+.form-add-btn {
   width: 100%;
   margin-top: 10px;
 }