Merge remote-tracking branch 'origin/master'

value

2024-05-27 9e34e3c4a5fce250614ac014ecc3e83f41d6f637

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

@@ -107,6 +107,7 @@
          <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="openConfig">光纤配置</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"
@@ -242,6 +243,30 @@
          <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"><span class="required-span">* </span>工程名称：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>工程名称EN：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <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 v-model="addObj.production" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label"><span class="required-span">* </span>生产单位EN：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -562,7 +587,11 @@
          isLeave: 0,
          orderType: null,
          send: 1,
          formType: '送检'
          formType: '送检',
          engineering: null,
          engineeringEn: null,
          production: null,
          productionEn: null,
        },
        sample: {
          sampleCode: null,
@@ -726,6 +755,14 @@
          this.$message.error('请输入来样方式')
        } else if (!this.addObj.orderType) {
          this.$message.error('请选择检验类别')
        }else if (!this.addObj.engineering) {
          this.$message.error('请输入工程名称')
        } else if (!this.addObj.engineeringEn) {
          this.$message.error('请输入工程名称EN')
        }else if (!this.addObj.production) {
          this.$message.error('请输入生产单位')
        }else if (!this.addObj.productionEn) {
          this.$message.error('请输入生产单位EN')
        } else if (this.sampleList.length < 1) {
          this.$message.error('请添加一个样品')
        } else if (!this.sampleList.every(m => m.sample)) {
@@ -1145,7 +1182,8 @@
        this.getProductLoad = true
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: row.model + '-' + row.modelNum,
          standardMethodListId: val
          standardMethodListId: val,
          factory: this.selectTree,
        }, {
          headers: {
            'Content-Type': 'application/json'
@@ -1280,6 +1318,10 @@
      filterHandler(value, row, column) {
        const property = column['property'];
        return row[property] === value;
      },
      openConfig(){
        this.$parent.playOrder(4)
        console.log(this.sampleIds);
      }
    }
  }