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

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

Browse Source
This commit is contained in:
super_liu
2021-11-07 17:07:20 +08:00
parent b718fa634b cf41b288f3
commit db2a59e2c5
6 changed files with 423 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+5
View File
@@ -515,6 +515,11 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this _this: this
}, res => { }, res => {
res.data.records.forEach(item => {
if(item.zrbm === "[]"){
item.zrbm = ''
}
})
this.listForm.dataList = res.data.records; this.listForm.dataList = res.data.records;
this.dataList = res.data.records; this.dataList = res.data.records;
let ids = []; let ids = [];
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+5
View File
@@ -525,6 +525,11 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this _this: this
}, res => { }, res => {
res.data.records.forEach(item => {
if(item.zrbm === "[]"){
item.zrbm = ''
}
})
this.listForm.dataList = res.data.records; this.listForm.dataList = res.data.records;
this.dataList = res.data.records; this.dataList = res.data.records;
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+5 -1
View File
@@ -337,7 +337,6 @@ export default {
}, },
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
console.log(item);
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: "OtherStandardDetails", name: "OtherStandardDetails",
params: { params: {
@@ -400,6 +399,11 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.dataList = item.dataList; this.dataList = item.dataList;
this.dataList.forEach(item => {
if(item.zrbm === "[]"){
item.zrbm = ''
}
})
this.dataList.distributePerson = item.dataList[0].distributePerson; this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList; this.listForm.breakdownList = item.breakdownList;
} else { } else {
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+2
View File
@@ -407,6 +407,7 @@ export default {
}, },
//动态表单读取 //动态表单读取
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) { if (item.form === undefined) {
@@ -472,6 +473,7 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true; this.isSubmit = true;
console.log(this.dataList);
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.children = this.dataList[0].children this.listForm.children = this.dataList[0].children
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+299 -238
View File
@@ -44,7 +44,8 @@
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑 <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
@click="batchEdit">批量编辑
</el-button> </el-button>
</div> </div>
</div> </div>
@@ -121,10 +122,10 @@
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="productType"--> <!-- prop="productType"-->
<!-- align="center"--> <!-- align="center"-->
<!-- label="在研产品">--> <!-- label="在研产品">-->
<el-table-column <el-table-column
prop="researchCompliance" prop="researchCompliance"
align="center" align="center"
@@ -223,104 +224,104 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- align="center"--> <!-- align="center"-->
<!-- label="在产产品">--> <!-- label="在产产品">-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="productionCompliance"--> <!-- prop="productionCompliance"-->
<!-- align="center"--> <!-- align="center"-->
<!-- width="160"--> <!-- width="160"-->
<!-- label="合规(具体情况)">--> <!-- label="合规(具体情况)">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0--> <!-- v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0-->
<!-- || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0--> <!-- || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0-->
<!-- || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"--> <!-- || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"-->
<!-- disabled--> <!-- disabled-->
<!-- v-model="scope.row.zcComplianceReasons"--> <!-- v-model="scope.row.zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"--> <!-- placeholder="请输入合规原因"-->
<!-- >--> <!-- >-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-else--> <!-- v-else-->
<!-- v-model="scope.row.zcComplianceReasons"--> <!-- v-model="scope.row.zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"--> <!-- placeholder="请输入合规原因"-->
<!-- >--> <!-- >-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- align="center"--> <!-- align="center"-->
<!-- width="160"--> <!-- width="160"-->
<!-- label="不合规">--> <!-- label="不合规">-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="productionNonCompliance"--> <!-- prop="productionNonCompliance"-->
<!-- align="center"--> <!-- align="center"-->
<!-- width="170"--> <!-- width="170"-->
<!-- label="不合规项目">--> <!-- label="不合规项目">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"--> <!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
<!-- disabled--> <!-- disabled-->
<!-- v-model="scope.row.zcNoCompliance"--> <!-- v-model="scope.row.zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"--> <!-- placeholder="请输入不合规项目"-->
<!-- >--> <!-- >-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-else--> <!-- v-else-->
<!-- v-model="scope.row.zcNoCompliance"--> <!-- v-model="scope.row.zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"--> <!-- placeholder="请输入不合规项目"-->
<!-- >--> <!-- >-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="productionCountermeasures"--> <!-- prop="productionCountermeasures"-->
<!-- align="center"--> <!-- align="center"-->
<!-- width="160"--> <!-- width="160"-->
<!-- label="应对措施">--> <!-- label="应对措施">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"--> <!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
<!-- disabled--> <!-- disabled-->
<!-- v-model="scope.row.zcCountermeasures"--> <!-- v-model="scope.row.zcCountermeasures"-->
<!-- placeholder="请输入应对措施"--> <!-- placeholder="请输入应对措施"-->
<!-- >--> <!-- >-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-else--> <!-- v-else-->
<!-- v-model="scope.row.zcCountermeasures"--> <!-- v-model="scope.row.zcCountermeasures"-->
<!-- placeholder="请输入应对措施"--> <!-- placeholder="请输入应对措施"-->
<!-- >--> <!-- >-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="productionCompletionTime"--> <!-- prop="productionCompletionTime"-->
<!-- align="center"--> <!-- align="center"-->
<!-- width="140"--> <!-- width="140"-->
<!-- label="完成时间">--> <!-- label="完成时间">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"--> <!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
<!-- disabled--> <!-- disabled-->
<!-- v-model="scope.row.zcCompletionTime"--> <!-- v-model="scope.row.zcCompletionTime"-->
<!-- type="date"--> <!-- type="date"-->
<!-- placeholder="请选择日期">--> <!-- placeholder="请选择日期">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-else--> <!-- v-else-->
<!-- class="datePickLen"--> <!-- class="datePickLen"-->
<!-- clearable--> <!-- clearable-->
<!-- v-model="scope.row.zcCompletionTime"--> <!-- v-model="scope.row.zcCompletionTime"-->
<!-- type="date"--> <!-- type="date"-->
<!-- placeholder="请选择日期">--> <!-- placeholder="请选择日期">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- 以后全选可能用--> <!-- 以后全选可能用-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="productionCompletionTime"--> <!-- prop="productionCompletionTime"-->
@@ -455,63 +456,107 @@
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150"> <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
<el-divider><span><b>在研产品</b></span></el-divider> <!-- <el-divider><span><b>在研产品</b></span></el-divider>-->
<el-formItem label="合规原因" class="add-form-item"> <el-formItem label="合规原因" class="add-form-item">
<el-input <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" v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
></el-input> >
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</el-formItem> </el-formItem>
<el-form-item label="不合规项目" class="add-form-item"> <el-form-item label="不合规项目" class="add-form-item">
<el-input <el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.noCompliance" v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
></el-input> >
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item"> <el-form-item label="不合规应对措施" class="add-form-item">
<el-input <el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.countermeasures" v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施" placeholder="请输入不合规应对措施"
></el-input> >
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="完成时间" class="add-form-item"> <el-form-item label="完成时间" class="add-form-item">
<el-date-picker <el-date-picker
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.completionTime" v-model="batchEditForm.completionTime"
type="date" type="date"
placeholder="选择日期"> placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
:disabled="acceptShow"
class="datePickLen"
clearable
v-model="batchEditForm.completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<br> <br>
<el-divider><span><b>在产产品</b></span></el-divider> <!-- <el-divider><span><b>在产产品</b></span></el-divider>-->
<el-formItem label="合规原因" class="add-form-item"> <!-- <el-formItem label="合规原因" class="add-form-item">-->
<el-input <!-- <el-input-->
v-model="batchEditForm.zcComplianceReasons" <!-- v-model="batchEditForm.zcComplianceReasons"-->
placeholder="请输入合规原因" <!-- placeholder="请输入合规原因"-->
></el-input> <!-- ></el-input>-->
</el-formItem> <!-- </el-formItem>-->
<el-form-item label="不合规项目" class="add-form-item"> <!-- <el-form-item label="不合规项目" class="add-form-item">-->
<el-input <!-- <el-input-->
v-model="batchEditForm.zcNoCompliance" <!-- v-model="batchEditForm.zcNoCompliance"-->
placeholder="请输入不合规项目" <!-- placeholder="请输入不合规项目"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="不合规应对措施" class="add-form-item"> <!-- <el-form-item label="不合规应对措施" class="add-form-item">-->
<el-input <!-- <el-input-->
v-model="batchEditForm.zcCountermeasures" <!-- v-model="batchEditForm.zcCountermeasures"-->
placeholder="请输入不合规应对措施" <!-- placeholder="请输入不合规应对措施"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="完成时间" class="add-form-item"> <!-- <el-form-item label="完成时间" class="add-form-item">-->
<el-date-picker <!-- <el-date-picker-->
v-model="batchEditForm.zcCompletionTime" <!-- v-model="batchEditForm.zcCompletionTime"-->
type="date" <!-- type="date"-->
placeholder="选择日期"> <!-- placeholder="选择日期">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm"> <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
@click="saveBatchEditForm">
确定 确定
</el-button> </el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
@@ -525,7 +570,8 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew, execTask} from "api/process"; import { inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew, execTask } from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default { export default {
name: "xmpg2Step6", name: "xmpg2Step6",
@@ -546,23 +592,23 @@ export default {
batchEditForm: { batchEditForm: {
// 在研产品 // 在研产品
// 合规 // 合规
complianceReasons: '', complianceReasons: "",
// 不合规 // 不合规
noCompliance: '', noCompliance: "",
// 应对措施 // 应对措施
countermeasures: '', countermeasures: "",
// 完成时间 // 完成时间
completionTime: '', completionTime: "",
// 在产产品 // 在产产品
// 合规 // 合规
zcComplianceReasons: '', zcComplianceReasons: "",
// 不合规 // 不合规
zcNoCompliance: '', zcNoCompliance: "",
// 应对措施 // 应对措施
zcCountermeasures: '', zcCountermeasures: "",
// 完成时间 // 完成时间
zcCompletionTime: '' zcCompletionTime: ""
}, },
hasChildren: true, hasChildren: true,
active: "1", active: "1",
@@ -573,7 +619,7 @@ export default {
saveLoading: false, saveLoading: false,
submitShow: false, submitShow: false,
acceptShow: false, acceptShow: false,
todoId: '', todoId: "",
showColumn: true, showColumn: true,
drawerTitle: "", //drawer标题 drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
@@ -618,120 +664,135 @@ export default {
methods: { methods: {
//确认转办 //确认转办
checkedTransferRole(data) { checkedTransferRole(data) {
this.assigneeNewLoading = true this.assigneeNewLoading = true;
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false;
if (res.success) { if (res.success) {
this.drawerModal = false this.drawerModal = false;
this.$message.success('调整成功') this.$message.success("调整成功");
this.$router.push("/processCenter"); this.$router.push("/processCenter");
this.processNum() this.processNum();
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message);
} }
}) });
}, },
// 请求转换流程图 // 请求转换流程图
processNum(row) { processNum(row) {
axios.request({ axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
responseType: 'blob', responseType: "blob",
method: 'get', method: "get",
params: { params: {
prcNum: this.$route.query.prcNum prcNum: this.$route.query.prcNum
} }
}).then(res => { }).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'}) // let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data) // let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data) this.processStep = window.URL.createObjectURL(res.data);
}) });
}, },
//转办事件 //转办事件
handleTransfer() { handleTransfer() {
this.drawerModal = true this.drawerModal = true;
this.drawerTitle = '转办处理人' this.drawerTitle = "转办处理人";
this.selectPeople = row this.selectPeople = row;
}, },
//批量编辑确定按钮事件 //批量编辑确定按钮事件
saveBatchEditForm() { saveBatchEditForm() {
this.selectList = JSON.parse(localStorage.getItem("selectList"));
// console.log(this.selectList) console.log("datalist", this.dataList);
for (let a = 0; a < this.dataList.length; a++) { console.log("select", this.selectList);
for (let b = 0; b < this.selectList.length; b++) { this.dataList.forEach(item => {
if (this.dataList[a].id === this.selectList[b]) { this.selectList.forEach(items => {
//合规 if (item.id === items) {
this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规 //不合规
this.dataList[a].noCompliance = this.batchEditForm.noCompliance item.noCompliance = this.batchEditForm.noCompliance;
//应对措施 //应对措施
this.dataList[a].countermeasures = this.batchEditForm.countermeasures item.countermeasures = this.batchEditForm.countermeasures;
//完成时间 //完成时间
this.dataList[a].completionTime = this.batchEditForm.completionTime item.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
} }
} });
} });
// 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]) {
this.modalshowflag = false // 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;
}, },
cancelBatchEditForm() { cancelBatchEditForm() {
this.modalshowflag = false this.modalshowflag = false;
}, },
//批量编辑 //批量编辑
batchEdit() { batchEdit() {
if (this.selectList.length > 0) { if (this.selectList.length > 0) {
//合规 //合规
this.batchEditForm.complianceReasons = '' this.batchEditForm.complianceReasons = "";
//不合规 //不合规
this.batchEditForm.noCompliance = '' this.batchEditForm.noCompliance = "";
//应对措施 //应对措施
this.batchEditForm.countermeasures = '' this.batchEditForm.countermeasures = "";
//完成时间 //完成时间
this.batchEditForm.completionTime = '' this.batchEditForm.completionTime = "";
//合规 //合规
this.batchEditForm.zcComplianceReasons = '' this.batchEditForm.zcComplianceReasons = "";
//不合规 //不合规
this.batchEditForm.zcNoCompliance = '' this.batchEditForm.zcNoCompliance = "";
//应对措施 //应对措施
this.batchEditForm.zcCountermeasures = '' this.batchEditForm.zcCountermeasures = "";
//完成时间 //完成时间
this.batchEditForm.zcCompletionTime = '' this.batchEditForm.zcCompletionTime = "";
this.modalshowflag = true this.modalshowflag = true;
} else { } else {
this.$message.warning('请选择要编辑的数据') this.$message.warning("请选择要编辑的数据");
} }
}, },
// 点击查看 // 点击查看
@@ -795,15 +856,15 @@ export default {
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
let commitStatus = res.commitStatus let commitStatus = res.commitStatus;
if(commitStatus && commitStatus > 0){ if (commitStatus && commitStatus > 0) {
this.acceptShow = true this.acceptShow = true;
this.submitShow = false this.submitShow = false;
}else { } else {
this.acceptShow = false this.acceptShow = false;
this.submitShow = true this.submitShow = true;
} }
this.todoId = res.id this.todoId = res.id;
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
} }
}).catch(e => { }).catch(e => {
@@ -819,18 +880,18 @@ export default {
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList; // this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList[0].children this.dataList = this.listForm.dataList[0].children;
this.dataList.map(item => { this.dataList.map(item => {
this.$set(item, 'standName', this.listForm.dataList[0].standName) this.$set(item, "standName", this.listForm.dataList[0].standName);
this.$set(item, 'standEnName', this.listForm.dataList[0].standEnName) this.$set(item, "standEnName", this.listForm.dataList[0].standEnName);
this.$set(item, 'standYear', this.listForm.dataList[0].standYear) this.$set(item, "standYear", this.listForm.dataList[0].standYear);
this.$set(item, 'standSort', this.listForm.dataList[0].standSort) this.$set(item, "standSort", this.listForm.dataList[0].standSort);
this.$set(item, 'standNumber', this.listForm.dataList[0].standNumber) this.$set(item, "standNumber", this.listForm.dataList[0].standNumber);
}) });
this.total = this.listForm.dataList[0].children.length; this.total = this.listForm.dataList[0].children.length;
} else { } else {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList[0].children this.dataList = item.form.dataList[0].children;
this.total = item.form.dataList[0].children.length; this.total = item.form.dataList[0].children.length;
} }
@@ -860,17 +921,17 @@ export default {
}); });
}, },
// 接受按钮 // 接受按钮
handleAccept(){ handleAccept() {
this.isSubmit = true this.isSubmit = true;
execTask({ execTask({
todoId: this.todoId // 当前节点ID todoId: this.todoId // 当前节点ID
}).then(res => { }).then(res => {
if (res.sign && res.sign === '0') { if (res.sign && res.sign === "0") {
this.$message.success('接收成功') this.$message.success("接收成功");
this.$router.push('/processCenter') this.$router.push("/processCenter");
} }
this.isSubmit = false this.isSubmit = false;
}) });
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -897,8 +958,8 @@ export default {
this.selectList = []; this.selectList = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id); this.selectList.push(data[i].id);
localStorage.setItem("selectList", JSON.stringify(this.selectList));
} }
}, },
getTree() { getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+19 -6
View File
@@ -382,21 +382,34 @@
</div> </div>
</el-drawer> </el-drawer>
<ProcessFooter <ProcessFooter
:show-save="submitShow" show-save
:show-transfer="submitShow" show-transfer
:show-affirm="submitShow" show-affirm
:show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:transfer-loading="isTransfer" :transfer-loading="isTransfer"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@submit="handleSubmit" @submit="handleSubmit"
@transfer="handleTransfer" @transfer="handleTransfer"
@save="handleSave" @save="handleSave"
@accept="handleAccept"
:approval="true" :approval="true"
> >
</ProcessFooter> </ProcessFooter>
<!-- <ProcessFooter-->
<!-- :show-save="submitShow"-->
<!-- :show-transfer="submitShow"-->
<!-- :show-affirm="submitShow"-->
<!-- :show-submit="submitShow"-->
<!-- :show-confirm="acceptShow"-->
<!-- :submitLoading="isSubmit"-->
<!-- :transfer-loading="isTransfer"-->
<!-- :saveLoading="saveLoading"-->
<!-- @submit="handleSubmit"-->
<!-- @transfer="handleTransfer"-->
<!-- @save="handleSave"-->
<!-- @accept="handleAccept"-->
<!-- :approval="true"-->
<!-- >-->
<!-- </ProcessFooter>-->
<!-- 福田全公司选人解决方案 --> <!-- 福田全公司选人解决方案 -->
<Role-tree <Role-tree
check-box check-box