Merge remote-tracking branch 'origin/master'

value

2024-06-08 5104054c6c7a28c3d97a66c1e614897a6db28ba0

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

@@ -451,7 +451,7 @@
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>指派人员：</div>
            <div class="search_input">
              <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;">
              <el-select v-model="distributeData.userId" placeholder="请选择" size="small" filterable  style="width: 100%;">
                <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
              </el-select>
@@ -530,9 +530,29 @@
          </el-col>
          <el-col style="margin-top: 6px;">
            <el-col v-for="(a,ai) in bsm2Val2" :key="ai">
              <el-col :span="10" class="pairing">{{a[0]}}</el-col>
              <el-col :span="10">
                <el-select v-model="a[0]" placeholder="请选择" size="small" style="width: 100%;">
                  <el-option
                    v-for="(item,index) in sampleList"
                    :key="index"
                    :label="index+1"
                    :value="index+1">
                  </el-option>
                </el-select>
              </el-col>
              <!-- <el-col :span="10" class="pairing">{{a[0]}}</el-col> -->
              <el-col :span="4" class="pairing" style="border: 0;color: rgba(0, 0, 0, 0.2);">——</el-col>
              <el-col :span="10" class="pairing">{{a[1]}}</el-col>
              <el-col :span="10">
                <el-select v-model="a[1]" placeholder="请选择" size="small" style="width: 100%;">
                  <el-option
                    v-for="(item,index) in sampleList"
                    :key="index"
                    :label="index+1"
                    :value="index+1">
                  </el-option>
                </el-select>
              </el-col>
              <!-- <el-col :span="10" class="pairing">{{a[1]}}</el-col> -->
            </el-col>
          </el-col>
        </el-row>
@@ -1112,6 +1132,8 @@
          this.sampleList.push(this.HaveJson(this.sample))
          this.count++
        }
        this.computationalPairing(this.sampleList.length)
        this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
      },
      selectSample(val) {
        this.sampleIds = []
@@ -1583,6 +1605,22 @@
            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
            }
          }
        }
        done()
      },