Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-05-31 24bb2269bf0d9a0aacc057a60d2c76d73b2fccc9

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

@@ -222,30 +222,6 @@
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">是否留样：</div>
          <div class="search_input">
            <el-radio-group v-model="addObj.isLeave">
              <el-radio :label="0">不留样</el-radio>
              <el-radio :label="1">留样</el-radio>
            </el-radio-group>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label" style="width: 175px;">是否涉及配套样品：</div>
          <div class="search_input" style="width: calc(100% - 175px);">
            <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()">
              <el-radio :label="1">是</el-radio>
              <el-radio :label="0">否</el-radio>
            </el-radio-group>
          </div>
        </el-col>
        <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>
          </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>
@@ -267,6 +243,30 @@
          <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">
          <div class="search_label">是否留样：</div>
          <div class="search_input">
            <el-radio-group v-model="addObj.isLeave">
              <el-radio :label="0">不留样</el-radio>
              <el-radio :label="1">留样</el-radio>
            </el-radio-group>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label" style="width: 175px;">是否涉及配套样品：</div>
          <div class="search_input" style="width: calc(100% - 175px);">
            <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()">
              <el-radio :label="1">是</el-radio>
              <el-radio :label="0">否</el-radio>
            </el-radio-group>
          </div>
        </el-col>
        <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>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -595,6 +595,7 @@
          engineeringEn: null,
          production: null,
          productionEn: null,
          companyId: null
        },
        sample: {
          sampleCode: null,
@@ -738,19 +739,14 @@
          this.$message.error('未选择数据')
          return
        }
        delete selects['orderBy']
        delete selects['updateUser']
        delete selects['updateTime']
        this.addObj.userId = selects.id
        this.addObj.company = selects.company
        this.addObj.custom = selects.name
        this.addObj.code = selects.code
        this.addObj.phone = selects.phone
        this.addObj.companyId = selects.id
        this.selectUserDia = false
      },
      save() {
        if (!this.addObj.custom) {
          this.$message.error('未选择下单客户')
        if (!this.addObj.companyId) {
          this.$message.error('未选择客户单位')
          return
        }
        if (!this.addObj.type) {