From 4299bf547e315c824dd59b587be8778937dfb08e Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期三, 09 八月 2023 17:54:06 +0800
Subject: [PATCH] 8-9提交代码
---
src/views/experiment/reportAuditing/index.vue | 204 ++++++++-------
src/views/experiment/checkTheReport/index.vue | 230 ++++++++++-------
src/views/experiment/planAssignments/index.vue | 307 ++++++++++------------
src/api/experiment/planAssignments.js | 9
4 files changed, 388 insertions(+), 362 deletions(-)
diff --git a/src/api/experiment/planAssignments.js b/src/api/experiment/planAssignments.js
new file mode 100644
index 0000000..b373041
--- /dev/null
+++ b/src/api/experiment/planAssignments.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function selectAllPlan(params) {
+ return request({
+ url: '/plan/selectAllPlan',
+ method: 'get',
+ params
+ })
+}
\ No newline at end of file
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index e14b79e..4a58f59 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -14,9 +14,23 @@
<el-button type="primary" @click="getData()">鏌ヨ</el-button>
<el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
</el-form-item>
+ <el-dropdown>
+ <span class="el-dropdown-link">
+ 楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item>楂樼骇鎼滅储</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
</el-form>
<el-form>
- <el-button class="rightBtn" type="primary" icon="el-icon-document" @click="exportData">瀵煎嚭鎶ュ憡</el-button>
+ <el-button
+ class="rightBtn"
+ type="primary"
+ icon="el-icon-document"
+ @click="exportData"
+ >瀵煎嚭鎶ュ憡</el-button
+ >
</el-form>
</div>
<div class="library-table">
@@ -28,22 +42,28 @@
<el-radio-button label="1">寰呭鏍�</el-radio-button>
<el-radio-button label="2">宸插鏍�</el-radio-button>
</el-radio-group>
+
+ <el-checkbox v-model="checked" style="margin-left: 20px"
+ >浠呯湅鎴戠殑</el-checkbox
+ >
</div>
</div>
<div class="table-box">
<el-table
ref="reportTable"
:max-height="800"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{
+ border: '0px',
+ background: '#f5f7fa',
+ color: '#606266',
+ boxShadow: 'inset 0 1px 0 #ebeef5',
+ textAlign: 'center',
+ }"
:data="reportTable"
style="width: 100%"
>
- <el-table-column
- type="selection"
- label=""
- min-width="5%"
- />
+ <el-table-column type="selection" label="" min-width="5%" />
<el-table-column
prop="materialCode"
@@ -63,39 +83,48 @@
sortable
min-width="10%"
/>
- <el-table-column
- prop="approver"
- label="瀹℃壒浜�"
- min-width="5%"
- />
- <el-table-column
- prop="status"
- label="瀹℃壒鐘舵��"
- min-width="8%"
- >
+ <el-table-column prop="approver" label="瀹℃壒浜�" min-width="8%">
<template slot-scope="scope">
<span>
- <el-tag type="info">{{ scope.row.status == 0 ? '寰呮彁浜�' :
- scope.row.status == 1 ? '寰呭鏍�' :
- scope.row.status == 2 ? '浠g瀛�' :'宸插畬鎴�' }}</el-tag>
+ <el-tag type="info" icon="el-icon-user">
+ <i class="el-icon-user">{{ scope.row.approver }}</i>
+ </el-tag>
</span>
- </template></el-table-column>
- <el-table-column
- prop="conclusion"
- label="妫�楠岀粨璁�"
- min-width="10%"
- />
- <el-table-column
- prop="name"
- label="缂栧埗浜�"
- min-width="8%"
- />
- <el-table-column
- label="鎿嶄綔"
- min-width="8%"
- >
+ </template>
+ </el-table-column>
+ <el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="handleClick(scope.row)">棰勮</el-button>
+ <span>
+ <el-tag type="info">{{
+ scope.row.status == 0
+ ? "寰呮彁浜�"
+ : scope.row.status == 1
+ ? "寰呭鏍�"
+ : scope.row.status == 2
+ ? "浠g瀛�"
+ : "宸插畬鎴�"
+ }}</el-tag>
+ </span>
+ </template></el-table-column
+ >
+ <el-table-column prop="conclusion" label="妫�楠岀粨璁�" min-width="8%" />
+ <el-table-column prop="name" label="缂栧埗浜�" min-width="8%">
+ <template slot-scope="scope">
+ <span>
+ <el-tag type="info" icon="el-icon-user">
+ <i class="el-icon-user">{{ scope.row.name }}</i>
+ </el-tag>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="8%">
+ <template slot-scope="scope">
+ <el-button
+ type="text"
+ size="small"
+ @click="handleClick(scope.row)"
+ >棰勮</el-button
+ >
<el-button type="text" size="small">鎵撳嵃</el-button>
</template>
</el-table-column>
@@ -118,45 +147,46 @@
</template>
<script>
-import { selectAllReport } from '@/api/experiment/checkTheReport'
+import { selectAllReport } from "@/api/experiment/checkTheReport";
export default {
data() {
return {
- input: '',
+ input: "",
checkStatus: undefined,
reportTable: [],
page: 1,
total: 0,
- pageSize: 10
- }
+ pageSize: 10,
+ checked: true,
+ };
},
created() {
- this.getData()
+ this.getData();
},
methods: {
// 鐘舵�佹寜閽�
handleRadioChange() {
- this.getData()
+ this.getData();
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
- this.pageSize = val
- this.getData()
+ console.log(`姣忛〉 ${val} 鏉);
+ this.pageSize = val;
+ this.getData();
},
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
- this.page = val
- this.getData()
+ console.log(`褰撳墠椤�: ${val}`);
+ this.page = val;
+ this.getData();
},
// 閲嶇疆鎸夐挳
resetData() {
- this.input = undefined
- this.page = 1
- this.pageSize = 10
- this.checkStatus = undefined
- this.getData()
+ this.input = undefined;
+ this.page = 1;
+ this.pageSize = 10;
+ this.checkStatus = undefined;
+ this.getData();
},
// 鏌ヨ鍒楄〃
async getData() {
@@ -164,54 +194,62 @@
page: this.page,
pageSize: this.pageSize,
name: this.input ? this.input : undefined,
- status: this.checkStatus ? this.checkStatus : undefined
- }
- const { data } = await selectAllReport(params)
- this.reportTable = data.row
- this.total = data.total
- }
- }
-}
+ status: this.checkStatus ? this.checkStatus : undefined,
+ };
+ const { data } = await selectAllReport(params);
+ this.reportTable = data.row;
+ this.total = data.total;
+ },
+ },
+};
</script>
<style lang="scss" scoped>
-.top-bar{
- margin: -25px -15px;
- background: #fff;
+.top-bar {
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+ .input-form {
+ width: 700px;
+ }
+ .el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF;
+ }
+ .el-icon-arrow-down {
+ font-size: 12px;
+ }
+}
+.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;
- padding: 5px 24px 0px 24px;
- .input-form {
- width: 800px;
+ .el-form-item {
+ margin-bottom: 30px !important;
}
-}
-.library-table{
- background-color: #fff;
- flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
+ }
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 0px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ > div:nth-child(2) {
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: 0px;
- flex: 1;
- background: #fff;
- display: flex;
- flex-direction: column;
- >div:nth-child(2){
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
- }
+ justify-content: end;
+ margin: 10px 0;
}
+ }
+
+}
</style>
diff --git a/src/views/experiment/planAssignments/index.vue b/src/views/experiment/planAssignments/index.vue
index cffcc61..f5bdf13 100644
--- a/src/views/experiment/planAssignments/index.vue
+++ b/src/views/experiment/planAssignments/index.vue
@@ -3,12 +3,17 @@
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item label="璁惧鍚嶇О:" class="sermargin">
- <el-select v-model="searchData.devicename" placeholder="鍏ㄩ儴" style="width: 100px;">
+ <el-select
+ v-model="searchData.devicename"
+ placeholder="鍏ㄩ儴"
+ style="width: 100px"
+ >
<el-option
- v-for="item in options"
+ v-for="item in options1"
:key="item.value"
:label="item.label"
- :value="item.value">
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -18,131 +23,132 @@
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ end-placeholder="缁撴潫鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
- <el-form-item label="妫�楠屼汉:" style="margin-right: 20px;">
- <el-select v-model="searchData.person" placeholder="鍏ㄩ儴" style="width: 80px;margin-right: 100px;">
+ <el-form-item label="妫�楠屼汉:" style="margin-right: 20px">
+ <el-select
+ v-model="searchData.person"
+ placeholder="鍏ㄩ儴"
+ style="width: 80px; margin-right: 100px"
+ >
<el-option
- v-for="item in options"
+ v-for="item in options2"
:key="item.value"
:label="item.label"
- :value="item.value">
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" plain style="margin-right: 10px;">閲嶇疆</el-button>
+ <el-button type="primary" plain style="margin-right: 10px"
+ >閲嶇疆</el-button
+ >
<el-button type="primary">鏌ヨ</el-button>
</el-form-item>
- </el-form>
+ </el-form>
</div>
<div class="table-box">
<div class="formwrapper">
<el-table
ref="planTable"
:max-height="800"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{
+ border: '0px',
+ background: '#f5f7fa',
+ color: '#606266',
+ boxShadow: 'inset 0 1px 0 #ebeef5',
+ textAlign: 'center',
+ }"
:data="planTable"
style="width: 100%"
>
- <el-table-column
- type="index"
- label="搴忓彿"
- min-width="10%"
- />
- <el-table-column
- prop="device"
- label="妫�楠岃澶�"
- min-width="8%"
- />
- <el-table-column
- prop="samplename"
- label="鏍峰搧鍚嶇О"
- min-width="8%"
- />
- <el-table-column
- prop="sampleid"
- label="鏍峰搧缂栧彿"
- min-width="10%"
- />
- <el-table-column
- prop="modelandspecification"
- label="瑙勬牸鍨嬪彿"
- min-width="12%"
- />
- <el-table-column
- prop="unit"
- label="鍗曚綅"
- min-width="5%"
- />
- <el-table-column
- prop="amount"
- label="鏁伴噺"
- min-width="5%"
- />
- <el-table-column
- prop="checkproject"
- label="妫�楠岄」鐩�"
- min-width="12%"
- />
- <el-table-column
- prop="checker"
- label="妫�楠屼汉"
- min-width="6%"
- />
- <el-table-column
- prop="duration"
- label="璁″垝宸ユ湡/h"
- min-width="8%"
- />
- <el-table-column
- prop="progress"
- label="妫�楠岃繘搴�"
- min-width="12%">
- <template slot-scope="scope">
- <div v-if="scope.row.progress === 100" style="display: flex;">
- <el-progress :text-inside="true" :stroke-width="15" :percentage="scope.row.progress" status="success" style="width: 70%;"></el-progress>
- <span style="color: rgb(103, 194, 58);">宸插畬鎴�</span>
- </div>
- <div v-if="scope.row.progress <100 && scope.row.progress >0" style="display: flex;">
- <el-progress :text-inside="true" :stroke-width="15" :percentage="scope.row.progress" status="warning" style="width: 70%;"></el-progress>
- <span style="color: rgb(230, 162, 60);">妫�楠屼腑</span>
- </div>
- <div v-if="scope.row.progress === 0" style="display: flex;">
- <el-progress :text-inside="true" :stroke-width="15" :percentage="scope.row.progress" style="width: 70%;"></el-progress>
- <span style="color: gray">鏈垎閰�</span>
- </div>
- <div v-else>
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="starttime"
- label="璁″垝寮�濮嬫椂闂�"
- min-width="10%"
- />
- <el-table-column
- prop="finishtime"
- label="璁″垝缁撴潫鏃堕棿"
- min-width="10%"
- />
- <el-table-column
- label="鎿嶄綔"
- min-width="8%"
- >
- <template slot-scope="scope">
- <el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
- </template>
- </el-table-column>
+ <el-table-column type="index" label="搴忓彿" min-width="10%" />
+ <el-table-column prop="device" label="妫�楠岃澶�" min-width="8%" />
+ <el-table-column prop="samplename" label="鏍峰搧鍚嶇О" min-width="8%" />
+ <el-table-column prop="sampleid" label="鏍峰搧缂栧彿" min-width="10%" />
+ <el-table-column
+ prop="modelandspecification"
+ label="瑙勬牸鍨嬪彿"
+ min-width="12%"
+ />
+ <el-table-column prop="unit" label="鍗曚綅" min-width="5%" />
+ <el-table-column prop="amount" label="鏁伴噺" min-width="5%" />
+ <el-table-column
+ prop="checkproject"
+ label="妫�楠岄」鐩�"
+ min-width="12%"
+ />
+ <el-table-column prop="checker" label="妫�楠屼汉" min-width="6%" />
+ <el-table-column prop="duration" label="璁″垝宸ユ湡/h" min-width="8%" />
+ <el-table-column prop="progress" label="妫�楠岃繘搴�" min-width="12%">
+ <template slot-scope="scope">
+ <div v-if="scope.row.progress === 100" style="display: flex">
+ <el-progress
+ :text-inside="true"
+ :stroke-width="15"
+ :percentage="scope.row.progress"
+ status="success"
+ style="width: 70%"
+ ></el-progress>
+ <span style="color: rgb(103, 194, 58)">宸插畬鎴�</span>
+ </div>
+ <div
+ v-if="scope.row.progress < 100 && scope.row.progress > 0"
+ style="display: flex"
+ >
+ <el-progress
+ :text-inside="true"
+ :stroke-width="15"
+ :percentage="scope.row.progress"
+ status="warning"
+ style="width: 70%"
+ ></el-progress>
+ <span style="color: rgb(230, 162, 60)">妫�楠屼腑</span>
+ </div>
+ <div v-if="scope.row.progress === 0" style="display: flex">
+ <el-progress
+ :text-inside="true"
+ :stroke-width="15"
+ :percentage="scope.row.progress"
+ style="width: 70%"
+ ></el-progress>
+ <span style="color: gray">鏈垎閰�</span>
+ </div>
+ <div v-else></div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="starttime"
+ label="璁″垝寮�濮嬫椂闂�"
+ min-width="10%"
+ />
+ <el-table-column
+ prop="finishtime"
+ label="璁″垝缁撴潫鏃堕棿"
+ min-width="10%"
+ />
+ <el-table-column label="鎿嶄綔" min-width="8%">
+ <template slot-scope="scope">
+ <el-button
+ type="text"
+ size="small"
+ @click="handleClick(scope.row)"
+ >鏌ョ湅</el-button
+ >
+ </template>
+ </el-table-column>
</el-table>
</div>
- </div>
+ </div>
</div>
</template>
<script>
+import { selectAllPlan } from "@/api/experiment/planAssignments";
export default {
data() {
return {
@@ -151,71 +157,36 @@
time: "",
person: "",
},
- options: [
- {
- value: "閫夐」1",
- label: "閫夐」1",
- },
- {
- value: "閫夐」2",
- label: "閫夐」2",
- disabled: true,
- },
- ],
- planTable: [{
- device: '鎷夊姏鏈�',
- samplename: '闀�閿岄挗缁炵嚎',
- sampleid: 'SN1027401-12937',
- modelandspecification: 'JLHA/G1A-185/30-14/7',
- unit: 'm',
- amount: '200',
- checkproject: '鎶楀帇寮哄害锛堢粸鍓嶏級',
- checker: '榛勫皬鏄�',
- duration: '2',
- progress: 100,
- starttime: '2023-08-04 8:00',
- finishtime: '2023-08-04 10:00',
- },{
- device: '鎷夊姏鏈�',
- samplename: '闀�閿岄挗缁炵嚎',
- sampleid: 'SN1027401-12937',
- modelandspecification: 'JLHA/G1A-185/30-14/7',
- unit: 'm',
- amount: '200',
- checkproject: '鎶楀帇寮哄害锛堢粸鍓嶏級',
- checker: '榛勫皬鏄�',
- duration: '2',
- progress: 60,
- starttime: '2023-08-04 8:00',
- finishtime: '2023-08-04 10:00',
- },{
- device: '鎷夊姏鏈�',
- samplename: '闀�閿岄挗缁炵嚎',
- sampleid: 'SN1027401-12937',
- modelandspecification: 'JLHA/G1A-185/30-14/7',
- unit: 'm',
- amount: '200',
- checkproject: '鎶楀帇寮哄害锛堢粸鍓嶏級',
- checker: '榛勫皬鏄�',
- duration: '2',
- progress: 30,
- starttime: '2023-08-04 8:00',
- finishtime: '2023-08-04 10:00',
- },{
- device: '鎷夊姏鏈�',
- samplename: '闀�閿岄挗缁炵嚎',
- sampleid: 'SN1027401-12937',
- modelandspecification: 'JLHA/G1A-185/30-14/7',
- unit: 'm',
- amount: '200',
- checkproject: '鎶楀帇寮哄害锛堢粸鍓嶏級',
- checker: '榛勫皬鏄�',
- duration: '2',
- progress: 0,
- starttime: '2023-08-04 8:00',
- finishtime: '2023-08-04 10:00',
- }]
+ options1: [],
+ options2: [],
+ planTable: [],
};
+ },
+ created() {
+ this.getData();
+ },
+ methods: {
+ // 鏌ヨ鍒楄〃
+ async getData() {
+ const params = {};
+ const { data } = await selectAllPlan(params);
+ this.planTable = data;
+ this.planTable.forEach((res) => {
+ let o1 = {
+ value: res.device,
+ label: res.device,
+ };
+ this.options1.push(o1);
+
+ if(res.userId == undefined) {
+
+ }
+ });
+ let d=this.options1.filter((val,index,self)=>{
+ return self.indexOf(val)==index;
+ })
+ console.log(d);
+ },
},
};
</script>
@@ -236,14 +207,14 @@
margin-right: 60px;
}
}
-.table-box{
+.table-box {
background-color: #fff;
margin: 0px -15px;
margin-top: 35px;
display: flex;
flex-direction: column;
height: 78vh;
- .formwrapper{
+ .formwrapper {
padding: 0px 20px;
margin-top: 0px;
flex: 1;
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index f016938..0e8bf65 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -14,9 +14,19 @@
<el-button type="primary" @click="getData()">鏌ヨ</el-button>
<el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
</el-form-item>
+ <el-dropdown>
+ <span class="el-dropdown-link">
+ 楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item>楂樼骇鎼滅储</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
</el-form>
<el-form>
- <el-button class="rightBtn" type="primary" @click="exportData">瀹℃牳</el-button>
+ <el-button class="rightBtn" type="primary" @click="exportData"
+ >瀹℃牳</el-button
+ >
</el-form>
</div>
<div class="library-table">
@@ -27,68 +37,58 @@
<el-radio-button label="0">寰呮彁浜�</el-radio-button>
<el-radio-button label="2">寰呴�氳繃</el-radio-button>
</el-radio-group>
+ <el-checkbox v-model="checked" style="margin-left: 20px"
+ >浠呯湅鎴戠殑</el-checkbox
+ >
</div>
</div>
<div class="table-box">
<el-table
ref="reportTable"
:max-height="800"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{
+ border: '0px',
+ background: '#f5f7fa',
+ color: '#606266',
+ boxShadow: 'inset 0 1px 0 #ebeef5',
+ textAlign: 'center',
+ }"
:data="reportTable"
style="width: 100%"
>
- <el-table-column
- type="selection"
- label=""
- min-width="5%"
- />
+ <el-table-column type="selection" label="" min-width="5%" />
<el-table-column
prop="materialCode"
label="鏍峰搧缂栧彿"
min-width="10%"
/>
- <el-table-column
- prop="reportCode"
- label="鎶ュ憡鍗曞彿"
- min-width="10%"
- />
+ <el-table-column prop="reportCode" label="鎶ュ憡鍗曞彿" min-width="10%" />
<el-table-column
prop="materialName"
label="鏍峰搧鍚嶇О"
min-width="10%"
/>
- <el-table-column
- prop="status"
- label="瀹℃壒鐘舵��"
- min-width="8%"
- >
+ <el-table-column prop="status" label="瀹℃壒鐘舵��" min-width="8%">
<template slot-scope="scope">
<span>
- <el-tag type="warning">{{ scope.row.status == 0 ? '寰呮彁浜�' : '宸插鏍�' }}</el-tag>
+ <el-tag type="warning">{{
+ scope.row.status == 0 ? "寰呮彁浜�" : "寰呴�氳繃"
+ }}</el-tag>
</span>
- </template></el-table-column>
- <el-table-column
- prop="approver"
- label="瀹℃壒浜�"
- min-width="8%"
- />
- <el-table-column
- prop="submitTime"
- label="鎻愪氦鏃ユ湡"
- min-width="8%"
- />
- <el-table-column
- prop="checkTime"
- label="瀹℃牳鏃ユ湡"
- min-width="8%"
- />
- <el-table-column
- label="鎿嶄綔"
- min-width="8%"
+ </template></el-table-column
>
+ <el-table-column prop="approver" label="瀹℃壒浜�" min-width="8%" />
+ <el-table-column prop="submitTime" label="鎻愪氦鏃ユ湡" min-width="8%" />
+ <el-table-column prop="checkTime" label="瀹℃牳鏃ユ湡" min-width="8%" />
+ <el-table-column label="鎿嶄綔" min-width="8%">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅璇︾粏</el-button>
+ <el-button
+ type="text"
+ size="small"
+ @click="handleClick(scope.row)"
+ >鏌ョ湅璇︾粏</el-button
+ >
</template>
</el-table-column>
</el-table>
@@ -110,45 +110,46 @@
</template>
<script>
-import { selectAllReportCheck } from '@/api/experiment/reportAuditing'
+import { selectAllReportCheck } from "@/api/experiment/reportAuditing";
export default {
data() {
return {
- input: '',
+ input: "",
checkStatus: undefined,
reportTable: [],
page: 1,
total: 0,
- pageSize: 10
- }
+ pageSize: 10,
+ checked: true,
+ };
},
created() {
- this.getData()
+ this.getData();
},
methods: {
// 鐘舵�佹寜閽�
handleRadioChange() {
- this.getData()
+ this.getData();
},
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
- this.pageSize = val
- this.getData()
+ console.log(`姣忛〉 ${val} 鏉);
+ this.pageSize = val;
+ this.getData();
},
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
- this.page = val
- this.getData()
+ console.log(`褰撳墠椤�: ${val}`);
+ this.page = val;
+ this.getData();
},
// 閲嶇疆鎸夐挳
resetData() {
- this.input = undefined
- this.page = 1
- this.pageSize = 10
- this.checkStatus = undefined
- this.getData()
+ this.input = undefined;
+ this.page = 1;
+ this.pageSize = 10;
+ this.checkStatus = undefined;
+ this.getData();
},
// 鏌ヨ鍒楄〃
async getData() {
@@ -156,54 +157,61 @@
page: this.page,
pageSize: this.pageSize,
name: this.input ? this.input : undefined,
- status: this.checkStatus ? this.checkStatus : undefined
- }
- const { data } = await selectAllReportCheck(params)
- this.reportTable = data.row
- this.total = data.total
- }
- }
-}
+ status: this.checkStatus ? this.checkStatus : undefined,
+ };
+ const { data } = await selectAllReportCheck(params);
+ this.reportTable = data.row;
+ this.total = data.total;
+ },
+ },
+};
</script>
<style lang="scss" scoped>
-.top-bar{
- margin: -25px -15px;
- background: #fff;
+.top-bar {
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+ .input-form {
+ width: 700px;
+ }
+ .el-dropdown-link {
+ cursor: pointer;
+ color: #409eff;
+ }
+ .el-icon-arrow-down {
+ font-size: 12px;
+ }
+}
+.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;
- padding: 5px 24px 0px 24px;
- .input-form {
- width: 800px;
+ .el-form-item {
+ margin-bottom: 30px !important;
}
-}
-.library-table{
- background-color: #fff;
- flex: 1;
- margin: 0px -15px;
- margin-top: 40px;
+ }
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 0px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ > div:nth-child(2) {
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: 0px;
- flex: 1;
- background: #fff;
- display: flex;
- flex-direction: column;
- >div:nth-child(2){
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
- }
+ justify-content: end;
+ margin: 10px 0;
}
+ }
+}
</style>
--
Gitblit v1.9.3