Merge remote-tracking branch 'origin/master'

朱佳吉

2024-05-09 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45

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

@@ -196,8 +196,7 @@
        </el-radio-group>
      </div>
      <div class="center-box">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index"
          >
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
              <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
@@ -675,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) {
@@ -921,7 +922,6 @@
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'resValue':
              console.log(this.param)
              this.tableList[0].lastValue = value.v.v
              break;
            case 'insResult':
@@ -1034,7 +1034,7 @@
          }).then(res => {
            if (res.code === 200 && res.data) {
              this.equipOptions = res.data.map(m => {
                m.value = m.factoryNo
                m.value = m.managementNumber
                m.label = m.deviceName
                return m
              })
@@ -1113,10 +1113,8 @@
        })
      },
      saveInsContext(){
        this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
          headers: {
            'Content-Type': 'application/json'
          }
        this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
          param: JSON.stringify(this.param)
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('保存失败')