Skip to content

R
rs-admin
提交 c6f0f046 authored 作者: 翟畅's avatar 翟畅
浏览文件
操作

zc增加排序

上级 dbe429da
隐藏空白字符变更
内嵌 并排
正在显示 包含 153 行增加 和 31 行删除
src/api/platform/company.js
浏览文件 @ c6f0f046
......@@ -125,4 +125,12 @@ export function createConSave2API(data) { //新增内容--保存文本
method: 'post',
data
})
}
export function editSortDetailAPI(data) { //集团领导--修改排序
return request({
url: `${requestPath.common}/column-content/updateSort`,
method: 'post',
data
})
}
\ No newline at end of file
src/views/marketing_manage/agency_module/component.vue
浏览文件 @ c6f0f046
......@@ -21,6 +21,9 @@
<el-form-item label="传真：" prop="fax">
<el-input v-model="dataForm.fax" style="width:40%;"></el-input>
</el-form-item>
<el-form-item label="排序：" prop="sort">
<el-input v-model="dataForm.sort" style="width:40%;" placeholder="请输入排序号"></el-input>
</el-form-item>
</el-form>
</div>
<div class="footer_fixed">
......@@ -74,6 +77,9 @@ export default {
province:[
{ required: true , message: '请输入省份简称' },
],
sort:[
{ pattern: /^\d*$/, message: '排序号为数字' }
]
},
sending: false,
sortList: [],
......
src/views/marketing_manage/agency_module/index.vue
浏览文件 @ c6f0f046
......@@ -9,6 +9,7 @@
<el-table-column prop="name" align="center" label="联系人" min-width="12%"></el-table-column>
<el-table-column prop="contactInformation" align="center" label="联系方式" min-width="12%"></el-table-column>
<el-table-column prop="fax" align="center" label="传真" min-width="12%"></el-table-column>
<el-table-column prop="sort" align="center" label="排序" min-width="8%"></el-table-column>
<el-table-column label="操作" min-width="15%" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" v-for="(item,index) in lineBtn" @click="handleBtn(item.url,scope.row.id)" v-if="(item.url != 'removeLine' || scope.row.status == 0)" :key="index">{{item.name}}</el-button>
......
src/views/marketing_manage/client_module/componentGroup.vue
浏览文件 @ c6f0f046
......@@ -21,6 +21,9 @@
<el-form-item label="电话：" prop="contactInformation">
<el-input v-model="dataForm.contactInformation" style="width:40%;" type="textarea" :autosize="{ minRows: 3, maxRows: 6}" placeholder="请输入电话人，中间用逗号隔开"></el-input>
</el-form-item>
<el-form-item label="排序：" prop="sort">
<el-input v-model="dataForm.sort" style="width:40%;" placeholder="请输入排序号"></el-input>
</el-form-item>
</el-form>
</div>
<div class="footer_fixed">
......@@ -73,6 +76,9 @@ export default {
region:[
{ required: true , message: '请输入地区' },
],
sort:[
{ pattern: /^\d*$/, message: '排序号为数字' }
]
},
sending: false,
sortList: [],
......
src/views/marketing_manage/client_module/componentRetail.vue
浏览文件 @ c6f0f046
......@@ -18,6 +18,9 @@
<el-form-item label="网址名称：" prop="urlName">
<el-input v-model="dataForm.urlName" style="width:40%;" placeholder="输入多个网址名称时，中间用逗号隔开"></el-input>
</el-form-item>
<el-form-item label="排序：" prop="sort">
<el-input v-model="dataForm.sort" style="width:40%;" placeholder="请输入排序号"></el-input>
</el-form-item>
</el-form>
</div>
<div class="footer_fixed">
......@@ -66,6 +69,9 @@ export default {
name:[
{ required: true , message: '请输入服务范围' },
],
sort:[
{ pattern: /^\d*$/, message: '排序号为数字' }
]
},
sending: false,
sortList: [],
......
src/views/marketing_manage/client_module/index.vue
浏览文件 @ c6f0f046
......@@ -12,6 +12,7 @@
<el-table-column prop="content" align="center" label="名称" min-width="12%"></el-table-column>
<el-table-column prop="name" align="center" label="联系人" min-width="15%"></el-table-column>
<el-table-column prop="contactInformation" align="center" label="电话" min-width="12%"></el-table-column>
<el-table-column prop="sort" align="center" label="排序" min-width="6%"></el-table-column>
<el-table-column label="操作" min-width="15%" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" v-for="(item,index) in lineBtn" @click="handleBtn(item.url,scope.row.id)" v-if="item.url == 'editGroupLine' || item.url == 'deleteGroupLine'" :key="index">{{item.name}}</el-button>
......@@ -22,6 +23,7 @@
<el-table-column prop="name" align="center" label="服务范围" min-width="12%"></el-table-column>
<el-table-column prop="telephoneWebsite" align="center" label="电话/网址链接" min-width="15%"></el-table-column>
<el-table-column prop="urlName" align="center" label="网址名称" min-width="15%"></el-table-column>
<el-table-column prop="sort" align="center" label="排序" min-width="6%"></el-table-column>
<el-table-column label="操作" min-width="15%" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" v-for="(item,index) in lineBtn" @click="handleBtn(item.url,scope.row.id)" v-if="item.url == 'editRetailLine' || item.url == 'deleteRetailLine'" :key="index">{{item.name}}</el-button>
......
src/views/marketing_manage/contact_module/index.vue
浏览文件 @ c6f0f046
......@@ -5,10 +5,10 @@
<el-button class="mr10" size="small" type='primary' v-for="(item,index) in topBtn" :key="index" @click="handleBtn(item.url)">{{item.name}}</el-button>
</div>
<el-table ref="table" class="table_box" v-loading="listLoading" :data="dataList" style="width: 100%" size="mini" highlight-current-row>
<el-table-column prop="name" align="center" label="分社名称" min-width="12%"></el-table-column>
<el-table-column prop="contactInformation" align="center" label="联系方式" min-width="12%"></el-table-column>
<el-table-column prop="sort" align="center" label="排序号" min-width="7%" sortable></el-table-column>
<el-table-column prop="content" align="center" label="分社介绍" min-width="15%">
<el-table-column prop="name" align="center" label="分社名称" min-width="10%"></el-table-column>
<el-table-column prop="contactInformation" align="center" label="联系方式" min-width="10%"></el-table-column>
<el-table-column prop="sort" align="center" label="排序号" min-width="6%" sortable></el-table-column>
<el-table-column prop="content" align="center" label="分社介绍" min-width="30%">
<template slot-scope="scope">
<span v-if="scope.row.content" v-html="scope.row.content"></span>
</template>
......@@ -23,7 +23,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作" min-width="15%" align="center">
<el-table-column label="操作" min-width="10%" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" v-for="(item,index) in lineBtn" @click="handleBtn(item.url,scope.row.id)" v-if="(item.url != 'removeLine' || scope.row.status == 0)" :key="index">{{item.name}}</el-button>
</template>
......
src/views/platform_manage/companyInfo/content/review.vue
浏览文件 @ c6f0f046
......@@ -187,6 +187,13 @@ export default {
margin: 10px auto;
display: table-cell;
}
/deep/p{
color: #555555;
font-size: 14px;
text-indent: 28px;
margin-bottom: 10px;
line-height: 32px;
}
}
.msg_browser,.msg_reply,.msg_agree {
float: right;
......
src/views/platform_manage/groupInfo/content/components/component.vue
浏览文件 @ c6f0f046
......@@ -47,6 +47,7 @@
<template slot-scope="scope">
<span class="lineBtn" @click="scope.row.isDisabled?editAddData(scope.$index):saveAddData()">{{scope.row.isDisabled?'编辑':'保存'}}</span>
<span class="lineBtn" @click="deleteLineTableItem(scope.row.id)">删除</span>
<span class="lineBtn" @click="editSortOption(scope.row.id)" v-if="currentColumnName == '集团领导'">修改排序</span>
</template>
</el-table-column>
</el-table>
......@@ -126,13 +127,26 @@
<el-button @click="setHeaderData" type="primary" :loading="sending" size="small">确定</el-button>
</span>
</el-dialog>
<!-- 排序弹窗 -->
<el-dialog title="修改排序" :visible.sync="editSortDialog" width="300px">
<el-form :model="editSortData" ref="editSortData" :rules="rules" label-position="right" label-width="80px" size="small">
<el-form-item label="排序号:" prop="sort">
<el-input v-model="editSortData.sort" placeholder="请填写排序号"></el-input>
</el-form-item>
</el-form>
<span class="dialog-footer" style="text-align:center;width:100%;display:inline-block">
<el-button @click="editSortDialog=false" size="small">取消</el-button>
<el-button @click="editSortSave" type="primary" :loading="sending" size="small">确定</el-button>
</span>
</el-dialog>
</div>
</el-card>
</div>
</template>
<script>
import { getConListAPI, getAllColuAPI, createConSave0API, createConSave1API, createConSave2API, detConAPI, getDetailListAPI, getDetailListHonorAPI, removeConAPI } from '@/api/platform/company'
import { getConListAPI, getAllColuAPI, createConSave0API, createConSave1API, createConSave2API, detConAPI, getDetailListAPI, getDetailListHonorAPI, removeConAPI, editSortDetailAPI } from '@/api/platform/company'
import { valValidate } from '@/utils/validate'
import { fileUrl } from '@/utils/global'
import { confirm } from '@/utils/function'
......@@ -153,6 +167,7 @@ export default {
{ name:'职务', val:'title',type: 1 },
{ name:'寄语', val:'content',type: 1 },
{ name:'其他', val:'other',type: 1 },
{ name:'排序号', val:'sort',type: 1 },
{ name:'书名', val:'bookName',type: 2 },
{ name:'载体形式', val:'carrierForm',type: 2 },
{ name:'荣誉称号', val:'honoraryTitle',type: 2 },
......@@ -161,9 +176,16 @@ export default {
{ name:'项目类别', val:'name',type: 2 },
{ name:'入选项目明细', val:'content',type: 2 },
{ name:'负责部门', val:'source',type: 2 },
{ name:'排序号', val:'sort',type: 2 },
],
currentHeadList:[],
setHeaderTypeDialog:false,
editSortDialog:false,
editSortData:{
columnId:null,
id:null,
sort:null,
},
typeOption:[
{ name:'全部数据', val:'1' },
{ name:'选中数据', val:'2' },
......@@ -200,6 +222,9 @@ export default {
cover: [
{ required: true, message:'请上传信息封面'},
],
sort:[
{ pattern:/^\d*$/, message:'排序号为数字'}
]
},
isShowUpdate:true,
dateBeginTime: {
......@@ -459,6 +484,17 @@ export default {
this.$message.warning('请先选择所属模块')
}
},
editSortSave(){
editSortDetailAPI(this.editSortData).then((res) => {
if(res.data.code == 0){
this.$message.success('修改排序成功');
this.editSortDialog = false
this.getList()
}else{
this.$message.warning(res.data.msg)
}
})
},
setHeaderData(){
if(this.exportData.type == 1){
this.tableHeadList = this.currentHeadList
......@@ -538,7 +574,14 @@ export default {
}
})
});
}
},
//修改排序
editSortOption(id){
this.editSortDialog = true
this.editSortData.id = id
this.editSortData.columnId = this.contentForm.columnId
this.editSortData.sort = null
},
}
}
</script>
......
src/views/platform_manage/groupInfo/content/review.vue
浏览文件 @ c6f0f046
......@@ -19,7 +19,10 @@
</span>
</div>
</div>
<div class="msgdet_left_con" v-html="pageData.content"></div>
<div class="msgdet_left_con" v-if="pageData.content" v-html="pageData.content"></div>
<div class="msg_bottom_img" v-if="pageData.listImgs && pageData.listImgs.length > 0">
<img :src="coverUrl(item.imgId)" alt="" class="bottom_image" v-for="(item,index) in pageData.listImgs" :key="'img'+index">
</div>
</div>
<div class="msgdet_left" v-else>
<div class="msgdet_content">
......@@ -42,7 +45,7 @@
</template>
<script>
import { detConAPI, getAllColuAPI, getDetailListAPI } from '@/api/platform/company'
import { detConAPI, getAllColuAPI, getDetailListAPI, getDetailListHonorAPI } from '@/api/platform/company'
export default {
name: 'viewContentGroup',
......@@ -59,6 +62,7 @@ export default {
{ name:'职务', val:'title',type: 1 },
{ name:'寄语', val:'content',type: 1 },
{ name:'其他', val:'other',type: 1 },
{ name:'排序号', val:'sort',type: 1 },
{ name:'书名', val:'bookName',type: 2 },
{ name:'载体形式', val:'carrierForm',type: 2 },
{ name:'荣誉称号', val:'honoraryTitle',type: 2 },
......@@ -68,6 +72,7 @@ export default {
{ name:'入选项目明细', val:'content',type: 2 },
{ name:'负责部门', val:'source',type: 2 },
{ name:'入选年份', val:'createdTime',type: 2 },
{ name:'排序号', val:'sort',type: 2 },
],
columnList:[],
}
......@@ -84,26 +89,13 @@ export default {
detConAPI(this.reviewId).then(res => {
if(res.data.code == 0){
this.pageData = res.data.data
console.log(this.pageData,'-0-0-0')
this.columnList.forEach((item,index) => {
if(item.id == this.pageData.columnId){
this.currentColumnName = item.name
if(item.name == "集团领导"){
this.tableHeadList = []
let data = this.headListData.filter( x => x.type == 1)
data.forEach((item,index) => {
if(this.pageData[item.val]){
this.tableHeadList.push(item)
}
})
this.getDetailHeaderList(0)
}else if(item.name == "荣誉长廊"){
this.tableHeadList = []
let data = this.headListData.filter( x => x.type == 2)
data.forEach((item,index) => {
if(this.pageData[item.val]){
this.tableHeadList.push(item)
}
})
this.getDetailHeaderList(1)
}
}
......@@ -117,6 +109,7 @@ export default {
getAllColuAPI({columnType:this.columnType}).then(res => {
if(res.data.code == 0){
this.columnList = res.data.data
console.log(this.columnList,'9090909')
this.getDetCon()
}else{
this.$message.error('获取数据失败')
......@@ -124,14 +117,46 @@ export default {
})
},
getDetailHeaderList(num){
this.dataHeaderList = []
getDetailListAPI({columnId:this.pageData.columnId,type:num}).then((res) => {
if(res.data.code == 0){
this.$nextTick(() => {
this.dataHeaderList = res.data.data
})
}
})
if(num == 0){ //集团领导
getDetailListAPI({columnId:this.pageData.columnId}).then((res) => {
if(res.data.code == 0){
this.$nextTick(() => {
this.dataHeaderList = res.data.data
this.tableHeadList = []
let data = this.headListData.filter( x => x.type == 1)
data.forEach((item,index) => {
if(this.dataHeaderList[0][item.val]){
this.tableHeadList.push(item)
}
})
})
}
})
}else if(num == 1){ //荣誉长廊
let year = String(new Date().getFullYear())
getDetailListHonorAPI({columnId:this.pageData.columnId,year:year}).then((res) => {
if(res.data.code == 0){
this.$nextTick(() => {
this.dataHeaderList = res.data.data
this.tableHeadList = []
let data = this.headListData.filter( x => x.type == 2)
if(this.dataHeaderList && this.dataHeaderList.length > 0){
if(year){
data.forEach((item,index) => {
if(this.dataHeaderList[0][item.val]){
this.tableHeadList.push(item)
}
})
}else{
this.tableHeadList = data
}
}else{
this.tableHeadList = []
}
})
}
})
}
},
goBack(){
let view = this.$route
......@@ -187,6 +212,23 @@ export default {
margin: 10px auto;
display: table-cell;
}
/deep/p{
color: #555555;
font-size: 14px;
text-indent: 28px;
margin-bottom: 10px;
line-height: 32px;
}
}
.msg_bottom_img{
width: 100%;
height: auto;
display: flex;
.bottom_image{
width:280px;
height:179px;
margin-right: 10px;
}
}
.msg_browser,.msg_reply,.msg_agree {
float: right;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论