From af71e3feef8c5561038d75da8f5c8f0286b02651 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 8 May 2023 09:27:56 +0800
Subject: [PATCH] 2023-5-8

---
 .../src/views/inAndOutBound/index.vue         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inAndOutBound/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inAndOutBound/index.vue
index abe8db52..6d0990b7 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inAndOutBound/index.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inAndOutBound/index.vue
@@ -9,6 +9,10 @@
           </el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="queryParams" :model="jmdListQuery" :inline="true" class="tab-header">
+              <el-form-item label="合同编号">
+               <el-input v-model="jmdListQuery.contractNumber" maxlength="20" placeholder="请输入油罐编号" class="addinputw"
+                 clearable />
+              </el-form-item>
               <el-form-item label="日期">
                 <el-date-picker v-model="jmdListQuery.date" type="date" clearable value-format="yyyy-MM-dd"
                   placeholder="选择日期" />
@@ -52,6 +56,7 @@
                     <el-table-column prop="salesContractNumber" label="合同编号" align="center" />
                     <el-table-column prop="contractSigningDate" label="合同日期" width="150" align="center" />
                     <el-table-column prop="deliveryDate" label="出库日期" width="150" align="center" />
+                    <el-table-column prop="flowmeterNumber" label="流量仪器" width="150" align="center" />
                     <el-table-column prop="tankNumber" label="油罐编号" width="150" align="center" />
                     <el-table-column prop="crudeName" label="原油类型" width="150" align="center" />
                     <el-table-column prop="inventory" label="油罐库存" width="150" align="center" />
@@ -146,6 +151,7 @@
         in112ListTotal: 1,
 
         jmdListQuery: {
+          contractNumber: "",
           date: ""
         }
       }
@@ -169,19 +175,18 @@
         }
       },
       dosearch() {
-        this.jmdListQuery = {
-          date: parseTime(new Date(), '{y}-{m}-{d}')
-        }
-        if (this.index == "0") {
+
+        // if (this.index == "0") {
           this.loadLogList()
-        } else if (this.index == "1") {
-          this.loadInallList()
-        }
+        // } else if (this.index == "1") {
+          this.loadIn112List()
+        // }
 
       },
       resetQuery() {
         this.jmdListQuery = {
-          date: parseTime(new Date(), '{y}-{m}-{d}')
+          contractNumber: "",
+          date: ""
         }
       },
       // 右上角点击事件
@@ -235,9 +240,7 @@
         req.logPagerList({
           current: this.logListQuery.current,
           size: this.logListQuery.size,
-          params: {
-            date: ''
-          }
+          params: this.jmdListQuery
         }).then(response => {
           if (response.code === '200' && response.data && response.data.total > 0) {
             this.logList = response.data.records
@@ -260,9 +263,7 @@
         req.in112PagerList({
           current: this.in112ListQuery.current,
           size: this.in112ListQuery.size,
-          params: {
-            date: ''
-          }
+          params: this.jmdListQuery
         }).then(response => {
           if (response.code === '200' && response.data && response.data.total > 0) {
             this.in112List = response.data.records