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

chenrui

2025-03-13 3268451493960900a913befafe760729061f38e8

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

 src/api/business/productOrder.js

@@ -22,7 +22,7 @@
  return request({
    url: '/insOrder/rawAllInsOrderExport',
    method: 'get',
    data: query,
    params: query,
    responseType: "blob"
  })
}

 src/api/cnas/personal/personalList.js

@@ -45,7 +45,7 @@
// åˆ é™¤éƒ¨é—¨
export function delDepartmentLims(query) {
  return request({
    url: "/department/delDepartmentLims",
    url: "/personBasicInfo/delDepartmentLims",
    method: "delete",
    params: query
  });
@@ -53,7 +53,7 @@
// æ·»åŠ éƒ¨é—¨
export function addDepartmentLims(query) {
  return request({
    url: "/department/addDepartmentLims",
    url: "/personBasicInfo/addDepartmentLims",
    method: "post",
    data: query
  });

 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>

 src/views/business/inspectionReview/index.vue

@@ -374,6 +374,7 @@
/*      if (!row.tempUrlPdf) return this.$message.warning('文件未上传')
      this.currentInfo = row
      this.lookDialogVisible = true*/
      console.log(this.javaApi)
      this.currentInfo = row;
      let fileName = row.url
      let fileType = "docx"

 src/views/business/inspectionTask/index.vue

@@ -246,6 +246,8 @@
    <edit-inspection-item ref="editInspectionItem"></edit-inspection-item>
    <!--查看工时弹框-->
    <viewManHourDia ref="viewManHourDia"></viewManHourDia>
    <!--不合格复测查看弹框-->
    <un-pass-retest-result v-if="retestVisible" :retestInfo="retestInfo" :retestVisible="retestVisible" @closeRetestLook="closeRetestLook"></un-pass-retest-result>
  </div>
</template>

@@ -254,6 +256,7 @@
import EditInspectionItem from "./components/EditInspectionItem.vue";
import limsTable from "@/components/Table/lims-table.vue";
import viewManHourDia from "./components/viewManHourDia.vue"
import UnPassRetestResult from "@/components/rawMaterialInspection/unPassRetestResult.vue"
import {
  claimInsOrderPlan,
  upPlanUser2,
@@ -267,12 +270,14 @@
  selectSampleAndProductByOrderId,
} from "@/api/business/inspectionTask.js";
import { mapGetters } from "vuex";
import {getRetestResult} from "@/api/business/rawMaterialOrder";
export default {
  name: 'InspectionTask',
  components: {
    EditInspectionItem,
    limsTable,
    viewManHourDia
    viewManHourDia,
    UnPassRetestResult
  },
  dicts: ["urgency_level", "inspection_task_state"],
  computed: {
@@ -569,6 +574,16 @@
          label: "操作",
          operation: [
            {
              name: "不合格复测查看",
              type: "text",
              clickFun: (row) => {
                this.getRetestResultInfo(row);
              },
              disabled: (row) => {
                return row.insResult!=0
              },
            },
            {
              name: "检验项绑定",
              type: "text",
              clickFun: (row) => {
@@ -592,6 +607,7 @@
      },
      lookTableLoading: false,
      // æ•°æ®æŸ¥çœ‹ç›¸å…³å­—段---结束
      retestVisible: false,
    };
  },
  mounted() {
@@ -928,6 +944,16 @@
        this.personList = data;
      });
    },
    // æŸ¥çœ‹ä¸åˆæ ¼å¤æµ‹ç»“æžœ
    getRetestResultInfo (row) {
      getRetestResult({insProductId: row.insProductId}).then(res => {
        this.retestVisible = true
        this.retestInfo = res.data
      })
    },
    closeRetestLook () {
      this.retestVisible = false
    },
    // ç»‘定检验项绑定
    getBinding(row) {
      this.bindCurrentInfo = row;

 src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue

@@ -90,7 +90,7 @@
                this.getRetestResult(row);
              },
              disabled: (row, index) =>  {
                return row.insResult!==0
                return row.insResult!=0
              }
            },
          ]

 src/views/business/productOrder/index.vue

@@ -877,7 +877,8 @@
    },
    // å¯¼å‡ºè®°å½•
    downLoad() {
      rawAllInsOrderExport({ ...this.entity }).then(res => {
      const params = { ...this.entity, state: this.tabList[this.tabIndex].value }
      rawAllInsOrderExport({ ...params }).then(res => {
        const blob = new Blob([res], { type: 'application/octet-stream' });
        this.$download.saveAs(blob, '委托检测信息导出.xlsx');
      }).catch(err => {

 src/views/performance/manHour/workTimeManagement.vue

@@ -42,7 +42,7 @@
      </div>
    </div>
    <div style="display: flex; align-items: center; justify-content: space-between">
      <el-radio-group :key="'111'" v-model="currentTable" size="small">
      <el-radio-group :key="'111'" v-model="currentTable" size="small" @change="searchList">
        <el-radio-button label="ValueTable0"> è¾…助工时 </el-radio-button>
        <el-radio-button label="ValueTable1"> äº§é‡å·¥æ—¶ </el-radio-button>
      </el-radio-group>
@@ -505,10 +505,17 @@
    this.getCurrentWeekNumber();
    this.collectWorkingHours();
    this.selectshiftByUser();
    this.getList();
    this.getList0();
    this.searchList()
  },
  methods: {
    searchList() {
      if (this.currentTable == 'ValueTable0') {
        this.getList();
      } else {
        this.getList0();
      }
    },
    // æŸ¥è¯¢è¾…助工时列表
    getList(entity) {
      this.tableLoading = true;
      let param = {};
@@ -531,6 +538,7 @@
          this.tableLoading = false;
        });
    },
    // æŸ¥è¯¢äº§é‡å·¥æ—¶åˆ—表
    getList0(entity) {
      this.tableLoading = true;
      let param = {};