elink-star
/
esua-epdc-admin-js
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

拼团购 顺道捎 bug修改

feature/syp_points
songyunpeng 5 years ago
parent
47298091d2
commit
ae61510015
5 changed files with 244 additions and 23 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. 93
      src/views/modules/custom/groupbuy-detail.vue
  2. 31
      src/views/modules/custom/groupbuyinfo.vue
  3. 99
      src/views/modules/custom/sds-detail.vue
  4. 6
      src/views/modules/custom/sdsinfo-add-or-update.vue
  5. 38
      src/views/modules/custom/sdsinfo.vue

93
src/views/modules/custom/groupbuy-detail.vue
View File

@ -0,0 +1,93 @@
<template>
<el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" ref="dataForm" label-width="150px">
<el-form-item label="标题：" prop="groupBuyTitle">
<div>{{ dataForm.groupBuyTitle }}</div>
</el-form-item>
<el-form-item label="联系电话：" prop="groupBuyMobile">
<div>{{ dataForm.groupBuyMobile }}</div>
</el-form-item>
<el-form-item label="发布内容：" prop="groupBuyContent">
<div>{{ dataForm.groupBuyContent }}</div>
</el-form-item>
<el-form-item label="团购时间：" prop="groupBuyTime">
<div>{{ dataForm.groupBuyTime }}</div>
</el-form-item>
<el-form-item label="发布时间：" prop="createdTime">
<div>{{ dataForm.createdTime }}</div>
</el-form-item>
<el-form-item label="排序：" prop="sort">
<div>{{ dataForm.sort }}</div>
</el-form-item>
<el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽状态：" prop="shieldFlag">
<div>已屏蔽</div>
</el-form-item>
<el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽原因：" prop="shieldReason">
<div>{{ dataForm.shieldReason }}</div>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('close') }}</el-button>
</template>
</el-dialog>
</template>
<script>
export default {
data () {
return {
visible: false,
dataForm: {
id: '',
content: '',
reportUser: '',
reportUserMobile: '',
anonymousFlag: '',
userId: '',
nickname: '',
userFace: '',
mobile: '',
deptId: '',
deptName: '',
parentDeptIds: '',
parentDeptNames: '',
allDeptIds: '',
allDeptNames: '',
delFlag: '',
shieldFlag: '',
shieldReason: '',
revision: '',
createdBy: '',
createdTime: '',
updatedBy: '',
updatedTime: ''
}
}
},
computed: {
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
// 获取信息
getInfo () {
this.$http.get(`/custom/groupbuyinfo/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
}
}
}
</script>

31
src/views/modules/custom/groupbuyinfo.vue
View File

@ -2,7 +2,7 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-custom__groupbuyinfo}"> <div class="mod-custom__groupbuyinfo}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item label="标题" prop="groupBuyTitle">
<el-input v-model.trim="dataForm.groupBuyTitle" placeholder="标题" clearable></el-input> <el-input v-model.trim="dataForm.groupBuyTitle" placeholder="标题" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="发布时间" prop="startTime"> <el-form-item label="发布时间" prop="startTime">
@ -32,14 +32,17 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column prop="groupBuyTitle" label="标题" header-align="center" align="center"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="groupBuyMobile" label="联系电话" header-align="center" align="center"></el-table-column> <el-table-column prop="groupBuyTitle" label="标题" header-align="center" align="center" width="200px"></el-table-column>
<el-table-column prop="groupBuyContent" label="发布内容" header-align="center" align="center"></el-table-column> <el-table-column prop="groupBuyMobile" label="联系电话" header-align="center" align="center" width="150"></el-table-column>
<el-table-column show-overflow-tooltip prop="groupBuyContent" label="发布内容" header-align="center" align="center" width="300px"></el-table-column>
<el-table-column prop="groupBuyTime" label="团购时间" header-align="center" align="center"></el-table-column> <el-table-column prop="groupBuyTime" 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="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center" width="100px"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button type="text" size="mini" @click="groupBuyDetailHandle(scope.row.id)">查看</el-button>
<el-button v-if="scope.row.shieldFlag === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="scope.row.shieldFlag === '0'" <el-button v-if="scope.row.shieldFlag === '0'"
type="text" type="text"
size="small" size="small"
@ -61,6 +64,8 @@
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<groupbuy-detail v-if="groupbuyDetailVisible" ref="groupbuyDetail" @refreshDataList="getDataList"></groupbuy-detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -68,6 +73,7 @@
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './groupbuyinfo-add-or-update' import AddOrUpdate from './groupbuyinfo-add-or-update'
import GroupbuyDetail from './groupbuy-detail'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -98,11 +104,13 @@ export default {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal).getTime()
} }
} }
} },
groupbuyDetailVisible: false
} }
}, },
components: { components: {
AddOrUpdate AddOrUpdate,
GroupbuyDetail
}, },
methods: { methods: {
shield (val) { shield (val) {
@ -130,6 +138,13 @@ export default {
}).catch(() => { }) }).catch(() => { })
}).catch(() => { }).catch(() => {
}) })
},
groupBuyDetailHandle (goupBuyId) {
this.groupbuyDetailVisible = true
this.$nextTick(() => {
this.$refs.groupbuyDetail.dataForm.id = goupBuyId
this.$refs.groupbuyDetail.init()
})
} }
} }
} }

99
src/views/modules/custom/sds-detail.vue
View File

@ -0,0 +1,99 @@
<template>
<el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" ref="dataForm" label-width="150px">
<el-form-item label="出发地：" prop="departure">
<div>{{ dataForm.departure }}</div>
</el-form-item>
<el-form-item label="目的地：" prop="destination">
<div>{{ dataForm.destination }}</div>
</el-form-item>
<el-form-item label="出发时间：" prop="departureTime">
<div>{{ dataForm.departureTime }}</div>
</el-form-item>
<el-form-item label="联系电话：" prop="mobile">
<div>{{ dataForm.mobile }}</div>
</el-form-item>
<el-form-item label="捎带内容：" prop="carryContent">
<div>{{ dataForm.carryContent }}</div>
</el-form-item>
<el-form-item label="捎带类型：" prop="carryStatus">
<div>{{ dataForm.carryStatus === '0' ? '需要捎':dataForm.anonymousFlag === '1' ? '可以捎':'未知' }}</div>
</el-form-item>
<el-form-item label="发布时间：" prop="createdTime">
<div>{{ dataForm.createdTime }}</div>
</el-form-item>
<el-form-item label="排序：" prop="sort">
<div>{{ dataForm.sort }}</div>
</el-form-item>
<el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽状态：" prop="shieldFlag">
<div>已屏蔽</div>
</el-form-item>
<el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽原因：" prop="shieldReason">
<div>{{ dataForm.shieldReason }}</div>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('close') }}</el-button>
</template>
</el-dialog>
</template>
<script>
export default {
data () {
return {
visible: false,
dataForm: {
id: '',
content: '',
reportUser: '',
reportUserMobile: '',
anonymousFlag: '',
userId: '',
nickname: '',
userFace: '',
mobile: '',
deptId: '',
deptName: '',
parentDeptIds: '',
parentDeptNames: '',
allDeptIds: '',
allDeptNames: '',
delFlag: '',
shieldFlag: '',
shieldReason: '',
revision: '',
createdBy: '',
createdTime: '',
updatedBy: '',
updatedTime: ''
}
}
},
computed: {
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
// 获取信息
getInfo () {
this.$http.get(`/custom/sdsinfo/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
}
}
}
</script>

6
src/views/modules/custom/sdsinfo-add-or-update.vue
View File

@ -17,7 +17,7 @@
<el-input v-model="dataForm.carryContent" placeholder="捎带内容"></el-input> <el-input v-model="dataForm.carryContent" placeholder="捎带内容"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="捎带类型" prop="carryStatus"> <el-form-item label="捎带类型" prop="carryStatus">
<el-select style="width: 100px" v-model="dataForm.carryStatus" placeholder="请选择" clearable> <el-select v-model="dataForm.carryStatus" placeholder="请选择" clearable>
<el-option <el-option
v-for="item in carryStatusArr" v-for="item in carryStatusArr"
:key="item.optionValue" :key="item.optionValue"
@ -56,11 +56,11 @@ export default {
carryStatusArr: [ carryStatusArr: [
{ {
'optionValue': '0', 'optionValue': '0',
'optionName': '我需要捎' 'optionName': '需要捎'
}, },
{ {
'optionValue': '1', 'optionValue': '1',
'optionName': '我可以捎' 'optionName': '可以捎'
} }
] ]
} }

38
src/views/modules/custom/sdsinfo.vue
View File

@ -39,16 +39,19 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column prop="departure" label="出发地" header-align="center" align="center"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="destination" label="目的地" header-align="center" align="center"></el-table-column> <el-table-column show-overflow-tooltip prop="departure" label="出发地" header-align="center" align="center" width="200px"></el-table-column>
<el-table-column show-overflow-tooltip prop="destination" label="目的地" header-align="center" align="center" width="200px"></el-table-column>
<el-table-column prop="departureTime" label="出发时间" header-align="center" align="center"></el-table-column> <el-table-column prop="departureTime" label="出发时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column> <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="carryContent" label="捎带内容" header-align="center" align="center" :formatter="carryStatusFormat"></el-table-column> <el-table-column show-overflow-tooltip prop="carryContent" label="捎带内容" header-align="center" align="center" ></el-table-column>
<el-table-column prop="carryStatus" label="捎带类型" header-align="center" align="center"></el-table-column> <el-table-column prop="carryStatus" label="捎带类型" header-align="center" align="center" :formatter="carryStatusFormat"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column> <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center" width="100px"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button type="text" size="mini" @click="sdsDetailHandle(scope.row.id)">查看</el-button>
<el-button v-if="scope.row.shieldFlag === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="scope.row.shieldFlag === '0'" <el-button v-if="scope.row.shieldFlag === '0'"
type="text" type="text"
size="small" size="small"
@ -70,6 +73,7 @@
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<sds-detail v-if="detailVisible" ref="sdsDetail" @refreshDataList="getDataList"></sds-detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -77,6 +81,7 @@
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './sdsinfo-add-or-update' import AddOrUpdate from './sdsinfo-add-or-update'
import SdsDetail from './sds-detail'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -95,11 +100,11 @@ export default {
carryStatusArr: [ carryStatusArr: [
{ {
'optionValue': '0', 'optionValue': '0',
'optionName': '我需要捎' 'optionName': '需要捎'
}, },
{ {
'optionValue': '1', 'optionValue': '1',
'optionName': '我可以捎' 'optionName': '可以捎'
} }
], ],
pickerBeginDateBefore: { pickerBeginDateBefore: {
@ -117,19 +122,21 @@ export default {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal).getTime()
} }
} }
} },
detailVisible: false
} }
}, },
components: { components: {
AddOrUpdate AddOrUpdate,
SdsDetail
}, },
methods: { methods: {
carryStatusFormat: function (row, column) { carryStatusFormat: function (row, column) {
let carryStatus = row.carryStatus let carryStatus = row.carryStatus
if (carryStatus === '0') { if (carryStatus === '0') {
return '我需要捎' return '需要捎'
} else if (carryStatus === '1') { } else if (carryStatus === '1') {
return '我可以捎' return '可以捎'
} }
}, },
shield (val) { shield (val) {
@ -157,6 +164,13 @@ export default {
}).catch(() => { }) }).catch(() => { })
}).catch(() => { }).catch(() => {
}) })
},
sdsDetailHandle (sdsId) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.sdsDetail.dataForm.id = sdsId
this.$refs.sdsDetail.init()
})
} }
} }
} }

Write Preview
Loading…
Cancel
Save