Browse Source

Merge branch 'dev' into test

shibei_master
13176889840 4 years ago
parent
commit
684c6e1561
  1. 11
      src/views/modules/base/resi.vue
  2. 5
      src/views/modules/communityParty/elegant/index.vue
  3. 220
      src/views/modules/communityService/dqfwzx/index.vue
  4. 2
      src/views/modules/communityService/measure/index.vue
  5. 2
      src/views/modules/communityService/sqzzz/index.vue
  6. 2
      src/views/modules/workPc/guidance/guidanceList.vue
  7. 2
      src/views/modules/workSys/demandCate.vue
  8. 6
      src/views/modules/workSys/resiCate.vue

11
src/views/modules/base/resi.vue

@ -64,6 +64,7 @@
align="center"
:fixed="item.columnName == 'NAME' ? 'left' : false"
:show-overflow-tooltip="true"
:width="item.width || computedWidth(item.label, item.itemType)"
>
<!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
<template slot-scope="scope">
@ -96,7 +97,7 @@
<el-button @click="handleEdit(scope.row)"
type="text"
size="small"
class="div-table-button--edit">编辑</el-button>
class="div-table-button--edit">修改</el-button>
<el-popconfirm title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row)">
<!-- <el-button slot="reference"
@ -390,8 +391,12 @@ export default {
this.tranferShow = false
this.getTableData()
},
computedWidth (label) {
const wd = 20 * label.length
computedWidth (label, type) {
let wd = ''
if (type == 'input' || type == 'select') wd = 40 * label.length
else if(type == 'radio') wd = 20 * label.length
console.log('type-----wd', wd)
return wd > 80 ? wd : 80
},
filterEdit (id) {

5
src/views/modules/communityParty/elegant/index.vue

@ -107,7 +107,7 @@
type="text"
size="small"
class="btn-color-edit"
>编辑</el-button
>修改</el-button
>
<el-popconfirm
title="删除之后无法恢复,确认删除?"
@ -201,7 +201,7 @@
<i class="el-icon-delete" @click="handleDelimg(item, index)"></i>
</div>
<el-upload class="avatar-uploader"
v-if="form.imageList.length < 3"
v-if="form.imageList.length < 3 && !disabled"
:action="uploadUlr"
:data="{customerId:customerId}"
:show-file-list="false"
@ -219,6 +219,7 @@
<div class="resi-btns">
<el-button size="small" @click="handlerCancle">取消</el-button>
<el-button
v-if="!disabled"
type="primary"
size="small"
:loading="btnLoading"

220
src/views/modules/communityService/dqfwzx/index.vue

@ -2,26 +2,23 @@
<div>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd"
>新增</el-button
>
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
</div>
<div class="m-center" v-if="tableData.length > 0">
<div class="m-center"
v-if="tableData.length > 0">
<div class="center-left">
<div class="list">
<div
@click="currentIndex = index"
class="item"
:class="{ 'z-on': currentIndex == index }"
:key="'ct' + index"
v-for="(item, index) in tableData"
>
<div
class="item-btn"
v-if="currentIndex == index"
@click="handleEdit"
>
<div @click="currentIndex = index"
class="item"
:class="{ 'z-on': currentIndex == index }"
:key="'ct' + index"
v-for="(item, index) in tableData">
<div class="item-btn"
v-if="currentIndex == index"
@click="handleEdit">
修改
</div>
<div class="item-name">{{ item.centerName }}</div>
@ -51,108 +48,89 @@
>
</div> -->
<div id="centerIndexApp" class="div_map"></div>
<el-table
:data="tableData[currentIndex].matterList"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="matterName" label="事项名称">
<div id="centerIndexApp"
class="div_map"></div>
<el-table :data="tableData[currentIndex].matterList"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50" />
<el-table-column prop="matterName"
label="事项名称">
</el-table-column>
<el-table-column prop="allowTime" label="可预约时间 ">
<el-table-column prop="allowTime"
label="可预约时间 ">
</el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
width="120"
>
<el-table-column fixed="right"
label="操作"
align="center"
width="120">
<template slot-scope="scope">
<el-button
@click="handleOrder(scope.$index)"
type="text"
size="small"
style="color: #1c6afd"
>预约</el-button
>
<el-button
@click="handleOrderList(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #1c6afd"
>预约记录</el-button
>
<el-button @click="handleOrder(scope.$index)"
type="text"
size="small"
style="color: #1c6afd">预约</el-button>
<el-button @click="handleOrderList(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div class="m-hint" v-else>
<el-empty description="暂无内容" :image-size="200"></el-empty>
<div class="m-hint"
v-else>
<el-empty description="暂无内容"
:image-size="200"></el-empty>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
<edit-form
ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose">
<edit-form ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"></edit-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="form2Show"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseForm2"
>
<order-form
ref="eleOrderForm"
@dialogCancle="handleCloseForm2"
@dialogOk="handleOrderSuccess"
></order-form>
<el-dialog :visible.sync="form2Show"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseForm2">
<order-form ref="eleOrderForm"
@dialogCancle="handleCloseForm2"
@dialogOk="handleOrderSuccess"></order-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="orderListShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约记录"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseOrderList"
>
<order-list
ref="eleOrderList"
@dialogCancle="handleCloseOrderList"
></order-list>
<el-dialog :visible.sync="orderListShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约记录"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseOrderList">
<order-list ref="eleOrderList"
@dialogCancle="handleCloseOrderList"></order-list>
</el-dialog>
</div>
</template>
@ -173,7 +151,7 @@ let loading; // 加载动画
export default {
components: { editForm, orderForm, orderList },
data() {
data () {
return {
openSearch: false,
@ -190,23 +168,23 @@ export default {
};
},
computed: {
maxTableHeight() {
maxTableHeight () {
return this.clientHeight - 520;
},
...mapGetters(["clientHeight"]),
},
watch: {
currentIndex() {
currentIndex () {
this.setMap();
},
},
async mounted() {
async mounted () {
await this.loadAgency();
await this.getTableData();
},
methods: {
// init
initMap() {
initMap () {
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519);
// map TMap.Map()
@ -226,7 +204,7 @@ export default {
infoWindowList = Array(10);
},
setMarker(lat, lng, centerName) {
setMarker (lat, lng, centerName) {
markers.setGeometries([]);
markers.add([
{
@ -240,11 +218,11 @@ export default {
]);
},
setCenter(lat, lng) {
setCenter (lat, lng) {
map.setCenter(new window.TMap.LatLng(lat, lng));
},
setMap() {
setMap () {
const { tableData, currentIndex } = this;
let item = tableData[currentIndex];
if (item) {
@ -253,24 +231,24 @@ export default {
}
},
handleClose() {
handleClose () {
this.formShow = false;
},
handleCloseForm2() {
handleCloseForm2 () {
this.form2Show = false;
},
handleCloseOrderList() {
handleCloseOrderList () {
this.orderListShow = false;
},
async handleAdd() {
async handleAdd () {
this.formShow = true;
await nextTick();
console.log(this.$refs);
this.$refs.eleEditForm.initForm("add");
},
async handleWatch() {
async handleWatch () {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm(
@ -279,7 +257,7 @@ export default {
);
},
async handleEdit() {
async handleEdit () {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm(
@ -288,12 +266,12 @@ export default {
);
},
handleEditSuccess() {
handleEditSuccess () {
this.handleClose();
this.getTableData();
},
async handleOrder(index) {
async handleOrder (index) {
this.form2Show = true;
await nextTick();
this.$refs.eleOrderForm.initForm(
@ -303,18 +281,18 @@ export default {
);
},
handleOrderSuccess() {
handleOrderSuccess () {
this.handleCloseForm2();
},
async handleOrderList(index) {
async handleOrderList (index) {
this.orderListShow = true;
await nextTick(0);
console.log(this.$refs);
this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
},
async handleDel(rowData, rowIndex) {
async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex);
const url =
"/heart/iccommunityselforganization/delcommunityselforganization";
@ -332,7 +310,7 @@ export default {
}
},
async getTableData() {
async getTableData () {
const oldLen = this.tableData.length;
const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
const { data, code, msg } = await requestPost(url, {
@ -353,7 +331,7 @@ export default {
},
//
async loadAgency() {
async loadAgency () {
const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {};

2
src/views/modules/communityService/measure/index.vue

@ -221,7 +221,7 @@
type="text"
size="small"
class="btn-color-edit"
>编辑</el-button
>修改</el-button
>
<el-popconfirm
title="取消之后无法恢复,确认取消?"

2
src/views/modules/communityService/sqzzz/index.vue

@ -107,7 +107,7 @@
type="text"
size="small"
class="div-table-button--edit"
>编辑</el-button
>修改</el-button
>
<el-popconfirm

2
src/views/modules/workPc/guidance/guidanceList.vue

@ -147,7 +147,7 @@ export default {
}
},
{
lable: '编辑', //
lable: '修改', //
size: 'mini',
style: 'margin: 0 6px;',
type: 'text',

2
src/views/modules/workSys/demandCate.vue

@ -78,7 +78,7 @@
<el-button @click="handleEdit(scope.row, 'edit')"
type="text"
size="small"
class="div-table-button--edit">编辑</el-button>
class="div-table-button--edit">修改</el-button>
</template>
</el-table-column>
</el-table>

6
src/views/modules/workSys/resiCate.vue

@ -64,7 +64,7 @@
:prop="item.columnName"
:label="item.label"
align="center"
width="180"
min-width="180"
>
<template slot-scope="scope">
<el-image
@ -75,7 +75,7 @@
<span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="120">
<el-table-column label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button
@click="handleLook(scope.row)"
@ -89,7 +89,7 @@
type="text"
size="small"
class="div-table-button--edit"
>编辑</el-button
>修改</el-button
>
</template>
</el-table-column>

Loading…
Cancel
Save