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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!32
This commit is contained in:
高嵩
2023-04-04 19:38:35 +08:00
parent 8c7b1ca73a cf3cea74e7
commit 47e732871e
13 changed files with 2374 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+48 -8
View File
@@ -334,7 +334,7 @@
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<el-button class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准问答</el-button>
<el-button class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准需求（翻译）申请流程</el-button>
<el-button v-if="false" class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准需求（翻译）申请流程</el-button>
</div>
</div>
</div>
@@ -2962,16 +2962,56 @@ export default {
this.relateDialog1 = true
this.relateNowList1 = list
},
selectAskReply(){
return new Promise((resolve,reject)=>{
this.$http.post('lawss/AskQuestions/selectAskReply', {
id: this.$route.params.id
}, {
_this: this
}, res => {
resolve(res)
},e => reject(e));
})
},
//标准问答按钮
knowledgeSharing() {
this.$router.push({
path: '/standQA',
query:{
standId: this.$route.params.id,
standType: 'BUSINESS_STAND',
sourceType: 'details',
}
this.selectAskReply()
.then((res)=>{
if( res && res.data.length === 0){
this.$router.push({
name: 'MyQuestions3',
query: {
activeName: "myQue",
type: this.$route.params.pageType,
id: this.$route.params.id,
dialogVisible: true
},
})
}else{
const data = res.data[0].askQuestions
this.$router.push({
name: 'MyQuestions3',
query: {
activeName: "myQue",
classification: data.classification,
id: this.$route.params.id,
dialogVisible: false
},
})
}
}).catch(e =>{
console.log(e)
})
// this.$router.push({
// // path: '/standQA',
// query: {
// standId: this.$route.params.id,
// standType: this.sarStandardsInfoEO.standType,
// sourceType: 'details',
// },
// name: 'MyQuestions2',
// })
},
// 更新LOG
relateEvent () {
src/pages/details/otherStandardDetails/index.vue
+50 -9
View File
@@ -37,7 +37,7 @@
@click="collectClick()"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
<el-button class="relation-btn" @click="">标准需求（翻译）申请流程</el-button>
<el-button v-if="false" class="relation-btn" @click="">标准需求（翻译）申请流程</el-button>
</div>
</div>
</div>
@@ -2634,16 +2634,57 @@ export default {
pageSizeChange1() {
this.getKnowList()
},
selectAskReply(){
return new Promise((resolve,reject)=>{
this.$http.post('lawss/AskQuestions/selectAskReply', {
id: this.$route.params.id
}, {
_this: this
}, res => {
resolve(res)
},e => reject(e));
})
},
//标准问答按钮
knowledgeSharing() {
this.$router.push({
path: '/standQA',
query: {
standId: this.$route.params.id,
standType: this.sarStandardsInfoEO.standType,
sourceType: 'details',
}
})
this.selectAskReply()
.then((res)=>{
if( res && res.data.length === 0){
this.$router.push({
name: 'MyQuestions3',
query: {
activeName: "myQue",
type: this.$route.params.pageType,
id: this.$route.params.id,
dialogVisible: true
},
})
}else{
const data = res.data[0].askQuestions
this.$router.push({
name: 'MyQuestions3',
query: {
activeName: "myQue",
type: this.$route.params.pageType,
// classification: data.classification,
id: this.$route.params.id,
dialogVisible: false
},
})
}
}).catch(e =>{
console.log(e)
})
// this.$router.push({
// // path: '/standQA',
// query: {
// standId: this.$route.params.id,
// standType: this.sarStandardsInfoEO.standType,
// sourceType: 'details',
// },
// name: 'MyQuestions2',
// })
},
// 获取知识点列表数据
getKnowList() {
src/pages/home2/components/todoList/index.vue
+37 -10
View File
@@ -1,6 +1,6 @@
<!-- 待办任务 -->
<template>
<div class="to-do-list">
<div class="to-do-list" v-loading="Loading">
<div style="border-bottom: 2px solid #f4f4f4">
<span class="task">
<i class="el-icon-s-goods"></i> 待办任务
@@ -9,18 +9,21 @@
</div>
<ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="min-height: 30px">
<span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }}</span>
<el-button type="primary"
size="small"
class="common-button-primary"
icon="el-icon-check"
@click="handleReceive(item)" v-if="item.showreceive && ((item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') ||
<div style="min-height: 30px;display: flex;justify-content: space-between">
<div>
<span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;"
>{{ getPrcNameFilter(item) }}</span>
</div>
<div>
<el-button type="primary"
size="small"
@click="handleReceive(item)" v-if="item.showreceive && ((item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') ||
(item.prcType == 9 && item.taskInfo == '解读') || (item.prcType == 6 && item.taskInfo === '合规评估') || (item.prcType == 6 && item.taskInfo == '批准') ||
(item.prcType == 2 && item.taskInfo === '调研结果反馈') || (item.prcType == 8 && item.taskInfo === '合规排查(上传合规举证材料)') ||
(item.prcType == 10 && item.taskInfo === '清单完善1') || (item.prcType == 26 && item.taskInfo === '立项确认') ||
(item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受任务</el-button>
(item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受</el-button>
</div>
<!-- <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
<!-- <span @click="dealWith(item)"-->
<!-- style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
@@ -42,6 +45,7 @@ export default {
total: 0,
pageNo: 1,
showreceive:true,
Loading:false
}
},
computed: {},
@@ -73,6 +77,7 @@ export default {
},
// 接受按钮
handleReceive(item) {
this.Loading = true
this.isSubmit = true
// execTask({
// todoId: this.todoId // 当前节点ID
@@ -106,9 +111,31 @@ export default {
this.showreceive = false
// this.$router.push('/processCenter')
// }
this.queryProcessPrmise().then(() => {
this.Loading = false
})
})
})
},
queryProcessPrmise () { // 查询待办流程
return new Promise((resolve,reject)=>{
this.$http.postData('lawss/activiti/todoTaskList', {
current: this.pageNo,
size: 10,
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
},
{
loading: 'loading',
_this: this
}, res => {
this.toDoTaskList = res.list
resolve()
}, e => {
reject()
})
})
},
dealWith (row) { // 办理
const prcType = row.prcType
switch(prcType) {
src/pages/localTool/standAutoSplit/index.vue
+1 -1
View File
@@ -30,7 +30,7 @@
<div class="action-bar">
<el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'">拆分</el-button>
<el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'e214975dcab66d2e27bf2ed9897f521c'">删除</el-button>
<el-button size="small" type="primary" @click="clickButtonToImport" v-btn-permission="'449d7543121f8588b0bddc4038d14863'">导入拆分结果</el-button>
<el-button size="small" type="primary" @click="clickButtonToImport">导入拆分结果</el-button>
</div>
<div class="table-wrap">
<div style="position: absolute;height: 100%;width: 100%;">
src/pages/personal/pages/my-questions/index3.vue
+2143
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/components/ProcessFooter.vue
+1 -1
View File
@@ -104,7 +104,7 @@
icon="el-icon-check"
@click="handleReceive"
:loading="submitLoading"
v-if="showReceive"
v-if="false"
>接收任务</el-button>
<el-button
type="danger"
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+31 -9
View File
@@ -7,7 +7,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable>
<el-select v-model="form.standSort" filterable clearable @change="standSortChange">
<el-option
v-for="item in standSortOptions"
placeholder="请选择企标类别"
@@ -18,12 +18,20 @@
</el-select>
</el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
<template>
<div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>
<div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>
<div style="padding-left: 10px; color: #666666;" v-else></div>
</template>
<el-select v-model="form.reviseStatus" filterable>
<el-option
v-for="item in opinionsStand"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<!--<template>-->
<!-- <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>-->
<!-- <div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '2'">修订</div>-->
<!-- <div style="padding-left: 10px; color: #666666;" v-else-if="form.reviseStatus === '3'">修改</div>-->
<!-- <div style="padding-left: 10px; color: #666666;" v-else></div>-->
<!--</template>-->
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
@@ -80,7 +88,8 @@
clearable
></el-input>
</el-form-item>
<el-form-item v-show="form.reviseStatus === '1'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">
<!--<el-form-item v-show="form.reviseStatus === '1'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">-->
<el-form-item v-show="form.reviseStatus === '1' || form.reviseStatus === '2'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">
<el-input
v-model="form.standNum"
:maxLength="100"
@@ -439,7 +448,7 @@
disabled
></el-input>
</el-form-item>
<el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
<el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled cbcd">
<el-select v-model="form.CYCD" filterable clearable
placeholder="请先选择采标程度"
>
@@ -753,6 +762,11 @@ export default {
},
data () {
return {
opinionsStand:[
{value: '1',label: '制定'},
{value: '2',label: '修订'},
{value: '3',label: '修改'},
],
fileId:'',
dialogVisible: false,
config: {
@@ -827,6 +841,9 @@ export default {
...mapGetters(['userInfo'])
},
methods: {
standSortChange(val){
this.$emit('standSortChange',val)
},
filterOp(data){
if(!data){
return ""
@@ -1097,6 +1114,11 @@ export default {
}
}
},
'form.reviseStatus':{
handler(val) {
this.$emit('reveseStatusChange',val)
}
}
}
}
</script>
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+25
View File
@@ -45,6 +45,8 @@
@formChoiceZRR3 = "formChoiceZRR3"
@formChoiceZRR4 = "formChoiceZRR4"
@formChoiceZRR5 = "formChoiceZRR5"
@standSortChange = "standSortChange"
@reveseStatusChange = 'reveseStatusChange'
/>
<div>
<el-collapse accordion v-model="activeName">
@@ -1118,6 +1120,7 @@
syrzOptions:[],//适用认证下拉框
data: [], // 标准列表数据
ListForm: {}, // 新增数据
maxStandnSn:"", // 最大順序號
}
},
watch:{
@@ -1166,6 +1169,16 @@
},
},
methods: {
reveseStatusChange(val){
if(val === '1'){
this.form.standNum = this.maxStandnSn
}else{
this.form.standNum = this.form.standSn
}
},
standSortChange(val){
this.form.standCode = val + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
},
checkedRoleTransfer (data) {
this.isSubmit = true
this.saveLoading = true
@@ -1266,6 +1279,7 @@
this.fileType = fileType
this.fileUpload(fileType)
}
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
},
modelProp(row,index){
console.log(row)
@@ -2853,6 +2867,13 @@
}, e => {
})
},
getMaxStandnSn(){
this.$http.get('lawss/sarBussionessStand/selectMaxStandnSn', '', {
_this: this
}, res => {
this.maxStandnSn = res.data
})
}
},
mounted () {
// this.getTaskId()
@@ -2894,6 +2915,7 @@
}
this.busVsFunc()
this.modelFunc()
this.getMaxStandnSn();
}
}
@@ -2904,6 +2926,9 @@
/deep/ .el-input__suffix{
display: none !important;
}
/deep/ .cbcd .el-input__suffix{
display: inline-block !important;
}
/deep/ #active2 .el-form-item__content{
margin-left: 0px !important;
}
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+1
View File
@@ -149,6 +149,7 @@
<div style="flex: auto;" v-show="active === '2'">
<formEditList
:key = "formKey"
:isTrue="true"
:formSub = "form"
:FBGBUSSFileListSub = "FBGBUSSFileList"
:LSBBBUSSFileListSub = "LSBBBUSSFileList"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+6 -1
View File
@@ -929,7 +929,7 @@
accept=".ZIP, .zip"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -4471,6 +4471,11 @@ export default {
},
// 点击导入标准
addImportModal(flag) {
if(this.selectSarMenu.id === undefined){
this.importFailed = true;
this.importForm.content = '请选择需要导入的目录'
return
}
this.importModalshowflag = true
this.showUploadlist = true
this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + '&userId=' + this.$store.getters.userInfo.userId
src/pages/regulatoryRepository/standQA/index.vue
+21
View File
@@ -1073,6 +1073,27 @@ export default {
this.dialogVisible = false
this.isSubmit = false
this.searchBtn()
this.$http.post('lawss/activiti/startProcessRollBack',{
json: JSON.stringify(res.data),
type: '27',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
},
{
_this: this
}, val => {
this.$http.post('lawss/activiti/completeTask',{
taskIds: val.data,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(res.data),
},
{
_this: this
}, res => {
}, e => {
})
}, e => {
})
}, e => {
})
src/pages/searchCenter/pages/standardSearch.vue
+1 -1
View File
@@ -30,7 +30,7 @@
<div>首页</div>
</router-link>
<!-- <button>标准翻译申请流程</button>-->
<a class="router-link1" style="margin-left: 10px;">
<a v-if="false" class="router-link1" style="margin-left: 10px;">
标准需求（翻译）申请流程
</a>
</div>
src/router/index.js
+9
View File
@@ -338,6 +338,15 @@ const routes = [
requireAuth: false,
title: '我的问答'
}
},
{
path: '/questions3',
name: 'MyQuestions3',
component: resolve => require(['@/pages/personal/pages/my-questions/index3.vue'], resolve),
meta: {
requireAuth: false,
title: '我的问答'
}
},
{
path: '/questionDetail',