diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 4bed4251c..45ccf0b85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -45,18 +45,23 @@
v-model="form.modelName"
clearable
>
-
@@ -735,6 +750,7 @@ export default {
pageSizeNo: this.$store.getters.userInfo.configContent
},
standList: [], //新添加的标准
+ commentText: '',
modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
@@ -1052,6 +1068,7 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
+ this.listForm.commentText = this.commentText
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
index ade22d84d..1060f42c4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
@@ -134,6 +134,21 @@
+
@@ -421,6 +436,7 @@ export default {
totalNo: 0,
prcNum: '',
pageSizeNo: this.$store.getters.userInfo.configContent,
+ commentText:'',
listForm: {
listName: "", //清单名称
// applyRegion: "", //适用区域
@@ -677,6 +693,7 @@ export default {
},
//提交事件
handleSubmit() {
+ this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
new file mode 100644
index 000000000..bb2722e67
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
@@ -0,0 +1,537 @@
+
+
+
+
+ 标准清单发布/更新流程
+ 业务经理审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 24ecd52e3..1ab67aba8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -158,6 +158,21 @@
+
@@ -712,6 +727,7 @@ export default {
pageSizeNo: this.$store.getters.userInfo.configContent
},
standList: [], //新添加的标准
+ commentText: '',
modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
@@ -1024,6 +1040,7 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
+ this.listForm.commentText = this.commentText
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index f651fe48e..0fea2918a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -387,9 +387,6 @@ export default {
},
//提交事件
handleSubmit() {
- if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
- this.$message.warning("请填写会签意见");
- }else{
this.isSubmit = true
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
@@ -410,7 +407,6 @@ export default {
}, e => {
});
- }
},
//选择标准取消事件
closeDrawer() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 8c29d742e..3761e3f62 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -149,6 +149,21 @@
+
@@ -392,6 +407,7 @@ export default {
// 当前流程类型(1待办/2已办)
processType: 1,
searching: false,
+ commentText:'',
standardTypeOptions: [
{
value: "INLAND",
@@ -711,6 +727,7 @@ export default {
},
//提交事件
handleSubmit() {
+ this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 0d8cf9310..cec4dac2b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -401,9 +401,6 @@ export default {
},
//提交事件
handleSubmit() {
- if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
- this.$message.warning("请填写审批意见");
- } else {
this.isSubmit = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -420,7 +417,6 @@ export default {
}
this.isSubmit = false
});
- }
},
//选择标准取消事件
closeDrawer() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index dd5c530aa..bdbc16be0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -862,8 +862,13 @@
},
methods: {
downloadFile (fileType) {
+ //文件id中出现了','字符,去除掉
if(fileType === 'fbgbjbd'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+ if(this.fbgbjbdFileId.search(',')){
+ this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+ console.log(this.fbgbjbdFileId);
+ }
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
@@ -885,11 +890,12 @@
}
},
getRule(){
+
if (this.formTongGuo.approvalOpinion === '0') {
- this.rules.commentText.required = false
+ this.rules.commentText[0].required = false;
this.$refs.formTongGuo.clearValidate('commentText')
- } else {
- this.rules.commentText.required = true
+ }else {
+ this.rules.commentText[0].required = true;
}
},
popoverHide (checkedIds, checkedData) {
@@ -964,6 +970,7 @@
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
+ console.log(processForm);
}
}).catch(e => {
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index e0b897644..26187ebbd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -836,6 +836,10 @@ export default {
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
+ if(this.fbgbjbdFileId.search(',')){
+ this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+ console.log(this.fbgbjbdFileId);
+ }
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 2d414fb44..840e35e6e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -815,6 +815,10 @@
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
+ if(this.fbgbjbdFileId.search(',')){
+ this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+ console.log(this.fbgbjbdFileId);
+ }
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
new file mode 100644
index 000000000..18a0232bd
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
@@ -0,0 +1,456 @@
+
+
+
+
+ 项目合规评估流程
+ 业务经理审批流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue
deleted file mode 100644
index 8366e5eb4..000000000
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
new file mode 100644
index 000000000..1984c73f1
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -0,0 +1,581 @@
+
+
+
+
+ 项目合规评估流程
+ 标准法规部领导审批
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index ad751c081..db6b832e9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -140,6 +140,21 @@
+
@@ -337,6 +352,7 @@ export default {
active: "1", //当前选中的type
isSubmit: false,
saveLoading: false,
+ commentText: '',
//表单的数据
listForm: {
projectNumber: "", //项目编号
@@ -522,6 +538,7 @@ export default {
},
//流程提交事件
handleSubmit(){
+ this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
new file mode 100644
index 000000000..90f130c65
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -0,0 +1,532 @@
+
+
+
+ 项目合规评估流程-项目
+ 责任人审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
similarity index 80%
rename from src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue
rename to src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
index 4caae637d..83bf7cf4c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
@@ -4,7 +4,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 050aaba49..2539b5689 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -140,6 +140,21 @@
+
@@ -340,7 +355,7 @@ export default {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
- breakdownList: [], //标准下的分解单数据
+ breakdownList: [] //标准下的分解单数据
},
dataList: [], //下面标准的数据
breakdownList: [], //标准下的条款数据
@@ -379,9 +394,11 @@ export default {
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
nodeList: [],
+ commentText: "",
projectModel: false, //项目抽屉开关
projectId: "", //项目id 用来查询标准
standId: [], //标准id 用来条款
+ zrbmOptions: [],
searching: false,
//项目检索条件
projectSearch: {
@@ -452,8 +469,21 @@ export default {
_this: this
}, res => {
this.listForm.dataList = res.data.records;
-
this.dataList = res.data.records;
+ this.listForm.dataList.forEach(item => {
+ // 责任部门转换
+ if (item.zrbm !== null || item.zrbm !== "") {
+ let k = (item.zrbm || "").split(",");
+ for (let i in this.zrbmOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrbmOptions[i].value === k[m]) {
+ k[m] = this.zrbmOptions[i].label;
+ }
+ item.zrbm = k.join(",");
+ }
+ }
+ }
+ });
let ids = [];
this.dataList.forEach(item => {
ids.push(item.standId);
@@ -471,7 +501,7 @@ export default {
{
_this: this
}, res => {
- this.listForm.breakdownList = res.data
+ this.listForm.breakdownList = res.data;
});
},
//标准的多选框改变
@@ -488,62 +518,65 @@ export default {
},
//流程保存事件
- handleSave(){
- this.saveLoading = true
- let _formData = new FormData()
- _formData.append('id', this.bpnId || '')
- _formData.append('createUser', this.$store.getters.userInfo.userId)
- _formData.append('createUserName', this.$store.getters.userInfo.userName)
- _formData.append('prcType', '6')
- _formData.append('json', JSON.stringify({
+ handleSave() {
+ this.saveLoading = true;
+ let _formData = new FormData();
+ _formData.append("id", this.bpnId || "");
+ _formData.append("createUser", this.$store.getters.userInfo.userId);
+ _formData.append("createUserName", this.$store.getters.userInfo.userName);
+ _formData.append("prcType", "6");
+ _formData.append("json", JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
- }))
+ }));
saveTaskFirst(_formData).then(res => {
- this.saveLoading = false
- this.$message.success('保存成功')
- this.bpnId = res.result
+ this.saveLoading = false;
+ this.$message.success("保存成功");
+ this.bpnId = res.result;
}).catch(e => {
- this.saveLoading = false
- })
+ this.saveLoading = false;
+ });
},
//流程提交事件
- handleSubmit(){
- var json = Object.assign(this.listForm, this.roleForm)
- json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.uName;
- json.standId = this.listForm.standId;
- this.$refs['listForm'].validate((valid) => {
+ handleSubmit() {
+ this.listForm.commentText = this.commentText;
+ var json = Object.assign(this.listForm, this.roleForm);
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.uName;
+ json.standId = this.listForm.standId;
+ this.$refs["listForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["roleForm"].validate((valid) => {
if (valid) {
- this.$refs['roleForm'].validate((valid) => {
- if (valid) {
- this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ _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.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");
- }
- });
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
}
+ this.isSubmit = false;
});
- } else {
- return this.$message.warning("请完善人员信息");
}
});
} else {
- return this.$message.warning("请完善基础信息");
+ return this.$message.warning("请完善人员信息");
}
});
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
},
choiceZRR(type, title, id) {
this.nodeList = [];
@@ -567,6 +600,14 @@ export default {
},
mounted() {
this.getProjectData();
+ // 查询各下拉框数据
+ this.$http.get("sys/dictype/getDicTypeListCode", "", {
+ _this: this,
+ loading: "loading"
+ }, res => {
+ this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
+ }, e => {
+ });
}
};
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index dc5411ced..516268297 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- }else{
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -451,7 +448,6 @@ export default {
}
}, e => {
});
- }
},
},
computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index d94aab4b9..f9f964ad9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -275,12 +275,10 @@
@@ -333,9 +348,7 @@ export default {
},
//提交事件
handleSubmit() {
- if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) {
- this.$message.warning("请选择架构经理");
- } else {
+ this.isSubmit = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -349,9 +362,9 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
+ this.isSubmit = false
}, e => {
});
- }
},
choiceZRR(scope, type, title, id) {
if (scope != null) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 808d861a7..1b6c15777 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -44,7 +44,7 @@
-
+
-
- {{ "请选择分发责任人" }}
-
-
- {{ scope.row.liablePeople || "-" }}
-
+
+
+
@@ -227,6 +241,8 @@ export default {
modalshowflag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
+ zrIndex: '',
+ zrType: '',
roleForm: {
liablePeople: ""
},
@@ -254,7 +270,6 @@ export default {
methods: {
// 点击查看
handlePreview(item) {
- console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -329,7 +344,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
- this.dataList.distributePerson = item.dataList[0].distributePerson;
+ // this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
});
},
@@ -366,14 +381,25 @@ export default {
this.$message.warning('请选择分发负责人')
}
},
- //批量操作按钮
- batchOperation(id) {
- if (this.selectList.length === 0) {
- this.$message.warning("请至少选择一条数据进行批量分发");
- } else {
- this.nodeList = [];
- this.nodeList.push(id);
- this.modalshowflag = true;
+ choiceZRRS (row, type, index) {
+ this.type = type
+ if (type === 1) {
+ this.drawerTitle = '选择责任人'
+ this.nodeList = []
+ this.zrIndex = index
+ this.zrType = type
+ this.nodeList.push(row)
+ this.modalshowflag = true
+ } else if (type === 2) {
+ // 批量
+ if (this.selectList.length > 0) {
+ this.zrType = type
+ this.nodeList = []
+ this.modalshowflag = true
+ this.drawerTitle = '批量选择责任人'
+ } else {
+ this.$message.warning('请选择要分发的数据')
+ }
}
},
//标准表格选择框改变
@@ -394,22 +420,21 @@ export default {
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
- checkedRole(data) {
- // 选取负责人时的操作
- let mis = [];
- this.selectList.forEach(item => {
- item.liablePeople = data[0].name;
- item.liablePeopleId = data[0].id;
- mis.push(item.standId);
- });
- this.dataList.forEach(item => {
- if (!mis.includes(item.standId)) {
- this.selectList.push(item);
- }
- });
- this.dataList = this.selectList;
- this.$refs.selection.clearSelection();
- this.modalshowflag = false;
+ checkedRole (data) {
+ if (this.type === 1) {
+ this.dataList[this.zrIndex].liablePeopleId = data[0].id
+ this.dataList[this.zrIndex].liablePeople = data[0].name
+ } else if(this.type === 2) {
+ this.dataList.forEach( item => {
+ this.selectList.forEach( items => {
+ if (item.standId === items.standId) {
+ item.liablePeopleId = data[0].id
+ item.liablePeople = data[0].name
+ }
+ })
+ })
+ }
+ this.modalshowflag = false
},
cancleUserInfo() {
this.modalshowflag = false;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index f192017ae..abc4b4732 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -98,6 +98,21 @@
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 7b034e7d7..8baf4cbd6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -236,6 +236,21 @@
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index be6930e03..877d12c52 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -432,9 +432,6 @@
},
//提交事件
handleSubmit() {
- if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
- this.$message.warning('请填写审批意见')
- } else {
this.listForm.ffFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@
this.$router.push("/processCenter");
}
});
- }
},
},
computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 58a19121c..663a26e34 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- }else{
this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
- }
},
},
computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 358573f9d..57dad97d2 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- }else{
this.listForm.gcFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
- }
},
},
computed: {
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 120de5f7b..a5b265b96 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -203,20 +203,20 @@ export default {
this.toProcessDetail('bzrkStep5',row)
}else if(prcType === '4'){
//标准清单发布流程数据
- this.toProcessDetail('bzqdfbStep4',row)
+ this.toProcessDetail('bzqdfbStep1-4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
if(row.taskInfo === '标准法规部领导审核'){
- this.toProcessDetail('xmpgStep7',row)
+ this.toProcessDetail('xmpgStep1-7',row)
}else{
- this.toProcessDetail('xmpgStep2',row)
+ this.toProcessDetail('xmpgStep1-2',row)
}
}else if(prcType === '6'){
//标准项目合规评估 项目维度
if(row.taskInfo === '标准法规部领导审核'){
- this.toProcessDetail('xmpg2Step12',row)
+ this.toProcessDetail('xmpg2Step1-12',row)
}else{
- this.toProcessDetail('xmpg2Step2',row)
+ this.toProcessDetail('xmpg2Step1-2',row)
}
}
} else {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 1b966f002..601dc8728 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -3,21 +3,22 @@
-
+
@@ -30,7 +31,8 @@
:value="opt.label"
:key="opt.value"
:label="opt.label"
- >{{ opt.label}}
+ >{{ opt.label }}
+
@@ -49,14 +51,16 @@
class="common-button-primary"
size="small"
v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'"
- @click="getLocalProductTableBtn">查询
+ @click="getLocalProductTableBtn">查询
+
清空
+ @click="clearAllSearch">清空
+
高级查询
+ >高级查询
+
@@ -79,110 +84,110 @@
+ @selection-change="handleSelectionChange">
+ type="selection"
+ width="55"
+ align="center">
+ show-overflow-tooltip
+ prop="projectPlatfor"
+ align="center"
+ label="产品平台">
+ prop="projectNumber"
+ align="center"
+ width="90"
+ label="项目编号">
+ show-overflow-tooltip
+ prop="projectName"
+ align="center"
+ label="项目名称">
- {{ scope.row.projectName }}
+ {{ scope.row.projectName }}
-
+
-
+
+ show-overflow-tooltip
+ prop="currentNode"
+ align="center"
+ label="当前节点">
-
+ prop="projectLevel"
+ align="center"
+ label="项目级别">
+
+ show-overflow-tooltip
+ prop="projectManager"
+ align="center"
+ label="项目经理">
@@ -190,7 +195,9 @@
- 查看
+
+ 查看
+
@@ -198,18 +205,19 @@
+ :page="localProTableSearch.page"
+ :total="total"
+ @pageChange="pageChange"
+ @pageSizeChange="pageSizeChange">
数据获取中
-
+
+ @reset="clearAllSearch">
-
+
-
+
@@ -224,17 +232,21 @@
@keyup.enter.native="getLocalProductTableBtn">
-
+
- {{ opt.label}}
+ {{ opt.label }}
+
-
+
- {{ opt.label}}
+ {{ opt.label }}
+
@@ -249,11 +261,13 @@
-
+
-
+
@@ -278,107 +292,109 @@