Merge remote-tracking branch 'origin/master'

value

2024-06-13 fd9deb7e45ff86f3570a3048a459b29f0ebbd628

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

@@ -294,15 +294,42 @@
              v-model="addObj.remark" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6" v-if="active==1">
        <!-- <el-col class="search_thing" :span="6" v-if="active==1">
          <div class="search_label">RTS：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="RTS"></el-input>
          </div>
        </el-col>
        </el-col> -->
      </el-row>
    </div>
    <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
      <div class="search" v-if="active==1" style="display: flex;background: transparent;">
        <div class="search_thing">
          <div class="search_label">样品型号：</div>
          <div class="search_input">
            <el-select v-model="model" placeholder="请选择" filterable allow-create default-first-option size="small" @change="changeModel">
              <el-option
                v-for="item in models"
                :key="item.value"
                :label="item.label"
                :value="item.value">
              </el-option>
            </el-select>
          </div>
        </div>
        <div class="search_thing">
          <div class="search_label">检验标准：</div>
          <div class="search_input">
            <el-select v-model="standardMethodListId" placeholder="请选择" size="small" @focus="methodFocus"
                :loading="methodLoad" @change="changeStandardMethodListId">
              <el-option
                v-for="item in methods"
                :key="item.id" :label="item.code" :value="item.id" >
              </el-option>
            </el-select>
          </div>
        </div>
      </div>
      <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
        border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
        <el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
@@ -362,6 +389,7 @@
              :controls="false" style="width: 80%;"></el-input-number>
          </template>
        </el-table-column>
        <el-table-column prop="proNum" label="检验项计数" width="120" align="center" ></el-table-column>
      </el-table>
      <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
        @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
@@ -559,7 +587,25 @@
            </el-col>
          </el-col>
        </el-row>
        <!-- <el-row v-if="bsm3">
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>RTS：</div>
            <div class="search_input">
              <el-input size="small" placeholder="请输入" clearable v-model="bsm3Val"></el-input>
            </div>
          </el-col>
        </el-row> -->
      </div>
    </el-dialog>
    <el-dialog title="RTS填写" :visible.sync="bsm3Dia" width="500px" :show-close="false" :before-close="beforeClose0">
      <el-row>
        <el-col class="search_thing" :span="22" style="display: flex;align-items: center;">
          <div class="search_label"><span class="required-span">* </span>RTS：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="bsm3Val"></el-input>
          </div>
        </el-col>
      </el-row>
    </el-dialog>
  </div>
</template>
@@ -569,6 +615,7 @@
  import fiberOpticConfig from './fiberoptic-config.vue'
  import equipConfig from './equip-config.vue'
  import cableConfig from './cable-config.vue'
  import Vue from 'vue'
  export default {
    components: {
      ValueTable,
@@ -710,9 +757,14 @@
        bsm2Dia: false,
        bsm2Val2: [],
        bsm2Val3: [],
        bsmRow3:null,
        bsm3Val:null,
        bsm3Dia:false,
        total: 0,
        RTS: '',
        totalArr: []
        totalArr: [],
        model:null,
        standardMethodListId:null,
      }
    },
    watch: {
@@ -742,7 +794,15 @@
        handler(val) {
          this.getTotal()
        }
      }
      },
      'addObj.sample'(val){
        this.model = null
        this.standardMethodListId = null
      },
      'addObj.sampleNum'(val){
        this.model = null
        this.standardMethodListId = null
      },
    },
    mounted() {
      this.selectEnumByCategoryForType()
@@ -766,6 +826,7 @@
          };
          this.addObj.type = String(this.addObj.type)
          this.sampleList = this.HaveJson(res.data.sampleProduct);
          this.getProNum()
          this.addObj.sampleNum = this.sampleList.length
          this.$nextTick(() => {
            this.$refs.sampleTable.doLayout()
@@ -808,7 +869,7 @@
        this.addObj.companyId = selects.id
        this.selectUserDia = false
      },
      handleAsk(ask) {
      handleAsk(ask,rts) {
        let code = [">", "<", "=", "＞", "＜", "≥", "≤", "±"];
        if (ask.includes('RTS')) {
          if (ask.includes('&')) {
@@ -819,7 +880,7 @@
              let index = code.findIndex(b => m.includes(b))
              if (index > -1) {
                let arr = m.split(code[index]).filter(b => !!b)
                let num = eval(this.replaceAll(arr[0], 'RTS', this.RTS))
                let num = eval(this.replaceAll(arr[0], 'RTS', rts))
                m = code[index] + '' + num
                arr1.push(m)
              }
@@ -830,7 +891,7 @@
            let index = code.findIndex(b => ask.includes(b))
            if (index > -1) {
              let arr = ask.split(code[index]).filter(b => !!b)
              let num = eval(this.replaceAll(arr[0], 'RTS', this.RTS))
              let num = eval(this.replaceAll(arr[0], 'RTS', rts))
              return code[index] + '' + num
            }
          }
@@ -862,8 +923,6 @@
          this.$message.error('请输入样品型号')
        } else if (!this.sampleList.every(m => m.standardMethodListId)) {
          this.$message.error('请选择检验标准')
        } else if (this.totalArr.find(a => a.ask!=null&&a.ask.includes('RTS')&&a.state==1) && !this.RTS) {
          this.$message.error('请输入RTS')
        } else {
          let sampleList = this.HaveJson(this.sampleList)
          let isRTS = this.totalArr.find(a=>a.ask!=null&&a.ask.includes('RTS')&&a.state==1)
@@ -872,7 +931,7 @@
              if(item.insProduct&&item.insProduct.length>0){
                item.insProduct.forEach(a=>{
                  if(a.state==1){
                    let ask = this.handleAsk(a.ask)
                    let ask = this.handleAsk(a.ask,a.rts)
                    if(ask&&a.state==1){
                      a.ask = ask
                    }
@@ -887,7 +946,7 @@
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            let ask = this.handleAsk(c.ask,c.rts)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
@@ -901,7 +960,7 @@
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            let ask = this.handleAsk(c.ask,c.rts)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
@@ -913,7 +972,7 @@
                          if(c.productList&&c.productList.length>0){
                            c.productList.forEach(d=>{
                              if(d.state==1){
                                let ask = this.handleAsk(d.ask)
                                let ask = this.handleAsk(d.ask,d.rts)
                                if(ask){
                                  d.ask = ask
                                }
@@ -938,7 +997,7 @@
              return a
            })),
            pairing: JSON.stringify(this.bsm2Val2)
          })
            })
          }).then(res => {
            this.saveLoad = false
            if (res.code == 201) return
@@ -1031,6 +1090,12 @@
          this.addObj.productionEn = '/'
        })
      },
      getProNum(){
        this.sampleList.forEach((m,i)=>{
          Vue.set(this.sampleList[i],'proNum',m.insProduct.filter(a=>a.state==1).length)
        })
        this.$refs.sampleTable.doLayout()
      },
      searchFilter() {
        this.$refs.tree.filter(this.search)
      },
@@ -1094,6 +1159,8 @@
          this.sample.insProduct = []
          this.sample.id = this.count
          this.sample.childSampleList = []
          this.sample.insulating = null
          this.sample.sheath = null
          this.sampleList.push(this.HaveJson(this.sample))
          this.count++
        }
@@ -1191,6 +1258,7 @@
      },
      upProductSelect(selection, row) {
        row.state = row.state == 1 ? 0 : 1
        this.getProNum()
        if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
          if (row.section.indexOf('[') > -1) {
            this.bsmRow = this.HaveJson(row)
@@ -1215,6 +1283,15 @@
          row.state = row.state == 1 ? 0 : 1
          this.$refs.productTable.toggleRowSelection(row, false)
          return
        }
        if (row.ask.includes('RTS')&&row.state === 1) {
          this.bsmRow3 = null;
          row.rts = ''
          this.bsm3Val = ''
          this.bsm3Dia = true
          this.bsmRow3 = row
        }else{
          this.bsm3Dia = false
        }
        this.sampleList.map(item => {
          if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1388,6 +1465,22 @@
          }, 200)
        })
      },
      changeModel(){
        this.sampleList.forEach(a => {
          let obj = this.sampleIds.find(b => b == a.id)
          if(obj){
            a.model = this.model
          }
        })
      },
      changeStandardMethodListId(){
        this.sampleList.forEach(a => {
          let obj = this.sampleIds.find(b => b == a.id)
          if(obj){
            a.standardMethodListId = this.standardMethodListId
          }
        })
      },
      methodFocus() {
        this.selectsStandardMethodByFLSSM()
      },
@@ -1439,6 +1532,8 @@
            return m
          })
        }
        this.getProNum()
        this.bsmRow3 = [];
        this.productList.forEach(p => {
          if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
            if (p.section.indexOf('[') > -1) {
@@ -1463,6 +1558,13 @@
            this.$message.error('样品数量不足够进行配对操作')
            this.$refs.productTable.clearSelection()
            return
          }
          if (p.ask.includes('RTS')&&p.state === 1) {
            p.rts = ''
            this.bsm3Val = ''
            this.bsm3 = true
            this.bsm3Dia = true
            this.bsmRow3.push(p)
          }
        })
        if (e.length > 0) {
@@ -1667,6 +1769,35 @@
            }
          }
        }
        // if(this.bsm3){
        //   if(!this.bsm3Val){
        //     this.$message.error('RST必须填写')
        //     return
        //   }else{
        //     if(Array.isArray(this.bsmRow3)){
        //       this.bsmRow3.forEach(item=>{
        //         item.rts = this.bsm3Val
        //       })
        //     }else{
        //       this.bsmRow3.rts = this.bsm3Val
        //     }
        //   }
        // }
        done()
      },
      beforeClose0(done) {
        if(!this.bsm3Val){
          this.$message.error('RST必须填写')
          return
        }else{
          if(Array.isArray(this.bsmRow3)){
            this.bsmRow3.forEach(item=>{
              item.rts = this.bsm3Val
            })
          }else{
            this.bsmRow3.rts = this.bsm3Val
          }
        }
        done()
      },
      getTotal() {