单元格合并；修复部分bug

value

2024-05-09 dcab0e19a1764af5c05ac8868ddc080dce81d8c0

单元格合并；修复部分bug

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -674,13 +674,15 @@
              }
            }
            if (b.v.ps != undefined && b.v.ps.value === '结论') {
              this.param[b.i].insResult = b
              conclusionList.forEach((n, i) => {
                if (n.r == b.r && n.c == b.c) {
                  b.v.f =
                    `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
                }
              })
              if(b.i!==undefined){
                this.param[b.i].insResult = b
                conclusionList.forEach((n, i) => {
                  if (n.r == b.r && n.c == b.c) {
                    b.v.f =
                      `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
                  }
                })
              }
            }
            set.add(b.r)
            if (b.v.f) {

 src/components/view/a6-device-management.vue

@@ -633,6 +633,9 @@
                //row = 点击对应行值一行值
                //复制给formData
                this.formData = this.HaveJson(row);
        if(typeof(row.insProductIds)==='number'){
          row.insProductIds = row.insProductIds+''
        }
                this.formData.insProductIds = row.insProductIds ? row.insProductIds.split(',') : [];
            },
            beforeUpload(file) {
@@ -664,12 +667,12 @@
                }
            },
            submitForm() {
                this.upLoad = true;
                delete this.formData.createTime
                delete this.formData.updateTime
                delete this.formData.createUser
                delete this.formData.updateUser
        this.formData.insProductIds = this.formData.insProductIds.join()
        this.upLoad = true;
                this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
                    headers: {
                        'Content-Type': 'application/json'
@@ -691,7 +694,7 @@
            },
            submitForm2() {
                this.upLoad2 = true;
        this.formData.insProductIds = this.formData.insProductIds.join()
        this.formData2.insProductIds = this.formData2.insProductIds.join()
                this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
                    headers: {
                        'Content-Type': 'application/json'

 src/components/view/b1-inspect-order-plan.vue

@@ -245,9 +245,9 @@
                            font: '复核',
                            type: 'text',
                            method: 'handleReview',
                            disabFun: (row, index) => {
                            /* disabFun: (row, index) => {
                                return row.userId == null || row.insState != 3
                            }
                            } */
                        }, {
                            id: '',
                            font: '认领',

 src/components/view/b1-sample.vue

@@ -853,7 +853,7 @@
        isEdit: false, //弹框--是否是修改,默认为false
        isDetail: false, //详情--是否展示为详情页面，默认为false
        currentEdit:null,//当前要维护的信息
        tableLoading:true,
        tableLoading:false,
        sampleCode:'',
        currentId:null,
        searchSampleCode:''

 static/js/menu.js

@@ -39,6 +39,11 @@
            i: "font icon-erjidaohang",
            u: "b1-sample",
            p: "selectWarehouse"
        }, {
            v: "不合格管理",
            i: "font icon-erjidaohang",
            u: "",
            p: ""
        }]
    },
    {