From 28d38f132ff7c6a1239df6c56f2da0a021bd4e96 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 13 九月 2023 16:12:08 +0800
Subject: [PATCH] 销售订单bug修复

---
 src/components/view/technical.vue |   55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 5b5a65b..424ee7e 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -4,14 +4,14 @@
       <el-row>
         <el-col :span="12">鎶�鏈枃浠�</el-col>
         <el-col :span="12" style="text-align: right;">
-          <el-button  icon="el-icon-plus">鐢熸垚椤圭洰涔�</el-button>
+          <el-button icon="el-icon-plus">鐢熸垚椤圭洰涔�</el-button>
         </el-col>
       </el-row>
     </div>
     <div class="search-header">
       <el-form v-model="searchData" :inline="true">
         <el-form-item label="璁㈠崟鍙�:">
-          <el-input v-model="searchData.id"></el-input>
+          <el-input v-model="searchData.id" ></el-input>
         </el-form-item>
         <el-form-item label="涓嬪崟鏃ユ湡:">
           <el-date-picker
@@ -21,9 +21,18 @@
             placeholder="閫夋嫨鏃ユ湡">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="浜у搧鍚嶇О:">
+          <el-input v-model="searchData.name" @input="query"></el-input>
+        </el-form-item>
+        <el-form-item label="缂栧埗鐘舵��:" >
+          <el-select v-model="searchData.type" size="small" placeholder="鍏ㄩ儴" style="width: 250px;">
+              <el-option label="寰呯紪鍒�" :value="0"></el-option>
+							<el-option label="宸茬紪鍒�" :value="1"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
-                <el-button  plain @click="resetBtn">閲� 缃�</el-button>
-                <el-button  @click="searchTechnical">鏌� 璇�</el-button>
+              <el-button plain @click="resetBtn" style="margin-left: 12px;">閲� 缃�</el-button>
+              <el-button @click="searchTechnical">鏌� 璇�</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -222,7 +231,9 @@
     return {
        searchData:{
         id:'',
-        date:''
+        date:'',
+        name:'',
+        condition:'',
        },
        compiledata:{},
        technicalTable: [],
@@ -242,8 +253,6 @@
       authorizedstrength(row) {
         this.compiledata = row
         this.compile()
-        // let ccc = row
-        // console.log(row);
       },
       //缂栧埗
       compile() {
@@ -255,23 +264,35 @@
       })
         this.getTechnicalTableData()
       },
+
       async showDetails(row){
         this.showDetail = true
         const res = await this.$axios.get(this.$api.url.selectOrderById,{params:{id:row.id}})
         this.selectedRow = res.data
         console.log(this.selectedRow)
       },
+
+
       async  getTechnicalTableData() {
         const res = await this.$axios.get(this.$api.url.selectAllOrder,{
           params:{
             pageSize:(this.pageParams.pageNo-1),
-            countSize:this.pageParams.pageSize,...this.searchData}})
+            countSize:this.pageParams.pageSize,...this.searchData,
+            orderCode:this.searchData.id, 
+            time:this.searchData.date,
+            name:this.searchData.name,
+            type:this.searchData.type, 
+          }
+        }) 
         this.technicalTable = res.data.row
         this.pageParams.total = res.data.total
       },
+
+
       // 澶撮儴鏉′欢鏌ヨ-閲嶇疆
       resetBtn() {
         this.searchData={}
+        this.getTechnicalTableData()
       },
       // 澶撮儴鏉′欢鏌ヨ-鏌ヨ
       searchTechnical() {
@@ -294,6 +315,9 @@
     height: 100%;
     width: 100%;
   }
+  .el-form-item__label{
+    padding: 0 60px 0;
+  }
   .technical .title .el-button {
     height: 32px;
     border: 1px solid rgba(190, 190, 190, 0.44);
@@ -311,9 +335,13 @@
   background: #fff;
   padding: 24px 32px;
 }
+
+.search-header .el-form-item__label{
+  padding: 0 30px 0 0;
+}
 .search-header .el-form-item{
   margin: 0px;
-  font-size: 14px;
+  font-size: 20px;
 }
 .search-header .el-form-item:nth-child(1){
   margin-right: 48px;
@@ -389,3 +417,12 @@
 }
 </style>
 
+<style>
+	.technical .title *{
+		font-size: 14px;
+	}
+	
+	.technical .search-header *{
+		font-size: 14px;
+	}
+</style>

--
Gitblit v1.9.3