Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-03-13 9b187951742c4a792d6a70418a9a6f6a3d458ed4

Merge remote-tracking branch 'origin/dev' into dev

 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>

 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>