Merge remote-tracking branch 'origin/master'

value

2024-06-21 691440d02d1e5545ebdae1bbf07fa7f5520c689f

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

@@ -163,20 +163,14 @@
            </el-select>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6" style="display: none;">
          <div class="search_label"><span class="required-span">* </span>委托人：</div>
        <el-col class="search_thing" :span="6" >
          <div class="search_label"><span class="required-span">* </span>制单人：</div>
          <div class="search_input">
            <el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
            <!-- <el-input readonly size="small" v-model="addObj.custom">
              <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
                  :disabled="active>1"></el-button></template>
            </el-input> -->
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">制单人：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
@@ -192,7 +186,7 @@
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>联系方式：</div>
          <div class="search_input">
            <el-input size="small" placeholder="选择委托客户" clearable disabled v-model="addObj.phone"></el-input>
            <el-input size="small" placeholder="选择委托客户" clearable :readonly="active>1" v-model="addObj.phone"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
@@ -309,6 +303,12 @@
          <div class="search_label">OTC订单号：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">委托人：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -551,15 +551,15 @@
      :before-close="beforeClose">
      <div class="body" style="max-height: 60vh;">
        <el-row v-if="bsm1">
          <el-col class="search_thing" :span="22">
          <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
            <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>
                <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">
          <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
            <div class="search_label">要求值：</div>
            <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
              <el-radio-group v-model="bsm1Val" @input="upBsm1">
@@ -612,6 +612,12 @@
      <el-table
      :data="editTable"
      style="width: 100%">
      <!-- inspectionItemList -->
      <el-table-column
          prop="inspectionItemList"
          label="检验项"
          width="180">
        </el-table-column>
        <el-table-column
          prop="sampleCode"
          label="样品编号"
@@ -1020,7 +1026,10 @@
              if (a.state == 1) {
                if(type==0){
                  let str = calBack(a.ask)
                  str&&obj.symbolList.push(str)
                  str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:a.inspectionItem,
                  })
                }else if(type==1){
                  let arr = this.editTable.filter(b => b.sampleId == item.id)
                  arr.forEach(f => {
@@ -1049,7 +1058,10 @@
                      if (c.state == 1) {
                        if(type==0){
                          let str = calBack(c.ask)
                          str&&obj.symbolList.push(str)
                          str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:c.inspectionItem,
                  })
                        }else if(type==1){
                          let arr = this.editTable.filter(b => b.sampleId == item.id)
                          arr.forEach(f => {
@@ -1077,7 +1089,10 @@
                      if (c.state == 1) {
                        if(type==0){
                          let str = calBack(c.ask)
                          str&&obj.symbolList.push(str)
                          str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:c.inspectionItem,
                  })
                        }else if(type==1){
                          // let ask = calBack(c.ask, c.rts)
                          // if (ask && c.state == 1) {
@@ -1107,7 +1122,10 @@
                          if (d.state == 1) {
                            if(type==0){
                              let str = calBack(d.ask)
                              str&&obj.symbolList.push(str)
                              str&&obj.symbolList.push({
                    symbolItem:str,
                    inspectionItem:d.inspectionItem,
                  })
                            }else if(type==1){
                              // let ask = calBack(d.ask, d.rts)
                              // if (ask && d.state == 1) {
@@ -1142,7 +1160,23 @@
        })
        if(type==0){
          editTable.forEach(a => {
            a.symbolList = Array.from(new Set(a.symbolList))
            a.symbolList.forEach(b => {
              let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
              b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
            })
          })
          editTable.forEach(a => {
            let mySet = new Set();
            a.symbolList = a.symbolList.filter(b =>{
              let num0 = mySet.size;
              mySet.add(b.symbolItem);
              let num1 = mySet.size;
              if(num0!=num1){
                return true;
              }else{
                return false
              }
            })
          })
          let editTableNew = []
          editTable.forEach(a => {
@@ -1150,9 +1184,10 @@
              let obj = {
                sampleCode:a.sampleCode,
                model:a.model,
                symbolItem:b,
                symbolItem:b.symbolItem,
                sampleId:a.sampleId,
                value:null
                value:null,
                inspectionItemList:b.inspectionItemList,
              }
              editTableNew.push(obj)
            })