From 109c83570a6c052c4c83633a0bce8ae81af97af2 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 20 二月 2025 17:04:07 +0800
Subject: [PATCH] 检验任务90%
---
src/components/Table/lims-table.vue | 24 +++++++++++
src/views/standard/model/index.vue | 80 ++++++++-------------------------------
src/views/business/inspectionTask/inspection.vue | 2 +
src/views/business/inspectionTask/index.vue | 5 +-
4 files changed, 45 insertions(+), 66 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 725f320..879357a 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -5,7 +5,7 @@
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" :height="height"
:highlight-current-row="highlightCurrentRow" :row-class-name="rowClassName" :row-style="rowStyle"
:row-key="rowKey" :span-method="spanMethod" stripe style="width: 100%" tooltip-effect="dark" @row-click="rowClick"
- @current-change="currentChange" @selection-change="handleSelectionChange">
+ @current-change="currentChange" @selection-change="handleSelectionChange" class="lims-table">
<el-table-column align="center" type="selection" width="55" v-if="isSelection" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" :index="indexMethod" />
@@ -427,3 +427,25 @@
/* 璁剧疆婊氬姩鏉″搴� */
}
</style>
+<style>
+.lims-table .highlight-warning-row-border td:first-child {
+ border-left: 4px solid #ffcd29;
+}
+
+.lims-table .highlight-warning-row-border td:last-child {
+ border-right: 4px solid #ffcd29;
+}
+
+/* .lims-table .highlight-danger-row-border td {
+ border-top: 2px solid red;
+ border-bottom: 2px solid red;
+ } */
+
+.lims-table .highlight-danger-row-border td:first-child {
+ border-left: 4px solid #f56c6c;
+}
+
+.lims-table .highlight-danger-row-border td:last-child {
+ border-right: 4px solid #f56c6c;
+}
+</style>
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index c9639da..4c59a35 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -138,7 +138,8 @@
</el-row>
</div>
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
- :height="'calc(100vh - 300px)'" @pagination="pagination" key="tableData0"></lims-table>
+ :rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination"
+ key="tableData0"></lims-table>
</div>
</div>
<el-dialog :visible.sync="claimVisible" title="鎻愮ず" width="400px">
@@ -707,7 +708,7 @@
this.loading = false;
});
},
- changeRowClass({ row, rowIndex }) {
+ rowClassName({ row, rowIndex }) {
if (this.currentTime == row.appointed) {
return "highlight-warning-row-border";
} else if (this.currentTime > row.appointed) {
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 0ed826a..a633db3 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -1109,6 +1109,8 @@
this.dataAcquisitionInfoNew = this.HaveJson(res.data);
// 瀵规暟閲囧洖鏉ョ殑鍊艰繘琛屽鐞�
this.handleDataAcquisition(res.data);
+ }).catch(err => {
+ this.dataAcquisitionLoading = false;
});
},
objectOrder(obj) {
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index 1d9f42c..1fa2c57 100644
--- a/src/views/standard/model/index.vue
+++ b/src/views/standard/model/index.vue
@@ -4,29 +4,16 @@
<div class="search_thing">
<div class="search_label">妯℃澘鍚嶇О锛�</div>
<div class="search_input">
- <el-input
- v-model="queryParams.name"
- clearable
- placeholder="璇疯緭鍏�"
- size="small"
- @keyup.enter.native="refreshTable()"
- ></el-input>
+ <el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
<div class="search_thing" style="padding-left: 30px">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()"
- >鏌� 璇�</el-button
- >
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
<div class="btn">
- <el-button
- v-if="checkPermi(['standard:model:add'])"
- size="small"
- type="primary"
- @click="openAdd"
- >鏂板</el-button
- >
+ <el-button v-if="checkPermi(['standard:model:add'])" size="small" type="primary" @click="openAdd">鏂板</el-button>
<!-- <el-button
v-if="checkPermi(['standard:model:copy'])"
size="small"
@@ -35,46 +22,17 @@
> -->
</div>
</div>
- <lims-table
- :tableData="tableData"
- :column="column"
- :page="page"
- :tableLoading="tableLoading"
- :height="'calc(100vh - 250px)'"
- style="padding: 20px; padding-top: 0"
- @pagination="pagination"
- ></lims-table>
- <el-dialog
- :before-close="isClose"
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- :visible.sync="isShow"
- title="妯℃澘缂栧埗"
- width="85%"
- >
+ <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
+ :height="'calc(100vh - 250px)'" style="padding: 20px; padding-top: 0" @pagination="pagination"></lims-table>
+ <el-dialog :before-close="isClose" :close-on-click-modal="false" :close-on-press-escape="false"
+ :visible.sync="isShow" title="妯℃澘缂栧埗" width="85%">
<div v-if="isShow" style="width: 100%; height: 82vh; overflow: auto">
- <Excel
- v-loading="loading"
- :data="row.thing"
- :execlTitle="row.name"
- ></Excel>
+ <Excel v-loading="loading" :data="row.thing" :execlTitle="row.name"></Excel>
</div>
</el-dialog>
- <el-dialog
- :before-close="closeCopyTem"
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- :visible.sync="isShowCopyTem"
- :title="title"
- width="35%"
- >
- <el-form
- ref="copyForm"
- :model="copyForm"
- :rules="copyFormRules"
- label-position="right"
- label-width="80px"
- >
+ <el-dialog :before-close="closeCopyTem" :close-on-click-modal="false" :close-on-press-escape="false"
+ :visible.sync="isShowCopyTem" :title="title" width="35%">
+ <el-form ref="copyForm" :model="copyForm" :rules="copyFormRules" label-position="right" label-width="80px">
<el-form-item label="妯＄増缂栧彿" prop="number">
<el-input v-model="copyForm.number" clearable size="small"></el-input>
</el-form-item>
@@ -87,12 +45,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="closeCopyTem">鍙� 娑�</el-button>
- <el-button
- :loading="submitCopyInfoLoading"
- type="primary"
- @click="submitCopyInfo"
- >纭� 瀹�</el-button
- >
+ <el-button :loading="submitCopyInfoLoading" type="primary" @click="submitCopyInfo">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -337,7 +290,7 @@
this.refreshTable("page");
});
})
- .catch(() => {});
+ .catch(() => { });
},
templateWrite(row) {
getEditTemplatePreparation({ id: row.id }).then((res) => {
@@ -345,7 +298,7 @@
return;
}
this.row = row;
- this.row.thing = res.msg;
+ this.row.thing = res.data;
this.isShow = true;
});
},
@@ -361,7 +314,7 @@
.then(() => {
this.closed();
})
- .catch(() => {});
+ .catch(() => { });
},
closed() {
this.loading = true;
@@ -453,6 +406,7 @@
.search_input {
width: calc(100% - 110px);
}
+
.btn {
position: absolute;
right: 14px;
--
Gitblit v1.9.3