From 22b45a79b2ceab7625e0fe248458c398cc26110d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 25 九月 2023 12:53:59 +0800
Subject: [PATCH] modified: src/components/view/Processingproducts.vue modified: src/components/view/rawInsDetail.vue modified: src/components/view/sale.vue
---
src/components/view/technical.vue | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 5b5a65b..501871f 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -4,33 +4,44 @@
<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
v-model="searchData.date"
value-format="yyyy-MM-dd"
type="date"
+ style="width: 10vw;"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
+ <el-form-item label="浜у搧鍚嶇О:" style="margin-right: 24px;">
+ <el-input v-model="searchData.name" ></el-input>
+ </el-form-item>
+ <el-form-item label="缂栧埗鐘舵��:" >
+ <el-select v-model="searchData.type" size="small" placeholder="鍏ㄩ儴" style="width: 10vw;">
+ <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>
<div class="technical-table">
<div class="table-box">
<el-table
- border style="width: 100%"
+ border
+ height="calc(90vh - 250px)"
:data="technicalTable"
>
<el-table-column
@@ -74,6 +85,10 @@
label="浜よ揣鏃ユ湡">
</el-table-column>
<el-table-column
+ prop="note"
+ label="澶囨敞">
+ </el-table-column>
+ <el-table-column
label="鐘舵��"
width="85"
>
@@ -89,7 +104,7 @@
<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="authorizedstrength(scope.row)">缂栧埗</el-button>
+ <el-button v-if="scope.row.type===0" type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
</template>
</el-table-column>
</el-table>
@@ -99,9 +114,9 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- :current-page="pageParams.pageNo"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="pageParams.pageSize"
+ :current-page="pageParams.pageSize"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="pageParams.countSize"
layout="total, sizes, prev, pager, next, jumper"
:total="pageParams.total">
</el-pagination>
@@ -222,15 +237,17 @@
return {
searchData:{
id:'',
- date:''
+ date:'',
+ name:'',
+ condition:'',
},
compiledata:{},
technicalTable: [],
showDetail: false,
selectedRow: {},
pageParams:{
- pageNo:1,
- pageSize:10,
+ pageSize:1,
+ countSize:10,
total:0
}
}
@@ -242,8 +259,6 @@
authorizedstrength(row) {
this.compiledata = row
this.compile()
- // let ccc = row
- // console.log(row);
},
//缂栧埗
compile() {
@@ -252,37 +267,49 @@
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}})
+ pageSize:(this.pageParams.pageSize),
+ countSize:this.pageParams.countSize,...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() {
this.getTechnicalTableData()
},
handleSizeChange(value){
- this.pageParams.pageSize = value
+ this.pageParams.countSize = value
this.getTechnicalTableData()
},
handleCurrentChange(value){
- this.pageParams.pageNo = value
+ this.pageParams.pageSize = value
this.getTechnicalTableData()
}
},
@@ -293,6 +320,9 @@
.technical{
height: 100%;
width: 100%;
+ }
+ .el-form-item__label{
+ padding: 0 60px 0;
}
.technical .title .el-button {
height: 32px;
@@ -311,12 +341,16 @@
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;
+ margin-right: 24px;
}
.search-header .el-form-item:nth-child(2){
margin-right: 24px;
@@ -339,7 +373,7 @@
}
/* 杈撳叆妗嗙殑鏍峰紡 */
.search-header .el-form-item .el-input >>>.el-input__inner{
-width: 224px;
+width: 10vw;
height: 32px ;
box-sizing: border-box;
background: rgb(255, 255, 255);
@@ -351,7 +385,7 @@
/* 鎶�鏈枃浠惰〃鏍兼牱寮� */
.technical-table{
margin-top: 11px;
- height: calc(100% - 140px);
+ /* height: calc(100% - 140px); */
background: #fff;
padding: 23px 21px ;
font-size: 14px;
@@ -389,3 +423,12 @@
}
</style>
+<style>
+ .technical .title *{
+ font-size: 14px;
+ }
+
+ .technical .search-header *{
+ font-size: 14px;
+ }
+</style>
--
Gitblit v1.9.3