Merge remote-tracking branch 'origin/master'

value

2024-06-08 5104054c6c7a28c3d97a66c1e614897a6db28ba0

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

@@ -100,7 +100,7 @@

<template>
  <div class="ins_order_add">
    <div v-show="!configShow">
    <div v-show="!configShow&&!equipConfigShow">
      <el-row class="title">
        <el-col :span="6" style="padding-left: 20px;">委托单信息&nbsp;&nbsp;&nbsp;总价：<span
            style="color: #3A7BFA">￥{{total}}</span></el-col>
@@ -116,8 +116,10 @@
          <el-button size="medium" @click="templateDia=true" v-show="active==1">
            <span style="color: #3A7BFA;">保存模板</span>
          </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="this.addObj.sampleType==='光缆'">光纤配置</el-button>
            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"
@@ -130,7 +132,7 @@
        </el-col>
      </el-row>
    </div>
    <div class="search" v-show="!configShow">
    <div class="search" v-show="!configShow&&!equipConfigShow">
      <el-row>
        <el-col class="search_thing" :span="6">
          <div class="search_label">委托编号：</div>
@@ -298,7 +300,7 @@
        </el-col>
      </el-row>
    </div>
    <div v-show="!configShow">
    <div v-show="!configShow&&!equipConfigShow">
      <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>
@@ -449,7 +451,7 @@
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>指派人员：</div>
            <div class="search_input">
              <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;">
              <el-select v-model="distributeData.userId" placeholder="请选择" size="small" filterable  style="width: 100%;">
                <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
              </el-select>
@@ -482,9 +484,12 @@
        </el-row>
      </span>
    </el-dialog>
    <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1Dia" width="500px" :show-close="false"
      :before-close="beforeClose">
    <fiberOpticConfig :currentId="currentId"
    @saveFiberopticConfig="getTotal()"
     v-if="configShow" :active="active" />
     <equipConfig :currentId="currentId"
     v-if="equipConfigShow" :active="active"/>
    <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">
@@ -504,6 +509,15 @@
              </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">
@@ -516,9 +530,29 @@
          </el-col>
          <el-col style="margin-top: 6px;">
            <el-col v-for="(a,ai) in bsm2Val2" :key="ai">
              <el-col :span="10" class="pairing">{{a[0]}}</el-col>
              <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>
                </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" class="pairing">{{a[1]}}</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>
                </el-select>
              </el-col>
              <!-- <el-col :span="10" class="pairing">{{a[1]}}</el-col> -->
            </el-col>
          </el-col>
        </el-row>
@@ -528,13 +562,14 @@
</template>

<script>
  import { Main } from 'element-ui'
import ValueTable from '../../tool/value-table.vue'
  import ValueTable from '../../tool/value-table.vue'
  import fiberOpticConfig from './fiberoptic-config.vue'
  import equipConfig from './equip-config.vue'
  export default {
    components: {
      ValueTable,
      fiberOpticConfig
      fiberOpticConfig,
      equipConfig
    },
    props: {
      active: {
@@ -663,6 +698,7 @@
        bsm1: false,
        bsm1Val: null,
        bsm1Dia: false,
        equipConfigShow: false,
        bsm2: false,
        bsm2Val: null,
        bsm2Dia: false,
@@ -820,53 +856,61 @@
          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')) && !this.RTS) {
        } 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'))
          if (isRTS) {
            sampleList.forEach(item => {
              if (item.insProduct && item.insProduct.length > 0) {
                item.insProduct.forEach(a => {
                  let ask = this.handleAsk(a.ask)
                  if (ask) {
                    a.ask = ask
          let isRTS = this.totalArr.find(a=>a.ask!=null&&a.ask.includes('RTS')&&a.state==1)
          if(isRTS){
            sampleList.forEach(item=>{
              if(item.insProduct&&item.insProduct.length>0){
                item.insProduct.forEach(a=>{
                  if(a.state==1){
                    let ask = this.handleAsk(a.ask)
                    if(ask&&a.state==1){
                      a.ask = ask
                    }
                  }
                })
              }
              // 光纤带项目
              if (item.bushing && item.bushing.length > 0) {
                item.bushing.forEach(a => {
                  if (a.fiber && a.fiber.length > 0) {
                    a.fiber.forEach(b => {
                      if (b.productList && b.productList.length > 0) {
                        b.productList.forEach(c => {
                          let ask = this.handleAsk(c.ask)
                          if (ask) {
                            c.ask = ask
              if(item.bushing&&item.bushing.length>0){
                item.bushing.forEach(a=>{
                  if(a.fiber&&a.fiber.length>0){
                    a.fiber.forEach(b=>{
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
                          }
                        })
                      }
                    })
                  }
                  if (a.fibers && a.fibers.length > 0) {
                    a.fibers.forEach(b => {
                      if (b.productList && b.productList.length > 0) {
                        b.productList.forEach(c => {
                          let ask = this.handleAsk(c.ask)
                          if (ask) {
                            c.ask = ask
                  if(a.fibers&&a.fibers.length>0){
                    a.fibers.forEach(b=>{
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
                          }
                        })
                      }
                      if (b.fiber && b.fiber.length > 0) {
                        b.fiber.forEach(c => {
                          if (c.productList && c.productList.length > 0) {
                            c.productList.forEach(d => {
                              let ask = this.handleAsk(d.ask)
                              if (ask) {
                                d.ask = ask
                      if(b.fiber&&b.fiber.length>0){
                        b.fiber.forEach(c=>{
                          if(c.productList&&c.productList.length>0){
                            c.productList.forEach(d=>{
                              if(d.state==1){
                                let ask = this.handleAsk(d.ask)
                                if(ask){
                                  d.ask = ask
                                }
                              }
                            })
                          }
@@ -880,6 +924,7 @@
          }
          this.saveLoad = true
          this.$axios.post(this.$api.insOrder.addInsOrder, {
            str: JSON.stringify({
            insOrder: this.addObj,
            list: JSON.stringify(sampleList.map(a => {
              a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : (
@@ -887,10 +932,7 @@
              return a
            })),
            pairing: JSON.stringify(this.bsm2Val2)
          }, {
            headers: {
              'Content-Type': 'application/json'
            }
          })
          }).then(res => {
            this.saveLoad = false
            if (res.code == 201) return
@@ -1045,6 +1087,7 @@
          this.sample.standardMethodListId = null
          this.sample.insProduct = []
          this.sample.id = this.count
          this.sample.childSampleList = []
          this.sampleList.push(this.HaveJson(this.sample))
          this.count++
        }
@@ -1089,6 +1132,8 @@
          this.sampleList.push(this.HaveJson(this.sample))
          this.count++
        }
        this.computationalPairing(this.sampleList.length)
        this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
      },
      selectSample(val) {
        this.sampleIds = []
@@ -1498,6 +1543,35 @@
          })
        }
      },
      openEquipConfig(){
        if (this.active === 1) {
          if (this.sampleIds.length === 0) {
            this.$message.error("未选择样品")
            return
          }
          this.equipConfigShow = true
        } else {
          if (this.sampleId === null) {
            this.$message.error('未选中样品')
            return
          }
          // this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
          //   sampleId: this.sampleId
          // }).then(res => {
          //   if (res.data.length === 0) {
          //     this.$message.error('该样品没有配置光纤')
          //     return
          //   }
          //   for (var i in this.sampleList) {
          //     if (this.sampleList[i].id = this.sampleId) {
          //       this.sampleList[i].bushing = res.data
          //       break
          //     }
          //   }
          //   this.configShow = true
          // })
        }
      },
      upBsm1(val) {
        let sections = JSON.parse(this.bsmRow.section);
        let asks = JSON.parse(this.bsmRow.ask);
@@ -1531,6 +1605,22 @@
            this.$message.error('特殊项目必须处理')
            return
          }
          let set = new Set()
          for (let i=0;i<this.bsm2Val2.length;i++){
            let num0 = set.size
            set.add(JSON.stringify(this.bsm2Val2[i]))
            let num1 = set.size
            if(num1==num0){
              this.$message.error('关联项目不能重复')
              return
            }
            set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
            let num2 = set.size
            if(num1==num2){
              this.$message.error('关联项目不能重复')
              return
            }
          }
        }
        done()
      },