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-01-25 18:44:45 +08:00
parent dd2afabb67 3dab05e4d4
commit e89707f729
19 changed files with 2532 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+24 -13
View File
@@ -630,11 +630,11 @@ export default {
})
}
break
//项目合规评估流程
//标准合规评估
case '5' :
if(row.taskInfo === '标准法规部业务经理审批'){
if(row.taskInfo === '审核(标准法规业务经理)'){
this.$router.push({
name: 'xmpgStep2',
name: 'bzpgStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -643,9 +643,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '标准评估任务下发'){
}else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){
this.$router.push({
name: 'xmpgStep3',
name: 'bzpgStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -654,9 +654,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '合规性评估'){
}else if(row.taskInfo === '任务分发(项目经理)'){
this.$router.push({
name: 'xmpgStep4',
name: 'bzpgStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -665,9 +665,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '分发责任人审核'){
}else if(row.taskInfo === '合规评估(专业技术人员)'){
this.$router.push({
name: 'xmpgStep5',
name: 'bzpgStep5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -676,9 +676,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '汇总审核'){
}else if(row.taskInfo === '审核(项目经理)'){
this.$router.push({
name: 'xmpgStep6',
name: 'bzpgStep6',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -687,9 +687,20 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '标准法规部领导审核'){
}else if(row.taskInfo === '审定(项目群负责人)'){
this.$router.push({
name: 'xmpgStep7',
name: 'bzpgStep7',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if(row.taskInfo === '批准(标准法规部高级经理)'){
this.$router.push({
name: 'bzpgStep8',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+6 -14
View File
@@ -445,7 +445,8 @@
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
width="70"
align="center">
</el-table-column>
<el-table-column
@@ -577,7 +578,7 @@ export default {
],
endTime: [
{ required: true, message: "请输入截止时间", trigger: "change" }
],
]
},
roleFormRules: {
dockUserName: [
@@ -720,15 +721,6 @@ export default {
this.ListModel = true;
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
this.roleRow = getlist[0];
} else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
//导入功能
leading() {
@@ -824,9 +816,9 @@ export default {
this.dataList.forEach(item => {
if(!item.distributePerson || !item.projectGroupPeople){
this.$message.warning('请填写完整的人员信息')
}else{
}else {
this.isSubmit = true;
this.listForm.dataList = this.dataList
this.listForm.dataList = this.dataList;
this.listForm.commentText = this.commentText;
let json = Object.assign(this.listForm, this.roleForm);
console.log(json);
@@ -837,7 +829,7 @@ export default {
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '5',
type: "5",
json: JSON.stringify({
taskInfo: "选择已拆分标准",
form: this.listForm,
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+207 -64
View File
@@ -1,4 +1,4 @@
<!--标准合规评估 业务经理审批-->
<!--标准合规评估 分发人分发项目-->
<template>
<div class="bzpg-step3">
<ProcessHeader toggle>
@@ -91,6 +91,7 @@
:data="dataList"
border
ref="selection"
tooltip-effect="dark"
height="100%"
style="width: 100%;"
@selection-change="selectProjectGroup"
@@ -118,16 +119,24 @@
label="项目状态"/>
<el-table-column
align="center"
:show-overflow-tooltip="true"
prop="projectNumber"
label="项目编号"/>
<el-table-column
align="center"
:show-overflow-tooltip="true"
prop="projectName"
label="项目名称"/>
<el-table-column
align="center"
prop="projectManager"
label="项目经理"/>
prop="uname"
label="项目经理">
<template slot-scope="scope">
<el-input v-model="scope.row.unameId" style="display: none;" />
<el-input v-model="scope.row.uname" placeholder="请选择项目经理"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="审批意见">
@@ -213,7 +222,7 @@
<!-- 添加抽屉-->
<el-drawer
title="添加项目"
:visible.sync="ProjectModel"
:visible.sync="projectModel"
size="900px"
custom-class="demo-drawer"
>
@@ -282,11 +291,12 @@
label="项目名称"/>
<el-table-column
align="center"
width="120"
prop="projectStatus"
label="项目状态"/>
<el-table-column
align="center"
prop="projectName"
prop="currentNode"
label="当前节点"/>
<el-table-column
align="center"
@@ -294,7 +304,7 @@
label="项目群"/>
<el-table-column
align="center"
prop="projectManager"
prop="uname"
label="项目经理"/>
</el-table>
</div>
@@ -314,7 +324,7 @@
</div>
</el-drawer>
<ProcessFooter
show-back
show-save
show-transfer
show-submit
:transfer-loading="isTransfer"
@@ -322,7 +332,7 @@
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@back="beforeBack"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -334,6 +344,13 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 选择责任人-->
<Role-tree
is-title="选择项目经理"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
</div>
</template>
@@ -341,7 +358,7 @@
import ProcessHeader from "process/components/ProcessHeader";
import ProcessFooter from "process/components/ProcessFooter";
import ProcessTitle from "process/components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "bzpgStep3",
@@ -352,7 +369,7 @@ export default {
},
data(){
return {
active: '1',
active: "1",
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
drawerModal: false,
@@ -360,33 +377,49 @@ export default {
isTransfer: false,
isSubmit: false,
saveLoading: false,
ProjectModel: false,
projectModel: false,
modalshowflag: false,
pageNo: 1,
totalNo: 0,
pageSizeNo: this.$store.getters.userInfo.configContent,
userId:this.$store.getters.userInfo.userId,
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: '',
drawerTitle: '',
projectGroup: '', //用来查询项目
commentText: "",
drawerTitle: "",
projectGroup: "", //用来查询项目
listForm: {},
dataList: [],
projectDataList: [],
breakdownList: [], //标准下的分解单数据
detailData: [],
nodeList: [],
nodeList2: [],
selectProjectList: [],
selectProjectGroupList: [],
productData: [], //项目群下的项目
projectStatus: [], //项目状态下拉框
projectSearch: {
projectStatus: "", //项目状态
},
projectStatus: "" //项目状态
}
}
},
mounted() {
this.getData()
this.processTable()
this.getProductData()
this.getData();
this.processTable();
this.getProductData();
/**
* 获取项目群筛选项的值
*/
this.$http.post("sarStandProjectLibrary/querySelect", {}, {
_this: this
}, res => {
res.data.statusList.forEach(item => {
if (item) {
this.projectStatus.push(item); //项目状态
}
});
});
},
methods: {
getData() {
@@ -406,22 +439,40 @@ export default {
/**
* @description: 动态表单读取
*/
getFormFieldList (item) {
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.projectGroup = item.dataList[0].projectGroup
this.dataList.distributePerson = item.dataList[0].distributePerson
this.listForm.breakdownList = item.breakdownList
})
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.projectGroup = item.dataList[0].projectGroup;
this.$http.get('SarStandItems/sar-stand-items/findAllItems', {
ids: item.standId,
type: item.fileType
},{
_this: this
}, res => {
this.breakdownList = res.data
this.breakdownList.map(item => {
delete item.termsConditions
})
})
});
},
choiceZRRS(row, type, index) {
this.nodeList2 = [];
this.lsIndex = index;
this.lsType = type;
if (row.unameId) {
this.nodeList2 = row.unameId.split(",");
} else {
this.nodeList2.push(row);
}
this.modalshowflag = true;
},
//查询项目群下的项目
getProductData(){
this.$http.get('sarStandProjectLibrary/queryProjects',{
getProductData() {
this.$http.get("sarStandProjectLibrary/queryProjects", {
projectGroup: this.projectGroup,
current: this.pageNo,
PageSize: this.pageSizeNo,
@@ -429,9 +480,9 @@ export default {
}, {
_this: this
}, res => {
this.productData = res.data.records
this.totalNo = res.data.count
})
this.productData = res.data.records;
this.totalNo = res.data.count;
});
},
//查询项目按钮
getProductDataBtn(){
@@ -463,31 +514,77 @@ export default {
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.selectProjectGroupList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.projectNumber === item.projectNumber;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.selectProjectGroupList = [];
this.$refs.selection.clearSelection();
}).catch(() => {
});
}
},
cancelStand(){
this.projectModel = false
cancelStand() {
this.projectModel = false;
},
okProject(){
if(this.selectProjectList.length){
}else{
this.$message.warning('请至少选择一条数据进行添加')
}
okProject() {
if (this.selectProjectList.length) {
let addFlag = true;
let projectNumbers = "";
this.selectProjectList.forEach(item => {
projectNumbers += item.projectNumber;
projectNumbers += ",";
});
if(this.dataList.length){
this.dataList.forEach(item => {
if (item.projectNumber === projectNumbers) {
addFlag = false;
}
});
}
if (addFlag) {
let projectNames = "", projectNumbers = "";
this.selectProjectList.forEach(items => {
projectNames += items.projectName;
projectNames += ",";
projectNumbers += items.projectNumber;
projectNumbers += ",";
});
this.dataList.push({
projectName: projectNames,
projectNumber: projectNumbers,
managementHostName: this.selectProjectList[0].managementHostName,
developmentHostName: this.selectProjectList[0].developmentHostName,
categoryName: this.selectProjectList[0].categoryName,
projectStatus: this.selectProjectList[0].projectStatus,
projectGroup: this.selectProjectList[0].projectGroup,
uname: this.selectProjectList[0].uname,
unameId: this.selectProjectList[0].projectManager,
})
} else {
this.$message.warning("请勿重复添加数据");
}
this.projectModel = false;
this.$refs.projectTable.clearSelection();
} else {
this.$message.warning("请至少选择一条数据进行添加");
}
},
selectProject(data){
this.selectProjectList = data
selectProject(data) {
this.selectProjectList = data;
},
pageChangeNo(page){
this.pageNo = page
this.getProductData()
pageChangeNo(page) {
this.pageNo = page;
this.getProductData();
},
pageSizeChangeNo(pageSize){
this.pageSizeNo = pageSize
this.getProductData()
pageSizeChangeNo(pageSize) {
this.pageSizeNo = pageSize;
this.getProductData();
},
//tab发生变化
handleTabs(name) {
@@ -495,7 +592,7 @@ export default {
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
this.foldFormFlag = !this.foldFormFlag;
},
// 点击查看
handlePreview(item) {
@@ -509,28 +606,74 @@ export default {
window.open(routeUrl.href, "_blank");
},
//提交
handleSubmit(){
handleSubmit() {
if (!this.dataList.length) {
this.$message.warning("请添加项目数据");
} else if(this.dataList.length > 5) {
this.$message.warning('您最多只能选择五条数据')
}else{
this.listForm.dataList = this.dataList;
this.listForm.breakdownList = this.breakdownList
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.isSubmit = true;
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");
}
this.isSubmit = false;
}, e => {
});
}
},
//驳回
beforeBack(){
//保存
handleSave() {
this.saveLoading = true;
this.listForm.dataList = this.dataList;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "5");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
checkedRole2(data) {
this.dataList[this.lsIndex].unameId = data[0].id;
this.dataList[this.lsIndex].uname = data[0].name;
this.modalshowflag = false;
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
checkedRole(data) {
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
this.isTransfer = false;
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum()
this.processNum();
} else {
this.$message.warning(res.message)
}
src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+681
View File
@@ -0,0 +1,681 @@
<!--标准合规评估 项目经理分发标准-->
<template>
<div class="bzpg-step4">
<ProcessHeader toggle>
<template slot="proName">标准合规评估流程</template>
<template slot="proNode">项目经理分发标准</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-collapse-transition>
<el-form
v-if="!foldFormFlag"
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" type="primary" size="mini" @click="choiceZRRS('', 2, '')" >
批量分发落实人
</el-button>
</div>
</div>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane
v-for="(item, index) in projectTabName"
:key="index"
:label="item"
:value="item"
:name="item">
</el-tab-pane>
</el-tabs>
<el-table
ref="multipleTable"
:data="dataList"
style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="100%"
border
highlight-current-row
@selection-change="selectProjectChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center"/>
<el-table-column
align="center"
min-width="180"
prop="projectGroup"
label="项目群"/>
<el-table-column
align="center"
min-width="180"
prop="projectNumber"
label="项目编号"/>
<el-table-column
min-width="300"
:show-overflow-tooltip="true"
align="center"
prop="projectName"
label="项目名称"/>
<el-table-column
align="center"
min-width="120"
prop="itemsNum"
label="条款号"/>
<el-table-column
align="center"
min-width="150"
prop="itemsName"
label="条款名称">
</el-table-column>
<el-table-column
label="条款内容"
width="200"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
查看条款内容
</el-button>
</template>
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="200px"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
align="center"
width="200px"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xcxssrq"
align="center"
width="160px"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
align="center"
width="160px"
label="在产车实施日期"/>
<el-table-column
label="落实人"
width="210"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.implementerId" style="display: none;" />
<el-input v-model="scope.row.implementer" placeholder="请选择落实人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
</el-table-column>
</el-table>
<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 class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{scope.row.commentText}}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
show-back
show-transfer
show-submit
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<!-- 选择责任人-->
<Role-tree
is-title="选择落实人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from "process/components/ProcessHeader";
import ProcessFooter from "process/components/ProcessFooter";
import ProcessTitle from "process/components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "bzpgStep4",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
data(){
return {
active: '1',
activeName: 'first',
fileType: '', //条款文件类型
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
drawerModal: false,
loading: false,
isTransfer: false,
isSubmit: false,
saveLoading: false,
modalshowflag: false,
itermsConditionsFlag: false,
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: '',
drawerTitle: '',
lsIndex: "",
itermsConditionsTitle: '',
listForm: {},
dataList: [],
detailData: [],
nodeList: [],
nodeList2: [],
projectTabName: [],
selectProject: [],
}
},
mounted() {
this.getData()
this.processTable()
},
methods: {
handleClick(tab) {
let projectData = this.dataList
this.dataList = []
projectData.forEach(item => {
if(item.projectName === tab.name){
this.dataList.push(item)
}
})
},
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.fileType = item.fileType
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.resDats
item.resDats.forEach(item => {
if(!this.projectTabName.includes(item.projectName)){
this.projectTabName.push(item.projectName)
}
})
this.listForm.resDats = []
this.listForm.breakdownList = []
this.dataList.distributePerson = item.dataList[0].distributePerson
})
},
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.$http.get('SarStandItems/sar-stand-items/findItemById',{
type:this.fileType,
ids: row.id
},{
_this: this
}, res => {
this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
})
this.itermsConditionsFlag = true
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
//提交
handleSubmit(){
this.dataList.map(item => {
delete item.termsConditions
})
this.listForm.commentText = this.commentText
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
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')
}
this.isSubmit = false
}, e => {
});
},
//驳回
beforeBack(){
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.listForm.commentText = this.commentText
this.listForm.stepFlag = '1'
const json = JSON.stringify(this.listForm);
this.isSubmit = true
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')
}
this.isSubmit = false
}, e => {
});
}
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
}, e => {})
},
selectProjectChange(data){
this.selectProject = data
},
choiceZRRS(row, type, index) {
this.type = type;
if (type === 1) {
this.nodeList2 = [];
this.lsIndex = index;
if (row.implementerId) {
this.nodeList2 = row.implementerId.split(",");
} else {
this.nodeList2.push(row);
}
this.modalshowflag = true;
} else if (type === 2) {
// 批量
if (this.selectProject.length > 0) {
this.nodeList2 = [];
this.modalshowflag = true;
this.selectProject.forEach(item =>{
if(item.implementerId){
this.nodeList2 = item.implementerId.split(",");
}
})
} else {
this.$message.warning("请选择要分发的数据");
}
}
},
checkedRole2(data) {
let idList = "",nameList = "";
data.forEach(item => {
if (nameList.length) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
if (this.type === 1) {
let projectList = JSON.parse(JSON.stringify(this.dataList))
projectList[this.lsIndex].implementerId = idList;
projectList[this.lsIndex].implementer = nameList;
this.dataList = projectList
} else if (this.type === 2) {
let projectList = JSON.parse(JSON.stringify(this.dataList))
projectList.forEach(item => {
this.selectProject.forEach(items => {
if (item.projectName === items.projectName && item.itemsNum === items.itemsNum) {
item.implementerId = idList;
item.implementer = nameList;
}
});
});
this.dataList = projectList
this.$refs.multipleTable.clearSelection();
}
this.modalshowflag = false;
},
},
computed: {
listNoDataText () {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
},
},
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzpg-step4 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
left: 0;
top: 0;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
/deep/.el-tabs__header{
margin: 0;
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+1012
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "step6"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "step7"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "step8"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+2 -2
View File
@@ -94,12 +94,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '汇总单.xls')"
@click="upload(oldData, '汇总单.xlsx')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '上报意见.xls')"
@click="upload(data, '上报意见.xlsx')"
size="mini">生成上报意见
</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+2 -2
View File
@@ -86,12 +86,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '汇总单.xls')"
@click="upload(oldData, '汇总单.xlsx')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '上报意见.xls')"
@click="upload(data, '上报意见.xlsx')"
size="mini">生成上报意见
</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+2 -2
View File
@@ -86,12 +86,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '汇总单.xls')"
@click="upload(oldData, '汇总单.xlsx')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '上报意见.xls')"
@click="upload(data, '上报意见.xlsx')"
size="mini">生成上报意见
</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+2 -2
View File
@@ -86,12 +86,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '汇总单.xls')"
@click="upload(oldData, '汇总单.xlsx')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '上报意见.xls')"
@click="upload(data, '上报意见.xlsx')"
size="mini">生成上报意见
</el-button>
</div>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+19 -8
View File
@@ -900,9 +900,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '合规性评估'){
}else if(row.taskInfo === '任务分发(项目经理)'){
this.$router.push({
name: 'xmpgStep4',
name: 'bzpgStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -911,9 +911,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '分发责任人审核'){
}else if(row.taskInfo === '合规评估(专业技术人员)'){
this.$router.push({
name: 'xmpgStep5',
name: 'bzpgStep5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -922,9 +922,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '汇总审核'){
}else if(row.taskInfo === '审核(项目经理)'){
this.$router.push({
name: 'xmpgStep6',
name: 'bzpgStep6',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -933,9 +933,20 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '标准法规部领导审核'){
}else if(row.taskInfo === '审定(项目群负责人)'){
this.$router.push({
name: 'xmpgStep7',
name: 'bzpgStep7',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if(row.taskInfo === '批准(标准法规部高级经理)'){
this.$router.push({
name: 'bzpgStep8',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+26 -1
View File
@@ -1223,6 +1223,31 @@ export default {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
},
// 上移 事件
moveUp(index, row) {
if (index === 0) {
this.$message({
message: '已经是列表中第一个素材！',
type: 'warning'
})
} else {
let temp = this.sarAccessInfoList[index - 1]
this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, temp)
}
},
moveDown(index) {
if (index === (this.sarAccessInfoList.length - 1)) {
this.$message({
message: '已经是列表中最后一个素材！',
type: 'warning'
})
} else {
let i = this.sarAccessInfoList[index + 1]
this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, i)
}
},
// 点击清单条目导入按钮事件
importmodalFlags() {
this.importmodalFlag = true
@@ -2075,7 +2100,7 @@ export default {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
// 能源类型数据字典
this.CycxOptions = res.data.CLLX
this.CycxOptions = res.data.ENERGYTYPES
this.categoryOptions = res.data.NYLXCLASS // 能源类型
// 适用车型数据字典
this.applyArcticOptions = res.data.PRODUCTTYPE
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+219 -214
View File
@@ -21,7 +21,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="项目分类" class="search-item">
<!-- <el-form-item label="项目分类" class="search-item">
<el-select
v-model="projectLibrarySearch.projectClassification"
placeholder="请选择项目类别"
@@ -34,7 +34,7 @@
>{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="项目状态" class="search-item search-item-last">
<el-select v-model="projectLibrarySearch.projectStatus" placeholder="请选择项目状态" clearable>
<el-option
@@ -85,130 +85,132 @@
</div>
<div class="table_info">
<el-table
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column
show-overflow-tooltip
prop="projectPlatfor"
align="center"
fixed="left"
min-width="100"
label="产品平台">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
fixed="left"
min-width="150"
label="项目编号">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectName"
align="center"
fixed="left"
min-width="300"
label="项目名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectClassification"
label="项目分类"
align="center"
min-width="120"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectStatus"
label="项目状态"
align="center"
min-width="120"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectGroup"
label="项目群"
min-width="120"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="productLine"
label="产品线"
min-width="160"
align="center"
>
</el-table-column>
<el-table-column
prop="projectStartDate"
label="项目计划开始日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
prop="projectEndDate"
label="项目计划完成日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="currentNode"
align="center"
label="当前节点">
</el-table-column>
<el-table-column
prop="projectLevel"
align="center"
label="项目级别">
<!-- <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>-->
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="uname"
align="center"
label="项目经理">
</el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'881cfa2f3c898e0954d90ee7d521ed70'">
查看
</el-dropdown-item>
<!-- // 权限id -->
<el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="'dd87f572b6c807b6982fa071fcbe0d41'">
发起确认流程
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
@selection-change="handleSelectionChange">
<!-- <el-table-column
show-overflow-tooltip
prop="projectPlatfor"
align="center"
fixed="left"
min-width="100"
label="产品平台">
</el-table-column>-->
<el-table-column
show-overflow-tooltip
prop="projectGroup"
label="项目群"
fixed="left"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
fixed="left"
min-width="150"
label="项目编号">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectName"
align="center"
fixed="left"
min-width="300"
label="项目名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
</template>
</el-table-column>
<!-- <el-table-column
show-overflow-tooltip
prop="projectClassification"
label="项目分类"
align="center"
min-width="120"
>
</el-table-column>-->
<el-table-column
show-overflow-tooltip
prop="projectStatus"
label="项目状态"
align="center"
min-width="120"
>
</el-table-column>
<!--<el-table-column
show-overflow-tooltip
prop="productLine"
label="产品线"
min-width="160"
align="center"
>
</el-table-column>-->
<el-table-column
prop="projectStartDate"
label="项目计划开始日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
prop="projectEndDate"
label="项目计划完成日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="currentNode"
align="center"
label="当前节点">
</el-table-column>
<!--<el-table-column
prop="projectLevel"
align="center"
label="项目级别">
&lt;!&ndash; <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>&ndash;&gt;
</el-table-column>-->
<el-table-column
show-overflow-tooltip
prop="uname"
align="center"
label="项目经理">
</el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'881cfa2f3c898e0954d90ee7d521ed70'">
查看
</el-dropdown-item>
<!-- // 权限id -->
<el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="'dd87f572b6c807b6982fa071fcbe0d41'">
发起确认流程
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
</div>
<pagination
:page="page"
@@ -303,9 +305,9 @@ import DatePickerGroup from "./components/DatePickerGroup";
import OrgTree from "@/components/CustomFormComponents/OrgTree";
import eventHub from "@/common/eventHub";
import ProjectRelatedPersonnel from "@/components/CustomFormComponents/ProjectRelatedPersonnel";
import { dateFormat } from "@/common/date/index";
import {dateFormat} from "@/common/date/index";
import moment from "moment";
import { solostarData } from "@/api/unqualProcess";
import {solostarData} from "@/api/unqualProcess";
function checkFD(rules, value, callback) {
this.value = value;
@@ -406,69 +408,69 @@ export default {
// 相关人员姓名
},
// 新增编辑弹窗里的数据
/* localProEODefault: {
// 项目相关人员
userEOList: [],
// 产品代码
produceCode: "",
// 项目阶段
productStage: "",
// 整车项目编号
zhengcarNo: "",
// 整车SOP时间
zhengcarSopTime: "",
// 项目编号
productNo: "",
// 项目类型
productTypeCode: "",
// 生产基地
producePlace: "",
// 基础车型
baseCartype: "",
// 左驾右驾
leftRight: "",
// 项目经理
productManager: "",
productManagerShow: "",
// 是否纳入开发
isDevelop: "",
energyKind: "",
// 平台
flatform: "",
// 项目名称
productName: "",
// 车型系列
productSet: "",
// 项目类别
productType: "",
// 项目状态
productBrand: "",
// SOP时间
sopTime: "",
// 阀点
pointTime: [],
// 计划通过时间
planPassTime: "",
// 实际通过时间
actualPassTime: "",
// 目标市场
targetMarket: "",
// 公告车型号
carModel: "",
// 项目相关人员id
relatePerson: "",
// eop信息
eopTime: "",
// 项目相关信息
saleMarket: "",
// 判断是国内还是海外
prodectCode: "",
// carModeFile: ''
// carModeFileList: ''
// 相关人员信息
relatePersonShow: ""
// 相关人员姓名
},*/
/* localProEODefault: {
// 项目相关人员
userEOList: [],
// 产品代码
produceCode: "",
// 项目阶段
productStage: "",
// 整车项目编号
zhengcarNo: "",
// 整车SOP时间
zhengcarSopTime: "",
// 项目编号
productNo: "",
// 项目类型
productTypeCode: "",
// 生产基地
producePlace: "",
// 基础车型
baseCartype: "",
// 左驾右驾
leftRight: "",
// 项目经理
productManager: "",
productManagerShow: "",
// 是否纳入开发
isDevelop: "",
energyKind: "",
// 平台
flatform: "",
// 项目名称
productName: "",
// 车型系列
productSet: "",
// 项目类别
productType: "",
// 项目状态
productBrand: "",
// SOP时间
sopTime: "",
// 阀点
pointTime: [],
// 计划通过时间
planPassTime: "",
// 实际通过时间
actualPassTime: "",
// 目标市场
targetMarket: "",
// 公告车型号
carModel: "",
// 项目相关人员id
relatePerson: "",
// eop信息
eopTime: "",
// 项目相关信息
saleMarket: "",
// 判断是国内还是海外
prodectCode: "",
// carModeFile: ''
// carModeFileList: ''
// 相关人员信息
relatePersonShow: ""
// 相关人员姓名
},*/
//查询3类
projectLibrarySearch: {
// 项目名称
@@ -679,9 +681,9 @@ export default {
// { type: 'string', max: 100, message: '产品系列长度不能超过100个字符', trigger: 'blur' }
// ],
productName: [
{ required: true, message: "项目名称不能为空", trigger: "blur" },
{ type: "string", max: 100, message: "项目名称长度不能超过100个字符", trigger: "blur" },
{ type: "string", validator: this.verify.checkSpecialCharacterProduct, trigger: "blur" }
{required: true, message: "项目名称不能为空", trigger: "blur"},
{type: "string", max: 100, message: "项目名称长度不能超过100个字符", trigger: "blur"},
{type: "string", validator: this.verify.checkSpecialCharacterProduct, trigger: "blur"}
],
// carModel: [
// { type: 'string', max: 100, message: '公告车型号不能为空', trigger: 'blur' }
@@ -699,31 +701,31 @@ export default {
// {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
// ],
flatform: [
{ required: true, message: "平台不能为空", trigger: "change" }
{required: true, message: "平台不能为空", trigger: "change"}
],
// productType: [
// { required: false, message: '项目类别不能为空', trigger: 'change' }
// ],
productBrand: [
{ required: true, message: "项目状态不能为空", trigger: "change" }
{required: true, message: "项目状态不能为空", trigger: "change"}
],
sopTime: [
{ required: true, message: "sop时间不能为空", trigger: "change" }
{required: true, message: "sop时间不能为空", trigger: "change"}
],
// productNo: [
// { required: false, validator:this.checkNum, trigger: 'change' }
// ],
productTypeCode: [
{ required: true, message: "项目类型不能为空", trigger: "change" }
{required: true, message: "项目类型不能为空", trigger: "change"}
],
productManager: [
{ required: true, message: "项目经理不能为空", trigger: "change" }
{required: true, message: "项目经理不能为空", trigger: "change"}
],
// produceCode: [
// { required: true, message: '产品代码不能为空', trigger: 'change' }
// ],
relatePerson: [
{ required: true, message: "项目相关成员不能为空", trigger: "change" }
{required: true, message: "项目相关成员不能为空", trigger: "change"}
],
// carModeFileList: []
pointTime: [
@@ -884,7 +886,7 @@ export default {
},
// 获取标准类别List数据
getAllInforList() {
this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => {
this.$http.get("sys/dictype/getDicTypeListCode", {}, {_this: this}, res => {
// this.xmztOptions = res.data.XMZT;
this.scxxOptions = res.data.SCXX;
this.countryList = res.data.COUNTRY;
@@ -955,7 +957,7 @@ export default {
} else {
this.title = "编辑车型/项目库";
row.targetMarket = row.targetMarket.split(",");
this.localProEO = { ...row };
this.localProEO = {...row};
// this.localProEO.id = row.id
if (this.localProEO.energyKind != null && !(this.localProEO.energyKind instanceof Array)) {
if (this.localProEO.energyKind === "") {
@@ -1095,8 +1097,8 @@ export default {
},
// 清空条件查询
clearAllSearch() {
this.localProTableSearch = { ...this.localProTableSearchDefault };
this.projectLibrarySearch = { ...this.projectLibrarySearchDefault };
this.localProTableSearch = {...this.localProTableSearchDefault};
this.projectLibrarySearch = {...this.projectLibrarySearchDefault};
this.localProTableSearch.page = 1;
this.getLocalProductTable();
},
@@ -1337,7 +1339,7 @@ export default {
handleProcess(row) {
// 项目清单确认流程
this.$router.push({
name:'xmqdqrStep1-4',
name: 'xmqdqrStep1-4',
query: {
row
}
@@ -1402,7 +1404,7 @@ export default {
},
// 取消或者关闭弹窗
resetReletionForm() {
this.relationTableSearch = { ...this.relationTableSearchDefault };
this.relationTableSearch = {...this.relationTableSearchDefault};
// this.$refs['processForm'].clearValidate()
this.$refs.RelectionMultipleTable.clearSelection();
this.reletionSelectNum = [];
@@ -1432,7 +1434,7 @@ export default {
this.$http.get("lawss/sarProductInfo/isOver", {
productNo: this.localProEO.productNo,
id: this.localProEO.id
}, { _this: this }, res => {
}, {_this: this}, res => {
if (res.data) {
callback(new Error("项目编号不能重复"));
} else {
@@ -1564,26 +1566,26 @@ export default {
this.localProEO.productManagerShow = userNameList.join(",");
},
selectSort() {
solostarData().then(res=>{
res.data.MaintenanceProjectClassification.forEach((item, index)=>{
solostarData().then(res => {
res.data.MaintenanceProjectClassification.forEach((item, index) => {
this.projectData.push({
label: item,
value: index
})
})
res.data.MaintenanceProjectStatus.forEach((item, index)=>{
res.data.MaintenanceProjectStatus.forEach((item, index) => {
this.projectStatus.push({
label: item,
value: index
})
})
res.data.notMaintenanceProjectClassification.forEach((item, index)=>{
res.data.notMaintenanceProjectClassification.forEach((item, index) => {
this.notProjectData.push({
label: item,
value: index
})
})
res.data.notMaintenanceProjectStatus.forEach((item, index)=>{
res.data.notMaintenanceProjectStatus.forEach((item, index) => {
this.notProjectStatus.push({
label: item,
value: index
@@ -1614,7 +1616,7 @@ export default {
this.ifMaintaince = "Maintenance";
} else {
this.ifMaintaince = this.$route.query.tabName;
if(this.ifMaintaince === "notMaintenance"){
if (this.ifMaintaince === "notMaintenance") {
this.localProTableSearch.prodectCode = this.ifMaintaince;
}
}
@@ -1644,6 +1646,7 @@ export default {
width: 100%;
//height: calc(100% - 110px);
height: calc(~'100% - 30px');
.table_info {
height: calc(70vh - 90px);
}
@@ -1654,7 +1657,7 @@ export default {
}
/deep/ .pagination {
position:inherit;
position: inherit;
//position: unset;
}
@@ -1668,15 +1671,17 @@ export default {
}
}
}
///deep/ .el-table--scrollable-x .el-table__body-wrapper {
// overflow-x: scroll;
//}
///deep/.el-table__fixed {
// height: 48px !important;
//}
/deep/.el-table .el-table__body-wrapper {
/deep/ .el-table .el-table__body-wrapper {
height: 84%;
}
::v-deep .el-drawer__header {
& > span:first-child {
outline: none !important;
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+16 -15
View File
@@ -10,9 +10,15 @@
<el-card class="contaiinerCard" style="margin: 5px">
<div style="padding: 20px">
<el-row style="margin-top: 10px">
<el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2">
<!-- <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>-->
<el-col :span="6">管理主体: <span class="valueColor">{{ localProEO.managementHostName || '-' }}</span></el-col>
<el-col :span="6">开发主体: <span class="valueColor">{{ localProEO.developmentHostName || '-' }}</span></el-col>
<el-col :span="6">项目细分类:<span class="valueColor">{{ localProEO.categoryName || '-' }}</span></el-col>
<el-col :span="6">项目群: <span class="valueColor">{{ localProEO.projectGroup }} </span></el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="6">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="6">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
<div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
{{ localProEO.projectName }}
@@ -26,21 +32,16 @@
</div>
</el-tooltip>
</el-col>
<el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
</el-col>
<el-col :span="6">项目状态: <span class="valueColor">{{ localProEO.projectStatus }} </span></el-col>
<!--<el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>-->
<el-col :span="6">当前节点: <span class="valueColor">{{ localProEO.currentNode }} </span></el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">项目状态: <span class="valueColor">{{ localProEO.projectStatus }} </span></el-col>
<el-col :span="5" :push="1">项目群: <span class="valueColor">{{ localProEO.projectGroup }} </span></el-col>
<el-col :span="5" :push="2">当前节点: <span class="valueColor">{{ localProEO.currentNode }} </span></el-col>
<el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
<el-col :span="5" :push="1">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="2"> 项目计划开始时间: <span
<!--<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>-->
<el-col :span="6">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="6"> 项目计划开始时间: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="4" :push="3">项目计划完成时间: <span
<el-col :span="6">项目计划完成时间: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row>
</div>
src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue
+181
View File
@@ -0,0 +1,181 @@
<template>
<div class="AddFileDetails">
<div class="left">
<iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
width="100%" height="100%"
frameborder="0" scrolling="no" ref="iframeDom"
></iframe>
</div>
<div class="rightDiv">
<div class="height">
新增意见
</div>
<div class="search-area">
<el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
<el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
<el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
<el-option
v-for="(item,index) in options"
:key="index"
:label="item.itemsNum"
:value="item.itemsNum"></el-option>
</el-select>
</el-form-item>
<el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
<el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="修改前" label-width="" class="add-form-item">
<div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
</el-form-item>
<el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
<el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
<el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
</el-form-item>
<el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
<el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
提交
</el-button>
</div>
</div>
</div>
</template>
<script>
export default {
name: "AddFileDetails",
data () {
return {
options: [],
opinionContent: { // 抽屉数据
partCode: '',
oldText: '',
newText: '',
reason: '',
chapterName: '',
cause: '',
},
opinionContentRules: {
partCode: [
{required: true, message: '请输入章节编号', trigger: 'blur'},
],
oldText: [
{required: true, message: '请输入修改前内容', trigger: 'blur'}
],
newText: [
{required: true, message: '请输入修改后内容', trigger: 'blur'}
],
reason: [
{required: true, message: '请输入修改理由', trigger: 'blur'}
],
},
isSubmit: false,
}
},
methods: {
saveUserInfo () {
this.$refs['formAdd'].validate((valid) => {
if (valid) {
this.isSubmit = true
var form = {
ideaId: this.$route.query.ideaId,
cid: this.$route.query.cid,
oldText: this.opinionContent.oldText,
newText: this.opinionContent.newText,
reason: this.opinionContent.reason,
partCode: this.opinionContent.partCode,
chapterName: this.opinionContent.chapterName,
cause: this.opinionContent.cause,
userId: this.$route.query.userId || '',
userName: this.$route.query.userName || '',
deptName: this.$route.query.institutionName || '',
deptId: this.$route.query.institutionId || '',
}
this.$http.post('slrs/sar-public-idea-all/insetStand', form, {
_this: this
}, res => {
if (res.respCode === '200') {
localStorage.setItem('freshClueNum', new Date().getTime())
this.isSubmit = false
this.opinionContent.partCode = ''
this.opinionContent.reason = ''
this.opinionContent.oldText = ''
this.opinionContent.newText = ''
this.opinionContent.cause = ''
this.opinionContent.chapterName = ''
}
})
}
})
},
optionsChange (data) {
for (let a = 0; a < this.options.length; a++) {
if (data === this.options[a].itemsNum) {
this.opinionContent.oldText = this.options[a].termsConditions
this.opinionContent.chapterName = this.options[a].itemsName
}
}
},
},
mounted() {
console.log(this.$route.query);
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
standId: this.$route.query.standId,
fileType: this.$route.query.fileType,
pageSize: 9999,
page: 1
}, {}, res => {
if (res.ok) {
this.options = res.data.list
}
}, e => {
})
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
.AddFileDetails {
height: 100%;
display: flex;
.left {
width: 60%;
height: 100%;
}
.rightDiv {
background: #fff;
width: 40%;
height: 100%;
.height {
margin-bottom: 0;
padding: 10px 20px;
font-size: 18px;
font-weight: bold;
color: #333333;
border-bottom: 1px solid #e5e5e5;
}
.search-area {
height: calc(~'100% - 90px');
overflow: auto;
}
.demo-drawer-footer {
width: 100%;
padding: 0 20px;
height: 50px;
line-height: 50px;
border-top: 1px solid #e8e8e8;
text-align: right;
background: #fff;
z-index: 999;
}
}
}
</style>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+36 -12
View File
@@ -250,6 +250,7 @@ export default {
name: 'consultationDetails',
data() {
return {
freshClueNum: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
options: [],
@@ -385,7 +386,7 @@ export default {
},
//编辑
selectStandardPro(type, row) {
this.type = type
this.type = type
if (type === 'edit') {
this.id = row.id
this.opiniontitle = '编辑意见内容'
@@ -394,16 +395,34 @@ export default {
this.opinionContent.oldText = row.oldText
this.opinionContent.newText = row.newText
this.opinionContent.cause = row.cause
this.isDialog = true
} else {
this.id = ''
this.opiniontitle = '新增意见'
this.opinionContent.partCode = ''
this.opinionContent.reason = ''
this.opinionContent.oldText = ''
this.opinionContent.newText = ''
this.opinionContent.cause = ''
localStorage.setItem('freshClueNum', new Date().getTime())
this.freshClueNum = localStorage.getItem('freshClueNum') || '';
let routeData = this.$router.resolve({
name: "AddFileDetails",
query: {
attId: this.fileInfoList[0].attId,
userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.institutionName || '',
deptId: this.$store.getters.userInfo.institutionId || '',
standId: JSON.parse(this.$route.query.item.files)[0].standId,
fileType: JSON.parse(this.$route.query.item.files)[0].standFileClassify,
ideaId: this.$route.query.item.id,
cid: this.$route.query.item.cid,
}
});
window.open(routeData.href, '_blank')
// return
// this.id = ''
// this.opiniontitle = '新增意见'
// this.opinionContent.partCode = ''
// this.opinionContent.reason = ''
// this.opinionContent.oldText = ''
// this.opinionContent.newText = ''
// this.opinionContent.cause = ''
}
this.isDialog = true
},
//删除
deleteStand(id) {
@@ -449,8 +468,8 @@ export default {
cause: this.opinionContent.cause,
userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.orgName || '',
deptId: this.$store.getters.userInfo.orgId || ''
deptName: this.$store.getters.userInfo.institutionName || '',
deptId: this.$store.getters.userInfo.institutionId || '',
}
if (this.type === 'edit') {
form.id = this.id
@@ -498,6 +517,11 @@ export default {
}
},
mounted() {
window.addEventListener("storage", ev => {
if(ev.key === 'freshClueNum'){
this.getList()
}
})
if (JSON.parse(this.$route.query.item.wkfiles).length) {
this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
} else {
@@ -522,7 +546,7 @@ export default {
this.getList()
this.getIdeaKey()
this.getFileInfo()
}
},
}
</script>
src/router/index.js
+58
View File
@@ -547,6 +547,51 @@ const routes = [
title: '标准合规评估流程'
}
},
{
path: '/bzpgStep4',
name: 'bzpgStep4',
component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step4.vue'),
meta: {
requireAuth: true,
title: '标准合规评估流程'
}
},
{
path: '/bzpgStep5',
name: 'bzpgStep5',
component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step5.vue'),
meta: {
requireAuth: true,
title: '标准合规评估流程'
}
},
{
path: '/bzpgStep6',
name: 'bzpgStep6',
component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step6.vue'),
meta: {
requireAuth: true,
title: '标准合规评估流程'
}
},
{
path: '/bzpgStep7',
name: 'bzpgStep7',
component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step7.vue'),
meta: {
requireAuth: true,
title: '标准合规评估流程'
}
},
{
path: '/bzpgStep8',
name: 'bzpgStep8',
component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step8.vue'),
meta: {
requireAuth: true,
title: '标准合规评估流程'
}
},
{
path: '/xmpgStep1',
name: 'xmpgStep1',
@@ -3720,6 +3765,19 @@ const routes = [
// menuId: ''
}
},
{
path: '/AddFileDetails',
name: 'AddFileDetails',
component: () =>
import('@/pages/regulatoryRepository/standardForComments/pags/AddFileDetails'),
meta: {
requireAuth: true,
title: '新增',
parentPath: '/standardForComments',
isBoolean: true,
// menuId: ''
}
},
{
path: '/details',
name: 'Details',