platform/src/views/business/dispatchUnit.vue
@@ -2,11 +2,7 @@ <TableLayout :permissions="['business:dispatchunit:query']"> <!-- 搜索表单 --> <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline> <<<<<<< HEAD <el-form-item label="所属业" prop="companyId"> ======= <el-form-item label="所属企业" prop="companyId"> >>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search"> <el-option v-for="item in companyList"
