Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/views/business/productOrder/components/addInspectionDia.vue

@@ -7,6 +7,7 @@
      title="添加检验项"
      width="80%">
      <el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
                :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
                max-height="400px" tooltip-effect="dark">
        <el-table-column align="center" label="序号" type="index" width="65"></el-table-column>
        <el-table-column align="center" label="样品名称" min-width="100" prop="sample">
@@ -26,9 +27,9 @@
                      size="small"></el-input>
          </template>
        </el-table-column>
        <el-table-column align="center" label="检验标准" min-width="100" prop="standardMethodListId">
        <el-table-column align="center" label="检验标准" min-width="100" prop="standardMethodName">
          <template slot-scope="scope">
            <el-input v-model="scope.row.standardMethodListId" clearable disabled placeholder="不填写则系统自动生成"
            <el-input v-model="scope.row.standardMethodName" clearable disabled placeholder="不填写则系统自动生成"
                      size="small"></el-input>
          </template>
        </el-table-column>
@@ -46,8 +47,8 @@
      title="添加检验项"
      width="90%">
      <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
                max-height="700px" style="margin-bottom: 10px;" tooltip-effect="dark"
                @selection-change="selectProduct">
                :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
                max-height="580px" tooltip-effect="dark" @selection-change="selectProduct">
        <el-table-column type="selection" width="65"></el-table-column>
        <el-table-column label="检验项分类" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
        <el-table-column label="检验项" min-width="140" prop="inspectionItem" show-overflow-tooltip></el-table-column>
@@ -105,6 +106,8 @@
</template>

<script>
import {addOmitOrderProduct, getProductTreeBySampleId, getSampleByOrderId} from "@/api/business/productOrder";

export default {
  name: "addInspectionDia",
  // import 引入的组件需要注入到对象中才能使用
@@ -132,10 +135,7 @@
  methods: {
    getDataList(row) {
      this.dialogVisible = true
      this.$axios.get(this.$api.insOrder.getSampleByOrderId + '?insOrderId=' + row.id).then(res => {
        if (res.code === 201) {
          return
        }
      getSampleByOrderId({insOrderId: row.id}).then(res => {
        this.sampleList = res.data
      })
    },
@@ -143,11 +143,8 @@
      this.itemDialogVisible = true
      this.getProductLoad = true
      this.id=row.id
      this.$axios.get(this.$api.insOrder.getProductTreeBySampleId + '?insSampleId=' + row.id).then(res => {
      getProductTreeBySampleId({insSampleId: row.id}).then(res => {
        this.getProductLoad = false
        if (res.code === 201) {
          return
        }
        this.productList = res.data
      }).catch(err => {
        this.getProductLoad = false
@@ -170,16 +167,8 @@
        type: 'warning'
      }).then(() => {
        this.upLoad = true
        this.$axios.post(this.$api.insOrder.addOmitOrderProduct,{insProductBindingList:this.productListSelected,insSampleId:this.id}, {
          headers: {
            "Content-Type": "application/json"
          },
          noQs: true
        } ).then(res => {
        addOmitOrderProduct({insProductBindingList:this.productListSelected,insSampleId:this.id}).then(res => {
          this.upLoad = false
          if (res.code === 201) {
            return
          }
          this.$message.success('添加成功！')
          this.itemDialogVisible = false
        }).catch(err => {
@@ -188,7 +177,7 @@
      }).catch(() => {
        this.$message({
          type: 'info',
          message: '已取消删除'
          message: '已取消添加'
        });
      });
    },