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

标准法规清单bug

Browse Source
This commit is contained in:
宋伟佳
2021-07-29 15:03:30 +08:00
parent 5123e51408
commit 6e334ed07d
5 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+9
View File
@@ -1273,6 +1273,15 @@ export default {
res.data = [];
}
this.dataList = res.data;
this.dataList.forEach(item => {
if (item.xcxssrqgj === null){
this.$set(item, "XCXSSRQ", '');
this.$set(item, "ZCCSSRQ", '');
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
}
})
this.listForm.dataList = res.data;
let formId = [];
this.dataList.map(item => {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+16 -30
View File
@@ -125,6 +125,9 @@
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
@@ -393,27 +396,14 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="applicationScope"
label="适用领域"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
}}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
sortable
align="center">
<template slot-scope="scope">
<div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
}}
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="updatePeople"
@@ -473,26 +463,13 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="applicationScope"
label="适用领域"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
}}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
sortable
align="center">
<template slot-scope="scope">
<div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
}}
</div>
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -1270,6 +1247,15 @@ export default {
res.data = [];
}
this.dataList = res.data;
this.dataList.forEach(item => {
if (item.xcxssrqgj === null){
this.$set(item, "XCXSSRQ", '');
this.$set(item, "ZCCSSRQ", '');
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
}
})
this.listForm.dataList = res.data;
let formId = [];
this.dataList.map(item => {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+16 -15
View File
@@ -93,20 +93,19 @@
<el-table-column
prop="distributePerson"
label="分发责任人">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
<!-- <el-input-->
<!-- v-model="dataList.distributePerson"-->
<!-- placeholder="请选择分发责任人"-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- readonly-->
<!-- v-if="dataList[scope.$index].distributePerson==null"-->
<!-- />-->
<!-- </template>-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.distributePerson"-->
<!-- placeholder="请选择分发负责人"-->
<!-- readonly-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- v-if="!scope.row.distributePerson"></el-input>-->
<!-- </template>-->
<template slot-scope="scope,text" v-if="showColumn">
<div>
<div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson
}}
</div>
</div>
</template>
@@ -409,8 +408,8 @@ export default {
label: "name"
},
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id,
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
qualityEngineer: "",
certifiedEngineer: "",
qualityEngineerName: "",
@@ -521,10 +520,11 @@ export default {
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") {
// this.dataList.distributePerson = data[0].id;
// this.dataList.distributePersonName = data[0].name;
this.dataList.distributePersonId = data[0].id;
this.dataList.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
console.log(this.dataList)
this.showColumn = false;
this.$nextTick(() => {
this.showColumn = true;
@@ -652,6 +652,7 @@ export default {
this.$message.warning("请选择分发责任人");
} else {
var json = Object.assign(this.listForm, this.roleForm);
console.log(json);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+26 -23
View File
@@ -328,33 +328,36 @@ export default {
//驳回事件
beforeBack () {
this.listForm.passFlag = '1'
this.handleSubmit()
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.passFlag = '1'
this.handleSubmit()
}
},
//提交事件
handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.breakdownList = this.listForm.breakdownList
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.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')
}
}, e => {
});
}
});
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/processDetail/index.vue
+10 -2
View File
@@ -205,10 +205,18 @@ export default {
this.toProcessDetail('bzqdfbStep4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
this.toProcessDetail('xmpgStep7',row)
if(row.taskInfo === '标准法规部部长审批'){
this.toProcessDetail('xmpgStep7',row)
}else{
this.toProcessDetail('xmpgStep2',row)
}
}else if(prcType === '6'){
//标准项目合规评估 项目维度
this.toProcessDetail('xmpg2Step12',row)
if(row.taskInfo === '标准法规部领导审核'){
this.toProcessDetail('xmpg2Step12',row)
}else{
this.toProcessDetail('xmpg2Step2',row)
}
}
} else {
this.$message.warning('当前流程未全部办理完成，无法查看')