合并冲突

licp

2024-08-05 04d1dd7511d7c4f7253152eb3c3443d09bd7d366

合并冲突

 src/components/do/b1-ins-order/add.vue

@@ -623,8 +623,11 @@
    <equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
    <cableConfig v-if="cableConfigShow" :active="active" />
<!--    单选特殊值处理框-->
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1Dia" min-width="400px" :show-close="false"
      :before-close="beforeClose">
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1Dia"
               :close-on-press-escape="false"
               :close-on-click-modal="false"
               min-width="400px" :show-close="false"
               :before-close="beforeClose">
      <div class="body" style="max-height: 60vh;">
        <el-row v-if="bsm1">
          <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
@@ -683,9 +686,16 @@
          </el-col>
        </el-row> -->
      </div>
      <span slot="footer" class="dialog-footer">
        <el-row>
          <el-button type="primary" @click="save2" :loading="saveLoad">确 定</el-button>
        </el-row>
      </span>
    </el-dialog>
<!--    全选特殊值处理框-->
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1DiaAll" min-width="400px" :show-close="false"
                :close-on-press-escape="false"
               :close-on-click-modal="false"
               :before-close="beforeClose">
      <div class="body" style="max-height: 60vh;" v-for="(item, index) in bsm1DiaList" :key="index">
        <el-row v-if="item.bsm1">
@@ -737,8 +747,15 @@
          </el-col>
        </el-row>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-row>
          <el-button type="primary" @click="save1" :loading="saveLoad">确 定</el-button>
        </el-row>
      </span>
    </el-dialog>
    <el-dialog title="特殊值填写" :visible.sync="bsm3Dia" width="800px" :show-close="false">
    <el-dialog title="特殊值填写" :visible.sync="bsm3Dia"
               :close-on-click-modal="false" :close-on-press-escape="false"
               width="800px" :show-close="false">
      <el-table
      :data="editTable"
      style="width: 100%">
@@ -777,7 +794,9 @@
        </el-row>
      </span>
    </el-dialog>
    <el-dialog title="温度循环要求填写" :visible.sync="circulateShow" width="900px" :before-close="beforeCirculateShowClose" :show-close="false">
    <el-dialog title="温度循环要求填写" :visible.sync="circulateShow" width="900px"
               :close-on-click-modal="false" :close-on-press-escape="false"
               :before-close="beforeCirculateShowClose" :show-close="false">
      <div class="search" style="display: flex;background: transparent;">
        <div class="search_thing">
          <div class="search_label">保温时间：</div>
@@ -862,7 +881,9 @@
      </span>
    </el-dialog>
    <!-- 电力试验室---温升试验/热循环 -->
    <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
    <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow"
               :close-on-click-modal="false" :close-on-press-escape="false"
               width="260px" :before-close="temperatureShowClose" :show-close="false">
      <div>
        <div v-if="isShowInput" style="margin-bottom: 6px">
          <span>循环次数:</span>
@@ -1827,7 +1848,8 @@
            state,
            id: this.currentId,
            companyId:this.addObj.companyId,
            laboratory:this.addObj.laboratory
            laboratory:this.addObj.laboratory,
            company: this.addObj.company
          }, {
            headers: {
              'Content-Type': 'application/json'
@@ -2447,6 +2469,7 @@
          })
        } else {
          this.productList.map(m => {
            console.log('m----', m)
            m.state = 0
            return m
          })
@@ -2707,6 +2730,72 @@
        this.changeProductList0()
        this.currentMethod.insProduct = this.productList0
      },
      save1 () {
        if (this.bsm1DiaList.length > 0) {
          this.bsm1DiaList.forEach(item => {
            if (!item.bsm1Val) {
              throw this.$message.error('特殊项目必须处理')
            }
          })
        }
        if (this.bsm2) {
          if (this.bsm2Val2.length === 0) {
            this.$message.error('特殊项目必须处理')
            return
          }
          let set = new Set()
          for (let i = 0; i < this.bsm2Val2.length; i++) {
            let num0 = set.size
            set.add(JSON.stringify(this.bsm2Val2[i]))
            let num1 = set.size
            if (num1 == num0) {
              this.$message.error('关联项目不能重复')
              return
            }
            set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
            let num2 = set.size
            if (num1 == num2) {
              this.$message.error('关联项目不能重复')
              return
            }
          }
          this.isBsm2Val2 = true;
        }
        this.bsm1DiaAll = false
      },
      save2 () {
        if (this.bsm1DiaList.length > 0) {
          this.bsm1DiaList.forEach(item => {
            if (!item.bsm1Val) {
              throw this.$message.error('特殊项目必须处理')
            }
          })
        }
        if (this.bsm2) {
          if (this.bsm2Val2.length === 0) {
            this.$message.error('特殊项目必须处理')
            return
          }
          let set = new Set()
          for (let i = 0; i < this.bsm2Val2.length; i++) {
            let num0 = set.size
            set.add(JSON.stringify(this.bsm2Val2[i]))
            let num1 = set.size
            if (num1 == num0) {
              this.$message.error('关联项目不能重复')
              return
            }
            set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
            let num2 = set.size
            if (num1 == num2) {
              this.$message.error('关联项目不能重复')
              return
            }
          }
          this.isBsm2Val2 = true;
        }
        this.bsm1Dia = false
      },
      beforeClose(done) {
        // if (this.bsm1) {
        //   if (this.bsm1Val === null || this.bsm1Val === '') {

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

@@ -1301,10 +1301,10 @@
                    if(str0==str){
                      maxNum = num
                    }
                    if(data[i][j].equipName&&data[i][j].equipValue){
                      if(!m.v.v){
                        this.changeEquip(data[i][j].equipValue,m)
                      }
                  }
                  if(data[i][j].equipName&&data[i][j].equipValue&&m.v&&m.v.ps&&m.v.ps.value=='设备编码'&&str0==str){
                    if(!m.v.v){
                      this.changeEquip(data[i][j].equipValue,m,data[i][j].equipName)
                    }
                  }
                })
@@ -3065,7 +3065,8 @@
          console.log(999,error);
        }
      },
      changeEquip(val, n) {
      changeEquip(val, n,v) {
        this.$set(n.v,'v',val)
        console.log(3333,val,n)
        this.$set(n.v,'v',val)
        this.tableList[0].arr.forEach((item,index)=>{
@@ -3073,6 +3074,9 @@
            if(this.param[m.i]){
              this.param[m.i].state = 1
            }
            if(m.i==n.i&&m.v.ps&&m.v.ps.value=='设备名称'&&v){
              this.$set(m.v,'v',v)
            }
          })
        })
        for (let i in this.param) {
@@ -3080,6 +3084,16 @@
            delete this.param[i]
          }
        }
        if(val&&v){
          for (let i1 in this.param[n.i].equipName) {
            if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
              this.$delete(this.param[n.i].equipValue[i1].v,'v')
              this.$set(this.param[n.i].equipValue[i1].v,'v',val)
              this.$delete(this.param[n.i].equipName[i1].v,'v')
              this.$set(this.param[n.i].equipName[i1].v,'v',v)
            }
          }
        }
        for (let i in this.equipOptions) {
          if (this.equipOptions[i].value === val) {
            for (let i1 in this.param[n.i].equipName) {

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

@@ -268,7 +268,7 @@
                            type: 'text',
                            method: 'handleReview',
                            disabFun: (row, userName) => {
                                return row.userId == null || row.insState != 3 ||(row.checkName&&!row.checkName.includes(JSON.parse(localStorage.getItem("user")).name))
                                return row.userName == null || row.insState != 3 ||(row.checkName&&!row.checkName.includes(JSON.parse(localStorage.getItem("user")).name))
                            }
                        }, {
                            id: '',