From da614b00cc2b6721a6deadeb51f278d5a17f732e Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 04 三月 2025 09:56:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/standard/model/index.vue | 90 +++++++++++---------------------------------
1 files changed, 23 insertions(+), 67 deletions(-)
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index e3bf16c..ab46ae4 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%" :modal-append-to-body="false">
+ <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>
@@ -109,8 +62,8 @@
delStandardTemplate,
getEditTemplatePreparation,
} from "@/api/standard/model";
-import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
export default {
+ name: 'Model',
components: {
Excel,
limsTable,
@@ -153,14 +106,13 @@
dataType: "action",
fixed: "right",
label: "鎿嶄綔",
- width: "320px",
operation: [
{
name: "缂栬緫",
type: "text",
clickFun: (row) => {
this.title = "缂栬緫";
- this.copyForm = row;
+ this.copyForm = this.HaveJson(row);
this.isShowCopyTem = true;
},
showHide: (row) => {
@@ -217,7 +169,6 @@
this.getList();
},
methods: {
- checkPermi,
getList() {
this.tableLoading = true;
let param = { ...this.queryParams, ...this.page };
@@ -340,7 +291,7 @@
this.refreshTable("page");
});
})
- .catch(() => {});
+ .catch(() => { });
},
templateWrite(row) {
getEditTemplatePreparation({ id: row.id }).then((res) => {
@@ -348,7 +299,7 @@
return;
}
this.row = row;
- this.row.thing = res.msg;
+ this.row.thing = res.data;
this.isShow = true;
});
},
@@ -364,7 +315,7 @@
.then(() => {
this.closed();
})
- .catch(() => {});
+ .catch(() => { });
},
closed() {
this.loading = true;
@@ -433,6 +384,10 @@
</script>
<style scoped>
+/* >>>.el-dialog__wrapper {
+ z-index: 100 !important;
+} */
+
.search {
background-color: #fff;
height: 80px;
@@ -456,6 +411,7 @@
.search_input {
width: calc(100% - 110px);
}
+
.btn {
position: absolute;
right: 14px;
--
Gitblit v1.9.3