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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-12-01 19:40:05 +08:00
parent 566360dc8a a004801ec3
commit 291cb18a5f
31 changed files with 1233 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessMixin.vue
+13 -1
View File
@@ -80,7 +80,19 @@ export default {
{
label: '外部标准化会后管理流程',
value: "22"
}
},
{
label: "企标复审流程",
value: "23"
},
{
label: '企标废止流程',
value: "24"
},
{
label: '企标制修订计划管控',
value: "25"
},
],
formDisableFlag: false,
pickerOptions: {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+156 -220
View File
@@ -262,28 +262,21 @@
v-model="form.xgdName"
clearable
></el-input>
<div v-if="xgdFileList.length>0">
<!-- {{ form.xgdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in xgdFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-input
@@ -292,28 +285,21 @@
v-model="form.fbgbjbdName"
clearable
></el-input>
<div v-if="FBGBJBDFileList.length>0">
<!-- {{ form.fbgbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in FBGBJBDFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-input
@@ -322,28 +308,21 @@
v-model="form.ssgName"
clearable
></el-input>
<div v-if="ssgFileList.length>0">
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in ssgFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
<el-input
@@ -352,28 +331,21 @@
v-model="form.caName"
clearable
></el-input>
<div v-if="caFileList.length>0">
<!-- {{ form.caName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in caFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<el-input
@@ -382,28 +354,21 @@
v-model="form.zbjbdName"
clearable
></el-input>
<div v-if="zbjbdFileList.length>0">
<!-- {{ form.zbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zbjbdFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -414,28 +379,21 @@
v-model="form.kwjName"
clearable
></el-input>
<div v-if="kwjFileList.length>0">
<!-- {{ form.kwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in kwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
@@ -446,28 +404,21 @@
v-model="form.jdwjName"
clearable
></el-input>
<div v-if="jdwjFileList.length>0">
<!-- {{ form.jdwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in jdwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-input
@@ -476,28 +427,21 @@
v-model="form.bpgName"
clearable
></el-input>
<div v-if="bpgFileList.length>0">
<!-- {{ form.bpgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in bpgFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
<el-input
@@ -506,28 +450,21 @@
v-model="form.zqyjgName"
clearable
></el-input>
<div v-if="zqyjgFileList.length>0">
<!-- {{ form.zqyjgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zqyjgFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
@@ -771,27 +708,20 @@
v-model="form.glwjName"
clearable
></el-input>
<div v-if="glwjFileList.length>0">
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传文件
</el-button>
<!-- {{ form.glwjName }}-->
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in glwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
@@ -1905,7 +1835,6 @@
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -1924,6 +1853,7 @@
this.key3++
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
this.form.ssrq = this.$moment(this.form.ssrq).format("YYYY-MM-DD")
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = bringData.id
@@ -2868,6 +2798,12 @@
position: relative;
overflow: hidden;
}
.fileClass {
width: 100%;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.prc-content-border {
/deep/ .el-input__inner {
padding-left: 30px;
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+1
View File
@@ -676,6 +676,7 @@ export default {
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
this.dataList = mes.form.dataList;
this.fileType = mes.form.fileType
this.dataList.forEach(item => {
if(!item.productLine){
this.dataList = null
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+30 -8
View File
@@ -208,19 +208,18 @@
</el-table-column>
<el-table-column
label="落实人"
width="170"
width="210"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.implementerId" style="display: none;" />
<el-input v-model="scope.row.implementer" placeholder="请选择落实人"
@click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)" />
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
</el-table-column>
</el-table>
<!-- 选择责任人-->
<Role-tree
check-box
is-title="选择落实人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
@@ -571,18 +570,29 @@ export default {
},
checkedRole(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
if (this.type === 1) {
this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id;
this.listForm.breakdownList[this.lsIndex].implementer = data[0].name;
this.listForm.breakdownList[this.lsIndex].implementerId = idList;
this.listForm.breakdownList[this.lsIndex].implementer = nameList;
} else if (this.type === 2) {
this.listForm.breakdownList.forEach(item => {
this.selectList.forEach(items => {
if (item === items) {
item.implementerId = data[0].id;
item.implementer = data[0].name;
item.implementerId = idList;
item.implementer = nameList;
}
});
});
this.$refs.multipleTable.clearSelection();
}
this.modalshowflag = false;
},
@@ -596,7 +606,11 @@ export default {
this.nodeList = [];
this.lsIndex = index;
this.lsType = type;
this.nodeList.push(row);
if(row.implementerId){
this.nodeList = row.implementerId.split(",");
}else{
this.nodeList.push(row);
}
this.modalshowflag = true;
} else if (type === 2) {
// 批量
@@ -605,6 +619,14 @@ export default {
this.nodeList = [];
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
this.selectList.forEach(item =>{
if(item.implementerId){
this.nodeList = item.implementerId.split(",");
}
})
// if(row.implementerId){
// this.nodeList = row.implementerId.split(",");
// }
} else {
this.$message.warning("请选择要分发的数据");
}
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+188 -123
View File
@@ -135,6 +135,11 @@
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
@click="batchEdit">批量编辑
</el-button>
</div>
</div>
<el-table
ref="multipleTable"
@@ -143,7 +148,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
height="56%"
height="48%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
@@ -211,10 +216,6 @@
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
<!-- align="center"-->
<!-- label="在研产品">-->
<el-table-column
prop="researchCompliance"
align="center"
@@ -233,6 +234,7 @@
<el-input
v-else
:disabled="acceptShow"
clearable
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
@@ -306,6 +308,7 @@
:disabled="acceptShow"
class="datePickLen"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
@@ -313,104 +316,6 @@
</template>
</el-table-column>
</el-table-column>
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- label="在产产品">-->
<!-- <el-table-column-->
<!-- prop="productionCompliance"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="合规(具体情况)">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="dataList[scope.$index].zcNoCompliance && dataList[scope.$index].zcNoCompliance.length>0-->
<!-- || dataList[scope.$index].zcCountermeasures && dataList[scope.$index].zcCountermeasures>0-->
<!-- || dataList[scope.$index].zcCompletionTime && dataList[scope.$index].zcCompletionTime !== null"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="dataList[scope.$index].zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="不合规">-->
<!-- <el-table-column-->
<!-- prop="productionNonCompliance"-->
<!-- align="center"-->
<!-- width="170"-->
<!-- label="不合规项目">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="dataList[scope.$index].zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="productionCountermeasures"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="应对措施">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcCountermeasures"-->
<!-- placeholder="请输入应对措施"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="dataList[scope.$index].zcCountermeasures"-->
<!-- placeholder="请输入应对措施"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="productionCompletionTime"-->
<!-- align="center"-->
<!-- width="140"-->
<!-- label="完成时间">-->
<!-- <template slot-scope="scope">-->
<!-- <el-date-picker-->
<!-- v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="请选择日期">-->
<!-- </el-date-picker>-->
<!-- <el-date-picker-->
<!-- v-else-->
<!-- class="datePickLen"-->
<!-- clearable-->
<!-- v-model="dataList[scope.$index].zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="请选择日期">-->
<!-- </el-date-picker>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
</el-table>
</div>
<div>
@@ -521,6 +426,96 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<!-- 批量编辑弹窗-->
<el-drawer
title="批量填写"
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
<el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
<!-- <el-divider><span><b>在研产品</b></span></el-divider>-->
<el-formItem label="合规原因" class="add-form-item">
<el-input
v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
|| batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
|| batchEditForm.completionTime && batchEditForm.completionTime !== null"
disabled
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</el-formItem>
<el-form-item label="不合规项目" class="add-form-item">
<el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item">
<el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
>
</el-input>
</el-form-item>
<el-form-item label="完成时间" class="add-form-item">
<el-date-picker
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
:disabled="acceptShow"
class="datePickLen"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
v-model="batchEditForm.completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
<br>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
@click="saveBatchEditForm">
确定
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
</el-button>
</div>
</el-drawer>
</div>
</template>
@@ -542,11 +537,24 @@ export default {
return {
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
comFlag: 0,
nodeList:[],
drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
modalShowFlag: false, // 批量编辑开关
batchEditForm: {
// 在研产品
// 合规
complianceReasons: "",
// 不合规
noCompliance: "",
// 应对措施
countermeasures: "",
// 完成时间
completionTime: "",
},
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -720,6 +728,7 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
@@ -729,6 +738,12 @@ export default {
item.implementer = this.$store.getters.userInfo.userName;
});
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;
@@ -792,30 +807,80 @@ export default {
this.isSubmit = false
})
},
handlePrice(){
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
}else {
this.comFlag ++
}
}
},
//提交事件
handleSubmit() {
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.handlePrice()
if(this.comFlag > 0) {
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 => {
});
}
},
//批量编辑
batchEdit() {
if (this.selectList.length > 0) {
//合规
this.batchEditForm.complianceReasons = "";
//不合规
this.batchEditForm.noCompliance = "";
//应对措施
this.batchEditForm.countermeasures = "";
//完成时间
this.batchEditForm.completionTime = "";
this.modalShowFlag = true;
} else {
this.$message.warning("请选择要编辑的数据");
}
},
//批量编辑确定按钮事件
saveBatchEditForm() {
this.dataList.forEach(item => {
this.selectList.forEach(items => {
if (item.id === items) {
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
//应对措施
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
}
});
});
this.modalShowFlag = false;
},
cancelBatchEditForm() {
this.modalShowFlag = false;
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+1 -1
View File
@@ -601,7 +601,7 @@ export default {
},
//流程提交事件
handleSubmit() {
let fileFlag
let fileFlag = true
this.dataList.forEach(item => {
if(!item.fileType){
fileFlag = false
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
-41
View File
@@ -110,10 +110,6 @@
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
@@ -147,43 +143,6 @@
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+1 -1
View File
@@ -618,7 +618,7 @@ export default {
},
//流程提交事件
handleSubmit() {
let fileFlag
let fileFlag = true
this.dataList.forEach(item => {
if(!item.fileType){
fileFlag = false
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+6 -6
View File
@@ -470,13 +470,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
@@ -529,7 +530,6 @@ export default {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+6 -6
View File
@@ -467,16 +467,18 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +495,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//提交事件
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+6 -5
View File
@@ -470,13 +470,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+79 -72
View File
@@ -404,8 +404,6 @@ export default {
this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
console.log(json);
return;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -423,7 +421,6 @@ export default {
},
//批量分发按钮
choiceZRRS(row, type, index) {
console.log(row);
this.selectedId = row.id || row.standId;
this.type = type;
if (type === 1) {
@@ -431,7 +428,11 @@ export default {
this.nodeList = [];
this.zrIndex = index;
this.zrType = type;
this.nodeList.push(row);
if (row.workPeopleId) {
this.nodeList = row.workPeopleId.split(",");
}else{
this.nodeList.push(row);
}
this.modalshowflag = true;
} else if (type === 2) {
// 批量
@@ -440,6 +441,11 @@ export default {
this.nodeList = [];
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
this.selectList.forEach(item =>{
if(item.workPeopleId){
this.nodeList = item.workPeopleId.split(",");
}
})
} else {
this.$message.warning("请选择要分发的数据");
}
@@ -463,6 +469,75 @@ export default {
}
},
checkedRole(data) {
console.log(data);
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
if(item.standId === this.selectedId){
item.workPeople = nameList || '请选择责任人'
item.workPeopleId = idList;
}
if (item.children) {
item.children.forEach(items => {
if (items.id === this.selectedId) {
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
});
}
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 2) {
this.selectList.forEach(item => {
this.dataList.map(items => {
if (item.standId === items.standId) {
items.workPeople = nameList || '请选择责任人'
items.workPeopleId = idList;
// this.$message.warning('您只能针对条款进行分发')
}
if (items.children) {
items.children.map(childrenItem => {
if (childrenItem.id === item.id) {
childrenItem.workPeople = nameList;
childrenItem.workPeopleId = idList;
}
});
}
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 3) {
// console.log("529",this.workPeopleList)
for (let i = 0; i < this.workPeopleList.children.length; i++) {
this.workPeopleList.children[i].workPeople = data[0].name;
this.workPeopleList.children[i].workPeopleId = data[0].id;
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
}
this.modalshowflag = false;
},
setChildren(children, type) {
// 编辑多个子层级
children.map(j => {
@@ -543,74 +618,6 @@ export default {
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
checkedRole(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
if(item.standId === this.selectedId){
item.workPeople = nameList;
item.workPeopleId = idList;
}
if (item.children) {
item.children.forEach(items => {
if (items.id === this.selectedId) {
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
});
}
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 2) {
this.selectList.forEach(item => {
this.dataList.map(items => {
if (item.standId === items.standId) {
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$message.warning('您只能针对条款进行分发')
}
if (items.children) {
items.children.map(childrenItem => {
if (childrenItem.id === item.id) {
childrenItem.workPeople = nameList;
childrenItem.workPeopleId = idList;
}
});
}
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 3) {
// console.log("529",this.workPeopleList)
for (let i = 0; i < this.workPeopleList.children.length; i++) {
this.workPeopleList.children[i].workPeople = data[0].name;
this.workPeopleList.children[i].workPeopleId = data[0].id;
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
}
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
}
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+59 -114
View File
@@ -219,6 +219,7 @@
clearable
v-model="scope.row.completionTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择日期">
</el-date-picker>
</template>
@@ -451,7 +452,7 @@
></Role-tree>
<el-drawer
title="批量填写"
:visible.sync="modalshowflag"
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
@@ -522,36 +523,11 @@
clearable
v-model="batchEditForm.completionTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
<br>
<!-- <el-divider><span><b>在产产品</b></span></el-divider>-->
<!-- <el-formItem label="合规原因" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="batchEditForm.zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- ></el-input>-->
<!-- </el-formItem>-->
<!-- <el-form-item label="不合规项目" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="batchEditForm.zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="不合规应对措施" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="batchEditForm.zcCountermeasures"-->
<!-- placeholder="请输入不合规应对措施"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="完成时间" class="add-form-item">-->
<!-- <el-date-picker-->
<!-- v-model="batchEditForm.zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="选择日期">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-form>
</div>
<div class="demo-drawer-footer">
@@ -582,6 +558,7 @@ export default {
},
data() {
return {
comFlag: 0,
total: 0,
currentPage: 1,
pageSize: 20,
@@ -622,7 +599,7 @@ export default {
todoId: "",
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
modalShowFlag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
roleForm: {
@@ -640,20 +617,10 @@ export default {
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //项目下的标准数据
dataList: [], //项目下的标准数据
children: [] //标准下的分解单数据
},
dataList: [
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //展示的标准数据
dataList: [], //展示的标准数据
commentText: "", //审批意见
detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId,
@@ -716,58 +683,21 @@ export default {
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
}else if(item.standId === items){
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
//应对措施
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
}
});
});
// for (let a = 0; a < this.dataList.length; a++) {
// for (let b = 0; b < this.selectList.length; b++) {
// if (this.dataList[a].id === this.selectList[b]) {
// console.log('11');
// //合规
// this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
// } else {
// for (let i = 0; i < this.dataList[a].children.length; i++) {
// if (this.dataList[a].children[i].id === this.selectList[b]) {
// //合规
// this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
// }
// }
// }
//
// }
// }
this.modalshowflag = false;
this.modalShowFlag = false;
},
cancelBatchEditForm() {
this.modalshowflag = false;
this.modalShowFlag = false;
},
//批量编辑
batchEdit() {
@@ -780,15 +710,7 @@ export default {
this.batchEditForm.countermeasures = "";
//完成时间
this.batchEditForm.completionTime = "";
//合规
this.batchEditForm.zcComplianceReasons = "";
//不合规
this.batchEditForm.zcNoCompliance = "";
//应对措施
this.batchEditForm.zcCountermeasures = "";
//完成时间
this.batchEditForm.zcCompletionTime = "";
this.modalshowflag = true;
this.modalShowFlag = true;
} else {
this.$message.warning("请选择要编辑的数据");
}
@@ -871,6 +793,7 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
@@ -881,6 +804,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -897,6 +823,7 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
} else {
@@ -904,6 +831,9 @@ export default {
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -920,6 +850,7 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.form.dataList[0].children;
@@ -964,31 +895,45 @@ export default {
this.isSubmit = false;
});
},
handlePrice(){
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === undefined)){
}else {
this.comFlag ++
}
}
},
//提交事件
handleSubmit() {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
this.handlePrice()
if(this.comFlag > 0) {
this.$message.warning('请填写完整的不符合项信息')
this.comFlag = 0
}else{
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
this.selectList.push(data[i].id || data[i].standId);
localStorage.setItem("selectList", JSON.stringify(this.selectList));
}
},
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+28 -26
View File
@@ -468,36 +468,38 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
})
})
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
})
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
})
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
});
},
//驳回事件
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+6 -5
View File
@@ -468,13 +468,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -491,11 +494,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+6 -5
View File
@@ -470,13 +470,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件