Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-06-29 f743df9508776dd59e19c1d8bd946b49d83e07eb

Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

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

@@ -547,6 +547,7 @@
    <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
    <equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
    <cableConfig v-if="cableConfigShow" :active="active" />
<!--    单选特殊值处理框-->
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1Dia" width="500px" :show-close="false"
      :before-close="beforeClose">
      <div class="body" style="max-height: 60vh;">
@@ -606,6 +607,60 @@
            </div>
          </el-col>
        </el-row> -->
      </div>
    </el-dialog>
<!--    全选特殊值处理框-->
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1DiaAll" width="500px" :show-close="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">
          <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
            <div class="search_label"><span class="required-span">* </span>选项：</div>
            <div class="search_input">
              <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
                <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
              </el-radio-group>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
            <div class="search_label">要求值：</div>
            <div class="search_input" v-show="item.bsm1Val!==null&&item.bsm1Val!==''">
              <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
                <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai"
                          :label="a">{{JSON.parse(item.bsmRow.ask)[ai]}}</el-radio>
              </el-radio-group>
            </div>
          </el-col>
        </el-row>
        <el-row v-if="item.bsm2">
          <el-col class="search_thing" :span="22">
            <div class="search_label" style="width: 220px;"><span class="required-span">* </span>样品熔接配对数量：</div>
            <div class="search_input">
              <el-input-number size="medium" v-model="item.bsm2Val" :min="1" :max="item.bsm2Val3.length" :precision="0"
                               style="width: 70%;" :controls="false" @change="bsm2Up"></el-input-number>
              <span>MAX：{{item.bsm2Val3.length}}</span>
            </div>
          </el-col>
          <el-col style="margin-top: 6px;">
            <el-col v-for="(a,ai) in item.bsm2Val2" :key="ai">
              <el-col :span="10">
                <el-select v-model="a[0]" placeholder="请选择" size="small" style="width: 100%;">
                  <el-option v-for="(item,index) in item.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">
                <el-select v-model="a[1]" placeholder="请选择" size="small" style="width: 100%;">
                  <el-option v-for="(item,index) in item.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>
      </div>
    </el-dialog>
    <el-dialog title="特殊值填写" :visible.sync="bsm3Dia" width="800px" :show-close="false">
@@ -761,6 +816,7 @@
        addSampleDia: false,
        count: 1,
        productList: [],
        bsm1DiaList: [],
        productIds: [],
        getProductLoad: false,
        saveLoad: false,
@@ -792,6 +848,7 @@
        bsm1: false,
        bsm1Val: null,
        bsm1Dia: false,
        bsm1DiaAll: false,
        equipConfigShow: false,
        cableConfigShow: false,
        bsm2: false,
@@ -1497,15 +1554,18 @@
        this.$refs.productTable.toggleRowSelection(row, true);
      },
      upProductSelect(selection, row) {
        console.log('danxuan', row)
        this.bsm1DiaList = []
        row.state = row.state == 1 ? 0 : 1
        if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
          if (row.section.indexOf('[') > -1) {
            this.bsmRow = this.HaveJson(row)
            row.bsmRow = this.HaveJson(row)
          }
          this.bsm1 = true
          this.bsm1Dia = true
          row.bsm1 = true
          this.bsm1DiaList.push(row)
          this.bsm1DiaAll = true
        } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
          this.bsm1 = false
          row.bsm1 = false
        }
        if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && row.state === 1) {
          this.bsm2 = true
@@ -1764,6 +1824,7 @@
        }
      },
      handleAll(e) {
        console.log('全选')
        if (e.length > 0) {
          this.productList.map(m => {
            m.state = 1
@@ -1776,15 +1837,17 @@
          })
        }
        this.bsmRow3 = [];
        this.bsm1DiaList = []
        this.productList.forEach(p => {
          if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
            if (p.section.indexOf('[') > -1) {
              this.bsmRow = this.HaveJson(p)
              p.bsmRow = this.HaveJson(p)
            }
            this.bsm1 = true
            this.bsm1Dia = true
            p.bsm1 = true
            this.bsm1DiaList.push(p)
            this.bsm1DiaAll = true
          } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
            this.bsm1 = false
            p.bsm1 = false
          }
          if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && p.state === 1) {
            this.bsm2 = true
@@ -1983,12 +2046,40 @@
          }
        }
      },
      beforeClose(done) {
        if (this.bsm1) {
          if (this.bsm1Val === null || this.bsm1Val === '') {
            this.$message.error('特殊项目必须处理')
            return
      upBsmAll (item) {
        let sections = JSON.parse(item.bsmRow.section);
        let asks = JSON.parse(item.bsmRow.ask);
        let tells = JSON.parse(item.bsmRow.tell);
        let manHours = JSON.parse(item.bsmRow.manHour);
        let prices = JSON.parse(item.bsmRow.price);
        for (var a in sections) {
          if (item.bsm1Val === sections[a]) {
            this.productList.forEach(p => {
              if (p.id === item.bsmRow.id) {
                p.section = sections[a]
                p.ask = asks[a]
                p.tell = tells[a]
                p.manHour = manHours[a]
                p.price = prices[a]
          }
            })
            break
          }
        }
      },
      beforeClose(done) {
        // if (this.bsm1) {
        //   if (this.bsm1Val === null || this.bsm1Val === '') {
        //     this.$message.error('特殊项目必须处理')
        //     return
        //   }
        // }
        if (this.bsm1DiaList.length > 0) {
          this.bsm1DiaList.forEach(item => {
            if (!item.bsm1Val) {
              throw this.$message.error('特殊项目必须处理')
            }
          })
        }
        if (this.bsm2) {
          if (this.bsm2Val2.length === 0) {