elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-tuceng0616' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-tuceng0616

shibei_master
dai 3 years ago
parent
49f0aefdda 9e019f8a61
commit
e22dd84654
2 changed files with 38 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/views/modules/shequzhili/csgltc/csgl.vue
  2. 25
      src/views/modules/shequzhili/ggfwtc/ggfw.vue

25
src/views/modules/shequzhili/csgltc/csgl.vue
View File

@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--delete" class="diy-button--search"
size="small" size="small"
@click="handleSearch">查询</el-button> @click="handleSearch">查询</el-button>
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
@ -45,10 +45,10 @@
</div> </div>
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<el-button class="diy-button--delete" <el-button class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button class="diy-button--delete" <el-button class="diy-button--search"
style="margin-left:10px" style="margin-left:10px"
size="small" size="small"
@click="handleExportModule('room')">下载模板</el-button> @click="handleExportModule('room')">下载模板</el-button>
@ -67,7 +67,7 @@
</el-upload> </el-upload>
<el-button style="float:left;margin-left:10px" <el-button style="float:left;margin-left:10px"
class="diy-button--delete" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
@ -115,6 +115,7 @@
<el-table-column prop="address" <el-table-column prop="address"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip
label="地址" label="地址"
width="120"> width="120">
</el-table-column> </el-table-column>
@ -131,12 +132,24 @@
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button v-if="scope.row.agencyId === agencyId && (scope.row.longitude === '' || scope.row.longitude === null || scope.row.latitude === '' || scope.row.latitude === null) && scope.row.sourceType === 'import'"
type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">待完善</el-button>
<el-button v-else-if="scope.row.agencyId === agencyId && (scope.row.longitude !== '' && scope.row.longitude !== null && scope.row.latitude !== '' && scope.row.latitude !== null) && scope.row.sourceType === 'import'"
type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-else-if="scope.row.agencyId === agencyId && scope.row.sourceType === 'add'"
type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" <el-button v-if="scope.row.agencyId === agencyId"
type="text"
class="div-table-button--delete" class="div-table-button--delete"
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>

25
src/views/modules/shequzhili/ggfwtc/ggfw.vue
View File

@ -32,7 +32,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--delete" class="diy-button--search"
size="small" size="small"
@click="handleSearch">查询</el-button> @click="handleSearch">查询</el-button>
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
@ -44,11 +44,11 @@
</div> </div>
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<el-button class="diy-button--delete" <el-button class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button class="diy-button--delete" <el-button class="diy-button--search"
style="margin-left:10px" style="margin-left:10px"
size="small" size="small"
@click="handleExportModule('room')">下载模板</el-button> @click="handleExportModule('room')">下载模板</el-button>
@ -66,7 +66,7 @@
size="small">导入</el-button> size="small">导入</el-button>
</el-upload> </el-upload>
<el-button style="float:left;margin-left:10px" <el-button style="float:left;margin-left:10px"
class="diy-button--delete" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
</div> </div>
@ -112,6 +112,7 @@
<el-table-column prop="address" <el-table-column prop="address"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip
label="地址" label="地址"
width="120"> width="120">
</el-table-column> </el-table-column>
@ -127,11 +128,23 @@
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button v-if="scope.row.agencyId === agencyId && (scope.row.longitude === '' || scope.row.longitude === null || scope.row.latitude === '' || scope.row.latitude === null) && scope.row.sourceType === 'import'"
type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">待完善</el-button>
<el-button v-else-if="scope.row.agencyId === agencyId && scope.row.longitude !== '' && scope.row.longitude !== null && scope.row.latitude !== '' && scope.row.latitude !== null && scope.row.sourceType === 'import'"
type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" <el-button v-else-if="scope.row.agencyId === agencyId && scope.row.sourceType === 'add'"
type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="scope.row.agencyId === agencyId"
type="text"
class="div-table-button--delete" class="div-table-button--delete"
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>

Write Preview
Loading…
Cancel
Save