From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/process/sampleDisposal/index.vue | 126 +++++------------------------------------
1 files changed, 17 insertions(+), 109 deletions(-)
diff --git a/src/views/CNAS/process/sampleDisposal/index.vue b/src/views/CNAS/process/sampleDisposal/index.vue
index c534d45..6ad90f6 100644
--- a/src/views/CNAS/process/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/sampleDisposal/index.vue
@@ -2,29 +2,27 @@
<div class="capacity-scope">
<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;">鏂板</el-button>
+ <el-button size="small" type="primary" @click="handleAdd0" style="margin-bottom: 10px">鏂板</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>
+ key="tableData" :height="'calc(100vh - 290px)'" :page="page" @pagination="pagination"></lims-table>
</div>
</el-tab-pane>
<el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;" :key="2">
- <div class="search">
- <div class="search_thing">
- <div class="search_label">骞存湀锛�</div>
- <div class="search_input">
- <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>
- </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>
+ <el-form :model="queryParams0" ref="queryParams0" size="small" :inline="true">
+ <el-form-item label="骞存湀" prop="month">
+ <el-date-picker v-model="queryParams0.month" type="month" placeholder="閫夋嫨鏈�" format="yyyy-MM"
+ value-format="yyyy-MM" size="small" @change="refreshTable()">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
<div class="table">
<lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading"
+ key="tableData0"
:height="'calc(100vh - 300px)'" :page="page0" @pagination="pagination0"></lims-table>
</div>
</el-tab-pane>
@@ -116,11 +114,11 @@
pageProcessTotaldeal,
} from "@/api/cnas/process/sampleDisposal";
export default {
+ name: 'SampleDisposal',
components: {
limsTable,
filePreview,
},
- name: "SampleDisposal",
data() {
return {
activeName: '濉啓',
@@ -249,51 +247,11 @@
};
},
mounted() {
- // this.entityCopy = this.HaveJson(this.componentData.entity);
this.getCustomPageList()
this.getList()
this.getList0()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let out = false
- let submitProcessTotaldeal = false
- let checkProcessTotaldeal = false
- let ratifyProcessTotaldeal = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addProcessDeal') {
- add = true
- }
- // if (power[i].menuMethod == 'exportProcessEvaluate') {
- // out = true
- // }
- if (power[i].menuMethod == 'submitProcessTotaldeal') {
- submitProcessTotaldeal = true
- }
- if (power[i].menuMethod == 'checkProcessTotaldeal') {
- checkProcessTotaldeal = true
- }
- if (power[i].menuMethod == 'ratifyProcessTotaldeal') {
- ratifyProcessTotaldeal = true
- }
- }
- if (!ratifyProcessTotaldeal) {
- this.componentData.do.splice(4, 1)
- }
- if (!checkProcessTotaldeal) {
- this.componentData.do.splice(3, 1)
- }
- if (!submitProcessTotaldeal) {
- this.componentData.do.splice(2, 1)
- }
- if (!add) {
- this.componentData0.do.splice(1, 1)
- this.componentData0.do.splice(0, 1)
- }
- this.addPower = add
- },
// 鑾峰彇閫佹牱鍗曚綅鍒楄〃
getCustomPageList() {
selectCustomPageList({
@@ -381,7 +339,6 @@
...this.addInfo
}).then(res => {
this.addLoading = false
- if (res.code === 201) return
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -398,7 +355,6 @@
...this.addInfo
}).then(res => {
this.addLoading = false
- if (res.code === 201) return
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -419,7 +375,6 @@
submitProcessTotaldeal({
id: row.id
}).then(res => {
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎻愪氦鎴愬姛!'
@@ -430,13 +385,10 @@
},
// 鏌ョ湅
handleLook(row) {
- // console.log(row)
- // this.title0 = '鏌ョ湅'
- // this.commonFun(row)
this.activeName = '濉啓'
this.queryParams.totaldealId = row.id
this.$nextTick(() => {
- this.page.current = 0;
+ this.page.current = 1;
this.getList();
})
},
@@ -478,7 +430,6 @@
}).then(res => {
this.checkLoading = false
this.noCheckLoading = false
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎿嶄綔鎴愬姛!'
@@ -493,7 +444,6 @@
}).then(res => {
this.checkLoading = false
this.noCheckLoading = false
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎿嶄綔鎴愬姛!'
@@ -510,7 +460,7 @@
return
}
// 鍚庣涓嬭浇
- this.$download.downloadFileFromUrl(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
+ this.$download.saveAs(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
},
handleDelete(row) {
this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
@@ -520,7 +470,6 @@
})
.then(() => {
delProcessDeal({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.page.current = 0;
this.getList();
@@ -533,19 +482,6 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
-.search {
- background-color: #fff;
- height: 40px;
- display: flex;
- align-items: center;
- position: relative;
-}
-
.search_thing {
width: 350px;
display: flex;
@@ -562,19 +498,8 @@
width: calc(100% - 110px);
}
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 140px);
- padding: 20px;
-}
-
.downPdf {
opacity: 0 !important;
-}
-
-.tables {
- table-layout: fixed;
- width: 100%;
}
.tables td {
@@ -584,23 +509,6 @@
font-size: 14px;
word-wrap: break-word;
white-space: normal;
-}
-
-.en {
- font-size: 12px;
- word-break: break-word;
- /* 鑷姩鏂 */
- overflow-wrap: break-word;
- /* 闃叉婧㈠嚭 */
- white-space: normal;
- /* 榛樿鎹㈣ */
-}
-
-.user-info {
- display: flex;
- align-items: center;
- justify-content: space-evenly;
- margin-top: 20px;
}
.user-info .el-button {
--
Gitblit v1.9.3