检验下单RTS功能修改

licp

2024-06-12 16d86c76d55eb062fa11ba6272e97379e0496d9d

检验下单RTS功能修改

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

@@ -294,12 +294,12 @@
              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">
@@ -559,6 +559,14 @@
            </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>
  </div>
@@ -710,6 +718,9 @@
        bsm2Dia: false,
        bsm2Val2: [],
        bsm2Val3: [],
        bsmRow3:null,
        bsm3Val:null,
        bsm3:false,
        total: 0,
        RTS: '',
        totalArr: []
@@ -808,7 +819,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 +830,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 +841,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 +873,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 +881,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 +896,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 +910,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 +922,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
                                }
@@ -1210,6 +1219,16 @@
        } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && row.state === 1) {
          this.bsm2 = false
        }
        if (row.ask.includes('RTS')&&row.state === 1) {
          this.bsmRow3 = null;
          row.rts = ''
          this.bsm3Val = ''
          this.bsm3 = true
          this.bsm1Dia = true
          this.bsmRow3 = row
        }else{
          this.bsm3 = false
        }
        this.sampleList.map(item => {
          if (this.sampleIds.indexOf(item.id) > -1) {
            item.insProduct.map(m => {
@@ -1433,6 +1452,7 @@
            return m
          })
        }
        this.bsmRow3 = [];
        this.productList.forEach(p => {
          if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
            if (p.section.indexOf('[') > -1) {
@@ -1453,6 +1473,15 @@
            }
          } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1) {
            this.bsm2 = false
          }
          if (p.ask.includes('RTS')&&p.state === 1) {
            p.rts = ''
            this.bsm3Val = ''
            this.bsm3 = true
            this.bsm1Dia = true
            this.bsmRow3.push(p)
          }else{
            this.bsm3 = false
          }
        })
        if (e.length > 0) {
@@ -1657,6 +1686,20 @@
            }
          }
        }
        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()
      },
      getTotal() {

 src/components/do/b1-ins-order/fiberoptic-config.vue

@@ -269,6 +269,14 @@
            </el-col>
          </el-col>
        </el-row>
        <el-row v-if="bsm3">
          <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>
      </div>
    </el-dialog>
  </div>
@@ -331,7 +339,10 @@
        bsm2Dia: false,
        bsm2Val2: [],
        bsm2Val3: [],
        sampleIds:[]
        sampleIds:[],
        bsm3: false,
        bsm3Val: null,
        bsmRow3: null,
      }
    },
    computed: {
@@ -720,8 +731,9 @@
            });
          }
        }
        if(this.type==1){
        this.bsmRow3 = []
          this.detectionItems.forEach(p => {
          if(this.type==1){
            if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
              if (p.section.indexOf('[') > -1) {
                this.bsmRow = this.HaveJson(p)
@@ -742,7 +754,18 @@
            } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1) {
              this.bsm2 = false
            }
          }
          if (p.ask.includes('RTS')&&p.state === 1) {
            p.rts = ''
            this.bsm3Val = ''
            this.bsm3 = true
            this.bsm1Dia = true
            this.bsmRow3.push(p)
          }else{
            this.bsm3 = false
          }
          })

          if (e.length > 0) {
            this.sampleList.map(item => {
              if (this.sampleIds.indexOf(item.id) > -1) {
@@ -763,7 +786,6 @@
              }
              return item
            })
          }
        }
        this.$nextTick(() => {
          this.$refs.productTable.doLayout()
@@ -812,6 +834,16 @@
          }
        }else{
          this.bsm1Dia = false
        }
        if (row.ask.includes('RTS')&&row.state === 1) {
          this.bsmRow3 = null;
          row.rts = ''
          this.bsm3Val = ''
          this.bsm3 = true
          this.bsm1Dia = true
          this.bsmRow3 = row
        }else{
          this.bsm3 = false
        }
      },
      computationalPairing(n){
@@ -884,6 +916,20 @@
            }
          }
        }
        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()
      },
      upBsm1(val) {

 src/view/notice.vue

@@ -6,7 +6,8 @@
  :direction="direction"
  :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
    <div class="notice-content" v-loading="loading">
      <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list">
      <el-button size="small" type="primary" @click="handleDropdownAll(1)" style="margin-bottom: 10px;margin-left: 330px;">全部已读</el-button>
      <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);">
        <div
        class="notice-content-item"
        v-for="(m,i) in list"
@@ -221,6 +222,7 @@
        this.keyMap = {};
        this.currentPage = 1;
        this.refresh();
        this.$emit('goNoticeDetail')
      })
    }
  },