合并冲突

licp

2024-03-28 70bf5f310d85c3a0700d75a7a877f5a1e403d83f

 src/components/view/b1-inspection-order.vue

@@ -86,9 +86,9 @@
                     v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
               <div class="search_label">样品名称：</div>
               <div class="search_label">样品类型：</div>
               <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                     v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
                     v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
               <el-button size="small" @click="refresh()">重 置</el-button>
@@ -157,7 +157,7 @@
                  <el-col class="search_thing" :span="22">
                     <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>指派人员：</div>
                     <div class="search_input">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable>
                           <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
@@ -217,7 +217,7 @@
            componentData: {
               entity: {
                  entrustCode: null,
                  sample: null,
                  sampleType: null,
                  state: 0,
                  orderBy: {
                     field: 'id',
@@ -447,7 +447,7 @@
         handleIssued(row) {
            this.issuedDialogVisible = true;
            this.$axios.post(this.$api.insOrder.selectOrderManDay, {
               id: row.sampleId
               id: row.id
            }).then(res => {
               this.distributeData.orderId = row.id
               this.distributeData.sampleId = row.sampleId