From 6c77a34048684cc24615e6c6d4327f6465041c39 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 28 Oct 2024 13:51:30 +0800
Subject: [PATCH] 10.28

---
 .../src/views/oilConfig/oilPurchase/list.vue  | 169 +++++++-----------
 1 file changed, 62 insertions(+), 107 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
index 765361f23..8e0838806 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
@@ -1,67 +1,71 @@
 <template>
   <div class="app-container">
     <div class="card-change">
-      <div class="box-gang">
-        <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole">0/0</div>
-          </el-tooltip>
-          <div class="size-hui">
-            <div class="dian" style="background: #0DC291"></div>
-            <div class="nei">采购吨数</div>
-          </div>
-        </div>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="" prop="purchaseNo">
+          <el-input v-model="queryParams.purchaseNo" placeholder="请输入进货单号"/>
+        </el-form-item>
+        <el-form-item label="" prop="supplierId">
+          <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" clearable>
+            <el-option
+              v-for="option in suppliersList"
+              :key="option.id"
+              :label="option.supplierName"
+              :value="option.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 
-        <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color: #00CAFF">0/0</div>
-          </el-tooltip>
-          <div class="size-hui">
-            <div class="dian" style="background: #00CAFF"></div>
-            <div class="nei">采购升数</div>
-          </div>
-        </div>
-        <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole">0/0</div>
-          </el-tooltip>
-          <div class="size-hui">
-            <div class="dian" style="background: #0DC291"></div>
-            <div class="nei">采购总额（元）</div>
-          </div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-          <div>
-            <el-form-item label="进货单号" prop="purchaseNo">
-              <el-input v-model="queryParams.purchaseNo" placeholder="请输入进货单号"/>
-            </el-form-item>
-          </div>
-          <div>
-            <el-form-item label="进货时间" prop="purchaseNo">
-              <el-date-picker
-                v-model="beginTime"
-                style="width: 200px"
-                type="date"
-                placeholder="开始日期">
-              </el-date-picker>
-            </el-form-item>
-          </div>
-        </el-form>
-        <div>
-          <el-button type="primary" >取消</el-button>
-          <el-button type="primary">保存</el-button>
-          <el-button type="primary">保存并审核</el-button>
-        </div>
+        <el-form-item label="" prop="numberId">
+          <el-select v-model="queryParams.numberId" placeholder="请选择油品油号">
+            <el-option
+              v-for="option in selectOilTypeByPrice"
+              :key="option.numberId"
+              :label="option.oilType +' '+option.oilName"
+              :value="option.numberId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" v-model="queryParams.status" prop="status">
+          <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+            <el-option
+              v-for="dict in dict.type.oilPurchasedStatus"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 
-      </div>
-      <el-button
-        type="primary"
-        @click="purchaseAdd"
-      >新增采购
-      </el-button>
+        <el-form-item label="">
+          <el-date-picker
+            v-model="beginTime"
+            style="width: 160px"
+            type="date"
+            placeholder="开始日期">
+          </el-date-picker>
+          至
+          <el-date-picker
+            v-model="endTime"
+            style="width: 160px"
+            type="date"
+            placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="display:flex;justify-content: end">
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          <el-button
+            type="primary"
+            @click="purchaseAdd"
+            v-hasPermi="['oilConfig:oilPurchase:list:add']"
 
-      <div style="height: 70vh;overflow: auto;scrollbar-width: none">
+          >新增采购
+          </el-button>
+        </el-form-item>
+      </el-form>
 
+      <div style="height: 70vh;overflow: auto">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="purchaseList"
@@ -280,56 +284,7 @@ export default {
 }
 
 .el-form--inline .el-form-item {
-  margin-right: 4px;
+  margin-right: 44px;
 }
-.box-gang{
-  width: 100%;
-  display: flex;
-  align-items: center;
-}
-.box{
-  padding: 5px;
-  padding-left: 20px;
-  width: 280px;
-  height: 60px;
-  background:#fff;
-  border-radius: 10px;
-  border: 1px solid #FF9655;
-  margin-right: 15px;
-}
-.size-hui{
-  display: flex;
-  align-items: center;
-  font-family: Source Han Sans CN, Source Han Sans CN;
-  font-weight: 400;
-  font-size: 13px;
-  color: #888888;
-  text-align: left;
-  font-style: normal;
-  text-transform: none;
 
-  .nei {
-    color: #333333;
-    width: 100%;
-  }
-}
-.dian{
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  margin-right: 5px;
-}
-.size-bole{
-  height: 31px;
-  font-size: 24px;
-  color: #0DC291;
-  font-weight: 600;
-  font-size: 24px;
-  text-align: left;
-  font-style: normal;
-  text-transform: none;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
 </style>