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-08-30 12:12:27 +08:00
parent 3a2291bf8f 594a3bcfa3
commit 040df77e78
8 changed files with 1478 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+5
View File
@@ -467,6 +467,7 @@
<el-date-picker
v-model="standItemSearch.XCXSSRQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="新车实施日期">
</el-date-picker>
</div>
@@ -477,6 +478,7 @@
<el-date-picker
v-model="standItemSearch.ZCCSSRQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="在产车实施日期">
</el-date-picker>
</div>
@@ -2396,6 +2398,9 @@ export default {
this.standItemSearch.parts = ''
this.standItemSearch.nameOrRequest = ''
this.standItemSearch.fileType = ''
this.standItemSearch.itemsName=''
this.standItemSearch.ZCCSSRQ=''
this.standItemSearch.XCXSSRQ=''
this.selectSarStandItems()
},
inputChange() {
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+4 -2
View File
@@ -328,11 +328,13 @@
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
let json = this.form
json.data = this.data
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.json,
form: json,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
@@ -400,7 +402,7 @@
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.json = data
this.data = data.info || data.data || []
this.data = data.info || data.data || data.form.data|| []
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+130 -75
View File
@@ -195,7 +195,7 @@
sortable="custom"
align="center">
<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>
</el-table-column>
<el-table-column
@@ -203,7 +203,7 @@
label="完成时间"
align="center">
<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>
</el-table-column>
<el-table-column
@@ -219,13 +219,14 @@
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-save
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@@ -236,48 +237,48 @@
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
export default {
export default {
name: "bzzqyjStep5",
data() {
return {
histortData: [],
oldData: [],
data: [],
commentText: '',
commentText: "",
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
nodeList: [],
type: '',
type: "",
defaultProps: {
children: 'children',
label: 'name'
children: "children",
label: "name"
},
treeData: [], // 人员数据
modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题
textarea: '', // 意见
drawerTitle: "", //drawer标题
textarea: "", // 意见
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: "1", // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
cid: "", // 编号
endTime: "", // 结束日期
cname: "" // 名称
},
formRules: {
responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' },
{ required: true, message: "请选择责任人", trigger: "change" }
]
},
json: {}
}
};
},
components: {
ProcessHeader,
@@ -285,63 +286,86 @@
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res
}, e => {})
this.histortData = res;
}, e => {
});
},
changeInput (index) {
this.data[index].type = true
changeInput(index) {
this.data[index].type = true;
},
handleTabs(name) {
this.active = name
this.active = name;
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
let json = this.form;
json.data = this.data;
console.log(json);
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
handleSave() {},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
this.$message.warning("请输入征求意见搞");
} else {
var a = 0
var b = 0
var a = 0;
var b = 0;
// var c = 0
for (let s1 = 0; s1 < this.data.length; s1++) {
if (!this.data[s1].chapterNumber) {
a++
a++;
}
if (!this.data[s1].chapterName) {
b++
b++;
}
// if (!this.data[s1].commentText) {
// c++
// }
}
if (a > 0) {
this.$message.warning('请输入章节编号')
this.$message.warning("请输入章节编号");
} else if (b > 0) {
this.$message.warning('请输入章节名称')
this.$message.warning("请输入章节名称");
}
// else if (c > 0) {
// this.$message.warning('请输入意见内容')
// }
else {
this.isSubmit = true
var json = this.json
json.oldinfo = this.oldData
json.commentText = this.commentText
json.introduce = true
this.$http.post('lawss/activiti/completeTask', {
this.isSubmit = true;
var json = this.json;
json.oldinfo = this.oldData;
json.commentText = this.commentText;
json.introduce = true;
console.log(json);
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
this.$message.success("提交成功");
this.$router.push("/processCenter");
}
this.isSubmit = false
})
this.isSubmit = false;
});
}
}
},
@@ -351,61 +375,87 @@
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach( item => {
let data = JSON.parse(res.mesg);
console.log(data);
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
if (data.summaryList === undefined && data.info === undefined) {
this.oldData = JSON.parse(JSON.stringify(data.form));
this.data = data.form.data;
}
if (data.summaryList.length !== 0) {
this.oldData = JSON.parse(JSON.stringify(data.summaryList));
}
if (data.info.length !== 0) {
this.oldData = JSON.parse(JSON.stringify(data.info));
}
data.summaryList.forEach(item => {
if (item.state) {
} else {
item.state = '1'
item.state = "1";
}
item.type = false;
});
data.info.forEach(item => {
if (item.state) {
} else {
item.state = "1";
}
item.type = false;
});
this.json = data;
if (data.summaryList.length === 0) {
this.data = data.info;
} else {
this.data = data.summaryList;
}
item.type = false
})
this.json = data
this.data = data.summaryList
if (data.introduce) {
} else {
this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
unique: data.uniques
}, {}, res => {
res.data.forEach(item => {
item.chapterNumber = item.partCode
item.responUserName= item.userName
this.data.push(item)
})
})
item.chapterNumber = item.partCode;
item.responUserName = item.userName;
this.data.push(item);
});
});
}
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
});
});
}
},
mounted() {
this.getHistoryData();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzdyStep5 {
/deep/.el-drawer__container {
@import '~@/assets/styles/style';
.bzdyStep5 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
@@ -413,6 +463,7 @@
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
@@ -420,18 +471,21 @@
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
@@ -439,6 +493,7 @@
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
@@ -446,5 +501,5 @@
}
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+131 -100
View File
@@ -59,11 +59,13 @@
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button>
size="mini">导出汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞</el-button>
size="mini">导出征求意见搞
</el-button>
</div>
<el-table
ref="multipleTable"
@@ -170,7 +172,7 @@
sortable="custom"
align="center">
<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>
</el-table-column>
<el-table-column
@@ -178,7 +180,7 @@
label="完成时间"
align="center">
<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>
</el-table-column>
<el-table-column
@@ -194,7 +196,7 @@
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
@@ -215,51 +217,51 @@
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand } from "api/process";
export default {
export default {
name: "bzzqyjStep6",
data() {
return {
histortData: [],
oldData: [],
data: [],
commentText: '',
oldText : '',
newText : '',
reason : '' ,
commentText: "",
oldText: "",
newText: "",
reason: "",
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
nodeList: [],
type: '',
type: "",
defaultProps: {
children: 'children',
label: 'name'
children: "children",
label: "name"
},
treeData: [], // 人员数据
modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题
textarea: '', // 意见
drawerTitle: "", //drawer标题
textarea: "", // 意见
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: "1", // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
cid: "", // 编号
endTime: "", // 结束日期
cname: "" // 名称
},
formRules: {
responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' },
{ required: true, message: "请选择责任人", trigger: "change" }
]
},
json: {}
}
};
},
components: {
ProcessHeader,
@@ -267,91 +269,94 @@
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res
}, e => {})
this.histortData = res;
}, e => {
});
},
stateText (row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
stateText(row) {
if (row === "1") {
return "上报";
} else if (row === "2") {
return "处理后上报";
}
},
upload (row, title) {
upload(row, title) {
var params = {
columnName: {
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
oldText : '修改前',
newText : '修改后',
reason : '修改理由',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容（包括理由或依据）",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
stateText: "处理意见"
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
};
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = '不上报'
item.stateText = "不上报";
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
},
handleTabs(name) {
this.active = name
this.active = name;
},
handleSave() {
},
handleSave() {},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
this.$message.warning("请输入征求意见搞");
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 0;
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
this.$message.success("提交成功");
this.$router.push("/processCenter");
}
this.isSubmit = false
})
this.isSubmit = false;
});
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 1;
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
this.$message.success("驳回成功");
this.$router.push("/processCenter");
}
this.isSubmit = false
})
this.isSubmit = false;
});
} else {
this.$message.warning('请输入反馈意见')
this.$message.warning("请输入反馈意见");
}
},
getData() {
@@ -360,48 +365,69 @@
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
arr.push(item)
let data = JSON.parse(res.mesg);
console.log(data);
if (data.oldinfo === undefined) {
this.form.cid = data.cid;
this.form.endTime = data.endTime;
this.form.cname = data.cname;
var arr = [];
data.summaryList.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
} else {
this.form.cid = data.oldinfo.cid;
this.form.endTime = data.oldinfo.endTime;
this.form.cname = data.oldinfo.cname;
var arr = [];
data.oldinfo.data.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
}
})
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
});
});
}
},
mounted() {
this.getHistoryData();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzdyStep6 {
/deep/.el-drawer__container {
@import '~@/assets/styles/style';
.bzdyStep6 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
@@ -409,6 +435,7 @@
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
@@ -416,18 +443,21 @@
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
@@ -435,6 +465,7 @@
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
@@ -442,5 +473,5 @@
}
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+26 -11
View File
@@ -355,19 +355,34 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
arr.push(item)
if (data.oldinfo === undefined) {
this.form.cid = data.cid;
this.form.endTime = data.endTime;
this.form.cname = data.cname;
var arr = [];
data.summaryList.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
} else {
this.form.cid = data.oldinfo.cid;
this.form.endTime = data.oldinfo.endTime;
this.form.cname = data.oldinfo.cname;
var arr = [];
data.oldinfo.data.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
}
})
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+26 -11
View File
@@ -355,18 +355,33 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
arr.push(item)
if (data.oldinfo === undefined) {
this.form.cid = data.cid;
this.form.endTime = data.endTime;
this.form.cname = data.cname;
var arr = [];
data.summaryList.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
} else {
this.form.cid = data.oldinfo.cid;
this.form.endTime = data.oldinfo.endTime;
this.form.cname = data.oldinfo.cname;
var arr = [];
data.oldinfo.data.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
}
})
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+124 -94
View File
@@ -59,11 +59,13 @@
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button>
size="mini">导出汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞</el-button>
size="mini">导出征求意见搞
</el-button>
</div>
<el-table
ref="multipleTable"
@@ -170,7 +172,7 @@
sortable="custom"
align="center">
<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>
</el-table-column>
<el-table-column
@@ -178,7 +180,7 @@
label="完成时间"
align="center">
<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>
</el-table-column>
<el-table-column
@@ -194,7 +196,7 @@
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
@@ -215,48 +217,48 @@
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand } from "api/process";
export default {
export default {
name: "bzzqyjStep9",
data() {
return {
histortData: [],
oldData: [],
data: [],
commentText: '',
commentText: "",
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
nodeList: [],
type: '',
type: "",
defaultProps: {
children: 'children',
label: 'name'
children: "children",
label: "name"
},
treeData: [], // 人员数据
modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题
textarea: '', // 意见
drawerTitle: "", //drawer标题
textarea: "", // 意见
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
active: "1", // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
cid: "", // 编号
endTime: "", // 结束日期
cname: "" // 名称
},
formRules: {
responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' },
{ required: true, message: "请选择责任人", trigger: "change" }
]
},
json: {}
}
};
},
components: {
ProcessHeader,
@@ -264,88 +266,91 @@
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res
}, e => {})
this.histortData = res;
}, e => {
});
},
upload (row, title) {
upload(row, title) {
var params = {
columnName: {
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容（包括理由或依据）",
department: "提出部门",
responUserName: "提出人",
stateText: "处理意见"
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
};
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = '不上报'
item.stateText = "不上报";
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
},
stateText (row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
stateText(row) {
if (row === "1") {
return "上报";
} else if (row === "2") {
return "处理后上报";
}
},
handleTabs(name) {
this.active = name
this.active = name;
},
handleSave() {
},
handleSave() {},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
this.$message.warning("请输入征求意见搞");
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 0;
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
this.$message.success("提交成功");
this.$router.push("/processCenter");
}
this.isSubmit = false
})
this.isSubmit = false;
});
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 1;
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
this.$message.success("驳回成功");
this.$router.push("/processCenter");
}
this.isSubmit = false
})
this.isSubmit = false;
});
} else {
this.$message.warning('请输入反馈意见')
this.$message.warning("请输入反馈意见");
}
},
getData() {
@@ -354,48 +359,68 @@
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
arr.push(item)
let data = JSON.parse(res.mesg);
if (data.oldinfo === undefined) {
this.form.cid = data.cid;
this.form.endTime = data.endTime;
this.form.cname = data.cname;
var arr = [];
data.summaryList.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
} else {
this.form.cid = data.oldinfo.cid;
this.form.endTime = data.oldinfo.endTime;
this.form.cname = data.oldinfo.cname;
var arr = [];
data.oldinfo.data.forEach(item => {
if (item.state != "3") {
arr.push(item);
}
});
this.json = data;
this.data = arr;
this.oldData = data.oldinfo;
}
})
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
});
});
}
},
mounted() {
this.getHistoryData();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzdyStep9 {
/deep/.el-drawer__container {
@import '~@/assets/styles/style';
.bzdyStep9 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
@@ -403,6 +428,7 @@
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
@@ -410,18 +436,21 @@
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
@@ -429,6 +458,7 @@
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
@@ -436,5 +466,5 @@
}
}
}
}
}
</style>
src/sysConfig/index.js
+4 -4
View File
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
// const devIp = '192.168.1.159'
const devIp = '10.96.10.171'
const devInterfacePORT = '9999'
// const devIp = '10.5.103.101'
// const devInterfacePORT = '9999'
const devIp = '62.234.136.153'
const devInterfacePORT = '8038'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -31,7 +31,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '62.234.136.153'
const prodInterfacePORT = '8038'
const prodInterfacePORT = '8033'
// 判断环境