Merge remote-tracking branch 'origin/master'

gaoluyang

2024-06-28 897faa2d11f5a64d0c5e0f3d802e363430f8bdc0

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

@@ -117,7 +117,7 @@
  <div class="ins_order_add">
    <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
      <el-row class="title">
        <el-col :span="6" style="padding-left: 20px;">委托单信息&nbsp;&nbsp;&nbsp;总价：<span
        <el-col :span="6" style="padding-left: 20px;text-align: left;">委托单信息&nbsp;&nbsp;&nbsp;总价：<span
            style="color: #3A7BFA">￥{{total}}</span></el-col>
        <el-col :span="18" style="text-align: right;">
          <el-select v-model="template" size="medium" placeholder="下单模板" style="margin-right: 10px;" v-show="active==1"
@@ -914,14 +914,16 @@
        this.selectUserDia = false
      },
      containsValue(str) {
        let symbolItem = ''
        this.symbolList.some(value =>{
          if(str.includes(value)){
            symbolItem  = value
            return true
          }
        })
        return symbolItem
        if(str){
          let symbolItem = ''
          this.symbolList.some(value =>{
            if(str.includes(value)){
              symbolItem  = value
              return true
            }
          })
          return symbolItem
        }
      },
      handleAsk(ask,symbolItem, value) {
        try{
@@ -1001,6 +1003,9 @@
            let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
            if (isRTS) {
              this.editTable = this.handleData(sampleList,this.containsValue, 0)
              this.editTable.forEach(item => {
                item.value = item.modelNum
              })
              this.bsm3Dia = true;
              return
            }
@@ -1024,6 +1029,7 @@
            model:item.model,
            symbolList:[],
            sampleId:item.id,
            modelNum:item.modelNum,
          }
          if (item.insProduct && item.insProduct.length > 0) {
            item.insProduct.forEach(a => {
@@ -1192,6 +1198,7 @@
                sampleId:a.sampleId,
                value:null,
                inspectionItemList:b.inspectionItemList,
                modelNum:a.modelNum,
              }
              editTableNew.push(obj)
            })
@@ -1230,7 +1237,8 @@
          this.saveLoad = true
          this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
            state,
            id: this.currentId
            id: this.currentId,
            companyId:this.addObj.companyId
          }, {
            headers: {
              'Content-Type': 'application/json'
@@ -1349,7 +1357,7 @@
        }
      },
      selectStandardTreeList() {
        this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
        this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
          this.list = res.data
          this.list.forEach(a => {
            this.expandedKeys.push(a.label)