From e3d6cc8c9ee3a771b92a8706e3cf83dededfaa43 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期日, 24 九月 2023 16:26:52 +0800
Subject: [PATCH] modified: src/assets/api/controller.js modified: src/components/view/Technicalindex.vue modified: src/components/view/finishedProductInspectionUp.vue modified: src/components/view/processInspectionUpdate.vue modified: src/components/view/rawInsDetail.vue modified: src/components/view/sale.vue
---
src/components/view/technical.vue | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 753f2ac..501871f 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -4,7 +4,7 @@
<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>
@@ -18,28 +18,30 @@
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="浜у搧鍚嶇О:">
- <el-input v-model="searchData.name" @input="query"></el-input>
+ <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" placeholder="鍏ㄩ儴" style="width: 310px;">
+ <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-form-item>
+ <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
@@ -83,6 +85,10 @@
label="浜よ揣鏃ユ湡">
</el-table-column>
<el-table-column
+ prop="note"
+ label="澶囨敞">
+ </el-table-column>
+ <el-table-column
label="鐘舵��"
width="85"
>
@@ -98,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>
@@ -108,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>
@@ -240,8 +246,8 @@
showDetail: false,
selectedRow: {},
pageParams:{
- pageNo:1,
- pageSize:10,
+ pageSize:1,
+ countSize:10,
total:0
}
}
@@ -261,8 +267,8 @@
id:this.compiledata.id
}).then( res =>{
this.$message.success('缂栧埗瀹屾垚')
- })
this.getTechnicalTableData()
+ })
},
async showDetails(row){
@@ -276,8 +282,8 @@
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,
@@ -299,11 +305,11 @@
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()
}
},
@@ -335,6 +341,7 @@
background: #fff;
padding: 24px 32px;
}
+
.search-header .el-form-item__label{
padding: 0 30px 0 0;
}
@@ -343,7 +350,7 @@
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;
@@ -366,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);
@@ -378,7 +385,7 @@
/* 鎶�鏈枃浠惰〃鏍兼牱寮� */
.technical-table{
margin-top: 11px;
- height: calc(100% - 140px);
+ /* height: calc(100% - 140px); */
background: #fff;
padding: 23px 21px ;
font-size: 14px;
@@ -416,3 +423,12 @@
}
</style>
+<style>
+ .technical .title *{
+ font-size: 14px;
+ }
+
+ .technical .search-header *{
+ font-size: 14px;
+ }
+</style>
--
Gitblit v1.9.3