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:
zhutianqi
2021-08-03 13:37:20 +08:00
parent 1ab9e81ded 7f69ee42ec
commit 0296a6ae27
21 changed files with 429 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/axios/index.js
+2 -1
View File
@@ -7,10 +7,11 @@ import axios from 'axios'
import router from '@/router'
import store from '@/store'
import {Message} from 'element-ui'
import { serverUrl } from '@/sysConfig'
export const CancelToken = axios.CancelToken
// import 'element-ui/lib/theme-chalk/index.css'
const _axios = axios.create({
baseURL: '/'
baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/'
})
/**
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+1
View File
@@ -1034,6 +1034,7 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4");
_formData.append("json", JSON.stringify({
taskInfo: '引入法规标准清单',
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+10 -38
View File
@@ -419,6 +419,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1,
totalNo: 0,
prcNum: '',
pageSizeNo: this.$store.getters.userInfo.configContent,
listForm: {
listName: "", //清单名称
@@ -454,20 +455,19 @@ export default {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
console.log(res.mes);
let mes = JSON.parse(res.mes);
this.listForm = mes.form;
this.detailData = mes.form.detailData
this.dataList = mes.form.dataList;
this.commentText = mes.commentText;
// this.fileList = mes.form.fileName.split(",")
// console.log(this.fileList);
this.prcNum = mes.prcNum
this.fileIds = mes.form.fileId;
this.getFileInfo();
this.processTable();
});
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
@@ -650,38 +650,6 @@ export default {
beforeUpload () {
},
// getData() {
// return new Promise((resolve, reject) => {
// inboundLiaisonDetail({
// taskIds: this.taskIds,
// pId: this.pId
// }).then(res => {
// if (res) {
// const processForm = JSON.parse(res.mesg)
// this.getFormFieldList(processForm)
// }
// }).catch(e => {
// })
// })
// },
// /**
// * @description: 动态表单读取
// */
// getFormFieldList (item) {
// this.$nextTick(() => {
// this.listForm = JSON.parse(JSON.stringify(item))
// this.listForm.prcNum = this.prcNum
// this.listForm.prcName = this.prcName
// this.listForm['id'] = item.id
// this.listForm.dataList = item.dataList
// this.dataList = item.dataList
// this.listForm.applyUpdUserId = item.applyUpdUserId
// this.listForm.jlUserId = item.jlUserId
// this.listForm.zrUserId = item.zrUserId
// this.fileIds = item.fileId;
// this.getFileInfo();
// })
// },
//保存事件
handleSave() {
this.saveLoading = true;
@@ -691,8 +659,12 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4");
_formData.append("json", JSON.stringify({
taskInfo: '根据会签意见修订',
form: this.listForm,
roleForm: this.roleForm,
prcNum: this.$route.query.prcNum,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: this.commentText
}));
saveTaskFirst(_formData).then(res => {
@@ -765,7 +737,7 @@ export default {
this.setMap(this.standStateOptions);
});
this.getData();
this.processTable();
// this.processTable();
this.getStandData();
},
};
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+14 -14
View File
@@ -193,20 +193,20 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
<el-card>
<el-form-item prop="dockUserName2" style="margin-bottom: 0">
<h4>会签人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
<!-- :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
<!-- <h4>会签人</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
<!-- <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
<!-- @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card>
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+6 -2
View File
@@ -446,8 +446,8 @@ export default {
cnName: "", //中文名称
enName: "", //英文名称
isSubTime: "", //发布日期
newCarTime: "", //新车型实施日期
oldCarTime: "", //在产车实施日期
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
applyCar: "", //适用车型
textState: "", //文本状态
id: ""
@@ -656,6 +656,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -694,6 +695,9 @@ export default {
taskInfo: '根据会签意见修订',
form: this.listForm,
roleForm: this.roleForm,
prcNum: this.$route.query.prcNum,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: this.commentText
}));
saveTaskFirst(_formData).then(res => {
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+103 -23
View File
@@ -29,7 +29,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standName" label="标准号/标准名称" align="center"/>
<el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -87,6 +96,42 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="确认+选择责任人" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>确认+选择责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="上传佐证材料填选择写信息" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
<el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="选择负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.checkUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>分发负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.checkUser" style="display: none;"></el-input>
<el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
</el-form>
</el-timeline>
</div>
@@ -103,7 +148,7 @@
<el-form :modal="queryUnqualidiedData" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
v-model="queryUnqualidiedData.standId"
v-model="queryUnqualidiedData.standSerialNumber"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
@@ -154,25 +199,44 @@
</div>
</div>
<el-table
ref="searchTable"
:data="unqualidiedData"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
ref="searchTable"
:data="unqualidiedData"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectedChange"
>
@selection-change="selectedChange"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称"/>
<el-table-column prop="productName" label="项目名称"/>
<el-table-column prop="itemsNum" label="条款号"/>
<el-table-column prop="itemsName" label="条款名称"/>
<el-table-column prop="planCloseTime" label="整改完成时间"/>
<el-table-column prop="responsibleUnit" label="责任部门"/>
<el-table-column prop="dutyEngineer" label="责任工程师"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" align="center" show-overflow-tooltip label="项目名称"/>
<el-table-column prop="itemsNum" align="center" label="条款号"/>
<el-table-column prop="itemsName" align="center" label="条款名称"/>
<el-table-column prop="planCloseTime" align="center" label="整改完成时间">
<template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" align="center" label="责任部门"/>
<el-table-column prop="dutyEngineer" align="center" label="责任工程师"/>
</el-table>
<pagination
style="position: relative;"
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"/>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
@@ -217,13 +281,17 @@ export default {
// 责任部门
zrbmOptions: [],
standModel: false,
// 总数
total: 0,
// 当前页数
pageNo: 1,
// 查询未符合项整改数据库数据
queryUnqualidiedData: {
pageNo: 1,
pageSize: 10,
total: 0,
closeState: '1',
standId: '', // 标准号/名称
standSerialNumber: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
},
@@ -269,9 +337,9 @@ export default {
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText','')
this.$set(item,'fileTextId','')
this.$set(item,'fileTextPath','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
})
this.total = res.data.total
})
@@ -308,6 +376,18 @@ export default {
});
}
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
//选择标准取消事件
closeDrawer() {
this.standModel = false
@@ -432,7 +512,7 @@ export default {
// 清空 查询条件
clearAllSearch (search = true) {
this.queryUnqualidiedData = {
standId: '',
standSerialNumber: '',
productName: '',
responsibleUnit: ''
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+28 -7
View File
@@ -13,7 +13,7 @@
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form">
<!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input v-model="nonSearch.standId"
size="small"
@@ -76,7 +76,7 @@
清空
</el-button>
</el-form-item>
</el-form>
</el-form>-->
<div class="content-center">
<el-button
style="text-align: end"
@@ -97,7 +97,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称" align="center"/>
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -119,7 +128,6 @@
</template>
</el-table-column>
</el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
@@ -316,9 +324,9 @@ export default {
const params = {
taskIds: this.taskIds,
pId: this.pId,
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
// standId: '', // 标准号/名称
// productName: '', // 项目名称
// responsibleUnit: '' // 责任部门
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
@@ -328,6 +336,7 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
})
},
// 批量选择分发责任人
@@ -455,6 +464,18 @@ export default {
})
this.dataList = this.realList
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 清空 查询条件
clearAllSearch () {
this.nonSearch = {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+45 -8
View File
@@ -13,7 +13,7 @@
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form">
<!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
size="small"
@@ -78,7 +78,7 @@
清空
</el-button>
</el-form-item>
</el-form>
</el-form>-->
<div class="content-center">
<el-button
style="text-align: end"
@@ -99,7 +99,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称" align="center"/>
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -125,7 +134,6 @@
</template>
</el-table-column>
</el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
@@ -316,6 +324,7 @@ export default {
for (let i = 0; i<fileData.length; i++) {
if (fileData[i].name === this.$store.getters.userInfo.userName) {
this.dataList = fileData[i].standardInfoList
this.standardInfoList = this.dataList
}
}
})
@@ -344,15 +353,31 @@ export default {
handleTabs(name) {
this.active = name
},
// 退回按钮
handleSubmitNo() {
if (this.commentText) {
var json = {
actionFlag: 1,
commentText: this.commentText
commentText: this.commentText,
standardInfoList: this.standardInfoList,
}
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskIds)
completeTask(params).then(res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
/* this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
@@ -365,7 +390,19 @@ export default {
})
} else {
this.$message.warning('请输入反馈意见')
}
}*/
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 保存按钮
handleSave() {},
src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpgStep1-3"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpgStep1-4"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+1
View File
@@ -633,6 +633,7 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", "5");
_formData.append("json", JSON.stringify({
taskInfo: '选择已拆分标准',
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+15 -15
View File
@@ -246,21 +246,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="填写评估反馈">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入您的评估分析"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<!-- <div>-->
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="填写评估反馈">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入您的评估分析"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
<!-- </div>-->
</div>
<div class="content" v-show="active === '3'">
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+44 -36
View File
@@ -447,45 +447,53 @@ export default {
},
//驳回事件
beforeBack () {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '1'
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '1'
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '2'
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
this.listForm.fenFlag = '2'
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+30 -23
View File
@@ -443,35 +443,42 @@ export default {
})
},
//驳回事件
beforeBack () {
beforeBack () { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.fenFlag = '2'
this.handleSubmit()
}
},
//提交事件
handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
});
});
}
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+32 -24
View File
@@ -442,34 +442,42 @@ export default {
//驳回事件
beforeBack () {
this.listForm.fenFlag = '2'
this.handleSubmit()
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.fenFlag = '2'
this.handleSubmit()
}
},
//提交事件
handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
});
});
}
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+5 -4
View File
@@ -85,22 +85,22 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="190px"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrqgj"
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -414,6 +414,7 @@ export default {
_this: this
}, res => {
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total;
});
},
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+30 -8
View File
@@ -284,14 +284,36 @@ export default {
}
break
case '5':
this.$router.push({
name: 'xmpgStep1-1',
query: {
type: '5',
processName: '项目合规评估流程-标准',
bpnId: id
}
})
if (mes.taskInfo === '选择已拆分标准') {
this.$router.push({
name: 'xmpgStep1-1',
query: {
type: '5',
processName: '项目合规评估流程-标准',
bpnId: id,
verifySarStandard: true,
}
})
}
// else if (mes.taskInfo === '分发责任人分发任务') {
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }else if (mes.taskInfo === '责任人填写评估反馈') {
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }
break
case '6':
this.$router.push({
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+3 -3
View File
@@ -99,9 +99,9 @@
prop="standId"
width="180px"
align="center"
label="标准编号">
label="标准号">
<template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -202,7 +202,7 @@
:model="historySeeForm"
>
<el-form-item class="add-form-item" label="标准编号:">
<div class="seeItem">{{historySeeForm.standId}}</div>
<div class="seeItem">{{historySeeForm.standSerialNumber}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="标准名称:">
<div class="seeItem">{{historySeeForm.standName}}</div>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+14 -1
View File
@@ -197,7 +197,7 @@
label="计划关闭时间">
<template slot-scope="scope">{{(scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11): '')}}</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
@@ -680,7 +680,20 @@ export default {
</script>
<style lang="less" scoped>
//.el-table {
// .el-table__fixed {
// height:auto !important; // 此处的important表示优先于element.style
// bottom:17px; // 改为自动高度后，设置与父容器的底部距离，则高度会动态改变
// }
//}
#rectification-dataBase {
/deep/.table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;
}
}
height: 100%;
display: flex;
flex-direction: column;
src/router/index.js
+19
View File
@@ -303,6 +303,7 @@ const routes = [
title: '项目合规评估流程'
}
},
//流程保存界面
{
path: '/xmpgStep1-1',
name: 'xmpgStep1-1',
@@ -312,6 +313,24 @@ const routes = [
title: '项目合规评估流程'
}
},
{
path: '/xmpgStep1-3',
name: 'xmpgStep1-3',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程'
}
},
{
path: '/xmpgStep1-4',
name: 'xmpgStep1-4',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程'
}
},
{
path: '/xmpgStep2',
name: 'xmpgStep2',
src/sysConfig/index.js
+1 -1
View File
@@ -30,7 +30,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '101.36.227.25'
const prodIp = '62.234.136.153'
const prodInterfacePORT = '8033'