From 6e60bc042d1670013ecdc93e87618ac95cd3b332 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 九月 2023 17:52:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technical.vue | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 5b5a65b..753f2ac 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -11,7 +11,7 @@
<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,7 +21,16 @@
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
- <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" placeholder="鍏ㄩ儴" style="width: 310px;">
+ <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-form-item>
@@ -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,12 @@
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;
--
Gitblit v1.9.3