From 523d7a54fb07fdf756fbc4faa5eb7fef7263a556 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 07 九月 2023 09:46:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/nonConformingFeedback/index.vue | 132 ++++++++++++++++++-------------------------
1 files changed, 56 insertions(+), 76 deletions(-)
diff --git a/src/views/experiment/nonConformingFeedback/index.vue b/src/views/experiment/nonConformingFeedback/index.vue
index c59f54c..bccfa6a 100644
--- a/src/views/experiment/nonConformingFeedback/index.vue
+++ b/src/views/experiment/nonConformingFeedback/index.vue
@@ -1,22 +1,15 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" style="width: 1000px;" :inline="true">
- <!-- <el-input v-model="input" class="input-form" placeholder="璇风洿鎺ヨ緭鍏ユ牱寮忕紪鍙�/鏍峰搧鍚嶇О/鍨嬪彿瑙勬牸/杩涜鎼滅储鎴栦笅鎷夐�夋嫨杩涜缁勫悎鏌ヨ"
- @keyup.enter.native="getData" /> -->
- <el-form-item style="width: 800px;">
- <el-col style="display: flex; justify-content: space-around;" :span="8">
- <el-row>鏍峰紡缂栧彿:</el-row>
- <el-row><el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input></el-row>
- </el-col>
- <el-col style="display: flex; justify-content: space-around;" :span="8">
- <el-row>鏍峰紡鍚嶇О:</el-row>
- <el-row><el-input size="small" v-model="materialName" placeholder="璇疯緭鍏ユ牱寮忓悕绉�"></el-input></el-row>
- </el-col>
- <el-col style="display: flex; justify-content: space-around;" :span="8">
- <el-row>鐢宠鍗曞彿:</el-row>
+ <el-form ref="form" style="width: 1000px;margin-top: 10px;" :inline="true">
+ <el-form-item label="鏍峰紡缂栧彿锛�">
+ <el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="鏍峰紡鍚嶇О锛�">
+ <el-input size="small" v-model="materialName" placeholder="璇疯緭鍏ユ牱寮忓悕绉�"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢宠鍗曞彿锛�">
<el-row><el-input size="small" v-model="inspectionCode" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"></el-input></el-row>
- </el-col>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getData()">鏌ヨ</el-button>
@@ -35,8 +28,8 @@
</el-dropdown>
</el-form-item>
</el-form>
- <el-form>
- <el-button size="40" type="primary">鎵归噺鎻愪氦</el-button>
+ <el-form style="margin-top: 10px;">
+ <el-button size="small" type="primary">鎵归噺鎻愪氦</el-button>
</el-form>
</div>
<div class="library-table">
@@ -140,68 +133,55 @@
</script>
<style lang="scss" scoped>
-.top-bar {
- margin: -25px -15px;
- background: #fff;
- display: flex;
- justify-content: space-between;
- padding: 5px 24px 0px 24px;
-
- .input-form {
- width: 800px;
- }
-
- .el-dropdown-link {
- cursor: pointer;
- color: #409EFF !important;
- }
-
- .el-icon-arrow-down {
- font-size: 12px !important;
- }
-
-
-}
-
-.library-table {
- background-color: #fff;
- flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
- display: flex;
- flex-direction: column;
-
- .table-header {
- padding: 20px;
- display: flex;
- justify-content: space-between;
-
- .el-form-item {
- margin-bottom: 30px !important;
- }
- }
-
- .table-box {
- padding: 0px 20px;
- margin-top: 20px;
- flex: 1;
- background: #fff;
- display: flex;
- flex-direction: column;
-
- >div:nth-child(2) {
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
-
- }
-}
-</style>
-<style >
.content-main {
.el-form .el-form-item .el-form-item__content {
width: 100% !important;
}
+ .top-bar {
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+ .input-form {
+ width: 800px;
+ }
+ .el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF !important;
+ }
+ .el-icon-arrow-down {
+ font-size: 12px !important;
+ }
+ }
+ .library-table {
+ background-color: #fff;
+ flex: 1;
+ margin: 0px -15px;
+ margin-top: 40px;
+ display: flex;
+ flex-direction: column;
+ .table-header {
+ padding: 20px;
+ display: flex;
+ justify-content: space-between;
+ .el-form-item {
+ margin-bottom: 30px !important;
+ }
+ }
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 20px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ >div:nth-child(2) {
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
+ }
+ }
}
</style>
--
Gitblit v1.9.3