Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop
This commit is contained in:
@@ -28,20 +28,24 @@ export default {
|
||||
this.$emit('pageChange', page)
|
||||
},
|
||||
pageSizeChange (pageSize) {
|
||||
if (this.getTypeFlag === 'CloudRepository') {
|
||||
this.userInfo.configContent = pageSize
|
||||
this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
|
||||
this.$emit('pageSizeChange', pageSize)
|
||||
} else {
|
||||
this.pageConfig(pageSize).then((res) => {
|
||||
if (res.ok) {
|
||||
this.userInfo.configContent = pageSize
|
||||
this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
|
||||
this.$emit('pageSizeChange', pageSize)
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
}
|
||||
this.userInfo.configContent = pageSize
|
||||
this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
|
||||
this.$emit('pageSizeChange', pageSize)
|
||||
|
||||
// if (this.getTypeFlag === 'CloudRepository') {
|
||||
// this.userInfo.configContent = pageSize
|
||||
// this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
|
||||
// this.$emit('pageSizeChange', pageSize)
|
||||
// } else {
|
||||
// this.pageConfig(pageSize).then((res) => {
|
||||
// if (res.ok) {
|
||||
// this.userInfo.configContent = pageSize
|
||||
// this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
|
||||
// this.$emit('pageSizeChange', pageSize)
|
||||
// }
|
||||
// }, e => {
|
||||
// })
|
||||
// }
|
||||
},
|
||||
/**
|
||||
* @description: 每页条数配置
|
||||
|
||||
@@ -4,6 +4,14 @@
|
||||
<div class="search-area">
|
||||
<div class="left">
|
||||
<el-form inline :model="localProTableSearch" class="label-input-form" @keyup.enter.native="getLocalProductTableBtn">
|
||||
<el-form-item label="项目编号" class="search-item">
|
||||
<el-input
|
||||
v-model="localProTableSearch.productName"
|
||||
placeholder="根据项目编号查找"
|
||||
:maxlength="100"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目名称" class="search-item">
|
||||
<el-input
|
||||
v-model="localProTableSearch.productName"
|
||||
@@ -12,7 +20,7 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目类别" class="search-item">
|
||||
<el-form-item label="项目分类" class="search-item">
|
||||
<el-select
|
||||
v-model="localProTableSearch.productType"
|
||||
placeholder="请选择项目类别"
|
||||
@@ -82,7 +90,7 @@
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="flatform"
|
||||
label="平台">
|
||||
label="产品平台">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productNo"
|
||||
@@ -99,7 +107,7 @@
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="productTypeShow"
|
||||
label="项目类别"
|
||||
label="项目分类"
|
||||
min-width="120"
|
||||
sortable
|
||||
>
|
||||
@@ -112,9 +120,25 @@
|
||||
sortable
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="productBrandShow"
|
||||
label="项目群"
|
||||
min-width="120"
|
||||
sortable
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sopTime"
|
||||
label="SOP时间"
|
||||
label="项目计划开始日期"
|
||||
min-width="120"
|
||||
sortable
|
||||
>
|
||||
<template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sopTime"
|
||||
label="项目计划完成日期"
|
||||
min-width="120"
|
||||
sortable
|
||||
>
|
||||
@@ -123,31 +147,18 @@
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="targetMarketShow"
|
||||
label="目标市场">
|
||||
label="当前节点">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="leftRight"
|
||||
label="左驾右驾">
|
||||
label="项目级别">
|
||||
<template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="carModel"
|
||||
min-width="120"
|
||||
label="公告车型号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="productManagerShow"
|
||||
label="项目经理">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="eopTime"
|
||||
sortable
|
||||
min-width="120"
|
||||
label="EOP信息">
|
||||
<template slot-scope="scope">{{(scope.row.eopTime ? scope.row.eopTime.substring(0, 11): '')}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="" fixed="right" width="50" :resizable="false">
|
||||
<template slot-scope="scope">
|
||||
<div @click.stop style="display: inline-block">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,19 +7,19 @@
|
||||
<table-tools-bar>
|
||||
<div slot="left">
|
||||
<div class="search-area">
|
||||
<el-form :modal="standCommonlySearch" inline class="label-input-form" @keyup.enter.native="sarStandCompareHis">
|
||||
<el-form :model="standCommonlySearch" inline class="label-input-form">
|
||||
<el-formItem label="类别" class="search-item">
|
||||
<el-input v-model="oldNumOrName" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
|
||||
<el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>
|
||||
</el-formItem>
|
||||
<el-formItem label="关键字" class="search-item">
|
||||
<el-input v-model="newNumOrName" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
|
||||
<el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>
|
||||
</el-formItem>
|
||||
<el-formItem label="开始日期" class="search-item">
|
||||
<el-datePicker v-model="newNumOrName1" :editable="false"
|
||||
<el-datePicker v-model="standCommonlySearch.start" :editable="false"
|
||||
placeholder="请选择开始日期"></el-datePicker>
|
||||
</el-formItem>
|
||||
<el-formItem label="结束日期" class="search-item">
|
||||
<el-datePicker v-model="newNumOrName2" :editable="false"
|
||||
<el-datePicker v-model="standCommonlySearch.end" :editable="false"
|
||||
placeholder="请选择结束日期"></el-datePicker>
|
||||
</el-formItem>
|
||||
<el-formItem class="search-item btn-box">
|
||||
@@ -38,8 +38,6 @@
|
||||
</div>
|
||||
</table-tools-bar>
|
||||
<div class="content">
|
||||
<div class="action-bar">
|
||||
</div>
|
||||
<div class="table-wrap">
|
||||
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
|
||||
<el-table
|
||||
@@ -49,65 +47,39 @@
|
||||
style="width: 100%;padding:0 0 20px 0;"
|
||||
height="100%"
|
||||
border
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
@selection-change="standSelectChange">
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="oldStandNum"
|
||||
label="类别"
|
||||
prop="categorg"
|
||||
label="标准"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<a class="table-jump" @click.stop="oldPreview(scope.row)">{{ scope.row.oldStandNum }}</a>
|
||||
<a class="table-jump" @click.stop="handlePreview(scope.row)">{{ scope.row.categorg }}</a>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="oldStandName"
|
||||
prop="cname"
|
||||
label="标准名称/政策名称"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.oldStandName }}</a>
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="征求意见周期"
|
||||
sortable
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="上传时间"
|
||||
sortable
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<pagination :page="splitInfoPage" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
|
||||
<loading :loading="spinShow">{{$t('m.dataLoading')}}……</loading>
|
||||
<!-- 分享 -->
|
||||
<el-drawer :title="$t('m.sharingStandard')" :visible.sync="drawerModal" width="300" :styles="drawerModalstyles" @on-close="treeCancel">
|
||||
<div class="demo-drawer-content">
|
||||
<dept-tree treeDivId="drawerModalTree"
|
||||
ref="drawerModalTree"
|
||||
@treeClick="selcetTree"
|
||||
allDept
|
||||
showUser
|
||||
:editable="false"
|
||||
style="padding: 0 15px">
|
||||
</dept-tree>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button size="mini" type="primary" @click="shareStandardBt" icon="el-icon-check">确定</el-button>
|
||||
<el-button size="mini" style="margin-right: 8px" @click="treeCancel" icon="el-icon-close">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<pagination :page="standCommonlySearch.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
|
||||
<loading :loading="spinShow">数据加载中……</loading>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -118,56 +90,18 @@ export default {
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
visibleOrgTable: false,
|
||||
orgTableVal: '',
|
||||
orgTableValName: '',
|
||||
spinShow: false,
|
||||
collect: '收藏',
|
||||
cancelCollect: false,
|
||||
standCommonlySearch: {},
|
||||
oldNumOrName: '',
|
||||
newNumOrName: '',
|
||||
newNumOrName1: '',
|
||||
newNumOrName2: '',
|
||||
standInfoList: [],
|
||||
tableHeight: null,
|
||||
total: 0,
|
||||
splitInfoPage: 1,
|
||||
splitInfoPageSize: this.$store.getters.userInfo.configContent,
|
||||
selectedList: [],
|
||||
drawerModalstyles: {
|
||||
height: 'calc(100% - 55px)',
|
||||
overflow: 'auto',
|
||||
paddingBottom: '53px',
|
||||
position: 'static'
|
||||
},
|
||||
// end 分享相关的
|
||||
shareStandardModal: false,
|
||||
shareStandardSelect: [],
|
||||
// 分享数据
|
||||
resType: '',
|
||||
// 消息推送保存对象
|
||||
personShareEO: {
|
||||
id: '',
|
||||
recipientId: '',
|
||||
shareUserId: '',
|
||||
resType: '',
|
||||
resId: '',
|
||||
resUri: '',
|
||||
resTitle: '',
|
||||
readFlag: '',
|
||||
validFlag: '',
|
||||
modifyTime: '',
|
||||
creationTime: '',
|
||||
oldStandName: '',
|
||||
},
|
||||
// 收藏标准
|
||||
personCollect: {
|
||||
collectResId: '',
|
||||
collectTitle: '',
|
||||
collectType: ''
|
||||
},
|
||||
drawerModal: false // 分享
|
||||
standCommonlySearch: {
|
||||
categorg: '',
|
||||
cname: '',
|
||||
start: '',
|
||||
end: '',
|
||||
page: 1,
|
||||
size: this.$store.getters.userInfo.configContent
|
||||
},
|
||||
spinShow: false,
|
||||
standInfoList: [],
|
||||
tableHeight: null,
|
||||
total: 0
|
||||
}
|
||||
},
|
||||
props: {
|
||||
@@ -175,334 +109,53 @@ export default {
|
||||
watch: {
|
||||
},
|
||||
methods: {
|
||||
handleCommand (command) {
|
||||
switch (command[1]) {
|
||||
case '查看':
|
||||
this.handlePreview(command[0])
|
||||
break
|
||||
case '查看类别':
|
||||
this.oldPreview(command[0])
|
||||
break
|
||||
case '收藏':
|
||||
this.collectInfo(command[0])
|
||||
break
|
||||
case '取消收藏':
|
||||
this.cancelCollectInfo(command[0])
|
||||
break
|
||||
case '分享':
|
||||
this.enjoyInfo(command[0])
|
||||
break
|
||||
case '删除':
|
||||
this.delFileEditInfo(command[0].id)
|
||||
break
|
||||
}
|
||||
},
|
||||
// 树点击
|
||||
isTreeOk (checkedList) {
|
||||
this.shareStandardSelect = []
|
||||
checkedList.map((item, index) => {
|
||||
if (!item.isParent) {
|
||||
this.shareStandardSelect.push(item.userId)
|
||||
}
|
||||
})
|
||||
if (this.shareStandardSelect.length === 0) {
|
||||
this.$message({
|
||||
message: '请选择要分享的人!',
|
||||
type: 'warning'
|
||||
})
|
||||
} else {
|
||||
this.personShareEO.resType = 'COMPARISON'
|
||||
this.personShareEO.resTitle = '【标准比对】 ' + (this.resPk.oldStandNum ? this.resPk.oldStandNum:'') + ' - ' + (this.resPk.newStandNum ? this.resPk.newStandNum:'')
|
||||
/*if (this.resPk.standYear != null && this.resPk.standYear !== '') {
|
||||
this.personShareEO.resTitle = this.resPk.oldStandName + ' ( 编号:' + this.resPk.oldFileType + ' ' + this.resPk.oldStandNum + '-' + this.resPk.standYear + ' )'
|
||||
} else {
|
||||
}*/
|
||||
this.personShareEO.resId = this.resPk.id
|
||||
this.personShareEO.resUri = JSON.stringify(this.resPk)
|
||||
this.personShareEO.recipientId = this.shareStandardSelect
|
||||
this.$http.post('/person/personShare/savePersonShare', this.personShareEO, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.$message({
|
||||
message: '标准分享成功!',
|
||||
type: 'success'
|
||||
// 点击查看
|
||||
handlePreview (item) {
|
||||
this.$store.commit('setDetailMap',this.$router.path)
|
||||
this.$router.push({
|
||||
name: 'consultationDetails',
|
||||
query: {
|
||||
item: item
|
||||
}
|
||||
})
|
||||
this.shareStandardModal = false
|
||||
this.visibleOrgTable = false
|
||||
// this.drawerModal = false
|
||||
this.shareStandardSelect = []
|
||||
// this.$refs.drawerModalTree.treeReload()
|
||||
}, e => {
|
||||
this.$message.error('标准分享失败!')
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
// 清空
|
||||
clearSearchStand () {
|
||||
this.standCommonlySearch.page = 1
|
||||
this.standCommonlySearch.start = ''
|
||||
this.standCommonlySearch.end = ''
|
||||
this.standCommonlySearch.categorg = ''
|
||||
this.standCommonlySearch.cname = ''
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
// 消息推送
|
||||
shareStandardBt () {
|
||||
if (this.shareStandardSelect.length === 0) {
|
||||
this.$message({
|
||||
message: '请选择要分享的人!',
|
||||
type: 'warning'
|
||||
})
|
||||
} else {
|
||||
this.personShareEO.resType = 'COMPARISON'
|
||||
this.personShareEO.resTitle = '【标准比对】 ' + (this.resPk.oldStandNum ? this.resPk.oldStandNum:'') + ' - ' + (this.resPk.newStandNum ? this.resPk.newStandNum:'')
|
||||
/*if (this.resPk.standYear != null && this.resPk.standYear !== '') {
|
||||
this.personShareEO.resTitle = this.resPk.oldStandName + ' ( 编号:' + this.resPk.oldFileType + ' ' + this.resPk.oldStandNum + '-' + this.resPk.standYear + ' )'
|
||||
} else {
|
||||
}*/
|
||||
this.personShareEO.resId = this.resPk.id
|
||||
this.personShareEO.resUri = JSON.stringify(this.resPk)
|
||||
this.personShareEO.recipientId = this.shareStandardSelect
|
||||
this.$http.post('/person/personShare/savePersonShare', this.personShareEO, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.$message({
|
||||
message: '标准分享成功!',
|
||||
type: 'success'
|
||||
})
|
||||
this.shareStandardModal = false
|
||||
this.drawerModal = false
|
||||
this.shareStandardSelect = []
|
||||
this.$refs.drawerModalTree.treeReload()
|
||||
}, e => {
|
||||
this.$message.error('标准分享失败!')
|
||||
})
|
||||
}
|
||||
},
|
||||
// 树点击
|
||||
selcetTree (treeId, treeNode) {
|
||||
this.shareStandardSelect = treeNode.id
|
||||
},
|
||||
// 取消
|
||||
treeCancel () {
|
||||
this.drawerModal = false
|
||||
this.$refs.drawerModalTree.treeReload()
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview (item) {
|
||||
sessionStorage.setItem('accessRow',JSON.stringify(item))
|
||||
this.$store.commit('setDetailMap',this.$router.path)
|
||||
this.$router.push({
|
||||
name: 'consultationDetails',
|
||||
params: {
|
||||
id: item.id
|
||||
}
|
||||
})
|
||||
},
|
||||
oldPreview (item) {
|
||||
sessionStorage.setItem('accessRow', JSON.stringify(item))
|
||||
this.$store.commit('setDetailMap', this.$route.path)
|
||||
this.$router.push({
|
||||
name: 'categoryDetails',
|
||||
params: {
|
||||
id: item.id
|
||||
}
|
||||
})
|
||||
},
|
||||
// oldPreview (item) {
|
||||
// let routeUrl = this.$router.resolve({
|
||||
// name: 'categoryDetails',
|
||||
// params: {
|
||||
// id: item.id,
|
||||
// pageType: 'INLAND_STAND'
|
||||
// }
|
||||
// })
|
||||
// window.open(routeUrl.href, '_self')
|
||||
// },
|
||||
// handlePreview (params) {
|
||||
// if (params.compareType === '条款比对') {
|
||||
// this.$store.commit('setDetailMap', this.$route.path)
|
||||
// this.$router.push({
|
||||
// name: 'SeeDatalis',
|
||||
// query: {
|
||||
// row: JSON.stringify(params)
|
||||
// }
|
||||
// })
|
||||
// } else {
|
||||
// let rowDataLeft = {}
|
||||
// let rowDataRight = {}
|
||||
// rowDataLeft.showNumber = params.oldStandNum
|
||||
// rowDataLeft.standName = params.oldStandName
|
||||
// rowDataLeft.standNameSplit = null
|
||||
// rowDataLeft.standNumSplit = null
|
||||
// rowDataRight.showNumber = params.newStandNum
|
||||
// rowDataRight.standName = params.newStandName
|
||||
// rowDataRight.standNameSplit = null
|
||||
// rowDataRight.standNumSplit = null
|
||||
// this.$store.commit('setDetailMap', this.$route.path)
|
||||
// this.$router.push({
|
||||
// name: 'TextComparison',
|
||||
// query: {
|
||||
// id: params.id,
|
||||
// flag: '查看',
|
||||
// rowDataLeft: JSON.stringify(rowDataLeft),
|
||||
// rowDataRight: JSON.stringify(rowDataRight)
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// },
|
||||
// 删除
|
||||
delFileEditInfo (id) {
|
||||
this.$confirm('是否删除?', '提示', {
|
||||
confirmButtonText: this.$t('m.determine'),
|
||||
cancelButtonText: this.$t('m.cancel'),
|
||||
type: 'warning',
|
||||
confirmButtonClass: 'common-button-primary',
|
||||
roundButton: true
|
||||
}).then(() => {
|
||||
this.$http.post('lawss/sarStandCompareHis/deleteByIds', {
|
||||
deleteByIdList: id
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.sarStandCompareHis()
|
||||
}
|
||||
})
|
||||
}).catch(() => {
|
||||
// 取消删除,清空选择
|
||||
// this.$refs.selections.clearSelection()
|
||||
})
|
||||
},
|
||||
enjoyInfo (item) {
|
||||
// this.$message({
|
||||
// message: '此功能正在开发中……',
|
||||
// type: 'warning'
|
||||
// })
|
||||
// this.drawerModal = true
|
||||
// this.$nextTick(() => {
|
||||
// this.$refs.drawerModalTree.clearSearch()
|
||||
// })
|
||||
this.visibleOrgTable = true
|
||||
this.resPk = JSON.parse(JSON.stringify(item))
|
||||
},
|
||||
// scope.$index 获取当前行下标
|
||||
collectInfo (item) {
|
||||
// 点击收藏
|
||||
this.spinShow = true
|
||||
item.isSubmit = true
|
||||
this.personCollect.collectResId = item.id
|
||||
if (item.standYear != null && item.standYear !== '') {
|
||||
this.personCollect.collectTitle = item.newStandName + ' ( 编号:' + item.newStandNum + ' )'
|
||||
} else {
|
||||
this.personCollect.collectTitle = item.newStandName + ' ( 编号:' + item.newStandNum + ' )'
|
||||
}
|
||||
this.personCollect.collectType = 'INLAND_STAND'
|
||||
this.$http.postData('person/personCollect', this.personCollect, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.spinShow = false
|
||||
item.isSubmit = false
|
||||
item.collectBtn = !item.collectBtn
|
||||
console.log(item.collectBtn, '点击收藏后')
|
||||
item.collectId = res.data.id
|
||||
this.cancelCollect = !this.cancelCollect
|
||||
}, e => {
|
||||
item.isSubmit = false
|
||||
})
|
||||
},
|
||||
cancelCollectInfo (item) {
|
||||
this.$http.put('person/personCollect/updateByUserId', {
|
||||
id: item.collectId
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
item.collectBtn = !item.collectBtn
|
||||
this.cancelCollect = !this.cancelCollect
|
||||
item.collectId = ''
|
||||
}
|
||||
})
|
||||
},
|
||||
clearSearchStand () {
|
||||
this.oldNumOrName = ''
|
||||
this.newNumOrName = ''
|
||||
this.splitInfoPage = 1
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
sarStandCompareHisInfo() {
|
||||
this.splitInfoPage = 1
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
// 表格
|
||||
sarStandCompareHis () {
|
||||
this.spinShow = true
|
||||
this.$http.get('lawss/sarStandCompareHis/page', {
|
||||
page: this.splitInfoPage,
|
||||
pageSize: this.splitInfoPageSize,
|
||||
oldNumOrName: this.oldNumOrName,
|
||||
newNumOrName: this.newNumOrName
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
for (let i = 0; i < res.data.list.length; i++) {
|
||||
res.data.list[i].checked = false
|
||||
if (res.data.list[i].collectId != null && res.data.list[i].collectId !== '') {
|
||||
res.data.list[i].collectBtn = false
|
||||
res.data.list[i].cancelCollectBtn = true
|
||||
} else {
|
||||
res.data.list[i].collectBtn = true
|
||||
res.data.list[i].cancelCollectBtn = false
|
||||
}
|
||||
res.data.list[i].isSubmit = false
|
||||
}
|
||||
this.standInfoList = res.data.list
|
||||
this.total = res.data.count
|
||||
this.spinShow = false
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
pageChange (page) {
|
||||
this.splitInfoPage = page
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
// 分页每页显示数改变后方法
|
||||
pageSizeChange (pageSize) {
|
||||
this.splitInfoPageSize = pageSize
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
standSelectChange (data) {
|
||||
this.selectedList = []
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.selectedList.push(data[i].id)
|
||||
}
|
||||
},
|
||||
contrastStandFile () {
|
||||
this.$store.commit('setDetailMap', this.$route.path)
|
||||
this.$router.push({
|
||||
name: 'ContrastDetails'
|
||||
})
|
||||
},
|
||||
batchDelete () {
|
||||
if (this.selectedList.length === 0) {
|
||||
this.$message({
|
||||
message: '请选择要删除的数据',
|
||||
type: 'warning'
|
||||
})
|
||||
} else {
|
||||
this.$confirm('确认删除这些数据?', '提示', {
|
||||
confirmButtonText: this.$t('m.determine'),
|
||||
cancelButtonText: this.$t('m.cancel'),
|
||||
type: 'warning',
|
||||
confirmButtonClass: 'common-button-primary',
|
||||
roundButton: true
|
||||
}).then(() => {
|
||||
this.$http.post('lawss/sarStandCompareHis/deleteByIds', {
|
||||
deleteByIdList: this.selectedList.join(',')
|
||||
}, {
|
||||
_this: this
|
||||
// 搜索
|
||||
sarStandCompareHisInfo() {
|
||||
this.splitInfoPage = 1
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
// 查询表格
|
||||
sarStandCompareHis () {
|
||||
this.spinShow = true
|
||||
var form = this.standCommonlySearch
|
||||
this.$http.get('sys/sar-public-idea/SelectAllP', form, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.sarStandCompareHis()
|
||||
this.standInfoList = res.data.records
|
||||
this.total = res.data.total
|
||||
this.spinShow = false
|
||||
}, e => {
|
||||
})
|
||||
}).catch(() => {
|
||||
// 取消删除,清空选择
|
||||
// this.$refs.multipleTable.clearSelection()
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
pageChange (page) {
|
||||
this.standCommonlySearch.page = page
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
// 分页每页显示数改变后方法
|
||||
pageSizeChange (pageSize) {
|
||||
this.$store.getters.userInfo.configContent = pageSize
|
||||
this.standCommonlySearch.size = pageSize
|
||||
this.sarStandCompareHis()
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
},
|
||||
@@ -551,18 +204,5 @@ export default {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
.s-c-input {
|
||||
/deep/ .el-input__inner {
|
||||
width: 190px;
|
||||
}
|
||||
}
|
||||
}
|
||||
::v-deep .el-drawer__header{
|
||||
&>span:first-child{
|
||||
outline:0 !important;
|
||||
}
|
||||
}
|
||||
::v-deep .el-drawer{
|
||||
outline:0 !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
<div v-show="heightShow" class="transition-box">
|
||||
<p class="transition-box-p">
|
||||
<label class="transition-box-label">标准号:</label>
|
||||
<span class="transition-box-span">{{ opinionList.standardNumber }}</span>
|
||||
<span class="transition-box-span">{{ this.$route.query.item.categorg }}</span>
|
||||
</p>
|
||||
<p class="transition-box-p">
|
||||
<label class="transition-box-label">标准名称:</label>
|
||||
<span class="transition-box-span">{{ opinionList.standardName || '-' }}</span>
|
||||
<span class="transition-box-span">{{ this.$route.query.item.cname || '-' }}</span>
|
||||
</p>
|
||||
<p class="transition-box-p">
|
||||
<label class="transition-box-label">上传时间:</label>
|
||||
<span class="transition-box-span">{{ opinionList.uploadTime || '-' }}</span>
|
||||
<span class="transition-box-span">{{ this.$route.query.item.starttime || '-' }}</span>
|
||||
</p> <p class="transition-box-p">
|
||||
<label class="transition-box-label">征求意见周期:</label>
|
||||
<span class="transition-box-span">{{ opinionList.opinionCycle || '-' }}</span>
|
||||
<span class="transition-box-span">{{ this.$route.query.item.endtime || '-' }}</span>
|
||||
</p>
|
||||
</div>
|
||||
</transition>
|
||||
@@ -39,23 +39,33 @@
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}">
|
||||
<el-table-column
|
||||
prop="date"
|
||||
prop="partCode"
|
||||
label="章节编号"
|
||||
width="180">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
prop="countent"
|
||||
label="修改意见内容(包括理由或依据)"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
label="提出部门"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="user"
|
||||
label="提出人"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="50" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<div @click.stop style="display: inline-block">
|
||||
<el-dropdown trigger="click" @command="handleCommand">
|
||||
<i class="iconfont"></i>
|
||||
<i v-if="scope.row.user === $store.getters.userInfo.userId" class="iconfont"></i>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'9K6ANCMBZ9'">编辑</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'UH6NV867E7'">删除</el-dropdown-item>
|
||||
<el-dropdown-item v-if="scope.row.user === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
|
||||
<el-dropdown-item v-if="" :command="[scope.row, '删除']">删除</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
@@ -64,14 +74,13 @@
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <pagination :page="splitInfoPage" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>-->
|
||||
<div>
|
||||
<pagination
|
||||
style="position: static;"
|
||||
:page="newModelPageConfig.page"
|
||||
:total="newModelPageConfig.total"
|
||||
@pageChange="page => handlePageChange('newModel', page)"
|
||||
@pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"></pagination>
|
||||
style="position: static;"
|
||||
:page="form.page"
|
||||
:total="total"
|
||||
@pageChange="handlePageChange"
|
||||
@pageSizeChange="handlePageSizeChange"></pagination>
|
||||
</div>
|
||||
<el-drawer
|
||||
:title=opiniontitle
|
||||
@@ -98,6 +107,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<loading :loading="spinShow">数据加载中……</loading>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -106,59 +116,45 @@ export default {
|
||||
name: 'consultationDetails',
|
||||
data () {
|
||||
return {
|
||||
spinShow: false,
|
||||
total: 0,
|
||||
opiniontitle: '新增意见',
|
||||
isDialog: false, //新增抽屉状态
|
||||
heightShow: true,
|
||||
isSubmit: false,
|
||||
opinionList: {
|
||||
standardNumber: 'GB 121-12',
|
||||
standardName: '机动车安全运行条件',
|
||||
uploadTime: '2002-11-23',
|
||||
opinionCycle: '2001-02-21到 2012-02-02'
|
||||
},
|
||||
opinionContent: {
|
||||
number:'',
|
||||
content: '',
|
||||
},
|
||||
standinfoList: [{
|
||||
date: '1.1.2',
|
||||
name: '文章内容不清晰',
|
||||
}, {
|
||||
date: '1.2.3.1',
|
||||
name: '标准有错误',
|
||||
}, {
|
||||
date: '1.21.1',
|
||||
name: '标准延时',
|
||||
}, {
|
||||
date: '1.21.1',
|
||||
name: '实用性不高',
|
||||
}, {
|
||||
date: '1.2.31',
|
||||
name: '不贴合国家标准',
|
||||
}, ],
|
||||
newModelPageConfig: {
|
||||
standinfoList: [],
|
||||
form: {
|
||||
cid: this.$route.query.item.cid,
|
||||
page: 1,
|
||||
total: 0
|
||||
size: this.$store.getters.userInfo.configContent
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
//分页数据改变
|
||||
handlePageChange(field, page) {
|
||||
switch (field) {
|
||||
case "newModel":
|
||||
break;
|
||||
case "":
|
||||
break;
|
||||
}
|
||||
getList() {
|
||||
this.spinShow = true
|
||||
this.$http.get('sys/sar-public-idea-all/getallStand', this.form, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.standinfoList = res.data.records
|
||||
this.total = res.data.total
|
||||
this.spinShow = false
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
handlePageSizeChange(field, pageSize) {
|
||||
switch (field) {
|
||||
case "newModel":
|
||||
break;
|
||||
case "":
|
||||
break;
|
||||
}
|
||||
//分页数据改变
|
||||
handlePageChange(page) {
|
||||
this.form.page = page
|
||||
this.getList()
|
||||
},
|
||||
handlePageSizeChange(pageSize) {
|
||||
this.$store.getters.userInfo.configContent = pageSize
|
||||
this.form.size = pageSize
|
||||
this.getList()
|
||||
},
|
||||
back (){
|
||||
this.$router.push({
|
||||
@@ -214,7 +210,9 @@ export default {
|
||||
},
|
||||
|
||||
},
|
||||
mounted () {}
|
||||
mounted () {
|
||||
this.getList()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -3,12 +3,11 @@
|
||||
* @author: chenxiaoxi
|
||||
* @date: 2018-09-04 17:47:46
|
||||
*/
|
||||
// 后台地址
|
||||
// 服务器地址
|
||||
// const devIp = '192.168.10.211'
|
||||
// const devInterfacePORT = '8888'
|
||||
const devIp = '192.168.10.145'
|
||||
const devInterfacePORT = '9999'
|
||||
// 服务器地址
|
||||
// const devIp = '39.98.140.126'
|
||||
// const devInterfacePORT = '10005'
|
||||
// 云端端口号
|
||||
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
|
||||
const simpleFilePath = 'att/attFile/upload'
|
||||
|
||||
Reference in New Issue
Block a user