From 1a0242fea671d45902c30c5054cf97e179bfb4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 8 Jul 2021 14:41:49 +0800
Subject: [PATCH 3/4] commit
---
src/assets/styles/scroll.less | 2 +-
.../pages/creatProcess/bzqdfb/step1.vue | 488 ++++++----
.../pages/creatProcess/bzqdfb/step2.vue | 14 +-
.../pages/creatProcess/bzqdfb/step3.vue | 200 ++--
.../pages/creatProcess/bzqdfb/step4.vue | 12 +-
.../pages/creatProcess/xmpg/step1.vue | 694 ++++++++++++++
.../processCenter/pages/newProcess/index.vue | 5 +
.../pages/addEdit.vue | 3 +-
.../pages/otherAddEit.vue | 885 ++++--------------
src/router/index.js | 9 +
10 files changed, 1342 insertions(+), 970 deletions(-)
create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
diff --git a/src/assets/styles/scroll.less b/src/assets/styles/scroll.less
index 96695f989..d8105b39e 100644
--- a/src/assets/styles/scroll.less
+++ b/src/assets/styles/scroll.less
@@ -20,7 +20,7 @@
box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.2) inset;
}
.el-table__fixed {
- height:auto !important; // 让固定列的高自适应，且设置!important覆盖ele-ui的默认样式
+ //height:auto !important; // 让固定列的高自适应，且设置!important覆盖ele-ui的默认样式
bottom:17px; // 固定列默认设置了定位， position: absolute;top: 0;left: 0;只需要再设置一下bottom的值，让固定列和父元素的底部出现距离即可
position: absolute;
top: 0;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 29e7bb6c0..d228e91d0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -7,7 +7,7 @@
+
-
+
- 填写会签意见
+ 会签人
-
+
-
+
标准/政策法规工程师
-
+
@@ -193,7 +199,8 @@
业务经理
-
+
@@ -455,7 +462,6 @@
@pageSizeChange="pageSizeChange"
/>
-
+
-
+
@@ -582,43 +603,53 @@ export default {
},
data() {
return {
+ standList: [], //新添加的标准
modalshowflag: false, // drawer开关
- drawerTitle: '', //drawer标题
+ drawerTitle: "", //drawer标题
nodeList: [],
defaultProps: {
- children: 'children',
- label: 'name'
+ children: "children",
+ label: "name"
},
roleForm: {
- startUserName: this.$store.getters.userInfo.account,
+ startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id,
- dockUser: '',
- responUserList: '',
- ministerUser: '',
- directorUser: '',
- presidentUser: '',
- dockUserName: '',
- responUserListName: '',
- ministerUserName: '',
- directorUserName: '',
- presidentUserName: ''
+ dockUser: "",
+ responUserList: "",
+ ministerUser: "",
+ directorUser: "",
+ presidentUser: "",
+ dockUserName: "",
+ responUserListName: "",
+ ministerUserName: "",
+ directorUserName: "",
+ presidentUserName: ""
+ },
+ formRules: {
+ listType: [
+ { required: true, message: "请选择清单类型", trigger: "blur" }
+ ],
+ listName: [
+ { required: true, message: "请填写清单名称", trigger: "change" }
+ ]
},
roleFormRules: {
- dockUserName: [
- { required: true, message: '请选择会签责任人', trigger: 'blur' },
- ],
+ // dockUserName: [
+ // { required: true, message: "请选择会签责任人", trigger: "blur" }
+ // ],
ministerUserName: [
- { required: true, message: '请选择修订责任人', trigger: 'blur' },
+ { required: true, message: "请选择修订责任人", trigger: "blur" }
],
directorUserName: [
- { required: true, message: '请选择审批责任人', trigger: 'blur' },
- ],
+ { required: true, message: "请选择审批责任人", trigger: "blur" }
+ ]
},
dataList: [],//清单里的标准数据
sarAccessListDatas: [], //国家地区清单表格
- uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
+ uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
standardData: [], //添加标准数据
+ standardData1: [], //添加标准数据
ListModel: false, //选择清单抽屉状态
standModel: false, // 选择标准抽屉状态
active: "1",
@@ -633,15 +664,18 @@ export default {
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
+ pageNo: 1,
+ totalNo: 0,
+ pageSizeNo: this.$store.getters.userInfo.configContent,
listForm: {
listType: "", //区分是哪个清单
listName: "", //清单名称
applyRegion: "", //适用区域
descriptionList: "", //清单说明
- enclosure: "", //附件
+ fileId: "", //附件
standId: "", //选择的清单的id
signFlag: "1", //是否会签 1为会签 2为不会签
- inforlist:"" , //用来存放标准列表的标准id
+ inforlist: "", //用来存放标准列表的标准id
dataList: [{
code: "", //标准号
standName: "", //标准名称
@@ -663,24 +697,24 @@ export default {
};
},
methods: {
- saveUserInfo () {
- if (this.type === 'dockUser') {
- this.roleForm.dockUser = this.roleRow.id
- this.roleForm.dockUserName = this.roleRow.name
- } else if (this.type === 'ministerUser') {
- this.roleForm.ministerUser = this.roleRow.id
- this.roleForm.ministerUserName = this.roleRow.name
- } else if (this.type === 'directorUser') {
- this.roleForm.directorUser = this.roleRow.id
- this.roleForm.directorUserName = this.roleRow.name
- } else if (this.type === 'presidentUser') {
- this.roleForm.presidentUser = this.roleRow.id
- this.roleForm.presidentUserName = this.roleRow.name
+ saveUserInfo() {
+ if (this.type === "dockUser") {
+ this.roleForm.dockUser = this.roleRow.id;
+ this.roleForm.dockUserName = this.roleRow.name;
+ } else if (this.type === "ministerUser") {
+ this.roleForm.ministerUser = this.roleRow.id;
+ this.roleForm.ministerUserName = this.roleRow.name;
+ } else if (this.type === "directorUser") {
+ this.roleForm.directorUser = this.roleRow.id;
+ this.roleForm.directorUserName = this.roleRow.name;
+ } else if (this.type === "presidentUser") {
+ this.roleForm.presidentUser = this.roleRow.id;
+ this.roleForm.presidentUserName = this.roleRow.name;
}
- this.modalshowflag = false
+ this.modalshowflag = false;
},
- cancleUserInfo () {
- this.modalshowflag = false
+ cancleUserInfo() {
+ this.modalshowflag = false;
},
//tab发生变化
handleTabs(name) {
@@ -689,21 +723,21 @@ export default {
choiceShow() {
this.ListModel = true;
},
- drawerCheck (data) {
- // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
- // if(getlist.length == 1) {
- // this.roleRow = getlist[0]
- // }else {
- // this.$refs.tree.setCheckedKeys([data.id]);
- // this.roleRow = this.$refs.tree.getCheckedNodes()[0]
- // }
+ drawerCheck(data) {
+ var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+ if (getlist.length == 1) {
+ this.roleRow = getlist[0];
+ } else {
+ this.$refs.tree.setCheckedKeys([data.id]);
+ this.roleRow = this.$refs.tree.getCheckedNodes()[0];
+ }
},
//判断当前是否会签
- selectSign (type) {
- if(type ==='1'){
- this.listForm.signFlag = 1
- }else if(type == '2'){
- this.listForm.signFlag = 2
+ selectSign(type) {
+ if (type === "1") {
+ this.listForm.signFlag = 1;
+ } else if (type == "2") {
+ this.listForm.signFlag = 2;
}
},
// //判断当前选中的是哪个清单
@@ -746,13 +780,13 @@ export default {
});
}
},
- //点击新增事件
+ //点击添加事件
addList() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
_this: this
}, res => {
- console.log(res);
this.standardData = res.data.list;
+ this.totalNo = res.data.pageCount
}, e => {
});
this.standModel = true;
@@ -786,62 +820,74 @@ export default {
},
//保存事件
handleSave() {
- this.saveLoading = true
- let _formData = new FormData()
- _formData.append('createUser', this.$store.getters.userInfo.userId)
- _formData.append('createUserName', this.$store.getters.userInfo.uName)
- _formData.append('prcType', this.$route.query.type)
- _formData.append('json', JSON.stringify({
+ this.saveLoading = true;
+ let _formData = new FormData();
+ _formData.append("createUser", this.$store.getters.userInfo.userId);
+ _formData.append("createUserName", this.$store.getters.userInfo.uName);
+ _formData.append("prcType", this.$route.query.type);
+ _formData.append("json", JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm,
listInfo: this.listInfo,
id: this.id
- }))
+ }));
saveTaskFirst(_formData).then(res => {
- this.saveLoading = false
- this.$message.success('保存成功')
+ this.saveLoading = false;
+ this.$message.success("保存成功");
}).catch(e => {
- this.saveLoading = false
- })
+ this.saveLoading = false;
+ });
},
//提交事件
handleSubmit() {
- let json = this.listForm
- json.zrUserId = this.$store.getters.userInfo.userId
- json.jlUserId = this.$store.getters.userInfo.userId
- json.applyUpdUserId = this.$store.getters.userInfo.userId
- json.approvalOpinion = ''
- json.prcCreateUser = this.$store.getters.userInfo.userId
- json.prcCreateUserName = this.$store.getters.userInfo.account
- json.standName = this.listForm.listName
- json.standId = this.listForm.standId
- this.$http.get('lawss/activiti/startProcess' , {type: '4'}, {
- _this: this
- }, res => {
- if(res.ok){
- this.$http.post('lawss/activiti/completeTask',{
- taskIds: res.data,
- userId : this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- },{
- _this: this
- }, res => {
- if(res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- })
- }
- })
+ let json = this.listForm;
+ json.zrUserId = this.$store.getters.userInfo.userId;
+ json.jlUserId = this.$store.getters.userInfo.userId;
+ json.applyUpdUserId = this.$store.getters.userInfo.userId;
+ json.approvalOpinion = "";
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.account;
+ json.standName = this.listForm.listName;
+ json.standId = this.listForm.standId;
+ this.$refs["qdfbForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["Form"].validate((valid) => {
+ if (valid) {
+ this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ });
+ }
+ });
+ } else {
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
},
// 删除上传的文件
- delFileInfo (file, fileList) {
+ delFileInfo(file, fileList) {
// this.fileInfoList = fileList
},
// 上传文件成功回调
- uploadBackSuccess (res, file, fileList) {
+ uploadBackSuccess(res, file, fileList) {
// if (res.ok) {
// this.fileInfoList = fileList
// this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
@@ -852,13 +898,41 @@ export default {
// }
},
//上传之前的钩子
- beforeUpload () {
+ beforeUpload() {
},
- //选择标准取消事件
+ //选择清单取消事件
closeDrawer() {
this.ListModel = false;
},
+ //添加标准取消事件
+ cancelStand() {
+ this.standModel = false;
+ },
+ //添加标准确定事件
+ okStand() {
+ let _this = this;
+ if (this.standList.length < 1) {
+ _this.$message.warning("请选择需要添加进清单的数据");
+ } else {
+ _this.standList.map(item => {
+ let newStand = false;
+ for (let itemKey of _this.dataList) {
+ if (item.id == itemKey.id) {
+ newStand = true;
+ break;
+ }
+ }
+ if (newStand) {
+ _this.$message.warning("请勿重复添加数据");
+ } else {
+ _this.dataList.push(item);
+ }
+ });
+ this.standardData = []
+ _this.standModel = false;
+ }
+ },
//选择清单确定事件
OkDrawer() {
if (this.selectedList.length === 1) {
@@ -870,27 +944,28 @@ export default {
for (let i = 0; i < this.selectedList.length; i++) {
bringData.push(deposit.get(this.selectedList[i]));
}
- this.listForm.standId = bringData[0].id
+ this.listForm.standId = bringData[0].id;
this.listForm.listName = bringData[0].detailedListName;
this.listForm.applyRegion = bringData[0].applicationScope;
this.listForm.descriptionList = bringData[0].remark;
- this.listForm.enclosure = bringData[0].detailedListName;
+ this.listForm.fileId = bringData[0].fileId;
this.ListModel = false;
- this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: bringData[0].id}, {
+ this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
_this: this
}, res => {
- this.dataList = res.data
- this.listForm.dataList = res.data
- let formId = ""
- this.dataList.forEach(item => {
- if(this.dataList.length !== 0){
- formId += ','
- formId += item.id
- }
- })
- this.listForm.inforlist = formId
+ if(res.data==null){
+ res.data=[]
+ }
+ this.dataList = res.data;
+ console.log(res.data);
+ this.listForm.dataList = res.data;
+ let formId = []
+ this.dataList.map(item => {
+ formId.push(item.id)
+ });
+ this.listForm.inforlist = formId.join(',');
}, e => {
- })
+ });
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
} else {
@@ -911,34 +986,45 @@ export default {
this.selectList.push(data[i].id);
}
},
- selectThree() {
+ //添加标准select的改变
+ selectThree(data) {
+ this.standList = data;
},
- choiceZRR (type, title, id) {
- this.nodeList = []
- this.nodeList.push(id)
- this.type = type
- this.drawerTitle = title
- this.modalshowflag = true
+ choiceZRR(type, title, id) {
+ this.nodeList = [];
+ this.nodeList.push(id);
+ this.type = type;
+ this.drawerTitle = title;
+ this.modalshowflag = true;
},
- getTree () {
- // this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
- // this.treeData = res.data
- // })
+ getTree() {
+ this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
+ this.treeData = res.data;
+ });
},
pageChange(page) {
this.page = page;
- this.searchData();
+ this.selectionList();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
- this.searchData();
- }
+ this.selectionList();
+ },
+ pageChangeNo(page){
+ this.page = page
+ this.addList()
+ },
+ pageSizeChangeNo(pageSize){
+ this.pageSizeNo = this.$store.getters.userInfo.configContent;
+ this.addList()
+
+ },
},
computed: {},
mounted() {
- this.selectionList()
+ this.selectionList();
this.selectSign();
- this.getTree()
+ this.getTree();
for (let i = 0; i < this.dataList.length; i++) {
this.standMap.set(this.dataList[i].id, this.dataList[i]);
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 1ed5b4e83..f6de56f6f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -53,11 +53,16 @@
clearable
>
-
+
+
+
@@ -352,7 +357,6 @@ export default {
*/
getFormFieldList (item) {
this.$nextTick(() => {
- console.log(item);
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 819a98232..f98995dff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -51,9 +51,9 @@
clearable
>
-
+
@@ -215,62 +215,75 @@
size="900px"
custom-class="demo-drawer"
>
-
+
+