@@ -14,7 +13,7 @@
基础信息
-
+
-
-
-
+
+
+
编辑
@@ -104,7 +103,6 @@
@@ -226,9 +224,10 @@
@@ -415,18 +414,14 @@ export default {
qblxData: [],
},
commentText: '',
- qblxRule: {},
-
+ qblxRule: {
+ processName: [
+ {required: true, message:'请输入流程名称', trigger: 'blur'}
+ ]
+ },
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
- dockUser: '',
- dockUserName: '',
- },
- roleFormRules:{
- dockUserName: [
- {required: true, message: '请选择责任工程师', trigger: 'change'},
- ],
},
// 上传路径
uploadPath: 'api/att/attFile/uploadNew',
@@ -474,9 +469,9 @@ export default {
// releaseTime: [
// {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
// ],
- // drafterName: [
- // {required: true, message: '请选择起草人', trigger: 'change'},
- // ],
+ drafterName: [
+ {required: true, message: '请选择起草人', trigger: 'change'},
+ ],
},
isSubmit: false,
saveLoading: false,
@@ -739,7 +734,6 @@ export default {
this.qblx_pageData = mes.form ? mes.form : mes.qblx_pageData
this.fileInfoList = mes.form ? mes.form.qblxFile : mes.qblx_pageData.qblxFile
this.commentText = mes.commentText
- this.roleForm = mes.roleForm
});
},
@@ -803,14 +797,9 @@ export default {
},
// 选人组件确认
drawerCheck(data) {
- if(this.type === '1' ){
- this.addQblxData.dutyPeopleId = data[0].id
- this.addQblxData.dutyPeople = data[0].name
- }else{
- this.roleForm.dockUser = data[0].id
- this.roleForm.dockUserName = data[0].name
- }
- this.modalshowflag = false
+ this.addQblxData.dutyPeopleId = data[0].id
+ this.addQblxData.dutyPeople = data[0].name
+ this.modalshowflag = false
},
/** 新增按钮 */
@@ -931,7 +920,6 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "26");
_formData.append("json", JSON.stringify({
- roleForm: this.roleForm,
qblx_pageData: this.qblx_pageData,
commentText: this.commentText
}));
@@ -944,15 +932,19 @@ export default {
})
},
listSubmit (item) {
+ console.log(item);
return new Promise((resolve, reject) => {
let newForm = Object.assign(this.roleForm, item,this.qblx_pageData);
+ newForm.startUserName = this.$store.getters.userInfo.userName
+ newForm.startUser = this.$store.getters.userInfo.userId
+ newForm.dockUser = item.drafter
+ newForm.dockUserName = item.drafterName
this.$http.post('lawss/activiti/startProcessRollBack',{
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '26',
json: JSON.stringify({
form: newForm,
- roleForm: this.roleForm,
commentText: this.commentText
})
},{
@@ -1130,6 +1122,14 @@ export default {
height: calc(~'100% - 65px');
overflow: auto;
}
+ .drawer-table{
+ /deep/.el-drawer__body{
+ overflow-y: hidden;
+ }
+ /deep/.demo-drawer-content{
+ overflow-y: hidden;
+ }
+ }
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index e9fc3c681..cc61b2324 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -917,7 +917,6 @@ export default {
this.fileIds = itemId.id
this.getFileInfo();
});
- console.log(item.area.join(','));
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
})