9-24 加班

XiaoRuby

2023-09-24 abba64c23543cd806ed8864a9a976408618a5f45

 src/components/view/processInspection.vue

@@ -5,8 +5,7 @@
        <el-row>
          <el-col :span="12">过程检验</el-col>
          <el-col :span="12" style="text-align: right;">
            <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
              style="background: #004EA2; ">新增</el-button>
                        <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus" style="background: #004EA2; ">新增</el-button>
            <el-button icon="el-icon-download" size="mini">导出</el-button>
          </el-col>
        </el-row>
@@ -19,18 +18,15 @@
          <el-option :value="0" label="不合格"></el-option>
        </el-select>
        <span>产品名称：</span>
        <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.name"
          placeholder="请输入产品名称"></el-input>
                <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.name" placeholder="请输入产品名称"></el-input>
        <span>工序：</span>
        <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.techfather"
          placeholder="请输入工序"></el-input>
                <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.techfather" placeholder="请输入工序"></el-input>
        <el-button size="mini"><span>重 置</span></el-button>
        <el-button size="mini" @click="searchPro" type="primary" style="background: #004EA2;"><span>查 询</span></el-button>
      </div>
      <div class="content-body">
        <div class="inspectionTable">
          <el-table ref="inspectionTable" height="calc(100vh - 320px)" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{
                    <el-table ref="inspectionTable" height="calc(100vh - 290px)" :cell-style="{ textAlign: 'center' }" :header-cell-style="{
              border: '0px',
              background: '#f5f7fa',
              color: '#606266',
@@ -39,37 +35,34 @@
            }" border :data="inspectionTable" style="width: 100%">
            <el-table-column type="selection" width="50"> </el-table-column>
            <el-table-column label="序号" type="index" width="60"></el-table-column>
            <el-table-column prop="order_number" label="订单编号" min-width="90" />
            <el-table-column prop="material" label="产品名称" min-width="80" />
            <el-table-column prop="specifications_model" label="规格型号" min-width="60" />
            <el-table-column prop="techfather" label="工序" min-width="70" />
            <el-table-column prop="techname" label="工艺名称" min-width="70" />
            <el-table-column prop="unit" label="单位" min-width="50" />
            <el-table-column prop="quantity" label="数量" min-width="50" />
            <el-table-column prop="createTime" label="报检日期" min-width="60" />
            <el-table-column prop="name" label="报检人" min-width="50" />
            <el-table-column prop="updateTime" label="检测日期" min-width="60" />
            <el-table-column prop="result" label="合格状态" min-width="80">
                        <el-table-column prop="order_number" label="订单编号" min-width="100" />
                        <el-table-column prop="material" label="产品名称" min-width="100" />
                        <el-table-column prop="specifications_model" label="规格型号" min-width="100" />
                        <el-table-column prop="techfather" label="工序" min-width="60" />
                        <el-table-column prop="techname" label="工艺名称" min-width="100" />
                        <el-table-column prop="unit" label="单位" min-width="60" />
                        <el-table-column prop="quantity" label="数量" min-width="60" />
                        <el-table-column prop="createTime" label="报检日期" min-width="110" />
                        <el-table-column prop="name" label="报检人" min-width="80" />
                        <el-table-column prop="updateTime" label="检测日期" min-width="110" />
                        <el-table-column prop="result" label="合格状态" min-width="100">
              <template slot-scope="scope">
                <span style="color: #34BD66;" v-if="scope.row.result == 1">合格</span>
                <span style="color: #E84738;" v-else-if="scope.row.result == 0">不合格</span>
              </template>
            </el-table-column>
            <el-table-column label="操作" min-width="80">
                        <el-table-column label="操作" min-width="150" fixed="right">
              <template slot-scope="scope">
                <el-button type="text" size="small" @click="handleClick(scope.row)" style="margin-left: 0;">详情</el-button>
                <el-button type="text" size="small">查看</el-button>
                <el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;"
                  @click="updateInsInfo(scope.row)">编辑</el-button>
                                <el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;" @click="updateInsInfo(scope.row)">编辑</el-button>
              </template>
            </el-table-column>
          </el-table>
        </div>
        <!-- 分页器 -->
        <div class="pagination">
          <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
            layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal" @size-change="handleSizeChange"
            @current-change="handleCurrentChange" />
                    <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
        </div>
      </div>
    </div>
@@ -82,24 +75,20 @@
            <!-- 点击返回，当前页面值为false -->
            <!-- <el-button type="primary" size="mini" style="background: #004EA2; "
              icon="el-icon-circle-plus-outline">新增</el-button> -->
            <el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back"
              style="background: #004EA2; ">返回</el-button>
                        <el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">返回</el-button>
          </el-col>
        </el-row>
        <el-form :model="processInspectVo" ref="addInspectionform" class="addInspectionform" label-position="right"
          label-width="120px" size="small">
                <el-form :model="processInspectVo" ref="addInspectionform" class="addInspectionform" label-position="right" label-width="120px" size="small">
          <div class="formwrapper">
            <el-row :gutter="230">
              <el-col :span="7">
                <el-form-item label="订单号：">
                  <el-input @blur="selectInfoByOrderId" style="width: 210px;" size="small"
                    v-model="processInspectVo.orderNumber" placeholder="请输入订单号" />
                                    <el-input @blur="selectInfoByOrderId" style="width: 210px;" size="small" v-model="processInspectVo.orderNumber" placeholder="请输入订单号" />
                </el-form-item>
              </el-col>
              <el-col :span="7">
                <el-form-item label="产品名称：">
                  <el-select style="width: 210px;" size="small" @change="selectSample" v-model="processInspectVo.material"
                    placeholder="请选择产品">
                                    <el-select style="width: 210px;" size="small" @change="selectSample" v-model="processInspectVo.material" placeholder="请选择产品">
                    <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name" :value="item.name">
                    </el-option>
                  </el-select>
@@ -107,24 +96,20 @@
              </el-col>
              <el-col :span="7">
                <el-form-item label="产品编码：">
                  <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.materialCode"
                    placeholder="请输入产品编码" />
                                    <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.materialCode" placeholder="请输入产品编码" />
                </el-form-item>
              </el-col>
            </el-row>
            <el-row :gutter="230">
              <el-col :span="7">
                <el-form-item label="规格型号：">
                  <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.specificationsModel"
                    placeholder="请输入规格型号" />
                                    <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.specificationsModel" placeholder="请输入规格型号" />
                </el-form-item>
              </el-col>
              <el-col :span="7">
                <el-form-item label="工序名称：">
                  <el-select @change="changeOptionSoptionSprocesses" v-model="processInspectVo.techfather"
                    placeholder="请选择" style="width: 210px;" size="small">
                    <el-option v-for="item in optionSoptionSprocesses" :key="item.name" :label="item.name"
                      :value="item.name">
                                    <el-select @change="changeOptionSoptionSprocesses" v-model="processInspectVo.techfather" placeholder="请选择" style="width: 210px;" size="small">
                                        <el-option v-for="item in optionSoptionSprocesses" :key="item.name" :label="item.name" :value="item.name">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -132,8 +117,7 @@
              <el-col :span="7">
                <el-form-item label="工艺名称：">
                  <el-select v-model="processInspectVo.techname" placeholder="请选择" style="width: 210px;" size="small">
                    <el-option v-for="item in optionTechnology" :key="item.id" :label="item.name"
                      :value="item.id + '-' + item.name">
                                        <el-option v-for="item in optionTechnology" :key="item.id" :label="item.name" :value="item.id + '-' + item.name">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -142,8 +126,7 @@
            <el-row :gutter="230">
              <el-col :span="7">
                <el-form-item label="单位：">
                  <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.unit"
                    placeholder="请输入单位" />
                                    <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.unit" placeholder="请输入单位" />
                </el-form-item>
              </el-col>
              <el-col :span="7">
@@ -172,21 +155,17 @@
            > -->
          </el-col>
        </el-row>
        <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod"
          height="calc(100vh - 550px)" style="width: 100%">
                <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)" style="width: 100%">
          <el-table-column type="index" label="序号" width="60"></el-table-column>
          <el-table-column label="项目" prop="father"></el-table-column>
          <el-table-column prop="name" label="指标"></el-table-column>
          <el-table-column prop="unit" label="单位"></el-table-column>
          <el-table-column prop="required" label="标准值"></el-table-column>
          <el-table-column prop="internal" label="内测值"></el-table-column>
          <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
            min-width="100" style="text-align: center;">
                    <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值" min-width="100" style="text-align: center;">
            <template slot-scope="scope">
              <el-tooltip :disabled="scope.row.dname != null" class="item" effect="dark" content="请先选择设备！"
                placement="top-start">
                <el-input :disabled="scope.row.dname === null" v-model="scope.row.empiricalValueAddss[index]"
                  @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                            <el-tooltip :disabled="scope.row.dname != null" class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                <el-input :disabled="scope.row.dname === null" v-model="scope.row.empiricalValueAddss[index]" @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
              </el-tooltip>
            </template>
          </el-table-column>
@@ -195,8 +174,7 @@
              <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                scope.row.dname == null ? "请选择" : scope.row.dname
              }}</el-button>
              <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
                v-model="filterText" placeholder="请选择">
                            <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="请选择">
                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                </el-option>
              </el-select>
@@ -245,12 +223,12 @@
</template>

<script>
import processInspectionUpdate from '../view/processInspectionUpdate.vue'
import processInspectionLook from '../view/processInspectionLook.vue'
import processInspectionUpdate from "../view/processInspectionUpdate.vue";
import processInspectionLook from "../view/processInspectionLook.vue";
export default {
  components: {
    processInspectionUpdate,
    processInspectionLook
        processInspectionLook,
  },
  data() {
    return {
@@ -264,7 +242,7 @@
        pageSize: 1,
        result: "", // 检测状态
        name: "", // 产品名称
        techfather: "" // 工序
                techfather: "", // 工序
      },
      optionsSamplename: [],
      inspectionTable: [],
@@ -289,7 +267,7 @@
        techfather: null,
        techname: null,
        technologyId: null,
        unit: null
                unit: null,
      },
      InspectioniD: null,
      addInspectionform: [
@@ -305,9 +283,9 @@
          quantity: "",
          group: "",
          worker: "",
          machine: ""
        }]
      ,
                    machine: "",
                },
            ],
      inspectionItems: [], // 新增检验项目表格
      inspectionResultForm: [
        {
@@ -315,8 +293,8 @@
          name: "",
          inspecter: "",
          conclusion: "",
          operation: ""
        }
                    operation: "",
                },
      ],
      options: [],
      value: "",
@@ -330,16 +308,16 @@
      defaultProps: {
        // 设备树数据设置
        children: "children",
        label: "name"
                label: "name",
      },
      nodeData: {
        id: 0,
        name: null
                name: null,
      }, // node点击保存当前点击数据
      clickSelectDevice: {
        index: null, // 点击选择存储当前行索引
        rpId: null // 点击选择存储当前行项目Id
      }
                rpId: null, // 点击选择存储当前行项目Id
            },
    };
  },
  watch: {
@@ -353,29 +331,29 @@
  },
  methods: {
    handleClick(row) {
      this.rowInfp = row
      this.showLook = true
            this.rowInfp = row;
            this.showLook = true;
    },
    combackIndex() {
      this.showAddPage = false
      this.defaultInitializationTable()
            this.showAddPage = false;
            this.defaultInitializationTable();
    },
    updateInsInfo(row) {
      this.rowInfp = row
      this.showUp = true
            this.rowInfp = row;
            this.showUp = true;
    },
    combackMain(val) {
      this.showUp = false
      this.showLook = false
            this.showUp = false;
            this.showLook = false;
      this.defaultInitializationTable(); // 初始化表格数据
      if (val) {
        this.$parent.removeAllTab()
                this.$parent.removeAllTab();
      }
    },
    searchPro() {
      this.search.countSize = this.pageSize
      this.search.pageSize = this.currentPage
      this.defaultInitializationTable()
            this.search.countSize = this.pageSize;
            this.search.pageSize = this.currentPage;
            this.defaultInitializationTable();
    },
    // 点击设备树保存点击记录
    nodeClick(data) {
@@ -388,65 +366,69 @@
    },
    // 获取设备树内容
    getOptions(row) {
      this.$axios.get(this.$api.url.inspectionItemChooseDev, {
            this.$axios
                .get(this.$api.url.inspectionItemChooseDev, {
        params: {
          father: row.father,
          name: row.name,
          technologyId: this.processInspectVo.technologyId
        }
      }).then(res => {
                        technologyId: this.processInspectVo.technologyId,
                    },
                })
                .then((res) => {
        this.materialOptions = res.data;
        if (this.materialOptions.length === 1) {
          this.$message({
            message: '该项目下只有一个试验设备，无需选择！',
            type: 'warning'
                            message: "该项目下只有一个试验设备，无需选择！",
                            type: "warning",
          });
          return
                        return;
        }
        row.isSelectDevice = true
        this.filterText = row.did
                    row.isSelectDevice = true;
                    this.filterText = row.did;
      });
    },
    // 点击表格选择触发
    clickTableSelect(scope) {
      // this.centerDialogVisible = true;
      if (this.clickSelectDevice.index != null) {
        this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
                this.$set(
                    this.inspectionItems[this.clickSelectDevice.index],
                    "isSelectDevice",
                    false
                );
      }
      this.clickSelectDevice.index = scope.$index;
      this.clickSelectDevice.rpId = scope.row.id;
      this.getOptions(scope.row)
            this.getOptions(scope.row);
    },
    // 点击树里面的确定
    clickNodeSure() {
      let select = this.materialOptions.filter(item => {
        return item.id === this.filterText
      })[0]
      this.nodeData.id = select.id
      this.nodeData.name = select.device
            let select = this.materialOptions.filter((item) => {
                return item.id === this.filterText;
            })[0];
            this.nodeData.id = select.id;
            this.nodeData.name = select.device;
      if (this.detailId == null) {
        this.inspectionItems[
          this.clickSelectDevice.index
        ].did = this.nodeData.id;
        this.inspectionItems[
          this.clickSelectDevice.index
        ].dname = this.nodeData.name;
                this.inspectionItems[this.clickSelectDevice.index].did =
                    this.nodeData.id;
                this.inspectionItems[this.clickSelectDevice.index].dname =
                    this.nodeData.name;
        this.centerDialogVisible = false;
      } else {
        this.$axios
          .post(this.$api.url.inspectionItemUpdateDevByInsId, {
            id: this.clickSelectDevice.rpId,
            type: 1,
            devId: this.nodeData.id
                        devId: this.nodeData.id,
          })
          .then(res => {
            this.getTableData()
                    .then((res) => {
                        this.getTableData();
            this.centerDialogVisible = false;
          });
      }
    },
    changeState(row, index) {
      if (row.did != null && row.did != '') {
            if (row.did != null && row.did != "") {
        // let val = row.empiricalValueAddss.filter(item => {
        //   return item != '' && item != null
        // })
@@ -460,34 +442,44 @@
        //   });
        //   return
        // }
        let str = ""
        row.empiricalValueAddss.forEach(e => {
          str += e + ","
        })
        if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
          return
                let str = "";
                row.empiricalValueAddss.forEach((e) => {
                    str += e + ",";
                });
                if (
                    str.slice(0, -1) === "" ||
                    str.slice(0, -1) === null ||
                    str.slice(0, -1) === undefined
                ) {
                    return;
        }
        this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                this.$axios
                    .post(
                        this.$api.url.inspectionItemlose_focus_update,
                        {
          deviceId: row.did,
          inspectionItemId: row.id,
          inspectionValue: str.slice(0, -1)
        }, {
          headers: { "Content-Type": "application/json" }
        }).then(res => {
          if (res.message === '内控值输入格式有问题!') {
                            inspectionValue: str.slice(0, -1),
                        },
                        {
                            headers: { "Content-Type": "application/json" },
                        }
                    )
                    .then((res) => {
                        if (res.message === "内控值输入格式有问题!") {
            this.$message({
              message: res.message,
              type: 'warning'
                                type: "warning",
            });
            return
                            return;
          }
          row.result = res.data.result
          row.username = res.data.username
        })
                        row.result = res.data.result;
                        row.username = res.data.username;
                    });
      } else {
        this.$message({
          message: '请选择择设备！',
          type: 'warning'
                    message: "请选择择设备！",
                    type: "warning",
        });
      }
    },
@@ -502,29 +494,32 @@
        const _col = _row > 0 ? 1 : 0;
        return {
          rowspan: _row,
          colspan: _col
        }
                    colspan: _col,
                };
      }
      if (columnIndex === 1) {
        const _row = this.spanArr[rowIndex];
        const _col = _row > 0 ? 1 : 0;
        return {
          rowspan: _row,
          colspan: _col
        }
                    colspan: _col,
                };
      }
    },
    // 合并表格
    mergeTable() {
      this.rowList = []
      this.spanArr = []
      this.position = 0
            this.rowList = [];
            this.spanArr = [];
            this.position = 0;
      this.inspectionItems.forEach((item, index) => {
        if (index === 0) {
          this.spanArr.push(1);
          this.position = 0;
        } else {
          if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
                    if (
                        this.inspectionItems[index].father ===
                        this.inspectionItems[index - 1].father
                    ) {
            this.spanArr[this.position] += 1;
            this.spanArr.push(0);
          } else {
@@ -532,21 +527,24 @@
            this.position = index;
          }
        }
      })
            });
    },
    changeOptionSoptionSprocesses() {
      this.optionTechnology = []
      let working = this.optionSoptionSprocesses.filter(item => {
        return item.name === this.processInspectVo.techfather
      })[0]
      this.optionTechnology = working.children
            this.optionTechnology = [];
            let working = this.optionSoptionSprocesses.filter((item) => {
                return item.name === this.processInspectVo.techfather;
            })[0];
            this.optionTechnology = working.children;
    },
    addTestProjevt() {
      let val = JSON.parse(JSON.stringify(this.processInspectVo))
      val.techname = this.processInspectVo.techname.split("-")[1]
      val.technologyId = this.processInspectVo.techname.split("-")[0]
      this.processInspectVo.technologyId = val.technologyId
      this.$axios.post(this.$api.url.processInspectAddProcess, {
            let val = JSON.parse(JSON.stringify(this.processInspectVo));
            val.techname = this.processInspectVo.techname.split("-")[1];
            val.technologyId = this.processInspectVo.techname.split("-")[0];
            this.processInspectVo.technologyId = val.technologyId;
            this.$axios
                .post(
                    this.$api.url.processInspectAddProcess,
                    {
        material: val.material,
        materialCode: val.materialCode,
        orderNumber: val.orderNumber,
@@ -556,58 +554,73 @@
        techname: val.techname,
        techId: Number(val.technologyId),
        mtId: Number(val.technologyId),
        unit: val.unit
      }, {
        headers: { "Content-Type": "application/json" }
      }).then(res => {
                        unit: val.unit,
                    },
                    {
                        headers: { "Content-Type": "application/json" },
                    }
                )
                .then((res) => {
        if (res.code === 201) {
          this.$message({
            message: res.message,
            type: 'warning'
                            type: "warning",
          });
          return
                        return;
        }
        this.isAddProject = true
        this.detailId = res.data
        this.inspectionResultForm[0].id = val.materialCode
        this.inspectionResultForm[0].name = val.material
        this.getTableData()
      })
                    this.isAddProject = true;
                    this.detailId = res.data;
                    this.inspectionResultForm[0].id = val.materialCode;
                    this.inspectionResultForm[0].name = val.material;
                    this.getTableData();
                });
    },
    getTableData() {
      this.$axios.get(this.$api.url.inspectionItemListUser, {
            this.$axios
                .get(this.$api.url.inspectionItemListUser, {
        params: {
          id: this.detailId,
          type: 1
        }
      }).then(res => {
        this.inspectionItems = res.data
        let arr = []
        let val = JSON.parse(JSON.stringify(this.inspectionItems))
        const uName = []
                        type: 1,
                    },
                })
                .then((res) => {
                    this.inspectionItems = res.data;
                    let arr = [];
                    let val = JSON.parse(JSON.stringify(this.inspectionItems));
                    const uName = [];
        //转成一维数组
        val.forEach(l => {
          let father = l.father
          l.children.forEach(c => {
            c.father = father
            c.empiricalValueAddss = []
            if (c.inspectionValue != '' && c.inspectionValue != null) {
              c.empiricalValueAddss = c.inspectionValue.split(",");
                    val.forEach((l) => {
                        let father = l.father;
                        l.children.forEach((c) => {
                            c.father = father;
                            c.empiricalValueAddss = [];
                            if (
                                c.inspectionValue != "" &&
                                c.inspectionValue != null
                            ) {
                                c.empiricalValueAddss =
                                    c.inspectionValue.split(",");
            } else {
              c.empiricalValueAddss.push("")
                                c.empiricalValueAddss.push("");
            }
            uName.push(c['username'])
            c.isSelectDevice = false
            arr.push(c)
          })
        })
        this.inspectionItems = arr
        let arrSort = JSON.parse(JSON.stringify(arr))
                            uName.push(c["username"]);
                            c.isSelectDevice = false;
                            arr.push(c);
                        });
                    });
                    this.inspectionItems = arr;
                    let arrSort = JSON.parse(JSON.stringify(arr));
        //根据集合对象数组长度排序
        arrSort.sort((a, b) => {
          if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
                        if (
                            a.empiricalValueAddss.length <
                            b.empiricalValueAddss.length
                        ) {
            return -1; // a排在b前面
          } else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
                        } else if (
                            a.empiricalValueAddss.length >
                            b.empiricalValueAddss.length
                        ) {
            return 1; // a排在b后面
          } else {
            return 0; // 保持相对顺序不变
@@ -615,44 +628,49 @@
        });
        // console.log(arrSort);
        console.log(uName);
        let name = [...new Set(uName)].filter(item => item !== null);
        let rname = ''
        name.forEach(m => {
          rname += m + ","
        })
        this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
        this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
        this.mergeTable(arr)
      })
                    let name = [...new Set(uName)].filter(
                        (item) => item !== null
                    );
                    let rname = "";
                    name.forEach((m) => {
                        rname += m + ",";
                    });
                    this.inspectionResultForm[0].inspecter = rname.slice(0, -1);
                    this.empiricalValueAdd =
                        arrSort[arrSort.length - 1].empiricalValueAddss.length;
                    this.mergeTable(arr);
                });
    },
    selectSample() {
      let sample = this.optionsSamplename.filter(item => {
        return item.name === this.processInspectVo.material
      })[0]
      this.processInspectVo.techfather = null
      this.processInspectVo.techname = null
      this.processInspectVo.materialCode = sample.code
      this.processInspectVo.specificationsModel = sample.specifications
      this.processInspectVo.unit = sample.unit
      this.optionSoptionSprocesses = []
      this.optionSoptionSprocesses = sample.children
            let sample = this.optionsSamplename.filter((item) => {
                return item.name === this.processInspectVo.material;
            })[0];
            this.processInspectVo.techfather = null;
            this.processInspectVo.techname = null;
            this.processInspectVo.materialCode = sample.code;
            this.processInspectVo.specificationsModel = sample.specifications;
            this.processInspectVo.unit = sample.unit;
            this.optionSoptionSprocesses = [];
            this.optionSoptionSprocesses = sample.children;
    },
    selectInfoByOrderId() {
      this.$axios.get(this.$api.url.chooseMaterProcessInspect, {
            this.$axios
                .get(this.$api.url.chooseMaterProcessInspect, {
        params: {
          orderNumber: this.processInspectVo.orderNumber
        }
      }).then(res => {
                        orderNumber: this.processInspectVo.orderNumber,
                    },
                })
                .then((res) => {
        if (res.data.length > 0) {
          console.log(res.data);
          this.optionsSamplename = res.data
                        this.optionsSamplename = res.data;
        } else {
          this.$message({
            message: '没有该订单号！',
            type: 'warning'
                            message: "没有该订单号！",
                            type: "warning",
          });
        }
      })
                });
    },
    // 当前页改变时触发 跳转其他页
    handleCurrentChange(val) {
@@ -668,7 +686,7 @@
    defaultInitializationTable() {
      this.$axios
        .post(this.$api.url.selectProcessInspectsList, this.search)
        .then(res => {
                .then((res) => {
          this.inspectionTableTotal = res.data.total;
          this.inspectionTable = res.data.row;
        });
@@ -684,7 +702,7 @@
        techfather: "",
        techname: "",
        technologyId: 0,
        unit: ""
                unit: "",
      };
      this.inspectionItems.push(obj);
    },
@@ -696,9 +714,12 @@
    clickDeleteInspectionColumn() {
      if (this.empiricalValueAdd - 1 === 0) {
      } else {
        if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                if (
                    this.empiricalValueAddMaxNumber !=
                    this.empiricalValueAdd - 1
                ) {
          this.empiricalValueAdd = this.empiricalValueAdd - 1;
          this.inspectionItems.forEach(i => {
                    this.inspectionItems.forEach((i) => {
            i.testValueList.splice(this.empiricalValueAdd, 1);
          });
        }
@@ -707,11 +728,11 @@
    // 添加检验值列
    clickAddInspectionColumn() {
      this.empiricalValueAdd = this.empiricalValueAdd + 1;
    }
        },
  },
  created() {
    this.defaultInitializationTable(); // 初始化表格数据
  }
    },
};
</script>

@@ -745,6 +766,10 @@
  overflow: hidden;
}

.rawPage span {
    white-space: nowrap;
}

.inspectionTable {
  padding: 20px 20px;
}