From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/productSamplingInfo/index.vue | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/views/business/productSamplingInfo/index.vue b/src/views/business/productSamplingInfo/index.vue
index 9ba2b67..9cf3667 100644
--- a/src/views/business/productSamplingInfo/index.vue
+++ b/src/views/business/productSamplingInfo/index.vue
@@ -1,17 +1,18 @@
<template>
<div class="capacity-scope">
<div style="display: flex;justify-content: space-between">
- <el-form :model="entity" ref="entity" size="small" :inline="true">
- <el-form-item label="缂栧彿" prop="quarterNo" v-show="tabIndex === 0">
+ <div class="search_box">
+ <div class="search_item">
+ <span class="search_label">缂栧彿</span>
<el-input v-model="entity.quarterNo" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
+ @keyup.enter.native="refreshTable()">
</el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
- </el-form-item>
- </el-form>
+ </div>
+ <div class="search_button">
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </div>
+ </div>
<div>
<el-button v-if="tabIndex === 1" size="small" type="primary" @click="yearSample('add')">骞村害鎶芥牱</el-button>
</div>
@@ -251,7 +252,7 @@
import { selectUserCondition } from "@/api/performance/class";
export default {
- name: "b1-product-sampling-info",
+ name: "ProductSamplingInfo",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, AddQuarterItem },
data() {
@@ -316,7 +317,7 @@
],
page: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData1: [],
@@ -362,7 +363,7 @@
],
page1: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
yearSampleDia: false, // 骞村害鎶芥牱
@@ -390,7 +391,7 @@
// 鏂规硶闆嗗悎
methods: {
// 鏌ヨ鍥炶皟
- refreshTable(e) {
+ refreshTable() {
if (this.tabIndex === 0) {
this.getQuarterPageList()
} else if (this.tabIndex === 1) {
@@ -593,9 +594,6 @@
// 鍒囨崲涓嬪崟tab琛ㄦ牸
handleTab(m, i) {
this.tabIndex = i;
- if (this.tabIndex === 0) {
- this.componentData.entity.quarterNo = this.entity.quarterNo
- }
this.refreshTable()
},
closeYearSampleDia() {
@@ -610,7 +608,7 @@
return 'height: calc(100% - ' + '44' + 'px)'
},
getUserList() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition().then((res) => {
this.userList = res.data;
})
},
@@ -648,4 +646,23 @@
border-color: #3A7BFA;
color: #3A7BFA;
}
+.search_box {
+ display: flex;
+}
+.search_item {
+ margin-bottom: 18px;
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+ line-height: 32px;
+}
+.search_label {
+ width: 52px;
+ font-size: 14px;
+ font-weight: 700;
+ color: #606266;
+}
+.search_button {
+ line-height: 30px;
+}
</style>
--
Gitblit v1.9.3