From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/business/unPass/index.vue | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 215 insertions(+), 4 deletions(-)
diff --git a/src/views/business/unPass/index.vue b/src/views/business/unPass/index.vue
index ab1c20a..88ee522 100644
--- a/src/views/business/unPass/index.vue
+++ b/src/views/business/unPass/index.vue
@@ -1,9 +1,220 @@
+<style scoped>
+.title {
+ height: 60px;
+ line-height: 60px;
+}
+
+.search {
+ background-color: #fff;
+ height: 80px;
+ display: flex;
+ align-items: center;
+}
+.search_thing {
+ display: flex;
+ align-items: center;
+ height: 50px;
+}
+.search_label {
+ width: 120px;
+ font-size: 14px;
+ text-align: right;
+}
+
+.search_input {
+ width: calc(100% - 120px);
+}
+.table {
+ margin-top: 10px;
+ background-color: #fff;
+ width: calc(100% - 40px);
+ height: calc(100% - 60px - 80px - 10px - 40px);
+ padding: 20px;
+}
+</style>
<template>
- <div>涓嶅悎鏍煎鐞�</div>
+ <div class="below-standard-main bg-1">
+ <div style="width: 100%; height: 100%">
+ <div>
+ <el-row class="title">
+ <el-col :span="12" style="padding-left: 20px; text-align: left"
+ >涓嶅悎鏍肩鐞�</el-col
+ >
+ </el-row>
+ </div>
+ <div class="search">
+ <div class="search_thing">
+ <div class="search_label">瑙勬牸鍨嬪彿锛�</div>
+ <div class="search_input">
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="entity.model"
+ @keyup.enter.native="refreshTable()"
+ ></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="entity.sample"
+ @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
+ >
+ </div>
+ </div>
+ <div class="table">
+ <lims-table
+ :tableData="tableData"
+ :column="column"
+ :tableLoading="tableLoading"
+ :parentSpanMethod="spanMethod"
+ :height="tableHeight+''"
+ :page="page"
+ @pagination="pagination"
+ ></lims-table>
+ </div>
+ </div>
+ </div>
</template>
<script>
-export default {};
-</script>
+import limsTable from "@/components/Table/lims-table.vue";
+import {
+ pageInsUnPass
+} from "../../../api/business/unPass";
-<style></style>
+
+
+import { convertToHtml } from "mammoth";
+export default {
+ components: {
+ limsTable,
+ },
+ data() {
+ return {
+ tableData: [],
+ column:[
+ {
+ label: '濮旀墭缂栧彿',
+ prop: 'entrustCode'
+ },
+ {
+ label: '鏍峰搧鍚嶇О',
+ prop: 'sample'
+ },
+ {
+ label: '瑙勬牸鍨嬪彿',
+ prop: 'model'
+ },
+ {
+ label: '妫�娴嬮」',
+ prop: 'inspectionItem'
+ },
+ {
+ label: '妫�娴嬪瓙椤�',
+ prop: 'inspectionItemSubclass'
+ },
+ {
+ label: '妫�娴嬬粨鏋�',
+ prop: 'lastValue'
+ },
+ {
+ label: '澶勭悊鎰忚',
+ prop: 'handleSuggestion'
+ },
+ {
+ label: '妫�楠屼汉',
+ prop: 'name'
+ }
+ ],
+ tableLoading: false,
+ page: {
+ current: 1,
+ size: 20,
+ total: 0,
+ },
+ entity: {
+ sample: null,
+ model: null,
+ },
+ entityCopy: {},
+ upIndex: 0,
+ statusList: [],
+ };
+ },
+ mounted() {
+ this.entityCopy = this.HaveJson(this.entity);
+ this.refreshTable();
+ },
+ created() {
+ this.getTableHeight();
+ },
+ methods: {
+ // 琛ㄦ牸鍚堝苟
+ spanMethod({row,column,rowIndex,columnIndex}) {
+ // 闇�瑕佸悎骞剁殑鍒�
+ const needSpan = [1]
+ if(needSpan.includes(columnIndex)) {
+ // 濡傛灉鏄涓�琛� 鎴栬�� 褰撳墠琛岀殑鍊煎拰涓婁竴琛岀殑鍊间笉涓�鏍� 灏辫寮�濮嬭繘琛岃绠楀悎骞�
+ if(rowIndex == 0 || row.entrustCode != this.tableData[rowIndex -1 ].entrustCode) {
+ // 鍚戜笅鎵惧埌鍜屽綋鍓嶈涓嶄竴鏍风殑琛屾暟
+ let rowSpan = 1;
+ while(rowIndex + rowSpan < this.tableData.length && row.entrustCode == this.tableData[rowIndex + rowSpan].entrustCode) {
+ rowSpan++
+ }
+ return [rowSpan,1]
+ }else {
+ // 濡傛灉鍜屼笂涓�琛岀殑鍊间竴鏍� 灏遍殣钘�
+ return [0,0]
+ }
+ }else{
+ return [1,1]
+ }
+ },
+ getTableHeight() {
+ this.tableHeight = window.innerHeight - 50 - 46 - 60 - 80 - 30 - 30 - 32;
+ },
+ getData() {
+ this.tableLoading = true;
+ pageInsUnPass({
+ current: this.page.current,
+ size: this.page.size,
+ model: this.entity.model,
+ sample: this.entity.sample,
+ }).then((res) => {
+ this.tableLoading = false;
+ this.tableData = res.data.records;
+ this.page.total = res.data.total;
+ });
+ },
+ pagination({page,limit}) {
+ this.page.current = page;
+ this.page.size = limit;
+ this.getData();
+ },
+
+ refreshTable() {
+ this.getData();
+ },
+ refresh() {
+ this.entity = this.HaveJson(this.entityCopy);
+ this.upIndex++;
+ this.$nextTick(() => {
+ this.getData();
+ });
+ },
+ },
+};
+</script>
--
Gitblit v1.9.3