合并冲突

licp

2024-03-28 70bf5f310d85c3a0700d75a7a877f5a1e403d83f

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

@@ -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>