合并冲突

licp

2024-05-27 e59a71579f6afd21c76f9d45c3b3f09c28d03c41

 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="$parent.playOrder(4)">光纤配置</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">工程名称：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value1" :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.value2" :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.value3" :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.value4" :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: '送检',
          value1: null,
          value2: null,
          value3: null,
          value4: null,
        },
        sample: {
          sampleCode: null,
@@ -1145,7 +1174,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'