Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

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

@@ -74,18 +74,18 @@
    display: flex;
    flex-direction: row;
    justify-content: space-between;
    .opticalProject {
      width: 38%;
    }
    .temperatureList {
      width: 60%;
      .temperatureListTitle {
        display: flex;
        flex-direction: row;
        justify-content: space-between;
        line-height: 30px;
      }
    }
  }
  .opticalProject {
    width: 38%;
  }
  .temperatureList {
    width: 60%;
  }
  .temperatureListTitle {
    display: flex;
    flex-direction: row;
    justify-content: space-between;
    line-height: 30px;
  }
</style>
<style>
@@ -118,7 +118,7 @@
  }

  .ins_order_add .el-table .warning-row .cell {
    color: #bababa;
    color: #3A7BFA;
  }

  .ins_order_add .el-select .is-disabled {
@@ -481,10 +481,10 @@
        <el-table-column prop="manHour" label="工时系数" width="100" show-overflow-tooltip></el-table-column> -->
        <!-- <el-table-column prop="deviceGroup" label="设备组" width="120" show-overflow-tooltip></el-table-column> -->
        <el-table-column prop="section" label="区间" min-width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="ask" label="要求值" min-width="220px">
        <el-table-column prop="ask" label="要求值" min-width="220px" v-if="isAskOnlyRead">
          <template slot-scope="scope">
            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'ask')"
              v-if="active==1&&isAskOnlyRead"></el-input>
            <span v-else>
              <!-- <template v-if="(scope.row.ask.indexOf('D')>-1
@@ -497,6 +497,16 @@
              </template>
              <template v-else>{{ scope.row.ask }}</template> -->
              <template >{{ scope.row.ask }}</template>
            </span>
          </template>
        </el-table-column>
        <el-table-column prop="tell" label="要求描述" min-width="220px">
          <template slot-scope="scope">
            <el-input size="small" placeholder="要求描述" v-model="scope.row.tell" clearable type="textarea"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
              v-if="active==1&&isAskOnlyRead"></el-input>
            <span v-else>
              <template >{{ scope.row.tell }}</template>
            </span>
          </template>
        </el-table-column>
@@ -565,8 +575,17 @@
          <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" filterable style="width: 100%;">
              <el-select v-model="distributeData.userId" placeholder="请选择" size="small" filterable style="width: 100%;" @change="changeUser">
                <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
              </el-select>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22" v-if="distributeData.userId">
            <div class="search_label"><span class="required-span">* </span>试验室：</div>
            <div class="search_input">
              <el-select v-model="distributeData.sonLaboratory" placeholder="请选择" size="small" filterable style="width: 100%;">
                <el-option v-for="item in sonLaboratoryList" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
              </el-select>
            </div>
@@ -602,20 +621,20 @@
    <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"
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1Dia" min-width="400px" :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" style="height: initial;margin: 5px 0;">
            <div class="search_label"><span class="required-span">* </span>选项：</div>
          <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
            <div class="search_label" style="width: 80px;"><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" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
              </el-radio-group>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
            <div class="search_label">要求值：</div>
          <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
            <div class="search_label" style="width: 80px;">要求值：</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"
@@ -664,20 +683,20 @@
      </div>
    </el-dialog>
<!--    全选特殊值处理框-->
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1DiaAll" width="500px" :show-close="false"
    <el-dialog title="检测到特殊项，请作出以下选择" :visible.sync="bsm1DiaAll" min-width="400px" :show-close="false"
               :before-close="beforeClose">
      <div class="body" style="max-height: 60vh;" v-for="(item, index) in bsm1DiaList" :key="index">
        <el-row v-if="item.bsm1">
          <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
            <div class="search_label"><span class="required-span">* </span>选项：</div>
          <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
            <div class="search_label" style="width: 80px;"><span class="required-span">* </span>选项：</div>
            <div class="search_input">
              <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
                <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
              </el-radio-group>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
            <div class="search_label">要求值：</div>
          <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
            <div class="search_label" style="width: 80px;">要求值：</div>
            <div class="search_input" v-show="item.bsm1Val!==null&&item.bsm1Val!==''">
              <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
                <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai"
@@ -840,6 +859,7 @@
        <el-button type="primary" @click="spliceData">保存</el-button>
      </span>
    </el-dialog>
    <!-- 电力试验室---温升试验/热循环 -->
    <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
      <div>
        <div v-if="isShowInput" style="margin-bottom: 6px">
@@ -984,7 +1004,8 @@
        issuedDialogVisible: false,
        distributeData: {
          appointed: '',
          userId: ''
          userId: '',
          sonLaboratory:''
        },
        personList: [],
        upLoad: false,
@@ -1051,7 +1072,8 @@
        temperatureTitle: '',
        temperatureTestNum: '',
        isShowInput: false,
        temId: ''
        temId: '',
        sonLaboratoryList:[]
      }
    },
    watch: {
@@ -1095,7 +1117,7 @@
      this.selectEnumByCategoryForType()
      this.getUserNow()
      this.selectStandardTreeList()
      this.selectInsOrderTemplate()
      // this.selectInsOrderTemplate()
      this.getAuthorizedPerson();
      this.selectEnumByCategoryForUnit()
      this.selectStandardMethods()
@@ -1230,7 +1252,7 @@
            item.tell = ask
          }
        })
        console.log('ask---', ask)
        // console.log('ask---', ask)
        this.temperatureShow = false
      },
      temperatureShowClose () {
@@ -1279,7 +1301,7 @@
      },

      handleTemperatureTestChange (value) {
        console.log('value---', value)
        // console.log('value---', value)
      },
      handleSelectionChange(val) {
        this.opticalProjectList = val;
@@ -1391,6 +1413,10 @@
        this.addObj.code = selects.code
        this.addObj.companyId = selects.id
        this.selectUserDia = false
        if(this.active==1){
          // TODO
          this.selectInsOrderTemplate()
        }
      },
      containsValue(str) {
        if(str){
@@ -1476,7 +1502,7 @@
              isHaveBushing = false
            }
          })
          console.log('isHaveBushing===', isHaveBushing)
          // console.log('isHaveBushing===', isHaveBushing)
          if (productListSelected && select[2] === '光缆' && isHaveBushing === false) {
            this.$message.error('光缆温度循环项目必须进行光纤配置')

@@ -1815,11 +1841,16 @@
          this.$message.error('指派人员未填写')
          return
        }
        if (this.distributeData.userId&&(this.distributeData.sonLaboratory== null ||this.distributeData.sonLaboratory== '')) {
          this.$message.error('试验室未填写')
          return
        }
        this.upLoad = true;
        this.$axios.post(this.$api.insOrder.upInsOrder, {
          orderId: this.distributeData.orderId,
          appointed: this.distributeData.appointed,
          userId: this.distributeData.userId
          userId: this.distributeData.userId,
          sonLaboratory:this.distributeData.sonLaboratory
        }).then(res => {
          if (res.code === 201) {
            this.upLoad = false
@@ -1846,6 +1877,9 @@
          this.addObj.companyId = selects.departId
          this.addObj.production = '/'
          this.addObj.productionEn = '/'
          if(this.active==1){
            this.selectInsOrderTemplate()
          }
        })
      },
      getProNum() {
@@ -2029,15 +2063,32 @@
      upProductSelect(selection, row) {
        this.bsm1DiaList = []
        row.state = row.state == 1 ? 0 : 1
        if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
        let arr = this.productList.filter(m=>m.state==1&&row.section.includes(m.section)&&m.ask&&m.section.indexOf('[')==-1)
        if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1&&arr.length==0) {
          if (row.section.indexOf('[') > -1) {
            row.bsmRow = this.HaveJson(row)
          }
          row.bsm1 = true
          this.bsm1DiaList.push(row)
          this.bsm1DiaAll = true
        } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
        } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0&&arr.length==0) {
          row.bsm1 = false
        }else if(arr.length>0){
          try{
          row.bsmRow = this.HaveJson(row)
          let section = arr[0].section
          let arr0 = JSON.parse(row.section)
          let arr1 = JSON.parse(row.ask)
          let arr2 = JSON.parse(row.manHour)
          let arr3 = JSON.parse(row.price)
          let arr4 = JSON.parse(row.tell)
          let index = arr0.indexOf(section)
          row.section = section
          row.ask = arr1[index]
          row.manHour = arr2[index]
          row.price = arr3[index]
          row.tell = arr4[index]
          } catch(e) {}
        }
        if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
          this.bsm2 = true
@@ -2083,7 +2134,7 @@
          this.circulateShow = false;
        }
        if ((row.inspectionItem === '温升试验' || row.inspectionItem === '热循环') && row.state === 1) {
          console.log('row---', row)
          // console.log('row---', row)
          this.temperatureTitle = `${row.inspectionItem}要求填写`
          this.isShowInput = row.inspectionItem === '热循环'
          this.temId = row.id
@@ -2133,12 +2184,12 @@
        rowIndex
      }) {
        if (row.state === 0) {
          return 'warning-row';
          return '';
        }
        return '';
        return 'warning-row';
      },
      selectInsOrderTemplate() {
        this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res => {
        this.$axios.get(this.$api.insOrder.selectInsOrderTemplate+'?company='+this.addObj.company).then(res => {
          if (res.code == 201) return
          this.templates = res.data
        })
@@ -2310,12 +2361,12 @@
        }
      },
      // 要求值变化时
      requestChange(e, row) {
      requestChange(e, row,type) {
        this.sampleList.map(item => {
          if (this.sampleIds.indexOf(item.id) > -1) {
            item.insProduct.map(m => {
              if (m.id == row.id) {
                m.ask = e;
                m[type] = e;
              }
              return m;
            })
@@ -2336,7 +2387,7 @@
        }
      },
      handleAll(e) {
        console.log('e---', e)
        // console.log('e---', e)
        if (e.length > 0) {
          this.productList.map(m => {
            if(e.find(a=>a.id == m.id)){
@@ -2386,7 +2437,7 @@
            this.circulateShow = false;
          }
          if ((p.inspectionItem === '温升试验' || p.inspectionItem === '热循环') && p.state === 1) {
            console.log('p---', p)
            // console.log('p---', p)
            this.temperatureTitle = `${p.inspectionItem}要求填写`
            this.isShowInput = p.inspectionItem === '热循环'
            this.temId = p.id
@@ -2669,7 +2720,7 @@
      getTotal() {
        this.totalArr = []
        this.total = 0;
        console.log(this.sampleList)
        // console.log(this.sampleList)
        this.sampleList.forEach(item => {
          if (item.insProduct && item.insProduct.length > 0) {
            item.insProduct.forEach(a => {
@@ -2715,7 +2766,6 @@
            if (item.manHourGroup === '' || !item.manHourGroup) {
              return true
            } else {
              console.log(item)
              mySet.add(item.manHourGroup)
              let num2 = mySet.size
              if (num2 > num1) {
@@ -2728,6 +2778,20 @@
        })
        arr0.forEach(item => {
          this.total += Number(item.price)
        })
        let arr1 = this.totalArr.filter(item => item.state == 1)
        let mySet0 = new Set();
        this.sonLaboratoryList = []
        arr1.forEach(item => {
          let num1 = mySet0.size
          mySet0.add(item.sonLaboratory)
          let num2 = mySet0.size
          if(num2>num1){
            this.sonLaboratoryList.push({
              label:item.sonLaboratory,
              value:item.sonLaboratory,
            })
          }
        })
      },
      bsm2Up(val) {
@@ -2744,6 +2808,11 @@
        for (let a of set) {
          this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a - 1]))
        }
      },
      changeUser(){
        if(this.sonLaboratoryList.length>0){
          this.distributeData.sonLaboratory = this.sonLaboratoryList[0].value
        }
      }
    }
  }