From 74c58b88f878c4beafcedf4f75712bbdef4f7a6a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 10:20:25 +0800
Subject: [PATCH] 优化任务检验页面
---
src/components/tool/value-table.vue | 3 +--
src/components/do/b1-inspect-order-plan/Inspection.vue | 18 +++++++++++-------
src/components/view/a5-laboratory-qualifications.vue | 15 ++++++++-------
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index de2ae89..f3fbdc0 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -31,18 +31,22 @@
background-color: #fff;
border-radius: 3px;
padding: 20px;
- overflow: auto;
}
.center-box {
display: flex;
align-items: center;
justify-content: center;
+ flex-direction: column;
flex-wrap: wrap;
+ width: 100%;
+ /* overflow-x: hidden; */
+ overflow-x: scroll;
}
.tables {
- margin-bottom: 16px;
+ table-layout:fixed;
+ margin: 5px 5px 16px;
}
.tables td {
@@ -54,7 +58,7 @@
.content {
display: flex;
- width: 100%;
+ width: 100px;
height: 100%;
align-items: center;
justify-content: left;
@@ -172,12 +176,12 @@
<div class="center">
<div class="center-box">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
- <tbody>
- <tr v-for="(m,i) in item.arr" :key="i">
+ <tbody style="overflow: auto;">
+ <tr v-for="(m,i) in item.arr" :key="i" style="overflow: auto;">
<!-- v-if="n.v.mc==undefined || n.v.mc.rs!=undefined" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1" :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1" -->
<td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
- :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
- <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
+ :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
+ <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" :style="`width:${item.style.columnlen[n.c]}px !important;`">
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')||state>1"
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index fb6ba2f..e3f3b28 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -1067,14 +1067,13 @@
// 鎵归噺鍒犻櫎
batchDelete(){
if(this.multipleSelection&&this.multipleSelection.length>0){
- // this.delUrl
this.$confirm('鏄惁鍒犻櫎閫変腑鐨勬暟鎹�?', "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
this.$axios.post(this.delUrl, {
- id: this.multipleSelection.map(item => item.id).join(',')
+ ids: JSON.stringify(this.multipleSelection.map(item => item.id))
}).then(res => {
if (res.code === 201) {
return
diff --git a/src/components/view/a5-laboratory-qualifications.vue b/src/components/view/a5-laboratory-qualifications.vue
index 9e3d802..21cca26 100644
--- a/src/components/view/a5-laboratory-qualifications.vue
+++ b/src/components/view/a5-laboratory-qualifications.vue
@@ -119,8 +119,9 @@
</div>
</el-image>
<div class="table-item-right" style="flex: 1;font-size: 12px;color: #666666;">
- <p style="line-height: 30px;">璧勮川鍚嶇О锛�<span style="color: #3A7BFA;">{{ m.name }}</span></p>
- <p style="line-height: 30px;">鏈夋晥鏃堕棿锛歿{m.expireTime}}</p>
+ <p style="line-height: 26px;">璧勮川鍚嶇О锛�<span style="color: #3A7BFA;">{{ m.name }}</span></p>
+ <p style="line-height: 26px;">棰佸彂鏃堕棿锛歿{m.recentlyTime}}</p>
+ <p style="line-height: 26px;">鍒版湡鏃堕棿锛歿{m.expireTime}}</p>
<p>
<span>鐘舵�侊細</span>
<el-tag :type="m.state==0?'danger':'success'" size="small">{{ m.state==0?'澶辨晥':'鏈夋晥' }}</el-tag>
@@ -278,10 +279,10 @@
itemParameterData: {
entity: {
name: null,
- orderBy: {
- field: 'id',
- order: 'asc'
- }
+ // orderBy: {
+ // field: 'id',
+ // order: 'asc'
+ // }
},
isIndex: false,
showSelect: true,
@@ -331,7 +332,7 @@
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
entity:{
name: null,
- orderBy: {field: "id", order: "asc"}
+ // orderBy: {field: "id", order: "asc"}
},
currentPage: 1, // 褰撳墠椤�
pageSize: 16, // 涓�椤�16鏉�
--
Gitblit v1.9.3