From 9b187951742c4a792d6a70418a9a6f6a3d458ed4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 三月 2025 14:31:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/costStatistics/index.vue | 31 ++++++++++++++-
src/views/business/costStatistics/components/viewInfoDia.vue | 70 +++++++++++++++++++++++++++++++++++
2 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/src/views/business/costStatistics/components/viewInfoDia.vue b/src/views/business/costStatistics/components/viewInfoDia.vue
new file mode 100644
index 0000000..63269f3
--- /dev/null
+++ b/src/views/business/costStatistics/components/viewInfoDia.vue
@@ -0,0 +1,70 @@
+<template>
+ <div>
+ <el-dialog title="璇︽儏" :visible.sync="viewInfoDia" width="1000px">
+ <limsTable :tableData="tableData" :column="column"
+ height="600" @pagination="pagination"
+ :page="page" :tableLoading="tableLoading"></limsTable>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import limsTable from "@/components/Table/lims-table.vue";
+import {selectRatesDetail} from "@/api/business/insOrderRates";
+export default {
+ name: '',
+ // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
+ components: { limsTable },
+ data() {
+ // 杩欓噷瀛樻斁鏁版嵁
+ return {
+ tableData: [],
+ column: [
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: 160 },
+ {label: '妫�楠岄」鍒嗙被', prop: 'inspectionItemClass', width: 160},
+ {label: '妫�楠岄」', prop: 'inspectionItem', width: 160},
+ {label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass', width: 160},
+ { label: '鏀惰垂鏍囧噯(鍏�/娆�)', prop: 'rates' },
+ ],
+ viewInfoDia: false,
+ tableLoading: false,
+ page: {
+ current: 1,
+ size: 10,
+ total: 0
+ },
+ info: {}
+ };
+ },
+ mounted() {
+
+ },
+ // 鏂规硶闆嗗悎
+ methods: {
+ openDia(row) {
+ this.viewInfoDia = true
+ this.info = this.HaveJson(row)
+ this.page.current = 1
+ this.page.size = 10
+ this.getList();
+ },
+ getList() {
+ this.tableLoading = true;
+ selectRatesDetail({insOrderId: this.info.id, ...this.page}).then(res => {
+ this.tableLoading = false;
+ this.tableData = res.data.records;
+ this.page.total = res.data.total;
+ }).catch(err => {
+ this.tableLoading = false;
+ })
+ },
+ pagination(page) {
+ this.page.size = page.limit;
+ this.getList();
+ },
+ }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/business/costStatistics/index.vue b/src/views/business/costStatistics/index.vue
index 6243ee8..98cf152 100644
--- a/src/views/business/costStatistics/index.vue
+++ b/src/views/business/costStatistics/index.vue
@@ -1,4 +1,5 @@
<template>
+<!-- 璐圭敤缁熻椤甸潰-->
<div class="capacity-scope">
<div class="search">
<div>
@@ -27,16 +28,18 @@
:height="'calc(100vh - 250px)'" @pagination="pagination"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
+ <viewInfoDia ref="viewInfoDia" v-if="viewInfoDia"></viewInfoDia>
</div>
</template>
<script>
import limsTable from "@/components/Table/lims-table.vue";
+import viewInfoDia from "./components/viewInfoDia.vue";
import {selectRatesPage} from "@/api/business/insOrderRates";
import {selectCustomPageList} from "@/api/system/customer";
export default {
- components: {limsTable},
+ components: {limsTable,viewInfoDia},
data() {
return {
entity: {
@@ -54,14 +57,29 @@
{ label: '濮旀墭浜�', prop: 'prepareUser' },
{ label: '鐢熶骇鍗曚綅', prop: 'production' },
{ label: '宸ョ▼鍚嶇О', prop: 'engineering' },
- { label: '宸ユ椂', prop: 'cost' }
+ { label: '宸ユ椂', prop: 'cost' },
+ {
+ dataType: "action",
+ fixed: "right",
+ label: "鎿嶄綔",
+ operation: [
+ {
+ name: "鏌ョ湅璇︽儏",
+ type: "text",
+ clickFun: (row) => {
+ this.openDia(row)
+ },
+ },
+ ],
+ }
],
page: {
total: 0,
size: 10,
current: 1
},
- companyOptions: []
+ companyOptions: [],
+ viewInfoDia: false
}
},
mounted() {
@@ -106,6 +124,13 @@
this.page.size = page.limit
this.refreshTable()
},
+ // 鏌ョ湅璇︽儏
+ openDia (row) {
+ this.viewInfoDia = true
+ this.$nextTick(() => {
+ this.$refs.viewInfoDia.openDia(row)
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3