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

This commit is contained in:
super_liu
2022-01-26 20:10:33 +08:00
21 changed files with 3880 additions and 696 deletions
+240 -119
View File
@@ -4,13 +4,13 @@
<div class="dynamic-content">
<!-- 实施预警 -->
<div class="dynamic" style="overflow-y: auto;">
<div class="container" >
<div class="container">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
<div class="dynamic-content">
<!-- <div>-->
<!-- <h5 style="font-size: 20px">实施预警</h5>-->
<!-- </div>-->
<!-- <div>-->
<!-- <h5 style="font-size: 20px">实施预警</h5>-->
<!-- </div>-->
<div class="more">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-row :gutter="24">
@@ -36,81 +36,113 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="适用车型">-->
<!-- <el-input clearable size="mini"-->
<!-- v-model="dynamic.applyType"-->
<!-- placeholder="根据适用车型查找">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
unlink-panels
v-model="dynamic.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="适用车型">-->
<!-- <el-input clearable size="mini"-->
<!-- v-model="dynamic.applyType"-->
<!-- placeholder="根据适用车型查找">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
<el-row :gutter="24">
<el-col>
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
<el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
unlink-panels
v-model="dynamic.SSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
v-model="dynamic.startIssueTime"
type="date"
size="mini"
:picker-options="pickerBeginDateBefore"
format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至" label-width="25px">
<el-date-picker
v-model="dynamic.endIssueTime"
type="date"
size="mini"
format="yyyy-MM-dd"
:picker-options="pickerBeginDateAfter"
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
unlink-panels
v-model="dynamic.XCXSSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
v-model="dynamic.startXCXSSRQ"
type="date"
size="mini"
:picker-options="XCXSSRQDateBefore"
format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至" label-width="25px">
<el-date-picker
v-model="dynamic.endXCXSSRQ"
type="date"
size="mini"
format="yyyy-MM-dd"
:picker-options="XCXSSRQDateAfter"
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
v-model="dynamic.startSSRQ"
type="date"
size="mini"
:picker-options="SSRQDateBefore"
format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至" label-width="25px">
<el-date-picker
v-model="dynamic.endSSRQ"
type="date"
size="mini"
format="yyyy-MM-dd"
:picker-options="SSRQDateAfter"
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
unlink-panels
v-model="dynamic.ZCCSSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
v-model="dynamic.startZCCSSRQ"
type="date"
size="mini"
:picker-options="ZCCSSRQDateBefore"
format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至" label-width="25px">
<el-date-picker
v-model="dynamic.endZCCSSRQ"
type="date"
size="mini"
format="yyyy-MM-dd"
:picker-options="ZCCSSRQDateAfter"
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
<el-button
style="margin: 6px 8px 0 0"
type="primary"
size="mini"
@click="searchBtnClick"
class="common-button-primary">
style="margin: 6px 8px 0 0"
type="primary"
size="mini"
@click="searchBtnClick"
class="common-button-primary">
查询
</el-button>
<el-button
style="margin: 6px 0 0 0"
size="mini"
@click="clearBtnClick"
class="common-button-primary">
style="margin: 6px 0 0 0"
size="mini"
@click="clearBtnClick"
class="common-button-primary">
清空
</el-button>
</el-col>
@@ -121,21 +153,21 @@
<el-button type="primary" size="mini" @click="exportExcelBtn">导出Excel</el-button>
</div>
<div class="content">
<!-- <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
<!-- <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
<el-table
:data="warningTableDatas"
style="overflow-y: auto;"
height="100%"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="warningTableLoading"
@selection-change="selectChange"
:data="warningTableDatas"
style="overflow-y: auto;"
height="100%"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="warningTableLoading"
@selection-change="selectChange"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column prop="standType" label="类型" width="100" align="center">
<template slot-scope="scope">
@@ -173,7 +205,9 @@
align="center">
<template slot-scope="scope">
<a v-if="scope.row.termsConditions === null"></a>
<a v-else @click="openDialog(scope.row.termsConditions)">{{ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0,20) + '...' }}</a>
<a v-else @click="openDialog(scope.row.termsConditions)">{{
scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0, 20) + '...'
}}</a>
</template>
</el-table-column>
<el-table-column prop="issueTime" label="发布日期" width="120" align="center">
@@ -199,23 +233,23 @@
<el-table-column prop="applyType" label="适用车型" width="150" align="center">
</el-table-column>
<el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template>
</el-table-column>
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
style="position: static;"
:page="pageConfig.page"
:pageSize="pageConfig.pageSize"
:total="pageConfig.total"
autoSize
@pageChange="page => handlePageChange('page', page)"
@pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)"></pagination>
style="position: static;"
:page="pageConfig.page"
:pageSize="pageConfig.pageSize"
:total="pageConfig.total"
autoSize
@pageChange="page => handlePageChange('page', page)"
@pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)"></pagination>
</div>
</div>
</div>
@@ -241,7 +275,7 @@
title="条款内容"
:visible.sync="detailTextDialog"
width="50%">
<span style="line-height: normal" v-html="detailText" ></span>
<span style="line-height: normal" v-html="detailText"></span>
<div slot="footer" class="dialog-footer">
</div>
</el-dialog>
@@ -261,13 +295,25 @@ export default {
selectedList: [],
exportName: '',
exportModelFlag: false,
warningTableDatas:[],
warningTableDatas: [],
warningTableHeight: '',
applyArcticOptions: [], // 适用车型下拉框
isShowBtn: true,
activeName: "STANDARD", //tab 默认选中值
// 头部搜索框
dynamic: {
// 发布日期
startIssueTime: '',
endIssueTime: '',
// 实施日期
startSSRQ: '',
endSSRQ: '',
//新车型实施日期
startXCXSSRQ: '',
endXCXSSRQ: '',
// 在产车实施日期
startZCCSSRQ: '',
endZCCSSRQ: '',
//标准编号
standCode: "",
//标准名称
@@ -306,7 +352,75 @@ export default {
},
warningTableLoading: false,
// 记录当前分页器是哪个预警信息触发
field: ''
field: '',
// 发布日期当前日期之前不可选择
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.endIssueTime;
if (beginDateVal) {
return time.getTime() > beginDateVal;
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.startIssueTime;
if (beginDateVal) {
return time.getTime() < beginDateVal;
}
}
},
SSRQDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.endSSRQ;
if (beginDateVal) {
return time.getTime() > beginDateVal;
}
}
},
SSRQDateAfter: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.startSSRQ;
if (beginDateVal) {
return time.getTime() < beginDateVal;
}
}
},
XCXSSRQDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.endXCXSSRQ;
if (beginDateVal) {
return time.getTime() > beginDateVal;
}
}
},
XCXSSRQDateAfter: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.startXCXSSRQ;
if (beginDateVal) {
return time.getTime() < beginDateVal;
}
}
},
ZCCSSRQDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.endZCCSSRQ;
if (beginDateVal) {
return time.getTime() > beginDateVal;
}
}
},
ZCCSSRQDateAfter: {
disabledDate: (time) => {
let beginDateVal = this.dynamic.startZCCSSRQ;
if (beginDateVal) {
return time.getTime() < beginDateVal;
}
}
},
};
},
methods: {
@@ -316,20 +430,20 @@ export default {
},
//确认导出
exportExcel() {
console.log('293',this.selectedList)
console.log('293', this.selectedList)
const exportURL = interfaceUrl + 'sys/EarlyWarning/exportWarning?' +
'&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
'&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
this.exportModelFlag = false
},
exportExcelBtn(){
console.log('302',this.selectedList)
exportExcelBtn() {
console.log('302', this.selectedList)
this.exportName = ''
this.exportModelFlag = true
},
selectChange(alldata){
console.log('307',alldata)
selectChange(alldata) {
console.log('307', alldata)
this.selectedList = []
for (let i = 0; i < alldata.length; i++) {
this.selectedList.push(alldata[i]['id'])
@@ -499,17 +613,17 @@ export default {
//标准名称
standName: this.dynamic.standName,
//发布日期
startIssueTime: this.dynamic.putTime[0],
endIssueTime: this.dynamic.putTime[1],
startIssueTime: this.dynamic.startIssueTime ? this.$moment(this.dynamic.startIssueTime).format('YYYY-MM-DD') : '',
endIssueTime: this.dynamic.endIssueTime ? this.$moment(this.dynamic.endIssueTime).format('YYYY-MM-DD') : '',
//实施日期
startSSRQ: this.dynamic.SSRQ[0],
endSSRQ: this.dynamic.SSRQ[1],
startSSRQ: this.dynamic.startSSRQ ? this.$moment(this.dynamic.startSSRQ).format('YYYY-MM-DD') : '',
endSSRQ: this.dynamic.endSSRQ ? this.$moment(this.dynamic.endSSRQ).format('YYYY-MM-DD') : '',
//新车型实施日期
startXCXSSRQ: this.dynamic.XCXSSRQ[0],
endXCXSSRQ: this.dynamic.XCXSSRQ[1],
startXCXSSRQ: this.dynamic.startXCXSSRQ ? this.$moment(this.dynamic.startXCXSSRQ).format('YYYY-MM-DD') : '',
endXCXSSRQ: this.dynamic.endXCXSSRQ ? this.$moment(this.dynamic.endXCXSSRQ).format('YYYY-MM-DD') : '',
//在产车实施日期
startZCCSSRQ: this.dynamic.ZCCSSRQ[0],
endZCCSSRQ: this.dynamic.ZCCSSRQ[1],
startZCCSSRQ: this.dynamic.startZCCSSRQ ? this.$moment(this.dynamic.startZCCSSRQ).format('YYYY-MM-DD') : '',
endZCCSSRQ: this.dynamic.endZCCSSRQ ? this.$moment(this.dynamic.endZCCSSRQ).format('YYYY-MM-DD') : '',
//适用车型
applyType: this.dynamic.applyType
}, {
@@ -534,7 +648,7 @@ export default {
if ((this.warningTableDatas.length === 0 || this.warningTableDatas === []) && this.pageConfig.page !== 1) {
this.warningTableLoading = true
this.handlePageChange('page', 1)
}else {
} else {
this.warningTableLoading = false
}
this.pageConfig.pageSize = res.data.size
@@ -573,16 +687,16 @@ export default {
roundButton: false
}).then(() => {
this.$http.get('sys/EarlyWarning/ChangePermissions', {
id: row.id,
}, {}, res => {
if (res.ok === true) {
this.pageConfig.page = 1
this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1
this.searchBtnClick()
this.getEarlyDate()
}
id: row.id,
}, {}, res => {
if (res.ok === true) {
this.pageConfig.page = 1
this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1
this.searchBtnClick()
this.getEarlyDate()
}
}
)
}).catch(() => {
this.$message.warning('取消事件')
@@ -660,7 +774,7 @@ export default {
handlePageChange(field, page) {
this.pageConfig.page = page
this.searchBtnClick()
console.log('735',this.warningTableDatas)
console.log('735', this.warningTableDatas)
this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
this.field = field
},
@@ -670,7 +784,7 @@ export default {
// this.pageConfig[_pageSize] = pageSize
this.pageConfig.pageSize = pageSize
this.searchBtnClick()
console.log('771',this.warningTableDatas)
console.log('771', this.warningTableDatas)
// this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
// this.field = field
},
@@ -679,7 +793,7 @@ export default {
openDialog(text) {
this.detailText = text
this.detailTextDialog = true
}
},
},
props: {
reload: {
@@ -870,6 +984,7 @@ export default {
.container {
height: calc(100% - 139px);
/deep/ .el-tabs__header {
height: 50px;
}
@@ -909,13 +1024,14 @@ export default {
align-items: center;
justify-content: center;
/deep/ .el-input__inner {
width: 185px;
}
.choose-time-area {
/deep/ .el-input__inner {
width: 210px;
width: 180px;
}
}
@@ -1075,11 +1191,16 @@ export default {
margin: 24px 0;
}
}
.textDialog {
/deep/ .el-dialog__body {
height: 400px;
overflow-y: auto;
}
}
/deep/ .el-date-editor.el-input {
width: 180px;
}
}
</style>
@@ -407,7 +407,6 @@ export default {
mounted() {
this.getData();
this.processTable();
this.getProductData();
/**
* 获取项目群筛选项的值
*/
@@ -457,6 +456,7 @@ export default {
delete item.termsConditions
})
})
this.getProductData();
});
},
choiceZRRS(row, type, index) {
@@ -481,7 +481,7 @@ export default {
_this: this
}, res => {
this.productData = res.data.records;
this.totalNo = res.data.count;
this.totalNo = res.data.total;
});
},
//查询项目按钮
@@ -533,6 +533,7 @@ export default {
this.projectModel = false;
},
okProject() {
console.log(this.selectProjectList);
if (this.selectProjectList.length) {
let addFlag = true;
let projectNumbers = "";
@@ -548,8 +549,10 @@ export default {
});
}
if (addFlag) {
let projectNames = "", projectNumbers = "";
let projectNames = "", projectNumbers = "", projectIds = "";
this.selectProjectList.forEach(items => {
projectIds += items.id;
projectIds += ',';
projectNames += items.projectName;
projectNames += ",";
projectNumbers += items.projectNumber;
@@ -558,6 +561,7 @@ export default {
this.dataList.push({
projectName: projectNames,
projectNumber: projectNumbers,
projectIds: projectIds,
managementHostName: this.selectProjectList[0].managementHostName,
developmentHostName: this.selectProjectList[0].developmentHostName,
categoryName: this.selectProjectList[0].categoryName,
@@ -158,25 +158,26 @@
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
min-width="180"
prop="projectGroup"
label="项目群">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
min-width="180"
prop="projectNumber"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
min-width="300"
:show-overflow-tooltip="true"
align="center"
width="200"
prop="projectName"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -187,6 +188,17 @@
align="center"
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"
@@ -200,13 +212,13 @@
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
@@ -420,6 +432,15 @@
@checkedRole="checkedTransferRole"
: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>
<!-- 批量编辑弹窗-->
<el-drawer
title="批量填写"
@@ -534,6 +555,9 @@ export default {
comFlag: 0,
nodeList:[],
drawerTitle:'',
fileType: '',
itermsConditionsTitle: '',
itermsConditionsFlag: false,
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
@@ -673,6 +697,20 @@ export default {
handleTabs(name) {
this.active = name;
},
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
},
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
@@ -722,44 +760,14 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
if (item.fenFlag === undefined) {
item.step3DTOS.forEach(item => {
item.implementerId = this.$store.getters.userInfo.userId;
item.implementer = this.$store.getters.userInfo.userName;
});
// this.commentText = ''
this.dataList = item.step3DTOS;
this.dataList.forEach(item => {
this.$set(item,'complianceReasons', '')
this.$set(item,'noCompliance', '')
this.$set(item,'countermeasures', '')
this.$set(item,'completionTime', '')
})
} else {
this.dataList = item.dataList;
// this.commentText = ''
this.dataList.forEach(item => {
item.implementerId = this.$store.getters.userInfo.userId;
item.implementer = this.$store.getters.userInfo.userName;
});
}
// this.getLocalTime()
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.standNumber = item.step3DTOS[0].standNumber;
this.listForm.id = item.step3DTOS[0].id;
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName;
this.listForm.itemNum = item.step3DTOS[0].itemNum;
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
this.fileType = item.fileType
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
@@ -827,27 +835,32 @@ export default {
this.$message.warning('请填写完整的不符合项信息')
this.comFlag = 0
}else{
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
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 => {
this.$confirm("请确认表单数据是否填写完整", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
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 => {
});
}).catch(() => {
});
}
}
@@ -872,7 +885,7 @@ export default {
saveBatchEditForm() {
this.dataList.forEach(item => {
this.selectList.forEach(items => {
if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
if (item.itemsNum === items.itemsNum && item.projectName === items.projectName) {
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
@@ -904,7 +917,7 @@ export default {
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.pageSize = pageSize;
this.searchData();
}
},
@@ -1,13 +1,766 @@
<!--标准合规评估 责任人评估-->
<template>
<div class="bzpg-step6">
<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 === false"
: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>
<el-form
v-if="foldFormFlag === true"
style="display: none"
: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
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
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>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectGroup"
label="项目群">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectNumber"
label="项目编号">
</el-table-column>
<el-table-column
min-width="300"
:show-overflow-tooltip="true"
align="center"
prop="projectName"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
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="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="140"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop="implementer"
align="center"
width="180"
label="评估人"
/>
</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>
</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-submit
show-transfer
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:transfer-loading="isTransfer"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
: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>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import Moment from 'moment';
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
export default {
name: "step6"
name: "xmpgStep6",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
data() {
return {
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
comFlag: 0,
nodeList:[],
drawerTitle:'',
fileType: '',
itermsConditionsTitle: '',
itermsConditionsFlag: false,
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
processType: 1,
loading: false,
dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
certifiedEngineerName: "", //认证工程师
qualityEngineerName: "", //质量工程师
dataList: [{
projectManager: "",
itemsName: "",
uname: "",
projectNumber: "",
implementer: "",
implementerId: "",
productLine: "",
itemNum: "",
distributePerson: "",
projectName: "",
distributePersonId: "",
complianceReasons: "", //在研合规原因
noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施
completionTime: "", //在研完成时间
zcComplianceReasons: "", //在产的合规原因
zcNoCompliance: "", //在产不合规项目
zcCountermeasures: "", //在产的应对措施
zcCompletionTime: "" //在产的完成时间
}]
},
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
user3: "",
user4: "",
user5: "",
standMap: new Map()
};
},
methods: {
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
//确认转办
checkedTransferRole (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 => {
});
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
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
},
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
//将时间戳转换为日期格式
getLocalTime(item) {
return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
},
// 时间戳(毫秒)转化为标准时间格式
getFullTime(item) {
const stamp = new Date(item);
const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
return item = time
},
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) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
this.fileType = item.fileType
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
}
});
},
//驳回事件
beforeBack () {
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dataList = this.dataList
this.listForm.passFlag = '1'
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 => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.dataList = this.dataList
this.listForm.passFlag = '0'
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 => {
});
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
// for (let i = 0; i < data.length; i++) {
// this.selectList.push(data[i].id);
// }
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize
this.searchData();
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
}
};
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzpg-step6 {
/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;
right: 0;
top: 0;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 14px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -1,13 +1,737 @@
<!--标准合规评估 项目负责人审核-->
<template>
<div class="bzpg-step7">
<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 === false"
: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>
<el-form
v-if="foldFormFlag === true"
style="display: none"
: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
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
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>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectGroup"
label="项目群">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectNumber"
label="项目编号">
</el-table-column>
<el-table-column
min-width="300"
:show-overflow-tooltip="true"
align="center"
prop="projectName"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
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="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="140"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop="implementer"
align="center"
width="180"
label="评估人"
/>
</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>
</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-submit
show-transfer
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:transfer-loading="isTransfer"
:approval="true"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
: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>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import Moment from 'moment';
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
export default {
name: "step7"
name: "xmpgStep7",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
data() {
return {
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
comFlag: 0,
nodeList:[],
drawerTitle:'',
fileType: '',
itermsConditionsTitle: '',
itermsConditionsFlag: false,
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
processType: 1,
loading: false,
dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
certifiedEngineerName: "", //认证工程师
qualityEngineerName: "", //质量工程师
dataList: [{
projectManager: "",
itemsName: "",
uname: "",
projectNumber: "",
implementer: "",
implementerId: "",
productLine: "",
itemNum: "",
distributePerson: "",
projectName: "",
distributePersonId: "",
complianceReasons: "", //在研合规原因
noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施
completionTime: "", //在研完成时间
zcComplianceReasons: "", //在产的合规原因
zcNoCompliance: "", //在产不合规项目
zcCountermeasures: "", //在产的应对措施
zcCompletionTime: "" //在产的完成时间
}]
},
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
user3: "",
user4: "",
user5: "",
standMap: new Map()
};
},
methods: {
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
//确认转办
checkedTransferRole (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 => {
});
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
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
},
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
//将时间戳转换为日期格式
getLocalTime(item) {
return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
},
// 时间戳(毫秒)转化为标准时间格式
getFullTime(item) {
const stamp = new Date(item);
const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
return item = time
},
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) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
this.fileType = item.fileType
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
}
});
},
//提交事件
handleSubmit() {
this.listForm.dataList = this.dataList
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 => {
});
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
// for (let i = 0; i < data.length; i++) {
// this.selectList.push(data[i].id);
// }
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize
this.searchData();
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
}
};
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzpg-step7 {
/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;
right: 0;
top: 0;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 14px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -1,13 +1,737 @@
<!--标准合规评估 标准法规部部长审批-->
<template>
<div class="bzpg-step8">
<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 === false"
: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>
<el-form
v-if="foldFormFlag === true"
style="display: none"
: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
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
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>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectGroup"
label="项目群">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectNumber"
label="项目编号">
</el-table-column>
<el-table-column
min-width="300"
:show-overflow-tooltip="true"
align="center"
prop="projectName"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
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="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="140"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop="implementer"
align="center"
width="180"
label="评估人"
/>
</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>
</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-submit
show-transfer
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:transfer-loading="isTransfer"
:approval="true"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
: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>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import Moment from 'moment';
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
export default {
name: "step8"
name: "xmpgStep8",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
data() {
return {
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
comFlag: 0,
nodeList:[],
drawerTitle:'',
fileType: '',
itermsConditionsTitle: '',
itermsConditionsFlag: false,
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
processType: 1,
loading: false,
dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
certifiedEngineerName: "", //认证工程师
qualityEngineerName: "", //质量工程师
dataList: [{
projectManager: "",
itemsName: "",
uname: "",
projectNumber: "",
implementer: "",
implementerId: "",
productLine: "",
itemNum: "",
distributePerson: "",
projectName: "",
distributePersonId: "",
complianceReasons: "", //在研合规原因
noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施
completionTime: "", //在研完成时间
zcComplianceReasons: "", //在产的合规原因
zcNoCompliance: "", //在产不合规项目
zcCountermeasures: "", //在产的应对措施
zcCompletionTime: "" //在产的完成时间
}]
},
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
user3: "",
user4: "",
user5: "",
standMap: new Map()
};
},
methods: {
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
//确认转办
checkedTransferRole (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 => {
});
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
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
},
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
//将时间戳转换为日期格式
getLocalTime(item) {
return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
},
// 时间戳(毫秒)转化为标准时间格式
getFullTime(item) {
const stamp = new Date(item);
const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
return item = time
},
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) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
this.fileType = item.fileType
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
}
});
},
//提交事件
handleSubmit() {
this.listForm.dataList = this.dataList
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 => {
});
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
// for (let i = 0; i < data.length; i++) {
// this.selectList.push(data[i].id);
// }
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize
this.searchData();
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
}
};
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzpg-step8 {
/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;
right: 0;
top: 0;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 14px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
@@ -2274,7 +2274,8 @@ export default {
getListTree(bringData) {
this.$http.get('sarResource/ts-resource/getListStand', {
sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId
userId: this.$store.getters.userInfo.userId,
isFlow: 'flow'
}, {}, res => {
if (res.ok) {
this.treeListOptions = res.data
@@ -2597,7 +2597,8 @@ export default {
getListTree(bringData) {
this.$http.get('sarResource/ts-resource/getListStand', {
sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId
userId: this.$store.getters.userInfo.userId,
isFlow: 'flow'
}, {}, res => {
if (res.ok) {
this.treeListOptions = res.data
@@ -0,0 +1,509 @@
<template>
<div class="qbzxdlxStep1">
<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 === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form class="label-input-form" ref="qblx_pageData" :model="qblx_pageData" :rules="qblxRule">
<el-form-item label="项目目标:" class="add-form-item">
<el-input
style="width: 90%"
clearable
v-model="qblx_pageData.projectTarget"
placeholder="请输入项目目标"/>
</el-form-item>
<el-form-item label="附件:" class="add-form-item">
<el-upload
style="width: 100%"
class="upload_style"
:disabled="acceptShow"
multiple
ref="uploadFile"
:action="uploadPath"
name="file"
:file-list="fillFileList"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:on-exceed="handleExceed"
:limit="1"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button
style="margin-left: 10px"
type="primary"
class="common-button-primary"
size="mini">
点击上传
</el-button>
</el-upload>
</el-form-item>
<el-form-item class="add-form-item">
<div style="margin-top: 10px;margin-bottom: 10px">
<el-button type="primary" size="small" @click="addQblx">新增</el-button>
<el-button type="plain" size="small" @click="uploadQblx">上传</el-button>
<el-button type="success" size="small" @click="qblxTemplate">模板下载</el-button>
<el-button type="danger" size="small" @click="delQblx">删除</el-button>
</div>
<el-table
:data="qblx_pageData.qblxData"
border
ref="entryTable"
height="49%"
style="width: 100%"
@selection-change="selectedDelete"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="esName" label="企标名称" align="center" width="300" show-overflow-tooltip></el-table-column>
<el-table-column prop="dutyUnit" label="责任单位" align="center"></el-table-column>
<el-table-column prop="dutyPeople" label="责任人" align="center"></el-table-column>
<el-table-column prop="firstDraftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="planTime" label="计划完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="endTime" label="截止日期" width="150" align="center"></el-table-column>
</el-table>
</el-form-item>
</el-form>
</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 class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-form
ref="roleForm"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>流程发起人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
</div>
</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.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-form>
</el-timeline>
</div>
</div>
<!-- 新增/编辑弹框 -->
<el-drawer
title="企标制修订立项计划"
:visible.sync="qblxModel"
size="600px"
custom-class="demo-drawer"
>
<el-form class="label-input-form" ref="addQblxData" style="height: 100%" :model="addQblxData" :rules="addRule">
<el-form-item class="add-form-item" label="企标名称"></el-form-item>
<el-form-item class="add-form-item" label="责任单位"></el-form-item>
<el-form-item class="add-form-item" label="责任人"></el-form-item>
<el-form-item class="add-form-item" label="初稿完成日期"></el-form-item>
<el-form-item class="add-form-item" label="计划完成日期"></el-form-item>
<el-form-item class="add-form-item" label="截止日期"></el-form-item>
</el-form>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
</div>
</el-drawer>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
is-title="选择责任人"
:is-visible.sync="modalshowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst } from '@/api/process.js'
export default {
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
name: "qbzxdlxStep1",
data() {
return {
active: '1',
qblx_pageData: {
projectTarget: '',
qblxFile: [],
qblxData: [],
},
commentText: '',
qblxRule: {},
roleForm: {
startUser: '',
startUserName: '',
dockUser: '',
dockUserName: '',
},
// 上传路径
uploadPath: 'api/att/attFile/upload',
acceptShow: false,
// 上传所储存文件数组
fillFileList: [],
// 新增弹框
qblxModel: false,
addQblxData: {
esName: '',
dutyUnit: '',
dutyPeople: '',
firstDraftTime: '',
planTime: '',
endTime: '',
},
addRule: {},
isSubmit: false,
saveLoading: false,
// 选人组件
modalshowflag: false,
nodeList: [],
taskID: '',
bpnId: '',
}
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getData()
}
},
methods: {
// 右上标签页面切换
handleTabs(name) {
this.active = name
},
// 保存后获取的数据
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.qblx_pageData = mes.qblx_pageData
this.commentText = mes.commentText
this.roleForm = mes.roleForm
});
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
if (this.fillFileList.length !== 0) {
this.newDataList = this.fillFileList
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
}
this.qblx_pageData.qblxFile = this.newDataList
this.$message({
showClose: true,
message: res.message,
type: 'success'
})
this.fileMadel = false
}
},
// 文件上传限制条件
handleBeforeUpload(file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX/PDF或XLS文件')
return false
}
// 判断文件上传大小
// eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
return false
}
return true
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
this.fillFileList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id) {
this.fillFileList.splice(index, 1)
}
})
this.qblx_pageData.qblxFile = this.fillFileList
},
// 限制上传
handleExceed(files, fileList) {
this.$message.error(`最多上传1个文件`)
},
// 表格勾选事件
selectedDelete() {
},
// 流程阶段负责人选择
choiceZRR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.modalshowflag = true
},
// 选人组件确认
drawerCheck(data) {
this.roleForm.dockUser = data[0].id
this.roleForm.dockUserName = data[0].name
this.modalshowflag = false
},
/** 新增按钮 */
addQblx() {
this.qblxModel = true
},
// 抽屉确认按钮
OkDrawer() {},
// 抽屉取消按钮
closeDrawer() {},
// 保存按钮
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '26')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
qblx_pageData: this.qblx_pageData,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮
handleSubmit() {
let json = {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
roleForm: this.roleForm,
qblx_pageData: this.qblx_pageData,
commentText: this.commentText
}
this.$refs['qblx_pageData'].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
let paramsInfo = new FormData()
// paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '26')
paramsInfo.append('json', JSON.stringify({json}))
processBack(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskID)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res => {
return res
})
}
this.$router.push("/processCenter");
}
this.isSubmit = false
})
})
} else {
this.$message.warning('请完成流程信息的人员选择')
}
})
}
})
},
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.qbzxdlxStep1 {
position: relative;
height: 100%;
/deep/.el-upload-list__item-name {
margin-left: 48px;
}
/deep/.el-upload-list {
width: 50%;
margin-bottom: 10px;
}
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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;
right: 0;
top: 0;
}
}
}
.content_form {
padding-top: 15px;
.el-divider--horizontal {
margin-top: 0px;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
/deep/ .el-textarea__inner {
font-family: inherit;
}
/deep/ .el-table th {
padding: 0px;
}
}
}
</style>
@@ -0,0 +1,231 @@
<template>
<div class="qbzxdlxStep1">
<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 === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form class="label-input-form" ref="qblx_pageData" :model="qblx_pageData" :rules="qblxRule">
<el-form-item label="项目目标:" class="add-form-item">
<el-input
style="width: 90%"
clearable
v-model="qblx_pageData.projectTarget"
placeholder="请输入项目目标"/>
</el-form-item>
<el-form-item label="附件:" class="add-form-item">
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
<div v-for="item in qblx_pageData.qblxFile" :key="item.id" style="color: #409EFF;">
<a v-if="item.name.length > 30" style="cursor: pointer" @click="fileLook(item)">
{{ item.name.slice(0,30) + '...' }} {{ ';' }}
</a>
<a v-else style="cursor: pointer" @click="fileLook(item)">
{{ item.name }} {{ ';' }}
</a>
<el-button
size="mini"
@click="previews(item.id)"
icon="el-icon-download"
style="height: 25px; margin-left: 5px;"
></el-button>
</div>
</el-form-item>
<el-form-item class="add-form-item">
<el-table
:data="qblx_pageData.qblxData"
border
ref="entryTable"
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="esName" label="企标名称" align="center" width="300" show-overflow-tooltip></el-table-column>
<el-table-column prop="dutyUnit" label="责任单位" align="center"></el-table-column>
<el-table-column prop="dutyPeople" label="责任人" align="center"></el-table-column>
<el-table-column prop="firstDraftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="planTime" label="计划完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="endTime" label="截止日期" width="150" align="center"></el-table-column>
</el-table>
</el-form-item>
</el-form>
</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="commentStep2">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<ProcessFooter
show-submit
show-transfer
:submitLoading="isSubmit"
:transferLoading="turnLoading"
@transfer="handleTurnTo"
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择转办人"
check-box
:is-visible.sync="modalshowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { completeTask, inboundLiaisonDetail,changeAssigneeNew } from "@/api/process.js"
export default {
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
name: "qbzxdlxStep2",
data() {
return {
active: '1', // 默认显示
qblx_pageData: {},
qblxRule: {},
commentStep2: '',
isSubmit: false,
turnLoading: false,
modalshowflag: false,
nodeList: [],
infoSourcesLength: '',
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
created() {
this.processTable()
this.getData()
},
methods: {
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 => {
})
},
getData() {
const params = {
taskIds: this.taskIds,
pId: this.pId,
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
})
},
getFormFieldList(item) {
this.$nextTick(() => {
this.qblx_pageData = JSON.parse(JSON.stringify(item)).qblx_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.qblx_pageData.qblxFile.length
})
},
// 预览
fileLook(file) { // 预览
const attId = file.id
this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
// 转办
handleTurnTo() {
this.modalshowflag = true
},
drawerCheck (data) {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 提交
handleSubmit() {
let json = {
roleList: this.roleForm,
memberId: this.$store.getters.userInfo.userId,
commentText: this.commentStep2,
qblx_pageData: this.qblx_pageData,
}
this.$refs['qblx_pageData'].validate((valid) => {
if (valid) {
this.isSubmit = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
})
},
}
}
</script>
<style scoped>
</style>
@@ -574,6 +574,12 @@
name: 'qbzxdjhgkStep1'
})
break
// 企标制修订立项计划流程
case '26':
this.$router.push({
name: 'qbzxdlxStep1'
})
break
}
},
checkPermission(permissionIdArray) {
@@ -264,7 +264,21 @@
</div>
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="''">
<div class="card-box" @click="handleCreateProcess('26')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">企标制修订立项计划</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
</div>
</div>
<div>
@@ -574,6 +588,12 @@ export default {
name: 'qbzxdjhgkStep1'
})
break
// 企标制修订立项计划流程
case '26':
this.$router.push({
name: 'qbzxdlxStep1'
})
break
}
},
checkPermission(permissionIdArray) {
@@ -168,40 +168,40 @@
</div>
</div>
<el-table
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%"
border
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%"
border
:height="sarProStateTableHeight"
: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>
<!-- <el-table-column-->
<!-- prop="standNumber"-->
<!-- label="标准编号">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="standName"-->
<!-- label="标准名称">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="sarProject.position === '1'"-->
<!-- prop="lastVersionNumber"-->
<!-- label="上一版本标准编号">-->
<!-- </el-table-column>-->
<el-table-column
v-if="sarProject.position === '2'"
prop="correspondDomesticStandard"
label="对应国行标">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="specificItem"
label="具体章条">
prop="standNumber"
label="标准编号">
</el-table-column>
<el-table-column
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
v-if="sarProject.position === '1'"
prop="lastVersionNumber"
label="上一版本标准编号">
</el-table-column>
<el-table-column
v-if="sarProject.position === '2'"
prop="correspondDomesticStandard"
label="对应国行标">
</el-table-column>
<el-table-column
prop="specificItem"
label="具体章条">
</el-table-column>
<el-table-column
prop="carModel"
@@ -137,7 +137,7 @@ export default {
this.$router.push({
name: "consultationDetails",
query: {
item: item
item: JSON.stringify(item)
}
});
},
@@ -101,6 +101,8 @@
_this: this
}, res => {
if (res.respCode === '200') {
// 储存变量监听刷新页面
this.$store.commit('SET_REFRESH_FLAG', true)
localStorage.setItem('freshClueNum', new Date().getTime())
this.isSubmit = false
this.opinionContent.partCode = ''
@@ -124,7 +126,6 @@
},
},
mounted() {
console.log(this.$route.query);
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
standId: this.$route.query.standId,
fileType: this.$route.query.fileType,
File diff suppressed because it is too large Load Diff
+21 -1
View File
@@ -2146,6 +2146,26 @@ const routes = [
title: '企标制修订计划管控流程'
}
},
// 企标制修订立项计划流程
{
path: '/qbzxdlxStep1',
name: 'qbzxdlxStep1',
component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue'),
meta: {
requireAuth: true,
title: '企标制修订立项计划流程(流程发起)'
}
},
{
path: '/qbzxdlxStep2',
name: 'qbzxdlxStep2',
component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue'),
meta: {
requireAuth: true,
title: '企标制修订立项计划流程(责任人确认)'
}
},
// 外部标准化协会入会流程
{
path: '/bzrhStep1',
@@ -3753,7 +3773,7 @@ const routes = [
// 详情页
// ************************** 其他详情页 ******************************* //
{
path: '/consultationDetails/:id/:pageType',
path: '/consultationDetails/:id?/:pageType?',
name: 'consultationDetails',
component: () =>
import('@/pages/regulatoryRepository/standardForComments/pags/consultationDetails'),
+3
View File
@@ -179,5 +179,8 @@ export default {
} else {
return JSON.parse(state.accessStandRegRows)
}
},
refreshFlag: state => {
return state.refreshFlag
}
}
+6
View File
@@ -296,5 +296,11 @@ export default {
state.accessStandRegTabName = ''
sessionStorage.removeItem('accessStandRegTabName')
}
},
SET_REFRESH_FLAG(state, flag) {
state.refreshFlag = flag
try {
localStorage.setItem('refreshFlag', flag)
} catch (e) {}
}
}
+4 -1
View File
@@ -33,6 +33,7 @@ let proLastDetail = '' // 流程结果详情
let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用)
let accessStandRegRows = '' // 标准法规清单编辑
let accessStandRegTabName = '' // 标准法规清单页面当前页签
let refreshFlag = '' // 监听其他页面刷新
try {
if (localStorage.theme) { defaultTheme = localStorage.theme }
if (localStorage.token) { defaultToken = localStorage.token }
@@ -65,6 +66,7 @@ try {
if (sessionStorage.rukuBaseInfo) { rukuBaseInfo = sessionStorage.rukuBaseInfo }
if (sessionStorage.accessStandRegRows) { accessStandRegRows = sessionStorage.accessStandRegRows }
if (sessionStorage.accessStandRegTabName) { accessStandRegTabName = sessionStorage.accessStandRegTabName }
if (sessionStorage.refreshFlag) { refreshFlag = localStorage.refreshFlag }
} catch (e) {}
export default {
theme: defaultTheme, // 主题
@@ -99,5 +101,6 @@ export default {
proLastDetail,
rukuBaseInfo,
accessStandRegRows,
accessStandRegTabName
accessStandRegTabName,
refreshFlag
}
+3 -3
View File
@@ -6,9 +6,9 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
const devIp = '192.168.10.6'
// const devIp = '62.234.136.153'
const devInterfacePORT = '9999'
// const devIp = '192.168.10.6'
const devIp = '62.234.136.153'
const devInterfacePORT = '8033'
// const devIp = '10.19.11.243'
// const devInterfacePORT = '4304'
// 配置 idm 认证