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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-05-10 10:33:24 +08:00
parent 4cecdd75b3 4fae8f208b
commit 9136e0eef5
12 changed files with 236 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+2 -2
View File
@@ -473,8 +473,8 @@
// },
// {
// title: '我的问答',
// path: '/questionsAndAnswers',
// menuId: '8VKLZATQQG4NQHXV9UDS'
// path: '/questions',
// menuId: ''
// },
{
title: '我的板块',
src/pages/details/otherStandardDetails/index.vue
+7
View File
@@ -3823,6 +3823,13 @@ export default {
location['child2'] = []
} else {
const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
if(childList.length){
childList.forEach(item => {
if(item.value === "[]"){
item.value = ''
}
})
}
location['child2'] = childList
}
}
src/pages/home2/components/todoList/index.vue
+1 -6
View File
@@ -39,12 +39,7 @@ export default {
mounted() {this.queryProcess()},
methods: {
getPrcNameFilter(row){
if(row && row.prcType === 'buss3'){
return row.prcName + '-' + row.taskInfo
}else {
return row.prcName
}
return row.prcName
},
togo () {
this.$router.push('/processCenter')
src/pages/personal/pages/my-questions/components/questions-item.vue
+68
View File
@@ -0,0 +1,68 @@
<!--问题项的描述-->
<template>
<div id="questions-item">
<div>
<div class="row">
<div class="item">
<span>{{question.modifyTime}}</span>
</div>
<div class="item" style="padding-left: 10px;">
<span>{{ resType }}</span>
</div>
</div>
<div class="row" style="margin-top: 10px">
<div class="item">
<span>{{question.resCode}}</span>
</div>
<div class="item" style="padding-left: 10px">
<span>{{question.content}}</span>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "questions-item",
props: ['question'],
computed: {
resType() {
const matcher = {
INLAND_STAND: '国内标准',
FOREIGN_STAND: '国外标准',
FOREIGN_LAWS: '国内外政策',
BUSINESS: '企业标准'
}
return matcher[this.question.resType]
}
},
data(){
return{
}
},
watch:{
question: {
immediate: true,
deep: true,
handler(val) {
this.question = val
}
}
}
};
</script>
<style lang="less" scoped>
#questions-item{
width: 100%;
padding:10px 0;
.row {
line-height: 1.2;
}
.item {
display: inline-block;
}
}
</style>
src/pages/personal/pages/my-questions/index.vue
+91
View File
@@ -0,0 +1,91 @@
<!--我的问答-->
<template>
<div id="my-questions">
<el-tabs
type="border-card"
style="height: 100%"
class="type-tabs"
tab-position="left"
>
<el-tab-pane label="我的提问">
<div style="height: 100%">
<el-tabs
class="question-tabs"
type="border-card"
style="height: 100%"
tab-position="left"
>
<template v-for="question in questionList">
<el-tab-pane :name="question.name">
<template slot="label">
<questonsItem :question="question"></questonsItem>
</template>
</el-tab-pane>
</template>
</el-tabs>
</div>
</el-tab-pane>
<el-tab-pane label="我的回答">
<div>
</div>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import questonsItem from './components/questions-item'
export default {
name: "index",
components:{
questonsItem,
},
data(){
return{
questionList: [{
title: '问题1',
name: '1',
content: '问题1的内容',
resCode:'GB 17354-XXXX',
resType: 'FOREIGN_STAND',
modifyTime: '2022-03-14 14:40:42',
}, {
title: '问题2',
name: '2',
content: '问题2的内容',
resCode:'GB 14444-1',
resType: 'INLAND_STAND',
modifyTime: '2021-08-35 17:45:49',
}],
}
},
};
</script>
<style lang="less" scoped>
#my-questions{
height: 100%;
background: #F5F7FA;
margin-bottom: 10px;
.type-tabs{
/deep/.el-tabs__header {
margin-right: 0;
}
}
.question-tabs{
height: 100%;
/deep/.el-tabs__item{
height: 100%;
}
}
/deep/.el-tabs__content{
height: 100%;
padding: 0;
}
/deep/.el-tab-pane{
height: 100%;
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+12 -3
View File
@@ -220,6 +220,7 @@
</div>
<!-- 添加抽屉-->
<el-drawer
class="drawer-table"
title="添加项目"
:visible.sync="projectModel"
size="900px"
@@ -261,7 +262,7 @@
</el-form-item>
</el-form>
</div>
<div style="height: calc(100% - 65px); overflow: auto">
<div style="height: calc(100% - 65px); ">
<div style="font-size: 16px; color: #FF7F50; padding-bottom: 10px; margin-left: 10px">
<p>如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。</p>
</div>
@@ -584,8 +585,9 @@ export default {
});
//去掉字符串的最后一个逗号
let dex = projectNumbers.lastIndexOf(",")
let name = projectNames.lastIndexOf(",")
this.dataList.push({
projectName: projectNames,
projectName: projectNames.substring(0, name),
projectNumber: projectNumbers.substring(0, dex),
projectIds: projectIds,
managementHostName: this.selectProjectList[0].managementHostName,
@@ -838,7 +840,14 @@ export default {
}
}
}
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
/deep/.demo-drawer-content{
overflow-y: hidden;
}
}
.demo-drawer-content {
margin-top: 10px;
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+1 -1
View File
@@ -409,7 +409,7 @@ export default {
}
this.qbfsForm = item.qbfsForm || item;
this.formLoading = false;
this.commentText = item.qbfsForm ? item.qbfsForm.commentText : ''
this.commentText = item.commentText
this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+30 -30
View File
@@ -6,7 +6,6 @@
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -14,7 +13,7 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<el-form class="label-input-form prc-content-border" label-width="150px" ref="qblx_pageData" :model="qblx_pageData" :rules="qblxRule">
<el-form-item label="流程名称" class="add-form-item form-item-disabled">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
style="width: 90%"
clearable
@@ -75,9 +74,9 @@
<el-table-column prop="drafterName" label="起草人" width="150" align="center"></el-table-column>
<el-table-column prop="resPersonName" label="评审责任人" width="150" align="center"></el-table-column>
<el-table-column prop="wgLeaderName" label="工作组组长" width="150" align="center"></el-table-column>
<el-table-column prop="draftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="releaseTime" label="标准发布时间" width="150" align="center"></el-table-column>
<el-table-column prop="endTime" label="截止日期" align="center"></el-table-column>
<el-table-column prop="draftTime" label="计划标准初稿完成时间" min-width="180" align="center"></el-table-column>
<el-table-column prop="releaseTime" label="计划标准发布时间" width="150" align="center"></el-table-column>
<el-table-column prop="endTime" label="立项完成时间" min-width="150" align="center"></el-table-column>
<el-table-column label="操作" align="center" width="80" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="editRow('edit','编辑信息',scope.row)">编辑</el-button>
@@ -104,7 +103,6 @@
<el-timeline>
<el-form
ref="roleForm"
:rules="roleFormRules"
:model="roleForm"
class="label-input-form">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -226,9 +224,10 @@
</el-drawer>
<!-- 选择工作组抽屉-->
<el-drawer
class="drawer-table"
title="选择工作组组长"
:visible.sync="workModel"
size="900px"
size="600px"
@close="closeWorkDrawer"
custom-class="demo-drawer"
>
@@ -415,18 +414,14 @@ export default {
qblxData: [],
},
commentText: '',
qblxRule: {},
qblxRule: {
processName: [
{required: true, message:'请输入流程名称', trigger: 'blur'}
]
},
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
dockUser: '',
dockUserName: '',
},
roleFormRules:{
dockUserName: [
{required: true, message: '请选择责任工程师', trigger: 'change'},
],
},
// 上传路径
uploadPath: 'api/att/attFile/uploadNew',
@@ -474,9 +469,9 @@ export default {
// releaseTime: [
// {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
// ],
// drafterName: [
// {required: true, message: '请选择起草人', trigger: 'change'},
// ],
drafterName: [
{required: true, message: '请选择起草人', trigger: 'change'},
],
},
isSubmit: false,
saveLoading: false,
@@ -739,7 +734,6 @@ export default {
this.qblx_pageData = mes.form ? mes.form : mes.qblx_pageData
this.fileInfoList = mes.form ? mes.form.qblxFile : mes.qblx_pageData.qblxFile
this.commentText = mes.commentText
this.roleForm = mes.roleForm
});
},
@@ -803,14 +797,9 @@ export default {
},
// 选人组件确认
drawerCheck(data) {
if(this.type === '1' ){
this.addQblxData.dutyPeopleId = data[0].id
this.addQblxData.dutyPeople = data[0].name
}else{
this.roleForm.dockUser = data[0].id
this.roleForm.dockUserName = data[0].name
}
this.modalshowflag = false
this.addQblxData.dutyPeopleId = data[0].id
this.addQblxData.dutyPeople = data[0].name
this.modalshowflag = false
},
/** 新增按钮 */
@@ -931,7 +920,6 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "26");
_formData.append("json", JSON.stringify({
roleForm: this.roleForm,
qblx_pageData: this.qblx_pageData,
commentText: this.commentText
}));
@@ -944,15 +932,19 @@ export default {
})
},
listSubmit (item) {
console.log(item);
return new Promise((resolve, reject) => {
let newForm = Object.assign(this.roleForm, item,this.qblx_pageData);
newForm.startUserName = this.$store.getters.userInfo.userName
newForm.startUser = this.$store.getters.userInfo.userId
newForm.dockUser = item.drafter
newForm.dockUserName = item.drafterName
this.$http.post('lawss/activiti/startProcessRollBack',{
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '26',
json: JSON.stringify({
form: newForm,
roleForm: this.roleForm,
commentText: this.commentText
})
},{
@@ -1130,6 +1122,14 @@ export default {
height: calc(~'100% - 65px');
overflow: auto;
}
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
/deep/.demo-drawer-content{
overflow-y: hidden;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
-1
View File
@@ -917,7 +917,6 @@ export default {
this.fileIds = itemId.id
this.getFileInfo();
});
console.log(item.area.join(','));
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
})
src/pages/processCenter/pages/phone/bzrk/step2.vue
+6 -3
View File
@@ -112,7 +112,6 @@
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
<van-field label="标签" v-model="form.gxhbq" readonly placeholder="请输入标签" />
</div>
<ProcessTitle>
<template slot="title">实施日期</template>
@@ -846,8 +845,12 @@ export default {
handleSave() {
},
handle1() {
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
if(this.formTongGuo.commentText){
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
}else{
this.$message.warning('请填写审批意见')
}
},
handle2() {
this.formTongGuo.approvalOpinion = 0
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+4 -4
View File
@@ -1540,17 +1540,17 @@ export default {
}
if (this.editRowData.ssrq === "-") {
this.editRowData.ssrq = "";
} else if (this.editRowData.ssrq !== null && this.editRowData.ssrq !== "-" && this.editRowData.ssrq !== "") {
} else if (this.editRowData.ssrq&& this.editRowData.ssrq !== "-" ) {
this.editRowData.ssrq = this.editRowData.ssrq.split(",");
}
if (this.editRowData.zccssrqgj === "-") {
this.editRowData.zccssrqgj = "";
} else if (this.editRowData.zccssrqgj !== null && this.editRowData.zccssrqgj !== "-" && this.editRowData.zccssrqgj !== "") {
} else if (this.editRowData.zccssrqgj && this.editRowData.zccssrqgj !== "-") {
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(",");
}
if (this.editRowData.xcxssrqgj === "-") {
this.editRowData.xcxssrqgj = "";
} else if (this.editRowData.xcxssrqgj !== null && this.editRowData.xcxssrqgj !== "-" && this.editRowData.xcxssrqgj !== " ") {
} else if (this.editRowData.xcxssrqgj && this.editRowData.xcxssrqgj !== "-") {
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(",");
}
this.drawerEdit = true;
@@ -2316,7 +2316,7 @@ export default {
id: this.zqaId,
types: '1',
page: this.page,
Size: this.Size
Size: 1000,
}, {
_this: this
}, res => {
src/router/index.js
+14 -4
View File
@@ -242,15 +242,25 @@ const routes = [
}
},
{
path: '/questionsAndAnswers',
name: 'QuestionsAndAnswers',
component: resolve => require(['@/pages/personal/pages/questionsAndAnswers'], resolve),
path: '/questions',
name: 'MyQuestions',
component: resolve => require(['@/pages/personal/pages/my-questions'], resolve),
meta: {
requireAuth: true,
title: '我的问答',
menuId: '8VKLZATQQG4NQHXV9UDS'
menuId: ''
}
}
// {
// path: '/questionsAndAnswers',
// name: 'QuestionsAndAnswers',
// component: resolve => require(['@/pages/personal/pages/questionsAndAnswers'], resolve),
// meta: {
// requireAuth: true,
// title: '我的问答',
// menuId: '8VKLZATQQG4NQHXV9UDS'
// }
// }
]
},
// ************************** 流程中心 *******************************