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:
zhaokaiyao@91isoft.com
2021-12-06 18:04:25 +08:00
parent 25ddff8630 820701b7ff
commit 607489f99b
19 changed files with 198 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -3713,7 +3713,7 @@ export default {
& > p { & > p {
min-height: 42px; min-height: 42px;
line-height: 43px; line-height: 43px;
border-bottom: 1px solid #E5E5E5; /*border-bottom: 1px solid #E5E5E5;*/
} }
} }
} }
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+5
View File
@@ -106,6 +106,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="单位:"> <el-form-item class="add-form-item" label="单位:">
<el-input <el-input
readonly
style="width: 100%" style="width: 100%"
placeholder="请填写" placeholder="请填写"
v-model="rh_pageData.fillUnit" v-model="rh_pageData.fillUnit"
@@ -115,6 +116,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="部门:"> <el-form-item class="add-form-item" label="部门:">
<el-input <el-input
readonly
style="width: 100%" style="width: 100%"
placeholder="请填写部门" placeholder="请填写部门"
v-model="rh_pageData.fillDept" v-model="rh_pageData.fillDept"
@@ -409,6 +411,9 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
if (this.rh_pageData.fillFile !== undefined) { if (this.rh_pageData.fillFile !== undefined) {
this.fillFileList = this.rh_pageData.fillFile this.fillFileList = this.rh_pageData.fillFile
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+5
View File
@@ -105,6 +105,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="单位:"> <el-form-item class="add-form-item" label="单位:">
<el-input <el-input
readonly
style="width: 100%" style="width: 100%"
placeholder="请填写" placeholder="请填写"
v-model="ch_pageData.fillUnit" v-model="ch_pageData.fillUnit"
@@ -114,6 +115,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="部门:"> <el-form-item class="add-form-item" label="部门:">
<el-input <el-input
readonly
style="width: 100%" style="width: 100%"
placeholder="请填写部门" placeholder="请填写部门"
v-model="ch_pageData.fillDept" v-model="ch_pageData.fillDept"
@@ -350,6 +352,9 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.uploadFileLength = this.ch_pageData.fileTextList.length this.uploadFileLength = this.ch_pageData.fileTextList.length
this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.roleForm = JSON.parse(JSON.stringify(item)).roleList
src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue
+2 -1
View File
@@ -110,7 +110,7 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id"> {{ item.oldFileName }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -361,6 +361,7 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item)); this.qbfsForm = JSON.parse(JSON.stringify(item));
this.fileList = item.fileList
let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
res = res.split(","); res = res.split(",");
this.dataList = []; this.dataList = [];
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+12 -3
View File
@@ -101,7 +101,7 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id"> {{ item.oldFileName }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -506,6 +506,16 @@ export default {
}else if(this.selectList.length < 1){ }else if(this.selectList.length < 1){
this.$message.warning('请至少选择一条数据进行带入') this.$message.warning('请至少选择一条数据进行带入')
}else{ }else{
this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById',{id: this.selectList[0].id},{
_this: this
}, res => {
let fileIds = res.data.attrInfoCaseMap.fbgbuss
this.$http.get('att/attFile/getMultiFileInfos',{fileIds: fileIds}, {
_this: this
}, res => {
this.fileList = res.data
})
})
this.qbfsForm.entNumber = this.selectList[0].standCode || '--' this.qbfsForm.entNumber = this.selectList[0].standCode || '--'
this.qbfsForm.cnName = this.selectList[0].standName || '--' this.qbfsForm.cnName = this.selectList[0].standName || '--'
this.qbfsForm.enName = this.selectList[0].standEnName || '--' this.qbfsForm.enName = this.selectList[0].standEnName || '--'
@@ -515,7 +525,6 @@ export default {
this.qbfsForm.releaseDate = this.selectList[0].issueTime || '--' this.qbfsForm.releaseDate = this.selectList[0].issueTime || '--'
this.qbfsForm.implementDate = this.selectList[0].putTime || '--' this.qbfsForm.implementDate = this.selectList[0].putTime || '--'
this.qbfsForm.reviewDate = '--' //复审日期字段未确定 this.qbfsForm.reviewDate = '--' //复审日期字段未确定
this.fileList = this.selectList[0].standFileList
this.ListModel = false this.ListModel = false
} }
}, },
@@ -525,7 +534,6 @@ export default {
}, },
//企业标准选中项改变 //企业标准选中项改变
selectListChange(data){ selectListChange(data){
console.log(data);
this.selectList = data this.selectList = data
}, },
// 点击查看 // 点击查看
@@ -568,6 +576,7 @@ export default {
this.$refs['roleForm'].validate((valid) => { this.$refs['roleForm'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.qbfsForm.fileList = this.fileList
this.qbfsForm.commentText = this.commentText this.qbfsForm.commentText = this.commentText
var json = Object.assign(this.qbfsForm, this.roleForm) var json = Object.assign(this.qbfsForm, this.roleForm)
this.$http.get('lawss/activiti/startProcess', {type: '23'}, { this.$http.get('lawss/activiti/startProcess', {type: '23'}, {
src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+10 -6
View File
@@ -97,7 +97,7 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id"> {{ item.oldFileName }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -329,6 +329,7 @@ export default {
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item)) this.qbfsForm = JSON.parse(JSON.stringify(item))
this.fileList = item.fileList
}) })
}, },
handleTabs(name) { handleTabs(name) {
@@ -406,18 +407,21 @@ export default {
this.modalshowflag = true; this.modalshowflag = true;
}, },
checkedRole(data) { checkedRole(data) {
var idList = ""; let idList = "";
var nameList = ""; let nameList = "";
data.forEach(item => { data.forEach(item => {
if (nameList.length > 0) { if (nameList.length) {
nameList += ","; nameList += ",";
idList += ","; idList += ",";
} }
idList += item.id; idList += item.id;
nameList += item.name; nameList += item.name;
}); });
this.qbfsForm.jgUserId = idList; this.$set(this.qbfsForm, 'jgUser', nameList)
this.qbfsForm.jgUser = nameList; this.$set(this.qbfsForm, 'jgUserId', idList)
if(this.qbfsForm.jgUser){
this.$refs.qbfsForm.validateField('jgUser')
}
}, },
/** /**
* @Description: 点击下载 * @Description: 点击下载
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+2 -1
View File
@@ -97,7 +97,7 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id"> {{ item.oldFileName }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -335,6 +335,7 @@ export default {
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item)) this.qbfsForm = JSON.parse(JSON.stringify(item))
this.fileList = item.fileList
}) })
}, },
//流程提交 //流程提交
src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+3 -2
View File
@@ -107,10 +107,10 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
:key="item.id"> {{ item.name }} :key="item.id"> {{ item.oldFileName }}
<i <i
title="下载" title="下载"
@click="downloadFile(item.id)" @click="downloadFile(item.id)"
@@ -372,6 +372,7 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item)); this.qbfsForm = JSON.parse(JSON.stringify(item));
this.fileList = item.fileList
let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
res = res.split(","); res = res.split(",");
this.dataList = []; this.dataList = [];
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+28 -18
View File
@@ -42,7 +42,7 @@
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="standShow" label="英文名称" prop="enName" class="add-form-item form-item-disabled"> <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
v-model="standardSearch.enName" v-model="standardSearch.enName"
@@ -50,7 +50,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="standShow" label="企标类别" prop="entCategory" class="add-form-item form-item-disabled"> <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
v-model="standardSearch.entCategory" v-model="standardSearch.entCategory"
@@ -58,7 +58,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="standShow" label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled"> <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
v-model="standardSearch.replaceNumber" v-model="standardSearch.replaceNumber"
@@ -66,7 +66,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="standShow" label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled"> <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
v-model="standardSearch.replacedNumber" v-model="standardSearch.replacedNumber"
@@ -74,7 +74,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="standShow" label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled"> <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
v-model="standardSearch.releaseDate" v-model="standardSearch.releaseDate"
@@ -82,7 +82,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="standShow" label="实施日期" prop="implementDate" class="add-form-item form-item-disabled"> <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
<el-input <el-input
readonly readonly
v-model="standardSearch.implementDate" v-model="standardSearch.implementDate"
@@ -209,16 +209,16 @@
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0"> <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 style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left"> <div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px"> <el-form :modal="standardSearchs" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="标准号" class="search-item search-item-last"> <el-form-item label="标准号" class="search-item search-item-last">
<el-input <el-input
v-model="standardSearch.standCode" v-model="standardSearchs.standCode"
placeholder="根据标准号查找" placeholder="根据标准号查找"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" class="search-item search-item-last"> <el-form-item label="标准名称" class="search-item search-item-last">
<el-input <el-input
v-model="standardSearch.standName" v-model="standardSearchs.standName"
placeholder="根据标准名称查找" placeholder="根据标准名称查找"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@@ -408,7 +408,6 @@ export default {
modalshowflag: false, modalshowflag: false,
modalshowflag2: false, modalshowflag2: false,
nodeList2: [], nodeList2: [],
standShow: false,
standardSearch: { standardSearch: {
standCode: "", standCode: "",
standName: "", standName: "",
@@ -421,6 +420,10 @@ export default {
reviewDate: '', reviewDate: '',
abolishCause:'', abolishCause:'',
}, },
standardSearchs:{
standCode: "",
standName: "",
},
roleForm: { roleForm: {
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.userId,
@@ -436,8 +439,17 @@ export default {
//必填人员校验规则 //必填人员校验规则
roleFormRules: { roleFormRules: {
dockUserName: [ dockUserName: [
{required: true, message: "请选择工作组组长", trigger: "change"} {required: true, message: "请选择标准法规部部长", trigger: "change"}
], ],
countersignerName: [
{required: true, message: '请选择会签人员', trigger: 'change'}
],
examineName: [
{required: true, message: '请选择审定责任人', trigger: 'change'}
],
approverName: [
{required: true, message: '请选择批准负责人', trigger: 'change'}
]
}, },
formRules: { formRules: {
standCode: [ standCode: [
@@ -465,7 +477,6 @@ export default {
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.standardSearch = mes.qbfsForm this.standardSearch = mes.qbfsForm
this.standShow = true
this.commentText = mes.commentText this.commentText = mes.commentText
}); });
}, },
@@ -502,8 +513,8 @@ export default {
}, },
getStandDataBtns(){ getStandDataBtns(){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
standCode: this.standardSearch.standCode, standCode: this.standardSearchs.standCode,
standName: this.standardSearch.standName, standName: this.standardSearchs.standName,
page: 1, page: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
@@ -517,8 +528,8 @@ export default {
//企业标准查询 //企业标准查询
getStandDataBtn(){ getStandDataBtn(){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
standCode: this.standardSearch.standCode, standCode: this.standardSearchs.standCode,
standName: this.standardSearch.standName, standName: this.standardSearchs.standName,
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
}, { }, {
@@ -532,7 +543,7 @@ export default {
//企业标准清空 //企业标准清空
clearSearch(){ clearSearch(){
this.page = 1 this.page = 1
this.standardSearch = { this.standardSearchs = {
standCode: '', standCode: '',
standName: '' standName: ''
} }
@@ -555,7 +566,6 @@ export default {
this.standardSearch.implementDate = this.selectList[0].putTime || '--' this.standardSearch.implementDate = this.selectList[0].putTime || '--'
this.standardSearch.reviewDate = '--' //复审日期字段未确定 this.standardSearch.reviewDate = '--' //复审日期字段未确定
this.fileList = this.selectList[0].standFileList this.fileList = this.selectList[0].standFileList
this.standShow = true
this.ListModel = false this.ListModel = false
} }
}, },
src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
+23 -19
View File
@@ -100,7 +100,7 @@
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -309,24 +309,28 @@ export default {
}, },
//流程驳回 //流程驳回
beforeBack(){ beforeBack(){
this.isSubmit = true if(!this.commentText){
this.qbfsForm.passFlag = '1' this.$message.warning('请填写审批意见')
this.qbfsForm.commentText = this.commentText }else{
let json = JSON.stringify(this.qbfsForm); this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { this.qbfsForm.passFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.commentText = this.commentText
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
this.isSubmit = false this.$message.success(res.message)
}, e => { this.$router.push('/processCenter')
}); }
this.isSubmit = false
}, e => {
});
}
}, },
//流程提交 //流程提交
handleSubmit(){ handleSubmit(){
src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+3 -3
View File
@@ -116,7 +116,7 @@
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
</el-button> </el-button>
<process-title> <process-title>
<template slot="title">审核信息</template> <template slot="title">会签信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
@@ -133,12 +133,12 @@
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
label="审核意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
label="审核人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+27 -23
View File
@@ -116,7 +116,7 @@
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
</el-button> </el-button>
<process-title> <process-title>
<template slot="title">审核信息</template> <template slot="title">会签信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
@@ -133,18 +133,18 @@
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
label="审核意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
label="审核人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -358,25 +358,29 @@ export default {
}, },
//流程驳回 //流程驳回
beforeBack(){ beforeBack(){
this.isSubmit = true; if(!this.commentText){
this.qbfsForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
this.qbfsForm.bzFlag = '1' }else{
this.qbfsForm.dataList = this.dataList; this.isSubmit = true;
let json = JSON.stringify(this.qbfsForm); this.qbfsForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { this.qbfsForm.bzFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.dataList = this.dataList;
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
this.isSubmit = false; this.$message.success(res.message);
}, e => { this.$router.push("/processCenter");
}); }
this.isSubmit = false;
}, e => {
});
}
}, },
//流程提交 //流程提交
handleSubmit() { handleSubmit() {
src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+27 -23
View File
@@ -116,7 +116,7 @@
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
</el-button> </el-button>
<process-title> <process-title>
<template slot="title">审核信息</template> <template slot="title">会签信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
@@ -133,18 +133,18 @@
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
label="审核意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
label="审核人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -358,25 +358,29 @@ export default {
}, },
//流程驳回 //流程驳回
beforeBack(){ beforeBack(){
this.isSubmit = true; if(!this.commentText){
this.qbfsForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
this.qbfsForm.sdFlag = '1' }else{
this.qbfsForm.dataList = this.dataList; this.isSubmit = true;
let json = JSON.stringify(this.qbfsForm); this.qbfsForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { this.qbfsForm.sdFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.dataList = this.dataList;
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
this.isSubmit = false; this.$message.success(res.message);
}, e => { this.$router.push("/processCenter");
}); }
this.isSubmit = false;
}, e => {
});
}
}, },
//流程提交 //流程提交
handleSubmit() { handleSubmit() {
src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+26 -22
View File
@@ -116,7 +116,7 @@
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
</el-button> </el-button>
<process-title> <process-title>
<template slot="title">审核信息</template> <template slot="title">会签信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
@@ -133,12 +133,12 @@
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
label="审核意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
label="审核人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -358,25 +358,29 @@ export default {
}, },
//流程驳回 //流程驳回
beforeBack(){ beforeBack(){
this.isSubmit = true; if(!this.commentText){
this.qbfsForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
this.qbfsForm.bafzFlag = '1' }else{
this.qbfsForm.dataList = this.dataList; this.isSubmit = true;
let json = JSON.stringify(this.qbfsForm); this.qbfsForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { this.qbfsForm.bafzFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.dataList = this.dataList;
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
this.isSubmit = false; this.$message.success(res.message);
}, e => { this.$router.push("/processCenter");
}); }
this.isSubmit = false;
}, e => {
});
}
}, },
//流程提交 //流程提交
handleSubmit() { handleSubmit() {
src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
+8 -1
View File
@@ -107,7 +107,14 @@
<el-table-column prop="fillPost" align="center" label="身份"/> <el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillTel" align="center" label="电话"/> <el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/> <el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料"/> <el-table-column prop="fillFile" align="center" label="资料">
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>
</template>
</el-table-column>
</el-table> </el-table>
</el-form-item> </el-form-item>
</el-form> </el-form>
src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
+8 -1
View File
@@ -111,7 +111,14 @@
<el-table-column prop="fillPost" align="center" label="身份"/> <el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillTel" align="center" label="电话"/> <el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/> <el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料"/> <el-table-column prop="fillFile" align="center" label="资料">
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>
</template>
</el-table-column>
</el-table> </el-table>
</el-form-item> </el-form-item>
</el-form> </el-form>
src/pages/processCenter/pages/processDetail/index.vue
+1 -1
View File
@@ -272,7 +272,7 @@ export default {
this.toProcessDetail('bzchStep6-1',row) this.toProcessDetail('bzchStep6-1',row)
} else if(prcType === '23'){ } else if(prcType === '23'){
//企标复审 //企标复审
this.toProcessDetail('qbzxdjhgkStep1-5',row) this.toProcessDetail('qbfsStep1-4',row)
}else if(prcType === '24'){ }else if(prcType === '24'){
//企标废止 //企标废止
this.toProcessDetail('qbfzStep1-7',row) this.toProcessDetail('qbfzStep1-7',row)
src/pages/regulatoryRepository/nonConfomity/index.vue
+1 -1
View File
@@ -50,7 +50,7 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
#non-cnfomity { #non-cnfomity {
height: 100%; height: inherit;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #FFFFFF; background-color: #FFFFFF;
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+6 -10
View File
@@ -1188,19 +1188,13 @@ export default {
color: #606266 !important; color: #606266 !important;
} }
#rectification-dataBase { #rectification-dataBase {
/deep/ .el-table__fixed {
height: 100% !important; //设置高优先，以覆盖内联样式
}
/deep/ .el-table__fixed-right { /deep/ .el-table__fixed-right {
height: 100% !important; //设置高优先，以覆盖内联样式 height: 100% !important; //设置高优先，以覆盖内联样式
} }
/deep/ .table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;
}
}
height: 100%; min-height: calc(100% - 100px);
overflow-y: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -1210,6 +1204,7 @@ export default {
} }
.container { .container {
height: calc(~'100% - 30px');
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
@@ -1222,6 +1217,7 @@ export default {
.inner-wrap { .inner-wrap {
position: absolute; position: absolute;
height: calc(70vh - 60px);
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
@@ -1231,7 +1227,7 @@ export default {
.footer { .footer {
/deep/ .pagination { /deep/ .pagination {
position: static; position: absolute;
} }
} }
} }