Merge remote-tracking branch 'origin/master'

zss

2024-07-01 e3f6f75938f45f2672bf0f0320cb92a4f96ff696

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

@@ -256,14 +256,14 @@
        <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.engineering"
            <el-input size="small" :placeholder="active>1 ? '' : '请输入'" clearable v-model="addObj.engineering"
              :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">工程名称EN：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineeringEn"
            <el-input size="small" :placeholder="active>1 ? '' : '请输入'" clearable v-model="addObj.engineeringEn"
              :readonly="active>1"></el-input>
          </div>
        </el-col>
@@ -302,19 +302,19 @@
        <el-col class="search_thing" :span="6">
          <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>
            <el-input size="small" :placeholder="active>1 ? '' : '请输入'" 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>
            <el-input size="small" :placeholder="active>1 ? '' : '请输入'" 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;">
          <div class="search_label">备注：</div>
          <div class="search_input">
            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable
            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable :placeholder="active>1 ? '' : '请输入'"
              v-model="addObj.remark" :readonly="active>1"></el-input>
          </div>
        </el-col>
@@ -331,7 +331,7 @@
        <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"
            <el-select v-model="model" :placeholder="active>1 ? '' : '请输入'" 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>
@@ -341,7 +341,7 @@
        <div class="search_thing">
          <div class="search_label">检验标准：</div>
          <div class="search_input">
            <el-select v-model="standardMethodListId" placeholder="请选择" size="small" @focus="methodFocus"
            <el-select v-model="standardMethodListId" :placeholder="active>1 ? '' : '请输入'" 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>
@@ -414,7 +414,17 @@
        @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
        :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
        <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
        <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip></el-table-column>
        <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip>
          <template slot="header" slot-scope="scope">
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
              <span>检验项</span>
              <el-input
              v-model="inspectionItem"
              size="mini"
              placeholder="请输入"/>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
          show-overflow-tooltip></el-table-column>
        <el-table-column prop="sonLaboratory" label="子实验室" min-width="130" show-overflow-tooltip :filters="filters"
@@ -865,7 +875,8 @@
        model: null,
        standardMethodListId: null,
        symbolList:[
        'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
        'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
        inspectionItem:null,
      }
    },
    watch: {