From 9b26870265cbbc75bcd32529e46b229a49ec30a0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 05 九月 2023 11:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index be7fb86..5f63b6c 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -41,8 +41,8 @@
<div class="library-table">
<div class="table-box">
<el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :cell-style="{textAlign: 'left'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
:data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
<el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="160px" />
@@ -338,10 +338,8 @@
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
<el-table-column prop="startTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
- <template slot-scope="scope">
- <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
- {{ scope.row.state===1 ? '宸叉娴�':'寰呮娴�' }}
- </span>
+ <template>
+ <span style="color: red">寰呮楠�</span>
</template>
</el-table-column>
</el-table>
@@ -649,7 +647,10 @@
checkdate.push(item['updateTime'])
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
})
- this.rawMaterialTable = res.data
+ let arr = res.data.filter((val)=>{
+ return val.type === 0;
+ })
+ this.rawMaterialTable = arr
})
} else if (this.type === 1) {
this.commisionVisible = true
--
Gitblit v1.9.3