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/laboratory/gather/index.vue | 10
src/views/experiment/passRateStatistics/index.vue | 12
src/views/experiment/reportAuditing/index.vue | 6
src/views/chart/work/index.vue | 9
src/views/laboratory/measure/index.vue | 19
src/views/basicData/index.vue | 103 +++++----
src/views/experiment/inspectionApplication/index.vue | 18
src/views/standardLibrary/index.vue | 18
src/views/experiment/planAssignments/plan.vue | 29 +-
src/views/CNAS/nonConformanceManage/index.vue | 18
src/views/laboratory/role/index.vue | 12
src/views/inspectionManagement/reportForInspection/index.vue | 14
src/views/personal/myInformation/index.vue | 156 ++-----------
src/views/experiment/nonConformingFeedback/index.vue | 132 +++++------
src/views/laboratory/personnel/index.vue | 8
src/views/CNAS/reviewAnnualPlan/index.vue | 15
src/views/laboratory/ledger/index.vue | 12
src/views/message/toDo/index.vue | 14
src/views/CNAS/satisfactionSurveys/index.vue | 10
src/views/experiment/checkTheReport/index.vue | 16
src/views/inspectionManagement/commissionInspection/index.vue | 12
21 files changed, 273 insertions(+), 370 deletions(-)
diff --git a/src/views/CNAS/nonConformanceManage/index.vue b/src/views/CNAS/nonConformanceManage/index.vue
index 45b5388..0b1c6be 100644
--- a/src/views/CNAS/nonConformanceManage/index.vue
+++ b/src/views/CNAS/nonConformanceManage/index.vue
@@ -1,9 +1,10 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData">
+ <el-form ref="form" :inline="true" :model="searchData" style="margin-top: 10px;">
<el-form-item label="褰曞叆鏃ユ湡:" style="margin-right: 20px;">
<el-date-picker
+ size="small"
v-model="searchData.entry_date"
type="date"
placeholder="璇烽�夋嫨褰曞叆鏃ユ湡">
@@ -11,13 +12,14 @@
</el-form-item>
<el-form-item label="瀹℃牳鏃ユ湡:" style="margin-right: 20px;">
<el-date-picker
+ size="small"
v-model="searchData.check_date"
type="date"
placeholder="璇烽�夋嫨瀹℃牳鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label="鐘舵��:" style="margin-right: 20px;">
- <el-select v-model="searchData.state" placeholder="鍏ㄩ儴" style="width: 100px;">
+ <el-select size="small" v-model="searchData.state" placeholder="鍏ㄩ儴" style="width: 100px;">
<el-option
v-for="item in stateoptions"
:key="item.value"
@@ -27,20 +29,20 @@
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬:" style="margin-right: 20px;">
- <el-input v-model="searchData.department" placeholder="璇疯緭鍏ラ儴闂�">
+ <el-input size="small" v-model="searchData.department" placeholder="璇疯緭鍏ラ儴闂�">
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="searchInspections">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="searchInspections">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-form class="rightBtn">
+ <el-form class="rightBtn" style="margin-top: 10px;">
<el-form-item class="createBtn">
- <el-button type="primary" icon="el-icon-document-add" style="margin-right: 10px;">鏂板璁板綍</el-button>
+ <el-button size="small" type="primary" icon="el-icon-document-add" style="margin-right: 10px;">鏂板璁板綍</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
- <el-button type="primary" icon="el-icon-download">瀵煎嚭</el-button>
+ <el-button size="small" type="primary" icon="el-icon-download">瀵煎嚭</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/CNAS/reviewAnnualPlan/index.vue b/src/views/CNAS/reviewAnnualPlan/index.vue
index 8e7a09c..5626a6d 100644
--- a/src/views/CNAS/reviewAnnualPlan/index.vue
+++ b/src/views/CNAS/reviewAnnualPlan/index.vue
@@ -1,9 +1,10 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true">
+ <el-form ref="form" :inline="true" style="margin-top: 10px;">
<el-form-item>
<el-date-picker
+ size="small"
v-model="input"
class="input-form"
type="month"
@@ -12,14 +13,15 @@
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getData()">鏌ヨ</el-button>
- <el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="getData()">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="resetData()">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-form class="rightBtn">
+ <el-form class="rightBtn" style="margin-top: 10px;">
<!-- 涓婁紶闄勪欢 -->
<el-form-item class="createBtn">
<el-button
+ size="small"
type="primary"
icon="el-icon-upload2"
@click="
@@ -74,6 +76,7 @@
<!-- 鏂板璁″垝 -->
<el-form-item class="createBtn">
<el-button
+ size="small"
type="primary"
icon="el-icon-document-add"
@click="
@@ -262,12 +265,12 @@
</el-form-item>
<!-- 瀵煎嚭骞村害璁″垝 -->
<el-form-item class="createBtn">
- <el-button type="primary" icon="el-icon-document-checked"
+ <el-button size="small" type="primary" icon="el-icon-document-checked"
>瀵煎嚭骞村害璁″垝</el-button
>
</el-form-item>
<el-form-item class="createBtn">
- <el-button type="primary" icon="el-icon-document-checked"
+ <el-button size="small" type="primary" icon="el-icon-document-checked"
>瀵煎嚭鍐呴儴瀹炴柦璁″垝</el-button
>
</el-form-item>
diff --git a/src/views/CNAS/satisfactionSurveys/index.vue b/src/views/CNAS/satisfactionSurveys/index.vue
index 98bf3c6..5082099 100644
--- a/src/views/CNAS/satisfactionSurveys/index.vue
+++ b/src/views/CNAS/satisfactionSurveys/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="content-main survey">
<div class="top-bar">
- <el-form ref="form" style="width: 1000px;" :inline="true">
+ <el-form ref="form" style="width: 1000px;margin-top: 10px;" :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="12">
<el-row>璋冩煡鏃ユ湡:</el-row>
<el-row style="width: 300px;">
- <el-date-picker style="width: 270px;" class="newly-form" v-model="surveyDate" type="date"
+ <el-date-picker size="small" style="width: 270px;" class="newly-form" v-model="surveyDate" type="date"
placeholder="璇烽�夋嫨璋冩煡鏃ユ湡" autocomplete="off">
</el-date-picker>
</el-row>
@@ -16,7 +16,7 @@
<el-col style="display: flex; justify-content: space-around;" :span="12">
<el-row>褰曞叆鏃ユ湡:</el-row>
<el-row style="width: 300px;">
- <el-date-picker style="width: 270px;" class="newly-form" v-model="entryDate" type="date"
+ <el-date-picker size="small" style="width: 270px;" class="newly-form" v-model="entryDate" type="date"
placeholder="璇烽�夋嫨褰曞叆鏃ユ湡" autocomplete="off">
</el-date-picker>
</el-row>
@@ -27,8 +27,8 @@
<el-button type="primary" size="small" plain @click="resetData()">娓呯┖</el-button>
</el-form-item>
</el-form>
- <el-form>
- <el-button size="40" @click="getFillName()" icon="el-icon-document-add" type="primary">鏂板璁板綍</el-button>
+ <el-form style="margin-top: 10px;">
+ <el-button size="small" @click="getFillName()" icon="el-icon-document-add" type="primary">鏂板璁板綍</el-button>
</el-form>
</div>
<div class="library-table">
diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index 4ec917c..1b1c086 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -1,53 +1,60 @@
<template>
<div class="main_div">
<div class="top_div">
- <span>鏍峰搧鍚嶇О锛�</span>
- <el-select v-model="params.material" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О" @change="selectProductModelTable()">
- <el-option v-for="item in productModelSelectmater" :value="item" :key="item.index" :label="item"></el-option>
- </el-select>
- <span class="top_div_span">椤圭洰鍒嗙粍锛�</span>
- <el-input v-model="params.father" placeholder="璇疯緭鍏ラ」鐩垎缁�" style="width: 10%" size="small "></el-input>
- <span class="top_div_span">椤圭洰鍚嶇О锛�</span>
- <el-input v-model="params.name" placeholder="璇疯緭鍏ラ」鐩悕绉�" style="width: 10%" size="small "></el-input>
- <el-button type="primary" class="top_div_button" size="small" @click="selectProductModelTable">鏌ヨ</el-button>
- <el-button class="top_div_button" size="small" @click="clean">閲嶇疆</el-button>
- <div style="float: right">
- <el-button class="top_div_button" type="primary" size="small" icon="el-icon-folder-add"
- @click="centerDialogVisible = true">鏂板</el-button>
- <el-dialog :visible.sync="centerDialogVisible" width="30%" right :before-close="handleClose"
- :title="isUpdate ? '鏇存柊' : '鏂板'" :hide-required-asterisk="false">
- <el-form :model="form" :rules="rules" ref="ruleForm" class="addForm">
- <el-form-item prop="material" required>
- <span>鏍峰搧鍚嶇О锛�</span>
- <el-autocomplete class="inline-input" v-model="form.material" :fetch-suggestions="querySearch1"
- placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" style="width: calc(100% - 70px);"></el-autocomplete>
- </el-form-item>
- <el-form-item>
- <span>椤圭洰鍒嗙粍锛�</span>
- <el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
- placeholder="璇疯緭鍏ユ牱鍝佸垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
- </el-form-item>
- <el-row :gutter="24">
- <el-col :span="12"><el-form-item prop="name" required><span>椤圭洰鍚嶇О锛�</span>
- <el-input style="width: calc(100% - 70px);" v-model="form.name"
- placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input></el-form-item></el-col>
- <el-col :span="12">
- <el-form-item prop="unit">
- <span v-html="'鍗� 浣嶏細'"></span>
- <el-input style="width: calc(100% - 70px);" v-model="form.unit"
- placeholder="璇疯緭鍏ュ崟浣�"></el-input></el-form-item></el-col>
- </el-row>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="centerDialogVisible = false" size="small ">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitAdd" size="small ">{{
- isUpdate ? "鏇� 鏂�" : "淇� 瀛�"
- }}</el-button>
- </span>
- </el-dialog>
- <el-button class="top_div_button" icon="el-icon-delete-solid" size="small" style="color: #00a5ff"
- @click="deleteListClick">鍒犻櫎</el-button>
- </div>
+ <el-form :inline="true" :model="params" label-position="left">
+ <el-form-item prop="material" label="鏍峰搧鍚嶇О锛�">
+ <el-select v-model="params.material" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О" @change="selectProductModelTable()">
+ <el-option v-for="item in productModelSelectmater" :value="item" :key="item.index" :label="item"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="father" label="椤圭洰鍒嗙粍锛�" width="200">
+ <el-input size="small" v-model="params.father" placeholder="璇疯緭鍏ラ」鐩垎缁�"></el-input>
+ </el-form-item>
+ <el-form-item prop="name" label="椤圭洰鍚嶇О锛�" width="200" >
+ <el-input size="small" v-model="params.name" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-button type="primary" class="top_div_button" size="small" @click="selectProductModelTable">鏌ヨ</el-button>
+ <el-button class="top_div_button" size="small" @click="clean">閲嶇疆</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-button class="top_div_button" type="primary" size="small" icon="el-icon-folder-add"
+ @click="centerDialogVisible = true">鏂板</el-button>
+ <el-button class="top_div_button" icon="el-icon-delete-solid" size="small" style="color: #00a5ff"
+ @click="deleteListClick">鍒犻櫎</el-button>
+ </el-form-item>
+ </el-form>
+ <el-dialog :visible.sync="centerDialogVisible" width="30%" right :before-close="handleClose"
+ :title="isUpdate ? '鏇存柊' : '鏂板'" :hide-required-asterisk="false">
+ <el-form :model="form" :rules="rules" ref="ruleForm" class="addForm">
+ <el-form-item prop="material" required>
+ <span>鏍峰搧鍚嶇О锛�</span>
+ <el-autocomplete class="inline-input" v-model="form.material" :fetch-suggestions="querySearch1"
+ placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" style="width: calc(100% - 70px);"></el-autocomplete>
+ </el-form-item>
+ <el-form-item>
+ <span>椤圭洰鍒嗙粍锛�</span>
+ <el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
+ placeholder="璇疯緭鍏ユ牱鍝佸垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
+ </el-form-item>
+ <el-row :gutter="24">
+ <el-col :span="12"><el-form-item prop="name" required><span>椤圭洰鍚嶇О锛�</span>
+ <el-input style="width: calc(100% - 70px);" v-model="form.name"
+ placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input></el-form-item></el-col>
+ <el-col :span="12">
+ <el-form-item prop="unit">
+ <span v-html="'鍗� 浣嶏細'"></span>
+ <el-input style="width: calc(100% - 70px);" v-model="form.unit"
+ placeholder="璇疯緭鍏ュ崟浣�"></el-input></el-form-item></el-col>
+ </el-row>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="centerDialogVisible = false" size="small ">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitAdd" size="small ">{{
+ isUpdate ? "鏇� 鏂�" : "淇� 瀛�"
+ }}</el-button>
+ </span>
+ </el-dialog>
</div>
<div class="table_div">
<el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
@@ -438,7 +445,7 @@
}
.top_div {
- height: 120px;
+ height: 90px;
width: 100%;
padding: 30px 40px;
background-color: #ffffff;
diff --git a/src/views/chart/work/index.vue b/src/views/chart/work/index.vue
index 9689a03..de2af9f 100644
--- a/src/views/chart/work/index.vue
+++ b/src/views/chart/work/index.vue
@@ -8,6 +8,7 @@
:model="formInline" class="demo-form-inline">
<el-form-item prop="date" label="妫�娴嬫棩鏈�:">
<el-date-picker
+ size="small"
v-model="formInline.date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
@@ -18,15 +19,15 @@
</el-date-picker>
</el-form-item>
<el-form-item prop="type" label="妫�楠岀被鍨�:">
- <el-select v-model="formInline.type" placeholder="閲囪喘鍏ュ簱">
+ <el-select size="small" v-model="formInline.type" placeholder="閲囪喘鍏ュ簱">
<el-option label="鍘熸潗鏂�" value="0"></el-option>
<el-option label="鎴愬搧" value="1"></el-option>
<el-option label="濮旀墭鍝�" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item class="buttons">
- <el-button @click="resetForm('formInline')">娓呯┖</el-button>
- <el-button type="primary" @click="onSubmit('formInline')">鏌ヨ</el-button>
+ <el-button size="small" @click="resetForm('formInline')">娓呯┖</el-button>
+ <el-button size="small" type="primary" @click="onSubmit('formInline')">鏌ヨ</el-button>
</el-form-item>
</el-form>
</el-card>
@@ -62,7 +63,7 @@
</el-row>
</div>
<div class="work-foot">
- <el-button type="primary">鏁版嵁瀵煎嚭</el-button>
+ <el-button size="small" type="primary">鏁版嵁瀵煎嚭</el-button>
</div>
</div>
</template>
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index 97a2491..f384a5f 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -1,24 +1,24 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData" label-position="left">
+ <el-form ref="form" :inline="true" :model="searchData" label-position="left" style="margin-top: 10px;">
<el-form-item label="鏍峰搧缂栧彿:">
- <el-input v-model="searchData.sample_code" class="input-form" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�"
+ <el-input size="small" v-model="searchData.sample_code" class="input-form" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�"
@keyup.enter.native="getData" />
</el-form-item>
<el-form-item label="鎶ュ憡鍗曞彿:">
- <el-input v-model="searchData.reportCode" class="input-form" placeholder="璇疯緭鍏ユ姤鍛婂崟鍙�" />
+ <el-input size="small" v-model="searchData.reportCode" class="input-form" placeholder="璇疯緭鍏ユ姤鍛婂崟鍙�" />
</el-form-item>
<el-form-item label="鐢宠鍗曞彿:">
- <el-input v-model="searchData.application_code" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
+ <el-input size="small" v-model="searchData.application_code" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getData()">鏌ヨ</el-button>
- <el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="getData()">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="resetData()">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-form>
- <el-button @click="exportToPDF" class="rightBtn" type="primary" icon="el-icon-document">瀵煎嚭鎶ュ憡</el-button>
+ <el-form style="margin-top: 10px;">
+ <el-button size="small" @click="exportToPDF" class="rightBtn" type="primary" icon="el-icon-document">瀵煎嚭鎶ュ憡</el-button>
</el-form>
</div>
<div class="library-table">
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 6df3ed6..bdf2da8 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -5,35 +5,35 @@
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="鐢宠鍗曞彿:">
- <el-input v-model="searchData.applicationnumber" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"
+ <el-input size="small" v-model="searchData.applicationnumber" class="input-form" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"
style="width: 200px; margin-right: 20px;">
<i slot="prefix" class="el-input__icon el-icon-search" />
</el-input>
</el-form-item>
- <el-form-item label="妫�楠岀被鍨�:">
- <el-select v-model="searchData.type" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
+ <el-form-item label="妫�楠岀被鍨�:" width="200">
+ <el-select size="small" v-model="searchData.type" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
<el-option v-for="item in typeoptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠岀粨鏋�:" style="margin-right: 20px;">
- <el-select v-model="searchData.state" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
+ <el-form-item label="妫�楠岀粨鏋�:" width="200">
+ <el-select size="small" v-model="searchData.state" placeholder="鍏ㄩ儴" style="width: 100px;margin-right: 20px;">
<el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="searchInspections">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="searchInspections">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-form class="rightBtn">
<el-form-item class="createBtn">
- <el-button type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
+ <el-button size="small" type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
style="background-color: rgb(1, 102, 226);">鏂板妫�楠屽崟</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
- <el-button type="primary" icon="el-icon-download"
+ <el-button size="small" type="primary" icon="el-icon-download"
style="background-color: rgb(1, 102, 226);">瀵煎嚭妫�楠屽崟</el-button>
</el-form-item>
</el-form>
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>
diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue
index 42bb334..75437a0 100644
--- a/src/views/experiment/passRateStatistics/index.vue
+++ b/src/views/experiment/passRateStatistics/index.vue
@@ -3,24 +3,24 @@
<div class="top-bar">
<el-form ref="form" :inline="true" :rules="rules" :model="searchData" label-position="left">
<el-form-item label="妫�娴嬫棩鏈�:" class="sermargin" prop="date">
- <el-date-picker v-model="searchData.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ <el-date-picker size="small" v-model="searchData.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label="妫�楠岀被鍨�:" class="sermargin" prop="type">
- <el-select v-model="searchData.type" placeholder="鍏ㄩ儴">
+ <el-select size="small" v-model="searchData.type" placeholder="鍏ㄩ儴">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="渚涘簲鍟�:">
- <el-select v-model="searchData.supplier" placeholder="鍏ㄩ儴">
+ <el-select size="small" v-model="searchData.supplier" placeholder="鍏ㄩ儴">
<el-option v-for="item in supplier" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-left: 40px;" label="鏍峰搧:">
- <el-select v-model="searchData.code" filterable placeholder="璇烽�夋嫨">
+ <el-select size="small" v-model="searchData.code" filterable placeholder="璇烽�夋嫨">
<el-option v-for="item in sampleOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
@@ -28,8 +28,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="clear" plain size="mini">娓呯┖</el-button>
- <el-button type="primary" @click="search" size="mini">鏌ヨ</el-button>
+ <el-button type="primary" @click="clear" plain size="small">娓呯┖</el-button>
+ <el-button type="primary" @click="search" size="small">鏌ヨ</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 2cb5bb8..0b9cb4f 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -44,18 +44,23 @@
<template>
<div class="plan">
<div class="title">
- <span>鐢宠鍗曠紪鍙凤細</span>
- <el-input v-model="search.code" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
- <span>妫�楠屾椂闂达細</span>
- <el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡" size="medium" value-format="yyyy-MM-dd" style="margin-right: 20px;">
- </el-date-picker>
- <span>妫�楠岀粨鏋滐細</span>
- <el-select v-model="search.testValue" size="medium" style="width: 200px;margin-right: 20px;">
- <el-option label="鍏ㄩ儴" :value="null"></el-option>
- <el-option label="鍚堟牸" :value="1"></el-option>
- <el-option label="涓嶅悎鏍�" :value="0"></el-option>
- </el-select>
+ <el-form :model="search" :inline="true" label-position="left">
+ <el-form-item prop="code" label="鐢宠鍗曠紪鍙凤細" width="200" style="margin: 20px 10px;">
+ <el-input v-model="search.code" size="small" ></el-input>
+ </el-form-item>
+ <el-form-item prop="date" label="妫�楠屾椂闂达細" width="200" style="margin: 20px 10px;">
+ <el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡" size="small" value-format="yyyy-MM-dd" style="margin-right: 20px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item prop="testValue" label="妫�楠岀粨鏋滐細" width="200" style="margin: 20px 10px;">
+ <el-select v-model="search.testValue" size="small">
+ <el-option label="鍏ㄩ儴" :value="null"></el-option>
+ <el-option label="鍚堟牸" :value="1"></el-option>
+ <el-option label="涓嶅悎鏍�" :value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
<el-button size="small" type="primary" @click="selectDataList">鏌ヨ</el-button>
<el-button size="small" @click="cleanBtn">閲嶇疆</el-button>
</div>
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index 6d041fe..00d0465 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true">
+ <el-form ref="form" :inline="true" style="margin-top: 10px;">
<el-form-item>
<el-input
v-model="input"
@@ -11,8 +11,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getData()">鏌ヨ</el-button>
- <el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="getData()">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="resetData()">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 357ef13..55cc187 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -5,22 +5,22 @@
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="濮旀墭缂栧彿:" class="sermargin">
- <el-input v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О:" class="sermargin">
- <el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item label="濮旀墭鍗曚綅:" style="margin-right: 20px;">
- <el-select v-model="searchData.department" placeholder="鍏ㄩ儴">
+ <el-select v-model="searchData.department" placeholder="鍏ㄩ儴" size="small">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button type="primary" size="small" @click="search">鏌ヨ</el-button>
+ <el-button type="primary" size="small" plain @click="reset">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-form>
@@ -39,7 +39,7 @@
v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime2)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
</el-row>
</div>
- <el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
+ <el-button size="small" slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
</el-popover>
</el-form>
</div>
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index f61d75c..c4d1f48 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -4,27 +4,27 @@
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="鏉愭枡缂栫爜:" position="left" class="sermargin">
- <el-input v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item label="鏉愭枡鍚嶇О:" class="sermargin">
- <el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏ユ潗鏂欏悕绉�">
+ <el-input size="small" v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏ユ潗鏂欏悕绉�">
</el-input>
</el-form-item>
<el-form-item label="鐘舵��:" class="sermargin">
- <el-select v-model="searchData.state" placeholder="鍏ㄩ儴">
+ <el-select size="small" v-model="searchData.state" placeholder="鍏ㄩ儴">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鏉ユ枡鏃ユ湡:" style="margin-right: 20px;">
- <el-date-picker value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="璇烽�夋嫨鏉ユ枡鏃ユ湡">
+ <el-date-picker size="small" value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="璇烽�夋嫨鏉ユ枡鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
- <el-button type="primary" icon="el-icon-plus" @click="addReportVisible = true">鏂板</el-button>
+ <el-button size="small" type="primary" @click="search">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="addReportVisible = true">鏂板</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/laboratory/gather/index.vue b/src/views/laboratory/gather/index.vue
index c7e421a..edae7b2 100644
--- a/src/views/laboratory/gather/index.vue
+++ b/src/views/laboratory/gather/index.vue
@@ -1,18 +1,18 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData">
+ <el-form style="margin-top: 10px;" ref="form" :inline="true" :model="searchData">
<el-form-item label="璁惧缂栧彿:" style="margin-right: 50px;">
- <el-input v-model="searchData.code" placeholder="璇疯緭鍏ヨ澶囩紪鍙�">
+ <el-input size="small" v-model="searchData.code" placeholder="璇疯緭鍏ヨ澶囩紪鍙�">
</el-input>
</el-form-item>
<el-form-item label="璁惧鍚嶇О:" style="margin-right: 20px;">
- <el-input v-model="searchData.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�">
+ <el-input size="small" v-model="searchData.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�">
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="searchInspections">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="searchInspections">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 0bf4c01..e79e599 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -2,7 +2,7 @@
<div class="ledger-main">
<div class="page-header-search">
<div class="serve-btn">
- <el-button type="primary" icon="el-icon-plus"
+ <el-button size="small" type="primary" icon="el-icon-plus"
@click="showAddDrawer()">鏂板浠櫒</el-button>
</div>
</div>
@@ -11,7 +11,7 @@
<div class="bom-item-search">
<el-row>
<el-col :span="19">
- <el-input v-model="filterText" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" />
+ <el-input size="small" v-model="filterText" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" />
</el-col>
<el-col :span="5">
<el-button type="primary" size="small" @click="addClassVisible = true"><i
@@ -28,14 +28,14 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form ref="form" :inline="true" :model="searchData">
- <el-form-item>
- <el-input v-model="searchData.keyword" placeholder="璇疯緭鍏ョ紪鍙�/璁惧鍚嶇О/鍨嬪彿瑙勬牸">
+ <el-form-item width="200">
+ <el-input size="small" v-model="searchData.keyword" placeholder="璇疯緭鍏ョ紪鍙�/璁惧鍚嶇О/鍨嬪彿瑙勬牸">
<i slot="prefix" class="el-input__icon el-icon-search" />
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="filterTableData">鏌ヨ</el-button>
- <el-button type="primary" plain @click="resetBtn">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="filterTableData">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="resetBtn">閲嶇疆</el-button>
</el-form-item>
</el-form>
</el-col>
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 5c78cf1..58e18c7 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -2,33 +2,32 @@
<div>
<div class="content-main">
<div class="top-bar">
- <el-form :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
+ <el-form style="margin-top: 10px;" :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
<el-form-item :label="this.radioValue === 0 ? '浠櫒璁惧缂栧彿:' : '璁″垝缂栧彿:'" class="sermargin">
- <el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item v-if="this.radioValue === 1">
- <!-- <el-col :span="12"><span hidden>2121</span></el-col> -->
- <el-button type="primary" @click="searchPlan">鏌ヨ</el-button>
+ <el-button size="small" type="primary" @click="searchPlan">鏌ヨ</el-button>
</el-form-item>
<el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
class="sermargin">
- <el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
<el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '璁￠噺鍗曚綅:' : '璁￠噺鍗曚綅锛�'"
style="margin-right: 20px;">
- <el-input v-model="searchData.measureunit" class="input-form" placeholder="璇疯緭鍏�">
+ <el-input size="small" v-model="searchData.measureunit" class="input-form" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
</el-form>
- <el-form :hidden="lookVisible">
+ <el-form :hidden="lookVisible" style="margin-top: 10px;">
<el-form-item v-if="this.radioValue === 0" class="rightBtn">
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset()">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="search">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset()">閲嶇疆</el-button>
</el-form-item>
<el-form-item v-if="this.radioValue === 1" class="rightBtn">
- <el-button type="primary" @click="addPlan()" icon="el-icon-plus">鏂板璁″垝</el-button>
+ <el-button size="small" type="primary" @click="addPlan()" icon="el-icon-plus">鏂板璁″垝</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/laboratory/personnel/index.vue b/src/views/laboratory/personnel/index.vue
index 6bec3a2..577f115 100644
--- a/src/views/laboratory/personnel/index.vue
+++ b/src/views/laboratory/personnel/index.vue
@@ -4,19 +4,19 @@
<div class="search-bar">
<el-form ref="form" :inline="true">
<el-form-item>
- <el-input v-model="keyword" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�">
+ <el-input size="small" v-model="keyword" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�">
<i slot="prefix" class="el-input__icon el-icon-search" />
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="getData()">鏌ヨ</el-button>
- <el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="getData()">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="resetData()">閲嶇疆</el-button>
<!-- <el-button type="text">楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right" /></el-button> -->
</el-form-item>
</el-form>
</div>
<div class="serve-btn">
- <el-button type="primary" icon="el-icon-plus" @click="dialogFormVisible = true">鏂板浜哄憳</el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="dialogFormVisible = true">鏂板浜哄憳</el-button>
<el-dialog :title="isUpdate == true ? '鏇存柊浜哄憳淇℃伅' : '鏂板浜哄憳'" :visible.sync="dialogFormVisible" width="30%">
<el-form :model="form" ref="form" :rules="rules" style="padding-right: 50px;">
<el-form-item label="璐﹀彿" :label-width="formLabelWidth" prop="account">
diff --git a/src/views/laboratory/role/index.vue b/src/views/laboratory/role/index.vue
index c91733a..8c13e3a 100644
--- a/src/views/laboratory/role/index.vue
+++ b/src/views/laboratory/role/index.vue
@@ -2,21 +2,21 @@
<div>
<div class="content-main">
<div class="top-bar">
- <el-form style="display: flex;align-items: center;" ref="form" :inline="true" :model="searchData">
+ <el-form style="display: flex;align-items: center;margin-top: 10px;" ref="form" :inline="true" :model="searchData">
<el-form-item label="瑙掕壊鍚嶇О锛�" class="sermargin">
- <el-input v-model="searchData.roleName" class="input-form" placeholder="璇疯緭鍏ヨ鑹插悕绉�" style="width:250px">
+ <el-input size="small" v-model="searchData.roleName" class="input-form" placeholder="璇疯緭鍏ヨ鑹插悕绉�" style="width:250px">
</el-input>
</el-form-item>
<el-form-item class="rightBtn">
<el-col>
- <el-button type="primary" @click="searchRole">鏌ヨ</el-button>
- <el-button type="primary" @click="clear()" plain>閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="searchRole">鏌ヨ</el-button>
+ <el-button size="small" type="primary" @click="clear()" plain>閲嶇疆</el-button>
</el-col>
</el-form-item>
</el-form>
- <el-form>
+ <el-form style="margin-top: 10px;">
<el-form-item class="rightBtn">
- <el-button type="primary" @click="addClickRole" icon="el-icon-plus">鏂板瑙掕壊</el-button>
+ <el-button size="small" type="primary" @click="addClickRole" icon="el-icon-plus">鏂板瑙掕壊</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/message/toDo/index.vue b/src/views/message/toDo/index.vue
index 7af1f63..ca79553 100644
--- a/src/views/message/toDo/index.vue
+++ b/src/views/message/toDo/index.vue
@@ -1,9 +1,10 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData">
+ <el-form ref="form" :inline="true" :model="searchData" style="margin-top: 10px;">
<el-form-item label="鏍囬:" class="sermargin">
<el-input
+ size="small"
v-model="searchData.title"
class="input-form"
placeholder="璇疯緭鍏ユ爣棰�"
@@ -12,6 +13,7 @@
</el-form-item>
<el-form-item label="鍐呭:" style="margin-right: 30px;">
<el-input
+ size="small"
v-model="searchData.content"
class="input-form"
placeholder="璇疯緭鍏ュ唴瀹�"
@@ -19,13 +21,13 @@
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="search">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="reset">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-form>
- <el-button class="deleteBtn" plain type="primary" @click="deleteMessage" >鍒犻櫎</el-button>
- <el-button type="primary" @click="readMessage" style="width: 110px;" >鏍囦负宸茶</el-button>
+ <el-form style="margin-top: 10px;">
+ <el-button size="small" class="deleteBtn" plain type="primary" @click="deleteMessage" >鍒犻櫎</el-button>
+ <el-button size="small" type="primary" @click="readMessage" style="width: 110px;" >鏍囦负宸茶</el-button>
</el-form>
</div>
<div class="library-table">
diff --git a/src/views/personal/myInformation/index.vue b/src/views/personal/myInformation/index.vue
index 3fc95ed..ab660ec 100644
--- a/src/views/personal/myInformation/index.vue
+++ b/src/views/personal/myInformation/index.vue
@@ -7,12 +7,30 @@
<div>鍩烘湰淇℃伅</div>
</div>
<div class="tips-btn">
- <span><i class="el-icon-edit" />鎿嶄綔锛�</span>
<el-button type="text" @click="dialogFormVisible = true">缂栬緫</el-button>
- <el-dialog title="缂栬緫" :visible.sync="dialogFormVisible">
- <el-form ref="form" :model="form" :rules="rules">
- <el-form-item label="璐﹀彿" :label-width="formLabelWidth" prop="account">
+ <el-dialog title="缂栬緫" :visible.sync="dialogFormVisible" >
+ <el-form ref="form" :model="form" :rules="rules" label-position="left">
+ <el-form-item label="鐢ㄦ埛鍚嶏細" :label-width="formLabelWidth" prop="account">
<el-input v-model="form.account" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="濮撳悕锛�" :label-width="formLabelWidth" prop="name">
+ <el-input v-model="form.name" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="鐢佃瘽鍙风爜锛�" :label-width="formLabelWidth" prop="phone">
+ <el-input show-word-limit maxlength="11" type="text" v-model="form.phone" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="閭锛�" :label-width="formLabelWidth" prop="email">
+ <el-input v-model="form.email" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="绛惧悕锛�" :label-width="formLabelWidth" prop="signature">
+ <el-upload
+ class="upload-demo"
+ action="#"
+ multiple
+ :limit="3">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -38,54 +56,6 @@
<span><i class="el-icon-edit" />绛惧悕锛�</span>
2121212121212121</div>
</div>
- <!-- <el-table
- ref="infoTable"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5'}"
- :data="infoTable"
- style="width: 100%"
- >
- <el-table-column
- prop="username"
- label="鐢ㄦ埛鍚�"
- width="200"
- />
- <el-table-column
- prop="name"
- label="濮撳悕"
- width="460"
- >
- <template slot-scope="scope">
- <el-tag type="info"><i class="el-icon-info" :style="{marginRight:'4px'}" />{{ scope.row.name }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- prop="cellPhone"
- label="鐢佃瘽鍙风爜"
- width="400"
- />
- <el-table-column
- prop="email"
- label="閭"
- width="300"
- />
- <el-table-column
- prop="signature"
- label="绛惧悕"
- width="120"
- :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]"
- :filter-method="filterTag"
- filter-placement="bottom-end"
- />
- <el-table-column
- label="鎿嶄綔"
- width="120"
- >
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button type="text" size="small">缂栬緫</el-button>
- </template>
- </el-table-column>
- </el-table> -->
</div>
<div class="my-business">
<div class="tips-main">
@@ -93,65 +63,7 @@
<span />
<div>浼佷笟淇℃伅</div>
</div>
- <div class="tips-btn">
- <span><i class="el-icon-edit" />鎿嶄綔锛�</span>
- <el-button type="text">閫�鍑�</el-button>
- </div>
</div>
- <!-- <el-table
- ref="businessTable"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5'}"
- :data="businessTable"
- style="width: 100%"
- >
- <el-table-column
- prop="businessSmallName"
- label="浼佷笟绠�绉�"
- width="200"
- />
- <el-table-column
- prop="businessBigName"
- label="浼佷笟鍚嶇О"
- width="460"
- />
- <el-table-column
- label="浼佷笟鑱旂郴浜�"
- width="400"
- >
- <template slot-scope="scope">
- <el-tag type="info"><i class="el-icon-info" :style="{marginRight:'4px'}"/>{{ scope.row.businessContact }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- prop="businessPhone"
- label="浼佷笟鑱旂郴鍙风爜"
- width="300"
- />
- <el-table-column
- prop="businessStatus"
- label="鍔犲叆鐘舵��"
- width="120"
- :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]"
- :filter-method="filterTag"
- filter-placement="bottom-end"
- >
- <template slot-scope="scope">
- <el-tag
- :type="scope.row.businessStatus === 0 ? 'primary' : 'success'"
- disable-transitions
- >{{ scope.row.businessStatus === 0 ? '鏈悓鎰�' : '宸插悓鎰�' }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- width="120"
- >
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">閫�鍑�</el-button>
- <el-button type="text" size="small">缂栬緫</el-button>
- </template>
- </el-table-column>
- </el-table> -->
<div class="message">
<div class="message-item"><span><i class="el-icon-edit" />浼佷笟绠�绉帮細</span>{{ businessTable.businessSmallName }}</div>
<div class="message-item">
@@ -196,7 +108,13 @@
businessStatus: 1
},
dialogFormVisible: false,
- form: [],
+ form: {
+ account: "",
+ name: "",
+ phone: "",
+ email: "",
+ signature: ""
+ },
formLabelWidth: 120
}
},
@@ -238,11 +156,9 @@
.my-main{
.my-info,.my-business{
background: #fff;
- // padding: 10px 20px 10px 20px;
margin: 0;
margin-bottom: 12px;
border-radius: 6px;
- overflow: hidden;
.tips-main{
// margin: ;
padding: 10px 20px 0 20px;
@@ -250,22 +166,8 @@
justify-content: space-between;
align-items: center;
height: 50px;
- // height: ;
- &:hover{
- background: #85bff810;
- .tips-btn{
- display: block;
- left: 0;
- opacity:1;
- }
- }
.tips-btn{
height: 100%;
- // display: none;
- position: relative;
- opacity:0;
- left: 100px;
- transition: all 0.3s ease-in-out;
}
.tips{
height: 100%;
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index f6088c1..5cbf919 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -4,13 +4,13 @@
<div class="library-bom" style="width: 300px">
<el-row :gutter="10">
<el-col :span="19">
- <el-input clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
+ <el-input size="small" clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
</el-col>
<el-col :span="5">
- <el-button type="primary" icon="el-icon-plus" @click="addTreeFormVisible = true"></el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="addTreeFormVisible = true"></el-button>
</el-col>
</el-row>
- <el-button type="text">鍏ㄩ儴</el-button>
+ <el-button size="small" type="text">鍏ㄩ儴</el-button>
<el-tree ref="tree" style="width: 100%" class="filter-tree" :data="standardTree" :props="defaultProps"
node-key="id" :highlight-current="true" :default-expand-all="true" :filter-node-method="filterNode"
:render-content="renderContent" @node-click="nodeClick" />
@@ -19,13 +19,13 @@
<div class="table-header">
<div class="serve-btn">
<span class="tipMsg">{{ msg !== "" ? msg : "" }}</span>
- <el-select v-model="versionValue" @change="changeSelect" placeholder="璇烽�夋嫨鐗堟湰鍙�">
+ <el-select size="small" v-model="versionValue" @change="changeSelect" placeholder="璇烽�夋嫨鐗堟湰鍙�">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
- <el-button type="primary" @click="addVersionFun">鏂板鐗堟湰鍙�</el-button>
- <el-button type="primary" @click="centerDialogVisible = true">鏂板椤圭洰</el-button>
- <el-button class="top_div_button" icon="el-icon-delete-solid" style="color: #00a5ff"
+ <el-button size="small" type="primary" @click="addVersionFun">鏂板鐗堟湰鍙�</el-button>
+ <el-button size="small" type="primary" @click="centerDialogVisible = true">鏂板椤圭洰</el-button>
+ <el-button size="small" class="top_div_button" icon="el-icon-delete-solid" style="color: #00a5ff"
@click="deleteListClick">鍒犻櫎</el-button>
</div>
</div>
@@ -181,7 +181,9 @@
formTypeOptions: [],
addTreeForm: {
addTypeArr: [],
- specificationsName: ""
+ specificationsName: "",
+ materialName: "",
+ standardName: "",
}
};
},
--
Gitblit v1.9.3