FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: There is no way the

Browse Source
This commit is contained in:
super_liu
2021-08-10 15:57:17 +08:00
parent e1bca81ad9
commit fbac71acd7
2 changed files with 86 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/searchCenter/pages/advancedSearch.vue
+54 -23
View File
@@ -937,7 +937,16 @@
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item> <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item> <el-dropdown-item v-if="scope.row.collectBtn"
:command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>--> <!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@@ -948,8 +957,16 @@
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item> <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="'FB3R3TVALD'" :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item> <el-dropdown-item v-if="scope.row.collectBtn"
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>--> :command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item><!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@@ -960,7 +977,16 @@
<el-button size="mini" @click="itemsDetails(scope.row)">查看</el-button> <el-button size="mini" @click="itemsDetails(scope.row)">查看</el-button>
</div> </div>
<div v-else> <div v-else>
<el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button> <el-dropdown-item v-if="scope.row.collectBtn"
:command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button> <el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
<!-- <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>--> <!-- <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>-->
</div> </div>
@@ -1306,9 +1332,7 @@ export default {
const inlandList = data['INLAND_STAND'] || [] const inlandList = data['INLAND_STAND'] || []
const foreignList = data['FOREIGN_STAND'] || [] const foreignList = data['FOREIGN_STAND'] || []
const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB'); const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
console.log(foreignFilterList)
this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList); this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
console.log(this.formFieldListStandData,'-----------------------------------1')
} }
}, e => {}) }, e => {})
}, },
@@ -1720,6 +1744,13 @@ export default {
this.total = res.data.count; this.total = res.data.count;
this.resultData = res.data.list; this.resultData = res.data.list;
this.resultData.map((item) => { this.resultData.map((item) => {
if (item.collectId != null && item.collectId !== '') {
item.collectBtn = false
item.cancelCollectBtn = true
} else {
item.collectBtn = true
item.cancelCollectBtn = false
}
if (item.applyArcticShow) { if (item.applyArcticShow) {
item.applyArcticShow.toString(); item.applyArcticShow.toString();
item.applyArcticShow = item.applyArcticShow.slice(0, item.applyArcticShow.length - 1); item.applyArcticShow = item.applyArcticShow.slice(0, item.applyArcticShow.length - 1);
@@ -1936,13 +1967,13 @@ export default {
} }
let pagetype = ""; let pagetype = "";
if (item.type === "stand") { if (item.type === "stand") {
if (item.stand_type === "INLAND") { if (item.standType === "INLAND") {
pagetype = "INLAND_STAND"; pagetype = "INLAND_STAND";
} else { } else {
pagetype = "FOREIGN_STAND"; pagetype = "FOREIGN_STAND";
} }
} else if (item.type === "laws") { } else if (item.type === "laws") {
if (item.laws_type === "INLAND") { if (item.lawsType === "INLAND") {
pagetype = "INLAND_LAWS"; pagetype = "INLAND_LAWS";
} else { } else {
pagetype = "FOREIGN_LAWS"; pagetype = "FOREIGN_LAWS";
@@ -1959,6 +1990,7 @@ export default {
} }
} }
personCollect.collectType = pagetype; personCollect.collectType = pagetype;
personCollect.userId = this.$store.getters.userInfo.userId
this.$http.postData("person/personCollect", personCollect, { this.$http.postData("person/personCollect", personCollect, {
_this: this _this: this
}, res => { }, res => {
@@ -1970,21 +2002,20 @@ export default {
}, },
// 取消收藏 // 取消收藏
cancelCollectStandard(item) { cancelCollectStandard(item) {
// this.judgeBussRole(item) item.isSubmit = true
// if (this.bussRoleFlag === false) { this.$http.put('person/personCollect/updateByUserId', {
// this.$message.error('当前角色无权限操作此数据') id: item.collectId
// } else { }, {
// } _this: this
this.$http.put("person/personCollect/updateByUserId", { }, res => {
id: item.collectId item.isSubmit = false
}, { item.collectBtn = !item.collectBtn
_this: this item.cancelCollectBtn = !item.cancelCollectBtn
}, res => { item.collectId = ''
item.collectBtn = !item.collectBtn; this.$message.success(res.message)
item.cancelCollectBtn = !item.cancelCollectBtn; }, e => {
item.collectId = ""; item.isSubmit = false
}, e => { })
});
}, },
// 取消 // 取消
treeCancel() { treeCancel() {
src/pages/searchCenter/pages/standardSearch.vue
+32 -8
View File
@@ -156,8 +156,17 @@
<!-- </el-button>--> <!-- </el-button>-->
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item> <el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item> <el-dropdown-item v-if="scope.row.collectBtn"
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>--> :command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -170,8 +179,17 @@
<!-- </el-button>--> <!-- </el-button>-->
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item> <el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item> <el-dropdown-item v-if="scope.row.collectBtn"
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>--> :command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -1003,7 +1021,6 @@
}) })
} }
this.searchOriginOptions = this.searchOptions this.searchOriginOptions = this.searchOptions
console.log(this.searchOriginOptions)
this.saveAllSortOptions = res.data.STANDCLASSIFY this.saveAllSortOptions = res.data.STANDCLASSIFY
this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组 this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
@@ -1241,6 +1258,15 @@
if (res.ok) { if (res.ok) {
this.total = res.data.count this.total = res.data.count
this.resultData = res.data.list this.resultData = res.data.list
this.resultData.map((item) => {
if (item.collectId != null && item.collectId !== '') {
item.collectBtn = false
item.cancelCollectBtn = true
} else {
item.collectBtn = true
item.cancelCollectBtn = false
}
});
this.selectGroupdata(res.data) this.selectGroupdata(res.data)
} else { } else {
this.total = 0 this.total = 0
@@ -1877,7 +1903,6 @@
let pagetype = '' let pagetype = ''
pagetype = item.typeShow pagetype = item.typeShow
if (item.typeShow === 'INLAND_STAND') { if (item.typeShow === 'INLAND_STAND') {
console.log('guonei权限')
routername = 'OtherStandardDetails' routername = 'OtherStandardDetails'
// if (this.$hasPermission('CFEZ3VP7EA95CTRBH3JB')) { // if (this.$hasPermission('CFEZ3VP7EA95CTRBH3JB')) {
// routername = 'OtherStandardDetails' // routername = 'OtherStandardDetails'
@@ -2051,6 +2076,7 @@
} }
} }
personCollect.collectType = pagetype personCollect.collectType = pagetype
personCollect.userId = this.$store.getters.userInfo.userId
this.$http.postData('person/personCollect', personCollect, { this.$http.postData('person/personCollect', personCollect, {
_this: this _this: this
}, res => { }, res => {
@@ -2120,7 +2146,6 @@
type: 'warning' type: 'warning'
}) })
} else { } else {
console.log(this.selectNowObjResult);
let pagetype = '' let pagetype = ''
if (this.selectNowObjResult.type === 'stand') { if (this.selectNowObjResult.type === 'stand') {
if (this.selectNowObjResult.standType === 'INLAND') { if (this.selectNowObjResult.standType === 'INLAND') {
@@ -2241,7 +2266,6 @@
if (item.type === 'stand') { if (item.type === 'stand') {
// if (this.$hasPermission('HK36LHK9444NPN8X634W')){ // if (this.$hasPermission('HK36LHK9444NPN8X634W')){
routername = 'OtherStandardDetails' routername = 'OtherStandardDetails'
console.log('guoneiQUANXIAN')
if (item.standType === 'INLAND') { if (item.standType === 'INLAND') {
pagetype = 'INLAND_STAND' pagetype = 'INLAND_STAND'
} else { } else {