From 4c5c20a7c03539104df74072b1b8a81b51c19ab8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 九月 2023 10:42:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/technical.vue | 78 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 11 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 8ec3eb3..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>
@@ -74,20 +83,22 @@
label="浜よ揣鏃ユ湡">
</el-table-column>
<el-table-column
- prop="type"
label="鐘舵��"
width="85"
>
<template slot-scope="scope">
- {{scope.state==0?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ <span :style="{'color': scope.row.type==0 ? 'red':'green'}">
+ {{scope.row.type==0?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ </span>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
width="194">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" size="small">缂栬緫闄勪欢</el-button>
+ <!-- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" size="small">缂栬緫闄勪欢</el-button> -->
+ <el-button type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
</template>
</el-table-column>
</el-table>
@@ -220,8 +231,11 @@
return {
searchData:{
id:'',
- date:''
+ date:'',
+ name:'',
+ condition:'',
},
+ compiledata:{},
technicalTable: [],
showDetail: false,
selectedRow: {},
@@ -236,23 +250,49 @@
this.getTechnicalTableData()
},
methods: {
+ authorizedstrength(row) {
+ this.compiledata = row
+ this.compile()
+ },
+ //缂栧埗
+ compile() {
+ console.log();
+ this.$axios.post(this.$api.url.compile,{
+ id:this.compiledata.id
+ }).then( res =>{
+ this.$message.success('缂栧埗瀹屾垚')
+ })
+ 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() {
@@ -275,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);
@@ -292,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;
@@ -370,3 +417,12 @@
}
</style>
+<style>
+ .technical .title *{
+ font-size: 14px;
+ }
+
+ .technical .search-header *{
+ font-size: 14px;
+ }
+</style>
--
Gitblit v1.9.3