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

企标废止修改

Browse Source
This commit is contained in:
宋伟佳
2021-12-06 17:54:15 +08:00
parent cb7b584fd1
commit 820701b7ff
6 changed files with 134 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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() {