Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-31 defa824eab2350fd6abfd10abd8f4df94749e336

 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>
@@ -611,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"
@@ -673,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"
@@ -1107,7 +1117,7 @@
      this.selectEnumByCategoryForType()
      this.getUserNow()
      this.selectStandardTreeList()
      this.selectInsOrderTemplate()
      // this.selectInsOrderTemplate()
      this.getAuthorizedPerson();
      this.selectEnumByCategoryForUnit()
      this.selectStandardMethods()
@@ -1403,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){
@@ -1863,6 +1877,9 @@
          this.addObj.companyId = selects.departId
          this.addObj.production = '/'
          this.addObj.productionEn = '/'
          if(this.active==1){
            this.selectInsOrderTemplate()
          }
        })
      },
      getProNum() {
@@ -2150,12 +2167,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
        })
@@ -2327,12 +2344,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;
            })