From 66b3c4c129b05b634d37ac7eac63eff0f0b9f426 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 27 二月 2025 10:11:52 +0800
Subject: [PATCH] 修改体系管理要求bug
---
src/views/CNAS/process/sampleDisposal/index.vue | 238 +++++++++++++++++++++++++++-------------------------------
1 files changed, 111 insertions(+), 127 deletions(-)
diff --git a/src/views/CNAS/process/sampleDisposal/index.vue b/src/views/CNAS/process/sampleDisposal/index.vue
index 705000e..0d12c66 100644
--- a/src/views/CNAS/process/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/sampleDisposal/index.vue
@@ -1,20 +1,11 @@
<template>
<div class="sample-disposal">
- <el-row class="title">
- <el-col :span="20" style="padding-left: 20px;text-align: left;">妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�</el-col>
- <el-col :span="4" style="text-align: right;">
- <!-- <el-button size="medium" type="primary" @click="handleDown" v-loading="outLoading" style="margin-right: 16px;">瀵煎嚭</el-button> -->
- </el-col>
- </el-row>
<el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="queryParams.totaldealId = ''">
<el-tab-pane label="濉啓" name="濉啓" style="height: 100%;" :key="1">
- <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;"
- v-if="addPower">鏂板</el-button>
+ <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;">鏂板</el-button>
<div class="table" style="height: calc(100% - 200px)" v-if="activeName == '濉啓'">
<lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading"
:height="'calc(100vh - 290px)'" :page="page" @pagination="pagination"></lims-table>
- <!-- <ValueTable ref="ValueTable0" :url="$api.processTotaldeal.pageProcessDeal" :componentData="componentData0"
- :key="upIndex0" :delUrl="$api.processTotaldeal.delProcessDeal" /> -->
</div>
</el-tab-pane>
<el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;" :key="2">
@@ -22,7 +13,7 @@
<div class="search_thing">
<div class="search_label">骞存湀锛�</div>
<div class="search_input">
- <el-date-picker v-model="componentData.entity.month" type="month" placeholder="閫夋嫨鏈�" format="yyyy-MM"
+ <el-date-picker v-model="queryParams0.month" type="month" placeholder="閫夋嫨鏈�" format="yyyy-MM"
value-format="yyyy-MM" size="small" @change="refreshTable()">
</el-date-picker>
</div>
@@ -33,8 +24,8 @@
</div>
</div>
<div class="table">
- <!-- <ValueTable ref="ValueTable" :url="$api.processTotaldeal.pageProcessTotaldeal" :componentData="componentData"
- :key="upIndex" /> -->
+ <lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading"
+ :height="'calc(100vh - 300px)'" :page="page0" @pagination="pagination0"></lims-table>
</div>
</el-tab-pane>
</el-tabs>
@@ -122,6 +113,7 @@
checkProcessTotaldeal,
ratifyProcessTotaldeal,
delProcessDeal,
+ pageProcessTotaldeal,
} from "@/api/cnas/process/sampleDisposal";
export default {
components: {
@@ -142,105 +134,6 @@
noCheckLoading: false,
checkLoading: false,
// 鍘嗗彶鍒楄〃
- componentData: {
- entity: {
- month: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [{
- id: 'handleLook',
- font: '鏌ョ湅',
- type: 'text',
- method: 'handleLook',
- }, {
- id: 'handleDown0',
- font: '涓嬭浇',
- type: 'text',
- method: 'handleDown0',
- disabFun: (row, index) => {
- return !row.url
- }
- },
- // {
- // id: 'handleAdd',
- // font: '濉啓',
- // type: 'text',
- // method: 'handleAdd',
- // disabFun: (row, index) => {
- // return row.submitState=='宸叉彁浜�'
- // }
- // },
- {
- id: 'handleSubmit',
- font: '鎻愪氦',
- type: 'text',
- method: 'handleSubmit',
- disabFun: (row, index) => {
- return !!row.submitState && row.submitState != '寰呮彁浜�'
- }
- }, {
- id: 'handleCheck',
- font: '瀹℃牳',
- type: 'text',
- method: 'handleCheck',
- disabFun: (row, index) => {
- return row.examineState == '閫氳繃' || row.submitState == '寰呮彁浜�'
- }
- }, {
- id: 'handleApproval',
- font: '鎵瑰噯',
- type: 'text',
- method: 'handleApproval',
- disabFun: (row, index) => {
- return row.ratifyState == '閫氳繃' || row.submitState == '寰呮彁浜�'
- }
- }],
- tagField: {},
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- needSort: [],
- inputType: ''
- },
- // 鏍峰搧鍒楄〃
- componentData0: {
- entity: {
- totaldealId: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [{
- id: 'handleAdd0',
- font: '淇敼',
- type: 'text',
- method: 'handleAdd0'
- }, {
- id: 'delete',
- font: '鍒犻櫎',
- type: 'text',
- method: 'doDiy'
- }],
- tagField: {},
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- needSort: [],
- inputType: ''
- },
- upIndex0: 100,
- entityCopy: {},
- upIndex: 0,
addInfo: {},//鏂板鏍峰搧
customPageList: [],
currentInfo: {
@@ -285,12 +178,81 @@
current: 0,
},
tableLoading: false,
+ queryParams0: {},
+ tableData0: [],
+ column0: [
+ { label: "鏈堜唤", prop: "month" },
+ { label: "鎬绘暟閲�", prop: "totalNum" },
+ { label: "鎻愪氦浜�", prop: "submitUserName" },
+ { label: "瀹℃牳浜�", prop: "examineUserName" },
+ { label: "鎵瑰噯浜�", prop: "ratifyUserName" },
+ {
+ dataType: "action",
+ fixed: "right",
+ label: "鎿嶄綔",
+ operation: [
+ {
+ name: "鏌ョ湅",
+ type: "text",
+ clickFun: (row) => {
+ this.handleLook(row);
+ },
+ },
+ {
+ name: "涓嬭浇",
+ type: "text",
+ clickFun: (row) => {
+ this.handleDown0(row);
+ },
+ disabled: (row) => {
+ return !row.url
+ }
+ },
+ {
+ name: "鎻愪氦",
+ type: "text",
+ clickFun: (row) => {
+ this.handleSubmit(row);
+ },
+ disabled: (row) => {
+ return !!row.submitState && row.submitState != '寰呮彁浜�'
+ }
+ },
+ {
+ name: "瀹℃牳",
+ type: "text",
+ clickFun: (row) => {
+ this.handleCheck(row);
+ },
+ disabled: (row) => {
+ return row.examineState == '閫氳繃' || row.submitState == '寰呮彁浜�'
+ }
+ },
+ {
+ name: "鎵瑰噯",
+ type: "text",
+ clickFun: (row) => {
+ this.handleApproval(row);
+ },
+ disabled: (row) => {
+ return row.ratifyState == '閫氳繃' || row.submitState == '寰呮彁浜�'
+ }
+ },
+ ],
+ },
+ ],
+ page0: {
+ total: 0,
+ size: 10,
+ current: 0,
+ },
};
},
mounted() {
// this.entityCopy = this.HaveJson(this.componentData.entity);
this.getCustomPageList()
- // this.getPower()
+ this.getList()
+ this.getList0()
},
methods: {
getPower() {
@@ -364,13 +326,34 @@
this.getList();
},
refresh() {
- this.queryParams = {};
- this.page.current = 1;
- this.getList();
+ this.queryParams0 = {};
+ this.page0.current = 1;
+ this.getList0();
},
refreshTable() {
- this.page.current = 1;
- this.getList();
+ this.page0.current = 1;
+ this.getList0();
+ },
+ getList0() {
+ this.tableLoading = true;
+ let param = { ...this.queryParams0, ...this.page };
+ delete param.total;
+ pageProcessTotaldeal({ ...param })
+ .then((res) => {
+ this.tableLoading = false;
+ if (res.code === 200) {
+ this.tableData0 = res.data.records;
+ this.page0.total = res.data.total;
+ }
+ })
+ .catch((err) => {
+ this.tableLoading = false;
+ });
+ },
+ pagination0({ page, limit }) {
+ this.page0.current = page;
+ this.page0.size = limit;
+ this.getList0();
},
// 濉啓
// handleAdd(row){
@@ -404,7 +387,8 @@
type: 'success',
message: '缂栬緫鎴愬姛!'
});
- this.$refs.ValueTable0.selectList()
+ this.page.current = 0;
+ this.getList();
}).catch(err => { });
} else {
// 鏂板
@@ -420,7 +404,8 @@
type: 'success',
message: '鏂板鎴愬姛!'
});
- this.$refs.ValueTable0.selectList()
+ this.page.current = 0;
+ this.getList();
}).catch(err => { });
}
},
@@ -439,7 +424,7 @@
type: 'success',
message: '鎻愪氦鎴愬姛!'
});
- this.$refs['ValueTable'].selectList()
+ this.refreshTable()
}).catch(err => { });
})
},
@@ -451,7 +436,8 @@
this.activeName = '濉啓'
this.queryParams.totaldealId = row.id
this.$nextTick(() => {
- this.$refs['ValueTable0'].selectList()
+ this.page.current = 0;
+ this.getList();
})
},
commonFun(row, callbanck) {
@@ -461,8 +447,8 @@
current: -1,
size: -1, ...this.queryParams
}).then(res => {
- this.currentInfo.arr = res.data.body.records
this.lookDialogVisible = true
+ this.currentInfo.arr = res.data.records
if (callbanck) {
callbanck()
}
@@ -497,7 +483,7 @@
type: 'success',
message: '鎿嶄綔鎴愬姛!'
});
- this.$refs['ValueTable'].selectList()
+ this.refreshTable()
this.lookDialogVisible = false
}).catch(err => { });
} else if (this.title0 == '鎵瑰噯') {
@@ -512,7 +498,7 @@
type: 'success',
message: '鎿嶄綔鎴愬姛!'
});
- this.$refs['ValueTable'].selectList()
+ this.refreshTable()
this.lookDialogVisible = false
}).catch(err => { });
}
@@ -574,7 +560,6 @@
.table {
background-color: #fff;
- width: calc(100% - 40px);
height: calc(100% - 60px - 140px);
padding: 20px;
}
@@ -586,7 +571,6 @@
.tables {
table-layout: fixed;
width: 100%;
- margin-top: 10px;
}
.tables td {
--
Gitblit v1.9.3