修复大量bug

value

2024-06-18 fe488157d08f14aed6b59dcea39264bc3c9b62cc

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

@@ -55,6 +55,21 @@
    border: 1px solid rgba(0, 0, 0, 0.1);
    border-radius: 4px;
  }

  .askRts {
    width: 100px;
    font-size: 12px;
    border-top: 0;
    border-left: 0;
    border-right: 0;
    border-bottom: 2px solid rgba(0, 0, 0, 0.3);
    text-align: center;
    background-color: rgba(0, 0, 0, 0.1);
    outline: none;
    border-radius: 2px;
    line-height: 24px;
    margin-top: 5px;
  }
</style>
<style>
  .ins_order_add .el-input-group__append,
@@ -118,10 +133,8 @@
          </el-button>
          <el-button size="medium" type="primary" @click="openCableConfig"
            v-if="active==1&&PROJECT=='装备电缆'">电缆配置</el-button>
          <el-button size="medium" type="primary" @click="openEquipConfig"
            v-if="active==1">子样品配置</el-button>
          <el-button size="medium" type="primary" @click="openConfig"
            v-if="addObj.sampleType==='光缆'">光纤配置</el-button>
          <el-button size="medium" type="primary" @click="openEquipConfig" v-if="active==1">子样品配置</el-button>
          <el-button size="medium" type="primary" @click="openConfig" v-if="addObj.sampleType==='光缆'">光纤配置</el-button>
          <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">提交</el-button>
          <!-- 审核 -->
          <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -312,12 +325,9 @@
        <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-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>
@@ -327,9 +337,7 @@
          <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 v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
              </el-option>
            </el-select>
          </div>
@@ -341,13 +349,13 @@
        <el-table-column type="index" label="序号" width="65" align="center"></el-table-column>
        <el-table-column prop="sample" label="样品名称" align="center" min-width="100">
          <template slot-scope="scope">
            <el-input size="small" v-model="scope.row.sample" clearable :disabled="active>1"></el-input>
            <el-input size="small" v-model="scope.row.sample" clearable :readonly="active>1"></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="sampleCode" label="样品编号" min-width="140" align="center">
          <template slot-scope="scope">
            <el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="不填写则系统自动生成"
              :disabled="active>1"></el-input>
              :readonly="active>1"></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="model" label="样品型号" align="center" min-width="100">
@@ -418,7 +426,17 @@
            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
              v-if="active==1&&isAskOnlyRead"></el-input>
            <span v-else>{{ scope.row.ask }}</span>
            <span v-else>
              <template v-if="(scope.row.ask.indexOf('D')>-1
              ||scope.row.ask.indexOf('W')>-1
              ||scope.row.ask.indexOf('X')>-1
              ||scope.row.ask.indexOf('RTS')>-1
              ||scope.row.ask.indexOf('H')>-1
              ||scope.row.ask.indexOf('L')>-1)&&active==1">
                <input class="askRts" v-model="scope.row.rts" /><br />{{ scope.row.ask }}
              </template>
              <template v-else>{{ scope.row.ask }}</template>
            </span>
          </template>
        </el-table-column>
      </el-table>
@@ -519,17 +537,15 @@
        </el-row>
      </span>
    </el-dialog>
    <fiberOpticConfig :currentId="currentId"
    @saveFiberopticConfig="getTotal()"
     v-if="configShow" :active="active" />
     <equipConfig :currentId="currentId"
     v-if="equipConfigShow" :active="active"/>
    <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">
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1Dia" width="500px" :show-close="false"
      :before-close="beforeClose">
      <div class="body" style="max-height: 60vh;">
        <el-row v-if="bsm1">
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>护套密度：</div>
            <div class="search_label"><span class="required-span">* </span>选项：</div>
            <div class="search_input">
              <el-radio-group v-model="bsm1Val" @input="upBsm1">
                <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a"></el-radio>
@@ -545,22 +561,13 @@
              </el-radio-group>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label">单价：</div>
            <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
              <el-radio-group v-model="bsm1Val" @input="upBsm1">
                <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
                  :label="a">{{JSON.parse(bsmRow.price)[ai]}}</el-radio>
              </el-radio-group>
            </div>
          </el-col>
        </el-row>
        <el-row v-if="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="bsm2Val" :min="1" :max="bsm2Val3.length" :precision="0" style="width: 70%;"
                :controls="false" @change="bsm2Up"></el-input-number>
              <el-input-number size="medium" v-model="bsm2Val" :min="1" :max="bsm2Val3.length" :precision="0"
                style="width: 70%;" :controls="false" @change="bsm2Up"></el-input-number>
              <span>MAX：{{bsm2Val3.length}}</span>
            </div>
          </el-col>
@@ -568,11 +575,7 @@
            <el-col v-for="(a,ai) in 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 sampleList"
                    :key="index"
                    :label="index+1"
                    :value="index+1">
                  <el-option v-for="(item,index) in sampleList" :key="index" :label="index+1" :value="index+1">
                  </el-option>
                </el-select>
              </el-col>
@@ -580,11 +583,7 @@
              <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 sampleList"
                    :key="index"
                    :label="index+1"
                    :value="index+1">
                  <el-option v-for="(item,index) in sampleList" :key="index" :label="index+1" :value="index+1">
                  </el-option>
                </el-select>
              </el-col>
@@ -875,8 +874,10 @@
        this.selectUserDia = false
      },
      handleAsk(ask,rts) {
        try{
        let code = [">", "<", "=", "＞", "＜", "≥", "≤", "±"];
        if (ask.includes('RTS')) {
          if (ask.includes('RTS') || ask.includes('D') || ask.includes('W') ||
            ask.includes('X') || ask.includes('H') || ask.includes('L')) {
          if (ask.includes('&')) {
            // 多个条件
            let arr0 = ask.split('&')
@@ -901,9 +902,14 @@
            }
          }
        }
        }catch(e){}
      },
      replaceAll(str, find, replace) {
        return str.replace(new RegExp(find, 'g'), replace);
      replaceAll(str, find, rts) {
        if (rts === undefined) {
          return str
        }
        return str.replace('RTS', rts).replace('D', rts).replace('W', rts).replace('X', rts).replace('H', rts).replace(
          'L', rts);
      },
      save() {
        if (!this.addObj.companyId) {
@@ -930,7 +936,9 @@
          this.$message.error('请选择检验标准')
        } else {
          let sampleList = this.HaveJson(this.sampleList)
          let isRTS = this.totalArr.find(a=>a.ask!=null&&a.ask.includes('RTS')&&a.state==1)
          let isRTS = this.totalArr.find(a => a.ask != null && (a.ask.includes('RTS') || a.ask.includes('D') || a.ask
            .includes('W') ||
            a.ask.includes('X') || a.ask.includes('H') || a.ask.includes('L')) && a.state == 1)
          if(isRTS){
            sampleList.forEach(item=>{
              if(item.insProduct&&item.insProduct.length>0){
@@ -997,7 +1005,8 @@
            str: JSON.stringify({
            insOrder: this.addObj,
            list: JSON.stringify(sampleList.map(a => {
              a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : (
                a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ?
                  '' : (
                '-' + a.modelNum))
              return a
            })),
@@ -1008,6 +1017,8 @@
            if (res.code == 201) return
            this.$message.success('已提交')
            this.$parent.playOrder(0)
          }).catch(e=>{
            this.saveLoad = false
          })
        }
      },
@@ -1153,9 +1164,7 @@
        this.addObj.factory = trees[0]
        this.addObj.laboratory = trees[1]
        this.addObj.sampleType = trees[2]
        if(trees[3]===''){
          this.addObj.sample = (trees[4] == undefined ? null : trees[4])
        }else if(trees[3]===undefined){
        if (trees[3] === undefined || trees[3] === '') {
          this.addObj.sample = trees[2]
        }else{
          this.addObj.sample = trees[3]
@@ -1218,6 +1227,9 @@
          this.sample.standardMethodListId = null
          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++
        }
@@ -1299,7 +1311,7 @@
          this.$refs.productTable.toggleRowSelection(row, false)
          return
        }
        if (row.ask.includes('RTS')&&row.state === 1) {
        /* if (row.ask.includes('D')&&row.state === 1) {
          this.bsmRow3 = null;
          row.rts = ''
          this.bsm3Val = ''
@@ -1307,7 +1319,7 @@
          this.bsmRow3 = row
        }else{
          this.bsm3Dia = false
        }
        } */
        this.sampleList.map(item => {
          if (this.sampleIds.indexOf(item.id) > -1) {
            item.insProduct.map(m => {
@@ -1322,6 +1334,7 @@
      },
      permute(nums) {
        const result = [];

        function backtrack(temp, nums) {
          if (temp.length === 2) {
            result.push([...temp]);
@@ -1575,13 +1588,13 @@
            this.$refs.productTable.clearSelection()
            return
          }
          if (p.ask.includes('RTS')&&p.state === 1) {
          /* 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) {
          this.sampleList.map(item => {