Browse Source

Merge branch '4.3.1_bug' into feature

xiaowang-bug
mk 2 years ago
parent
commit
0c9586d90e
  1. 8
      src/views/modules/communityParty/regionalParty/units.vue
  2. 2
      src/views/modules/resourceManagement/enterprise/index.vue

8
src/views/modules/communityParty/regionalParty/units.vue

@ -268,14 +268,14 @@
>
</div>
<div class="table-more-btn">
<!-- <div class="table-more-btn">
<el-button
type="text"
size="small"
@click="handleScore(scope.row)"
>积分记录</el-button
>
</div>
</div> -->
<div class="table-more-btn">
<el-button
type="text"
@ -290,13 +290,13 @@
></el-button>
</el-popover>
<el-button
<!-- <el-button
v-else
type="text"
size="small"
@click="handleScore(scope.row)"
>积分记录</el-button
>
> -->
</template>
</el-table-column>
</el-table>

2
src/views/modules/resourceManagement/enterprise/index.vue

@ -25,7 +25,7 @@
clearable placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="九小场所" prop="nineSmallPlacesFlag">
<el-select v-model.trim="formData.nineSmallPlacesFlag" placeholder="请选择" class="u-item-width-normal"
<el-select v-model.trim="formData.nineSmallPlacesFlag" clearable placeholder="请选择" class="u-item-width-normal"
size="small">
<el-option v-for="item in nineArray" :key="item.value" :label="item.label"
:value="item.value"></el-option>

Loading…
Cancel
Save