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-08-03 18:01:11 +08:00
parent 1281868ed3
commit 001353d687
4 changed files with 555 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+1 -4
View File
@@ -1305,6 +1305,7 @@ export default {
if (cur[i].pId == null || cur[i].pId === '') { if (cur[i].pId == null || cur[i].pId === '') {
this.parentNode = cur[i] this.parentNode = cur[i]
} }
console.log(str);
this.zNodes = str this.zNodes = str
} }
// 查完左侧目录后，如果没有选中的，设置最外层选中 // 查完左侧目录后，如果没有选中的，设置最外层选中
@@ -1450,7 +1451,6 @@ export default {
loading: 'loading' loading: 'loading'
}, },
res => { res => {
console.log(res)
if (res.ok) { if (res.ok) {
this.$copyText(this.copyMessage).then((e) => { this.$copyText(this.copyMessage).then((e) => {
}) })
@@ -1657,7 +1657,6 @@ export default {
let regSt = /<table/g let regSt = /<table/g
let countSt = newContent.match(regSt) let countSt = newContent.match(regSt)
let countEd = newContent.match(regEd) let countEd = newContent.match(regEd)
console.log(countSt)
if (countSt === null) { if (countSt === null) {
this.$message.warning('内容必须包含一个表格') this.$message.warning('内容必须包含一个表格')
} else if (countSt.length > 1 && countEd.length > 1) { } else if (countSt.length > 1 && countEd.length > 1) {
@@ -2115,7 +2114,6 @@ export default {
this.standItemEO.ZRBM = this.standItemEO.responsibleUnit this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
this.saveItemId = row.id this.saveItemId = row.id
this.showUpdateItemInfo() this.showUpdateItemInfo()
console.log(this.standItemEO)
}, },
getOrgTreeSource () { getOrgTreeSource () {
this.$http.get('sys/org/getTree', {}, {_this: this}, this.$http.get('sys/org/getTree', {}, {_this: this},
@@ -2148,7 +2146,6 @@ export default {
attribute (row) { attribute (row) {
this.getFileName(row) this.getFileName(row)
this.showItemInfoEO = JSON.parse(JSON.stringify(row)) this.showItemInfoEO = JSON.parse(JSON.stringify(row))
console.log(this.showItemInfoEO)
}, },
getDicTypeName(opt, type) { getDicTypeName(opt, type) {
const _type = type ? type.split(',') : [] const _type = type ? type.split(',') : []
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+3 -2
View File
@@ -376,7 +376,7 @@
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, saveTaskFirst } from "api/process"; import { inboundLiaisonDetail, saveinboundTask } from "api/process";
export default { export default {
name: "bzqdfbStep3", name: "bzqdfbStep3",
@@ -700,9 +700,10 @@ export default {
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
commentText: this.commentText commentText: this.commentText
})); }));
saveTaskFirst(_formData).then(res => { saveinboundTask(_formData).then(res => {
this.saveLoading = false; this.saveLoading = false;
this.$message.success("保存成功"); this.$message.success("保存成功");
this.$router.push('/processCenter')
this.bpnId = res.result; this.bpnId = res.result;
}).catch(e => { }).catch(e => {
this.saveLoading = false; this.saveLoading = false;
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+52 -51
View File
@@ -177,7 +177,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -185,7 +185,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -193,7 +193,7 @@
label="审批意见" label="审批意见"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.commentText}}</span> <span>{{ scope.row.commentText }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -201,7 +201,7 @@
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -223,12 +223,12 @@
</template> </template>
<script> <script>
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} from "api/process"; import { inboundLiaisonDetail } from "api/process";
export default { export default {
name: "bzqdfbStep4", name: "bzqdfbStep4",
components: { components: {
ProcessHeader, ProcessHeader,
@@ -242,7 +242,7 @@
processType: 1, processType: 1,
loading: false, loading: false,
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
approvalOpinion: '', // 通过0/驳回1 approvalOpinion: "", // 通过0/驳回1
active: "1", active: "1",
listType: "country", //选择的清单类型 listType: "country", //选择的清单类型
isSubmit: false, isSubmit: false,
@@ -251,7 +251,7 @@
selectedList: [], //选择清单的选择框 selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框 selectList: [], //选择标准的选择框
bringData: [], bringData: [],
commentText: '', //填写会签意见 commentText: "", //填写会签意见
page: 1, page: 1,
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
@@ -261,7 +261,7 @@
descriptionList: "", //清单说明 descriptionList: "", //清单说明
enclosure: "", //附件 enclosure: "", //附件
signFlag: "1", //是否会签 1为会签 2为不会签 signFlag: "1", //是否会签 1为会签 2为不会签
approvalOpinion: '', // 通过/驳回 approvalOpinion: "", // 通过/驳回
dataList: [{ dataList: [{
standNumber: "", //标准号 standNumber: "", //标准号
cnName: "", //中文名称 cnName: "", //中文名称
@@ -291,17 +291,17 @@
}, },
methods: { methods: {
processTable() { processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '', sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu shunxu: this.shunxu
}, { }, {
loading: 'loading', loading: "loading",
_this: this _this: this
}, res => { }, res => {
this.detailData = res this.detailData = res;
}, e => { }, e => {
}) });
}, },
//tab发生变化 //tab发生变化
handleTabs(name) { handleTabs(name) {
@@ -332,28 +332,28 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm) this.getFormFieldList(processForm);
} }
}).catch(e => { }).catch(e => {
}) });
}) });
}, },
/** /**
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum this.listForm.prcNum = this.prcNum;
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 = item.dataList this.dataList = item.dataList;
this.listForm.applyUpdUserId = item.applyUpdUserId this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId this.listForm.zrUserId = item.zrUserId;
}) });
}, },
// 请求上传的文件信息 // 请求上传的文件信息
getFileInfo() { getFileInfo() {
@@ -365,8 +365,8 @@
console.log(res); console.log(res);
this.$nextTick(() => { this.$nextTick(() => {
res.data.map(item => { res.data.map(item => {
this.listForm.modelName = item.oldFileName this.listForm.modelName = item.oldFileName;
this.listForm.model = item.id this.listForm.model = item.id;
}); });
}); });
}, e => { }, e => {
@@ -396,28 +396,29 @@
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.approvalOpinion = '1' this.listForm.approvalOpinion = "1";
this.handleSubmit() this.handleSubmit();
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === ''){ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
} } else {
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
json: json, json: json
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message);
this.$router.push('/processCenter') this.$router.push("/processCenter");
} }
}); });
}
}, },
//选择标准取消事件 //选择标准取消事件
closeDrawer() { closeDrawer() {
@@ -446,11 +447,11 @@
data.forEach(item => { data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label); this.$set(this.textStatusMap, item.value, item.label);
}); });
}, }
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
} }
}, },
mounted() { mounted() {
@@ -462,16 +463,16 @@
this.standStateOptions = res.data.WBZTCLASS; // 文本状态 this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions); this.setMap(this.standStateOptions);
}); });
this.getData() this.getData();
this.processTable() this.processTable();
}, }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzqdfb-step4 { .bzqdfb-step4 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
@@ -541,6 +542,6 @@
.demo-drawer-content { .demo-drawer-content {
margin-top: 10px; margin-top: 10px;
} }
} }
</style> </style>
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+19 -19
View File
@@ -69,43 +69,43 @@
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
prop="prcNum" <!-- prop="prcNum"-->
label="流程编号" <!-- label="流程编号"-->
align="center" <!-- align="center"-->
width="150" <!-- width="150"-->
> <!-- >-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="prcType" prop="prcType"
label="流程类型" label="流程类型"
align="center" align="center"
width="180" width="500"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.prcName || getPrcName(scope.row.prcType) }} {{ scope.row.prcName || getPrcName(scope.row.prcType) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
prop="prcName" <!-- prop="prcName"-->
label="流程名称" <!-- label="流程名称"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
align="center" <!-- align="center"-->
min-width="250" <!-- min-width="250"-->
> <!-- >-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="creatUserName" prop="creatUserName"
label="发起人" label="发起人"
align="center" align="center"
width="90" width="300"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatTime" prop="creatTime"
label="创建日期" label="创建日期"
align="center" align="center"
width="150" width="380"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -115,7 +115,7 @@
prop="endTime" prop="endTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="380"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>