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