Browse Source

【pc端 - 优化bug】-【优化bug】-(魏凯)-2020/07/23

master
weikai 5 years ago
parent
commit
7bc501315a
  1. 2
      src/views/modules/news/banner.vue
  2. 10
      src/views/modules/sys/resourcestotalrelation-list.vue

2
src/views/modules/news/banner.vue

@ -5,7 +5,7 @@
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()"> @keyup.enter.native="getDataListSearch()">
<el-form-item label="标题:"> <el-form-item label="标题">
<el-input v-model="dataForm.title" @keyup.native="btKeyUptitle" <el-input v-model="dataForm.title" @keyup.native="btKeyUptitle"
placeholder="请输入标题" placeholder="请输入标题"
clearable></el-input> clearable></el-input>

10
src/views/modules/sys/resourcestotalrelation-list.vue

@ -7,7 +7,7 @@
> >
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-news__resourcestotalrelation}"> <div class="mod-news__resourcestotalrelation}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="selectData()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<div> <div>
<el-form-item label="统计名称" prop="totalName"> <el-form-item label="统计名称" prop="totalName">
<el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input> <el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input>
@ -31,10 +31,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="selectData()">{{ $t('query') }}</el-button> <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('workRecord:relation:save')" type="primary" @click="selectHandle()">{{ "新增" }}</el-button> <el-button v-if="$hasPermission('workRecord:relation:save')" type="success" @click="selectHandle()">{{ "新增" }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -47,8 +47,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column> <el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="totalType" label="统计类型" header-align="center" align="center"></el-table-column> <el-table-column prop="totalType" label="统计类型" header-align="center" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column> <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="spec" label="规格" header-align="center" align="center"></el-table-column> <el-table-column prop="spec" label="规格" header-align="center" align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column> <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
<el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column> <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>

Loading…
Cancel
Save