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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-08-10 17:05:50 +08:00
parent 0f91bf9607 4b21a453dd
commit 03d33f5439
24 changed files with 574 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+20 -2
View File
@@ -212,7 +212,16 @@ router.beforeEach(function (to, from, next) {
next()
}else if (toName.slice(0,5) !== 'phone') {
if(toName === 'LoginVerify'){
next('/blankPage')
if(toName === 'phoneHome'){
// 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852
localStorage.removeItem('token')
token = localStorage.getItem("token")
window.sessionStorage.clear()
localStorage.setItem("routerName","phoneHome")
next('/loginVerifyPhone')
}else{
next('/blankPage')
}
}else {
if(toName === 'blankPage' || toName === 'processedPage') {
next()
@@ -223,7 +232,16 @@ router.beforeEach(function (to, from, next) {
}else {
if(toName !== 'blankPage'){
if(to.matched.length === 0){
next('/blankPage')
if(toName === 'phoneHome'){
// 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852
localStorage.removeItem('token')
token = localStorage.getItem("token")
window.sessionStorage.clear()
localStorage.setItem("routerName","phoneHome")
next('/loginVerifyPhone')
}else{
next('/blankPage')
}
}else {
next()
}
src/pages/details/otherStandardDetails/index.vue
+15 -13
View File
@@ -880,6 +880,9 @@
label="适用车型"
width="90"
>
<template slot-scope="scope">
{{filterApplyArctic(scope.row)}}
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="responsibleUnit"-->
@@ -2096,6 +2099,14 @@ export default {
props: {},
watch: {},
methods: {
filterApplyArctic(row){
console.log(row)
if(row.applyArctic){
return row.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '')
}else {
return ""
}
},
handleChangeList(data){
this.handleList = data
},
@@ -3139,28 +3150,19 @@ export default {
},
// 分解单----查看标准条款相关
selectSarStandItems(id, flag) {
this.tableLoading = true
this.standItemSearch.standId = this.sarStandardsInfoEO.id
this.standItemSearch.fileType = this.fileType
console.log("---------------------------------------------")
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
...this.standItemSearch,
pageSize: this.pageSize7, page: this.page7, order: this.order, orderBy: this.orderBy
}, {}, res => {
this.selectedItemList = []
if (res.ok) {
res.data.list.forEach(item => {
let k = (item.applyArctic || "").split(',')
for (let i in this.applyArcticOptions.options) {
for (let m = 0; m < k.length; m++) {
if (this.applyArcticOptions.options[i].value === k[m]) {
k[m] = this.applyArcticOptions.options[i].label
}
item.applyArctic = k.join(',')
}
}
item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '')
})
if (res.data) {
this.standItemList = res.data.list;
this.total7 = res.data.count // 分页需要
this.tableLoading = false
}
}, e => {
})
src/pages/localTool/standAutoSplit/index.vue
+2
View File
@@ -1051,8 +1051,10 @@ export default {
batchDelete () {
if (this.selectedList.length === 0) {
this.$message.error('请选择要删除的数据')
return
} if(this.selectedList.length > 10){
this.$message.error('批量删除仅支持10条以内')
return
} else {
this.$confirm('确认删除选择数据？', '确认删除', {
confirmButtonText: '确定',
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+9 -7
View File
@@ -1506,13 +1506,15 @@ export default {
}, {
_this: this
}, res => {
if (res.data) {
this.batchDeleteItem()
} else if(this.selectedList === null){
this.$message.warning('请确认选择条款是否有子节点，若有，则此次删除将全部删除。')
} else {
this.deleteItemsModal = true
}
// 接口判断作甚？ COPY SQ 逻辑
this.batchDeleteItem()
// if (res.data) {
// this.batchDeleteItem()
// } else if(this.selectedList === null){
// this.$message.warning('请确认选择条款是否有子节点，若有，则此次删除将全部删除。')
// } else {
// this.deleteItemsModal = true
// }
}, e => {
})
} else {
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+8 -2
View File
@@ -12,7 +12,7 @@
<div class="row">
<div class="item" @click="clickButtonTo">
<div style="cursor: pointer;">附件：
<div v-if="fileList.length > 0" v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
<div v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
<span style="" @click="clickButtonTo(item.id)" :title="item.name"> {{ item.name }}</span>
</div>
</div>
@@ -43,6 +43,10 @@ export default {
type: Object,
required: false
},
fileList: {
type: Array,
required: false
},
questionerForm: {
type: Object,
required: false
@@ -58,6 +62,9 @@ export default {
}
},
methods:{
fileListSetFunc(){
return this.assemble(this.answer.appendixId,this.answer.appendixName)
},
archiveVerify(){
return !!(this.questionerForm && this.questionerForm.questioner && this.questionerForm.questioner !== this.answererNowUserName
&& this.institutionId === '30001273');
@@ -83,7 +90,6 @@ export default {
answerChang(){}
},
mounted () {
this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName)
},
watch:{
answer: {
src/pages/personal/pages/my-questions/index.vue
+49 -19
View File
@@ -68,6 +68,7 @@
</div>
<div style="height: 100%" v-else>
<el-tabs
v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -84,7 +85,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -126,6 +127,7 @@
</div>
<div style="height: 100%" v-else>
<el-tabs
v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -142,7 +144,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -184,6 +186,7 @@
</div>
<div style="height: 100%" v-else>
<el-tabs
v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -200,7 +203,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -242,6 +245,7 @@
</div>
<div style="height: 100%" v-else>
<el-tabs
v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -258,7 +262,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -311,7 +315,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
v-model="activeQue"
@@ -330,6 +334,7 @@
<div class="answer-box" >
<question-item-info :key="qiiKey"
:answer="item"
:fileList="fileListSetFunc(item)"
:questionerForm="question"></question-item-info>
</div>
</div>
@@ -374,7 +379,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
v-model="activeQue"
@@ -393,6 +398,7 @@
<div class="answer-box" >
<question-item-info :key="qiiKey"
:answer="item"
:fileList="fileListSetFunc(item)"
:questionerForm="question"></question-item-info>
</div>
</div>
@@ -437,7 +443,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
v-model="activeQue"
@@ -456,6 +462,7 @@
<div class="answer-box" >
<question-item-info :key="qiiKey"
:answer="item"
:fileList="fileListSetFunc(item)"
:questionerForm="question"></question-item-info>
</div>
</div>
@@ -500,7 +507,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
v-model="activeQue"
@@ -521,6 +528,7 @@
:key="qiiKey"
:answer="item"
:questionerForm="question"
:fileList="fileListSetFunc(item)"
></question-item-info>
</div>
</div>
@@ -577,7 +585,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -594,7 +602,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -635,7 +643,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -652,7 +660,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -693,7 +701,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -710,7 +718,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -751,7 +759,7 @@
</div>
</div>
<div style="height: 100%" v-else>
<el-tabs
<el-tabs v-loading="tagsLoading"
class="question-box"
type="border-card"
style="height: 100%"
@@ -768,7 +776,7 @@
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
<question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
</div>
</div>
</template>
@@ -846,7 +854,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button class="common-button-primary" size="mini" type="primary":loading="submitBtnLoading" @click="queSubmit">提 交</el-button>
<el-button class="common-button-primary" size="mini" type="primary" :loading="submitBtnLoading" @click="queSubmit">提 交</el-button>
</span>
</el-dialog>
<!-- 选择标准抽屉-->
@@ -1253,6 +1261,7 @@ export default {
},
data(){
return{
tagsLoading: false,
submitBtnLoading: false,
aiKey:1,
qiiKey:1,
@@ -1326,7 +1335,6 @@ export default {
}
},
mounted(){
console.log(this.$store.getters.userInfo)
this.standSearch()
// 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -1621,9 +1629,11 @@ export default {
this.subSearch()
},
standClick(){
this.tagsLoading = true
this.queSearch()
},
standClick2(){
this.tagsLoading = true
this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
standardId: this.activestand,
answerer: this.$store.getters.userInfo.userId,
@@ -1631,11 +1641,13 @@ export default {
_this: this
}, res => {
this.questionsList = res.data
this.tagsLoading = false
}, e =>{
})
},
standClick3(){
this.tagsLoading = true
this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
standardId: this.activestand,
answerer: this.$store.getters.userInfo.userId,
@@ -1643,6 +1655,7 @@ export default {
_this: this
}, res => {
this.questionsList = res.data
this.tagsLoading = false
}, e =>{
})
@@ -1668,14 +1681,31 @@ export default {
})
}
this.answerList = res.data
this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName)
}else{
this.answerList = res.data
this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName)
}
this.qiiKey++
this.dataLoading = false
this.tagsLoading = false
}, e => {
})
},
fileListSetFunc(item){
return this.assemble(item.appendixId,item.appendixName)
},
assemble(ids,names){
let list= [];
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
}
return list;
},
//提问按钮
queBtn(){
this.fileList = []
@@ -1761,6 +1791,7 @@ export default {
_this: this
}, res => {
this.questionsList = res.data
this.tagsLoading = false
})
},
//查询回答标准
@@ -1805,7 +1836,6 @@ export default {
},
//文件上传前
beforeUploadTheme(file){
console.log(file);
var filename = file.name;
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+12 -11
View File
@@ -126,6 +126,7 @@
</div>
<el-button
@click="fileUpload"
v-if="!disabledXX"
:disabled="acceptShow || disabledXX"
type="primary"
class="common-button-primary"
@@ -136,8 +137,8 @@
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="类别:">
<el-radio v-model="ch_pageData.sort" label="1">计划内</el-radio>
<el-radio v-model="ch_pageData.sort" label="2">计划外</el-radio>
<el-radio :disabled="disabledXX" v-model="ch_pageData.sort" label="1">计划内</el-radio>
<el-radio :disabled="disabledXX" v-model="ch_pageData.sort" label="2">计划外</el-radio>
</el-form-item>
</el-col>
</el-row>
@@ -190,7 +191,7 @@
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4>
@@ -201,7 +202,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>分委会主任/部门中心主任</h4>
@@ -213,7 +214,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="填写信息" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="填写信息" placement="top" :color="roleForm.dutyUserName1 ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName1" style="margin-bottom: 0">
<h4>责任工程师</h4>
@@ -225,7 +226,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.partUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="partUserId" style="margin-bottom: 0">
<h4>参会人员所在部门中心主任</h4>
@@ -237,7 +238,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="汇总修订" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="汇总修订" placement="top" :color="roleForm.startUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规部人员</h4>
@@ -285,7 +286,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.directorUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>院长</h4>
@@ -519,9 +520,9 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.ch_pageData = mes.ch_pageData
this.commentInfo = mes.commentInfo
this.roleForm = mes.roleForm
this.ch_pageData = mes.json.ch_pageData
this.commentInfo = mes.json.commentInfo
this.roleForm = mes.json.roleForm
});
},
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+133 -107
View File
@@ -226,133 +226,134 @@
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="管理主体" class="search-item search-item-last">
<el-select v-model="projectSearch.managementHostName"
@change="optionsChange(projectSearch)"
placeholder="请选择管理主体" filterable clearable>
<el-option
v-for="(item, index) in managementHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="开发主体" class="search-item search-item-last">
<el-select v-model="projectSearch.developmentHostName" @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
<el-option
v-for="(item, index) in developmentHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目细分类" class="search-item search-item-last">
<el-select v-model="projectSearch.categoryName" @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
<el-option
v-for="(item, index) in categoryName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目状态" class="search-item search-item-last">
<el-select v-model="projectSearch.projectStatus" placeholder="请选择项目状态" filterable clearable>
<el-option
v-for="(item, index) in projectStatus"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
v-btn-permission=""
@click="getProductDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission=""
@click="clearProject">清空
</el-button>
</el-form-item>
</el-form>
</div>
<div class="standard-content">
<div class="content">
<div class="standard-table-search">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="管理主体" class="search-item search-item-last">
<el-select v-model="projectSearch.managementHostName"
@change="optionsChange(projectSearch)"
placeholder="请选择管理主体" filterable clearable>
<el-option
v-for="(item, index) in managementHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="开发主体" class="search-item search-item-last">
<el-select v-model="projectSearch.developmentHostName" @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
<el-option
v-for="(item, index) in developmentHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目细分类" class="search-item search-item-last">
<el-select v-model="projectSearch.categoryName" @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
<el-option
v-for="(item, index) in categoryName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目状态" class="search-item search-item-last">
<el-select v-model="projectSearch.projectStatus" placeholder="请选择项目状态" filterable clearable>
<el-option
v-for="(item, index) in projectStatus"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
v-btn-permission=""
@click="getProductDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission=""
@click="clearProject">清空
</el-button>
</el-form-item>
</el-form>
</div>
<div class="standard-table-wrap">
<div style="height: calc(100% - 65px); ">
<div style="font-size: 16px; color: #FF7F50; padding-bottom: 10px; margin-left: 10px">
<p>如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。</p>
</div>
<el-table
:data="productData"
tooltip-effect="dark"
style="width: 100%"
border
ref="projectTable"
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
:data="productData"
tooltip-effect="dark"
style="width: 100%"
border
ref="projectTable"
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProject"
@selection-change="selectProject"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
align="center"
prop="projectName"
label="项目名称"/>
align="center"
prop="projectName"
label="项目名称"/>
<el-table-column
align="center"
width="120"
prop="projectStatus"
label="项目状态"/>
align="center"
width="120"
prop="projectStatus"
label="项目状态"/>
<el-table-column
align="center"
prop="currentNode"
label="当前节点"/>
align="center"
prop="currentNode"
label="当前节点"/>
<el-table-column
align="center"
prop="projectGroup"
label="项目群"/>
align="center"
prop="projectGroup"
label="项目群"/>
<el-table-column
align="center"
prop="uname"
label="项目经理"/>
align="center"
prop="uname"
label="项目经理"/>
</el-table>
</div>
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
</div>
<pagination
:page="pageNo"
:pageSize="pageSizeNo"
:total="totalNo"
@pageChange="pageChangeNo"
@pageSizeChange="pageSizeChangeNo"
:page="pageNo"
:pageSize="pageSizeNo"
:total="totalNo"
@pageChange="pageChangeNo"
@pageSizeChange="pageSizeChangeNo"
/>
</div>
</div>
@@ -410,6 +411,7 @@ export default {
return {
active: "1",
//折叠的标志，true为折叠，false为不折叠
replaceLoading: false,
foldFormFlag: false,
drawerModal: false,
loading: false,
@@ -565,6 +567,9 @@ export default {
},
//查询项目群下的项目
getProductData() {
this.replaceLoading = true
// 已维护 状态 1 , 为维护 状态 0
this.projectSearch.flag = '1'
this.$http.get("sarStandProjectLibrary/queryProjects", {
projectGroup: this.projectGroup,
current: this.pageNo,
@@ -575,6 +580,7 @@ export default {
}, res => {
this.productData = res.data.records;
this.totalNo = res.data.total;
this.replaceLoading = false
});
},
//查询项目按钮
@@ -916,6 +922,26 @@ export default {
overflow-y: hidden;
}
}
.standard-content {
height: 100%;
padding: 10px 0 0;
.content {
height: 100%;
display: flex;
flex-direction: column;
padding: 0 10px;
.standard-table-wrap {
flex: auto;
overflow-y: auto;
}
.pagination {
position: static;
/deep/ .pagination-slot {
padding: 0;
}
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+7 -2
View File
@@ -1110,7 +1110,7 @@
</el-form>
</div>
<!-- 保存||提交-->
<ProcessFooter v-show="!disabledXX || verifySarStandard"
<ProcessFooter v-show="!disabledXX && verifySarStandard"
show-save
show-submit
:submitLoading="isSubmit"
@@ -3819,7 +3819,12 @@
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-drawer__body{
height: 100%;
display: flex;
flex-direction: column;
overflow-y: auto !important;
}
.bzrkStep1 {
/deep/ .el-button--mini.is-circle {
padding: 2px;
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+1
View File
@@ -381,6 +381,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data)
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.commentText2 = data.commentText2 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1
View File
@@ -614,6 +614,7 @@
json.info = []
json.form = this.form
json.department = this.$store.getters.userInfo.orgName
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+22 -5
View File
@@ -627,13 +627,15 @@ export default {
json.onlyKey = this.onlyKey
json.spId = this.form.spId
json.spName = this.form.spName
json.form.info = this.data
json.form.onlyKey = this.onlyKey
json.form.spId = this.form.spId
json.form.spName = this.form.spName
json.commentText4 = this.commentText4
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText4: this.commentText4
}));
_formData.append("json", JSON.stringify(json));
console.log(json);
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
@@ -654,6 +656,7 @@ export default {
json.info = this.data
json.onlyKey = this.onlyKey
json.spName = this.form.spName
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -718,7 +721,21 @@ export default {
this.form.endTime = data.endTime || data.form.endTime
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.json = data.form ? data.form : data
if(data.form){
data.modelList = data.form.modelList?data.form.modelList: data.modelList
data.startUserName = data.form.startUserName? data.form.startUserName: data.startUserName
data.presidentUser = data.form.presidentUser ? data.form.presidentUser :data.presidentUser
data.presidentUserName = data.form.presidentUserName ? data.form.presidentUserName : data.presidentUserName
data.fjList = data.form.fjList ? data.form.fjList:data.fjList
data.spId = data.form.spId ? data.form.spId : ''
data.spName = data.form.spName ? data.form.spName : ''
data.startUser = data.form.startUser ? data.form.startUser : data.startUser
data.cid = data.form.cid?data.form.cid:data.cid
data.endTime = data.form.endTime? data.form.endTime:data.endTime
data.textType =data.form.textType? data.form.textType:data.textType
}
this.json = data
console.log(this.json)
this.standId = data.standId
this.getItemList(data.standId,data.textType)
this.data = data.info || data.form.info
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+13 -2
View File
@@ -541,8 +541,19 @@
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '')
this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '')
if(data.form){
let user7Id = data.form.user7
if(user7Id){
this.form.user7 =user7Id
this.form.user7Name =data.form.user7Name
}else{
this.form.user7 = data.user7 ? data.user7 : data.spId
this.form.user7Name = data.user7Name ? data.user7Name : data.spName
}
}else{
this.form.user7 = data.user7 ? data.user7 : data.spId
this.form.user7Name = data.user7Name ? data.user7Name : data.spName
}
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+5
View File
@@ -1003,6 +1003,7 @@
{validator: validateStandNumber, trigger: 'change'}
],
standNumNotRule: [],
standYear: [
{ required: true, message: '请输入标准年份'},
],
@@ -2494,6 +2495,10 @@
// } else if (val === '') {
// this.form.country = []
// }
if(this.form.standStatus !== '1'){
this.rules.standNum[0].required = false;
}
this.fileInfoHandle()
this.$refs['form'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+4
View File
@@ -324,6 +324,7 @@
<el-button :disabled="disabledXX" type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div>
</el-drawer>
<loading :loading="formLoading">数据加载中...</loading>
</div>
</template>
@@ -338,6 +339,7 @@ export default {
props: ['message'],
data(){
return{
formLoading: false,
disabledXX:!!this.$route.query.disabledXX,
formRules: {
bussSort: [
@@ -390,9 +392,11 @@ export default {
// this.qbfsForm = {}
// }
//查询下拉框数据
this.formLoading = true
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.formLoading = false
this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+4
View File
@@ -340,6 +340,7 @@
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div>
</el-drawer>
<loading :loading="formLoading">数据加载中...</loading>
</div>
</template>
@@ -354,6 +355,7 @@ export default {
props: ['message'],
data(){
return{
formLoading:false,
disabledXX:!!this.$route.query.disabledXX,
BZList: [],
cbcdOptions: [],
@@ -412,9 +414,11 @@ export default {
// this.qbfsForm = {}
// }
//查询下拉框数据
this.formLoading = true
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.formLoading = false
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+4
View File
@@ -410,6 +410,7 @@
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<loading :loading="formLoading">数据加载中...</loading>
</div>
</template>
@@ -443,6 +444,7 @@ export default {
};
return {
disabledXX:!!this.$route.query.disabledXX,
formLoading:false,
workModel: false,
workSearch: {
workGroupName: "",
@@ -572,9 +574,11 @@ export default {
// this.qbfsForm = {}
// }
//查询下拉框数据
this.formLoading = true
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.formLoading = false
this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
this.BZList = res.data.ENERGYTYPES //适用车型
// this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+11 -2
View File
@@ -226,8 +226,9 @@
</el-form-item>
<el-form-item label="制修订类型" class="search-item search-item-last">
<el-select :disabled="disabledXX" v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
<el-option label="请选择" value=""></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
@@ -323,6 +324,7 @@
label="起草责任单位">
</el-table-column>
</el-table>
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
</div>
<pagination
:page="page"
@@ -561,6 +563,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<loading :loading="formLoading">数据加载中...</loading>
</div>
</template>
@@ -582,6 +585,8 @@ export default {
data(){
return {
disabledXX:!!this.$route.query.disabledXX,
replaceLoading:false,
formLoading:false,
workModel: false,
workSearch: {
workGroupName: "",
@@ -721,9 +726,11 @@ export default {
// this.qbfsForm = {}
// }
//查询下拉框数据
this.formLoading = true
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.formLoading = false
this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
this.BZList = res.data.ENERGYTYPES //适用车型
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
@@ -1070,6 +1077,7 @@ export default {
},
//企业标准查询
getStandDataBtn(){
this.replaceLoading = true
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName,
@@ -1087,6 +1095,7 @@ export default {
}
})
this.total = this.standinfoList.length
this.replaceLoading = false
})
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+4
View File
@@ -331,6 +331,7 @@
<el-button :disabled="disabledXX" type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div>
</el-drawer>
<loading :loading="formLoading">数据加载中...</loading>
</div>
</template>
@@ -346,6 +347,7 @@ export default {
data(){
return{
disabledXX:!!this.$route.query.disabledXX,
formLoading:false,
formRules: {
bussSort: [
{ required: true, message: "请选择企标类别", trigger: "blur" }
@@ -399,9 +401,11 @@ export default {
// if(this.qbfsForm.passFlag){
// this.qbfsForm = {}
// }
this.formLoading = true
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.formLoading = false
this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+18
View File
@@ -409,6 +409,24 @@ export default {
break
}
this.qbfsForm = item.qbfsForm || item;
if (this.qbfsForm.bussSort) {
if(this.qbfsForm.bussSort instanceof Array){
this.qbfsForm.bussSort = this.qbfsForm.bussSort[0]
}else {
let val = this.qbfsForm.bussSort.replace('//',"").replace('["',"").replace('"]',"").toString()
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.qbfsForm.bussSort = this.form.bussSort.join(",")[0];
} else {
this.qbfsForm.bussSort = val
}
} else if (val === '') {
this.qbfsForm.bussSort = ""
}
}
} else {
this.qbfsForm.bussSort = ""
}
this.formLoading = false;
this.commentText = item.commentText
this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+220 -70
View File
@@ -249,88 +249,164 @@
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<div class="standard-content">
<div class="content" style="overflow-x: hidden">
<div class="standard-table-search">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="管理主体" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.managementHostName"
placeholder="请输入管理主体"
></el-input>
</el-form-item>
<el-form-item label="开发主体" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.developmentHostName"
placeholder="请输入开发主体"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目群" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.projectGroup"
placeholder="请输入项目群"
></el-input>
</el-form-item>
<el-form-item label="项目状态" class="search-item search-item-last">
<el-select v-model="projectSearch.projectStatus" placeholder="请选择项目状态" clearable>
<el-option
v-for="opr in xmztOptions"
:key="opr.value"
:value="opr.label"
:label="opr.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目细分类" class="search-item search-item-last">
<el-input :disabled="disabledXX"
v-model="projectSearch.categoryName"
placeholder="请输入项目细分类"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box" style="margin-top: 39px;">
<el-button
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box" style="margin-top: 39px;">
<el-button
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="standard-table-wrap">
<el-table
:data="ProjectDatas"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
:data="ProjectDatas"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
>
<el-table-column
type="selection"
width="55"
align="center" />
type="selection"
width="55"
align="center" />
<el-table-column
prop="projectNumber"
align="center"
label="项目编号"
prop="managementHostName"
align="center"
width="120"
label="管理主体"
/>
<el-table-column
prop="projectName"
align="center"
label="项目名称"
prop="developmentHostName"
align="center"
width="120"
label="开发主体"
/>
<el-table-column
prop="projectClassification"
align="center"
label="项目分类"
prop="categoryName"
align="center"
width="120"
label="项目细分类"
/>
<el-table-column
prop="uname"
align="center"
label="项目经理"
prop="projectGroup"
align="center"
width="100"
label="项目群"
/>
<el-table-column
prop="projectNumber"
align="center"
label="项目编号"
/>
<el-table-column
prop="projectNumber"
align="center"
label="项目编号"
/>
<el-table-column
prop="projectName"
align="center"
width="250"
label="项目名称"
/>
<el-table-column
prop="projectClassification"
align="center"
width="120"
label="项目分类"
/>
<el-table-column
prop="uname"
align="center"
label="项目经理"
/>
</el-table>
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
</div>
<pagination
:page="page"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
:page="page"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
/>
</div>
</div>
@@ -348,6 +424,7 @@ import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst, taskDel,queryTaskFirst } from "api/process";
import file from "@/pages/knowledgeGraph/components/file";
import {solostarData} from "@/api/unqualProcess";
export default {
name: "xmpg2Step1",
@@ -359,6 +436,12 @@ export default {
data() {
return {
disabledXX:!!this.$route.query.disabledXX,
replaceLoading: false,
// 项目分类数组
notProjectData: [],
projectStatus: [],
projectData: [],
notProjectStatus: [],
active: "1", //当前选中的type
isSubmit: false,
saveLoading: false,
@@ -421,8 +504,13 @@ export default {
//项目检索条件
projectSearch: {
projectNumber: "",
projectName: ""
projectName: "",
managementHostName: "",
developmentHostName: "",
categoryName: "",
projectGroup: "",
},
xmztOptions: [],
//项目数据
ProjectDatas: [],
page: 1,
@@ -478,9 +566,10 @@ export default {
},
//获取项目数据
getProjectData() {
this.replaceLoading = true
this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
page: this.page,
pageSize: this.pageSize,
Page: this.page,
PageSize: this.pageSize,
...this.projectSearch
}, {
_this: this
@@ -492,6 +581,7 @@ export default {
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total;
}
this.replaceLoading = false
});
},
@@ -718,11 +808,41 @@ export default {
this.commentText = mes.commentText
})
},
selectSort() {
solostarData().then(res => {
res.data.MaintenanceProjectClassification.forEach((item, index) => {
this.projectData.push({
label: item,
value: index
})
})
res.data.MaintenanceProjectStatus.forEach((item, index) => {
this.projectStatus.push({
label: item,
value: index
})
this.xmztOptions = this.projectStatus
})
res.data.notMaintenanceProjectClassification.forEach((item, index) => {
this.notProjectData.push({
label: item,
value: index
})
})
res.data.notMaintenanceProjectStatus.forEach((item, index) => {
this.notProjectStatus.push({
label: item,
value: index
})
})
})
}
},
mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
this.selectSort()
this.getProjectData();
// 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -755,6 +875,16 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
/deep/ .el-form-item{
margin-bottom: 9px !important;
}
/deep/ .el-drawer__body{
overflow-y: auto !important;
}
/deep/ .demo-drawer-footer{
height: 5% !important;
}
.xmpg2-step1 {
/deep/ .el-drawer__container {
.prc-content-border {
@@ -826,6 +956,26 @@ export default {
}
}
.standard-content {
height: 91%;
padding: 10px 0 0 0;
.content {
height: 100%;
display: flex;
flex-direction: column;
padding: 0 10px;
.standard-table-wrap {
flex: auto;
overflow-y: auto;
}
.pagination {
position: static;
/deep/ .pagination-slot {
padding: 0;
}
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+1 -1
View File
@@ -594,7 +594,7 @@
</el-form>
</div>
<!-- 保存||提交-->
<ProcessFooter v-show="!disabledXX || verifySarStandard"
<ProcessFooter v-show="!disabledXX && verifySarStandard"
show-save
show-submit
:submitLoading="isSubmit"
src/pages/processCenter/pages/processDetail/index.vue
+1 -1
View File
@@ -314,7 +314,7 @@ export default {
let data = {
name: componentName,
query: {
bpnId: this.$route.query.bpnId,
bpnId: row.bpnId,
taskIds: row.id,
prcId: row.processInstanceId,
prcNum: row.prcNum,
src/pages/regulatoryRepository/standQA/index.vue
+10 -5
View File
@@ -23,7 +23,7 @@
<el-input v-model="questionSerach.problemDescription" placeholder="根据关键词查询"></el-input>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="searchBtn">查询</el-button>
<el-button size="mini" type="primary" @click="searchBtn">查询</el-button>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="delSearch">清空</el-button>
@@ -59,7 +59,8 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '订阅']">订阅</el-dropdown-item>
<el-dropdown-item v-if="!scope.row.subState || scope.row.subState === 'n'" :command="[scope.row, '订阅']">订阅</el-dropdown-item>
<el-dropdown-item v-if="scope.row.subState === 'y'" :command="[scope.row, '取消订阅']">取消订阅</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -673,7 +674,10 @@ export default {
this.handleDetail(command[0])
break
case '订阅':
this.subscribe(command[0])
this.subscribe(command[0],'y')
break
case '取消订阅':
this.subscribe(command[0],'n')
break
}
},
@@ -690,14 +694,15 @@ export default {
}, e => {
})
},
subscribe(row){
subscribe(row,subState){
this.$http.postData('lawss/Subscription/insertSubscription',{
askId: row.id,
usId: this.$store.getters.userInfo.userId,
subState: subState,
},{
_this: this
}, res => {
console.log(res);
row.subState = subState
})
},
refreshStandMap(){