diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue index 8e1683844..88a0a3959 100644 --- a/src/pages/config/pages/operationLog/index.vue +++ b/src/pages/config/pages/operationLog/index.vue @@ -97,7 +97,7 @@ - + 数据处理中 diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index f742ddb6f..04d43a5e0 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -46,6 +46,11 @@ v-btn-permission="'3e0cee86b3522d4233df8f1f11ab02c7'" size="mini">新增角色 + 查看人员 +
+ +
+
+
+ + + + + + + + + 查询 + + + + 清空 + + + +
+
+
+ + + + + + + +
+ 数据处理中 +
+ @@ -272,6 +348,17 @@ export default { name: 'role-manage', data() { return { + roleTotal: 0, + RoleModel: false, + roleData: [], + roleLoading: false, + roleForm: { + roleId: '', + userId: '', + userName: '', + pageNumber: 1, + pageSize: this.$store.getters.userInfo.configContent, + }, twoLoading: false, type: '', // 新增/编辑状态 addRoleTitle: '', @@ -334,6 +421,48 @@ export default { } }, methods: { + RolePageChange (page) { + this.roleForm.pageNumber = page + this.roleCheck() + }, + RolePageSizeChange (pageSize) { + this.roleForm.pageSize = pageSize + this.roleCheck() + }, + getRole () { + this.RoleModel = true + this.roleForm.pageNumber = 1 + this.roleCheck() + }, + clearRole () { + this. roleForm = { + userId: '', + userName: '', + pageNumber: 1, + pageSize: this.$store.getters.userInfo.configContent, + } + this.roleCheck() + }, + RoleCancle () { + this. roleForm = { + userId: '', + userName: '', + pageNumber: 1, + pageSize: this.$store.getters.userInfo.configContent, + } + }, + roleCheck () { + this.roleForm.roleId = this.id + this.$http.get('sarUser/user/selectUserByRole', this.roleForm, { + _this: this, + loading: "roleLoading", + }, res => { + if (res.ok) { + this.roleData = res.data.records + this.roleTotal = res.data.total + } + }) + }, handleCommand(command) { switch (command[1]) { case '编辑': @@ -689,24 +818,19 @@ export default { .role-manage { display: flex; height: 100%; - - /deep/ .el-form-item__content { - width: 100%; + .roleTable { + height: calc(~'100% - 52px'); } - .filter-tree1 { height: 100%; } - .tree-close { .tree { left: -200px !important; } - .tree-right { width: calc(~'100% - 15px') !important; } - /deep/.el-form-item__content { margin-left: 40px !important; } @@ -715,11 +839,9 @@ export default { color: #FFF; } } - .tree-closed { width: 15px !important; } - .tree-content { background: #fff; width: 16%; @@ -736,7 +858,6 @@ export default { right: 0; } } - .tree-right { overflow-y: hidden; padding: 0; @@ -762,7 +883,6 @@ export default { } } } - /deep/ .el-dialog { margin-top: 9vh !important; width: 35%; @@ -774,23 +894,20 @@ export default { } /deep/.el-form-item__content { margin-left: 40px!important; + width: 100%; } } - /deep/ .el-select__tags { overflow-x: hidden; } - /deep/ .width-all { width: 100%; } - .laws-tree { /deep/ .clearable { top: 20px; } } - .add-form-item { display: flex; } diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index d9a6633f9..c4f494ad0 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -812,9 +812,9 @@ export default { break //项目评估流程-项目 case '6': - if(row.taskInfo === '标准法规部业务经理审批'){ + if(row.taskInfo === '任务分发'){ this.$router.push({ - name: 'xmpg2Step2', + name: 'xmpgStep2', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -823,9 +823,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '工程经理转办'){ + }else if(row.taskInfo === '合规评估'){ this.$router.push({ - name: 'xmpg2Step3', + name: 'xmpgStep3', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -834,9 +834,9 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '架构经理任务分发') { + } else if(row.taskInfo === '审核') { this.$router.push({ - name: 'xmpg2Step4', + name: 'xmpgStep4', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -845,9 +845,9 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '分发责任人下发') { + } else if(row.taskInfo === '批准') { this.$router.push({ - name: 'xmpg2Step5', + name: 'xmpgStep5', query: { taskIds: row.taskIds, prcId: row.prcId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue deleted file mode 100644 index c93396988..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ /dev/null @@ -1,1198 +0,0 @@ - - - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue deleted file mode 100644 index dcfe3d662..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue +++ /dev/null @@ -1,552 +0,0 @@ - - - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue new file mode 100644 index 000000000..476cff1d8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue @@ -0,0 +1,588 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue deleted file mode 100644 index e5df4db16..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ /dev/null @@ -1,715 +0,0 @@ - - - - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 05603a242..66ce7238e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -1,8 +1,8 @@ - + @@ -513,251 +403,214 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst, taskDel } from "api/process"; +import { saveTaskFirst, taskDel ,queryTaskFirst} from "api/process"; import file from "@/pages/knowledgeGraph/components/file"; export default { name: "xmpgStep1", components: { - ProcessHeader, ProcessFooter, + ProcessHeader, ProcessTitle }, data() { return { - //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, - //用来判断提交事件条件是否满足 - satisfyFlag: true, - active: "1", standModel: false, - tableLoading: false, - sarAccessListDatas: [], - productData: [], //添加抽屉的数据 - standList: [], //新添加的标准 - modalshowflag: false, // drawer开关 - commentText: "", - drawerTitle: "", //drawer标题 - // 查询相关参数 - searching: false, - fileType: "", - projectSearch: { - productLine: '', - uname: '', - }, - standardSearch: { - standType: "", - standName: "" - }, - decomposeOptions: [], //分解单数据 - standardTypeOptions: [ - { - value: "INLAND", - label: "国内标准法规", - item: "INLAND" - }, - { - value: "FOREIGN", - label: "海外标准法规", - item: "FOREIGN" - } - ], - nodeList: [], - defaultProps: { - children: "children", - label: "name" - }, - roleForm: { - prcCreateUserName: this.$store.getters.userInfo.userName, - prcCreateUser: this.$store.getters.userInfo.userId, - qualityEngineer: "", - certifiedEngineer: "", - qualityEngineerName: "", - certifiedEngineerName: "", - distributePerson: "", - dockUser: "", - ministerUser: "", - dockUserName: "", - ministerUserName: "" + addShow: true, + standData: [], + standList: [], + active: "1", //当前选中的type + isSubmit: false, + saveLoading: false, + fileType: '', + bpnId: '', + decomposeOptions: [], //分解单来源数据 + //表单的数据 + listForm: { + projectNumber: "", //项目编号 + projectName: "", //项目名称 + endTime: '', + dataList: [], //项目下的标准数据 + breakdownList: [] //标准下的分解单数据 }, + dataList: [], //下面标准的数据 + breakdownList: [], //标准下的条款数据 + //表单的验证 formRules: { - standName: [ - { required: true, message: "请填写标准名称", trigger: "change" } + projectNumber: [ + { required: true, message: "请填写项目编号", trigger: "change" } ], - standNumber: [ - { required: true, message: "请填写标准编号", trigger: "change" } + projectName: [ + { required: true, message: "请填写项目名称", trigger: "change" } ], endTime: [ {required: true, message: '请输入截止时间', trigger: 'change'}, ], - qualityEngineer: [ - { required: true, message: "请选择质量工程师", trigger: "change" } - ], - certifiedEngineer: [ - { required: true, message: "请选择认证工程师", trigger: "change" } - ] }, + //选人的验证 roleFormRules: { - dockUserName: [ + serviceManagerName: [ { required: true, message: "请选择业务经理", trigger: "change" } ], - ministerUserName: [ - { required: true, message: "请选择标准法规部领导", trigger: "change" } - ] }, - ListModel: false, //选择拆分标准抽屉状态 - treeData: [], // 人员数据 - selectList: [], //选择标准的选择框 - currentIndex: -1, // 当前操作行索引 - isSubmit: false, - saveLoading: false, - selectedList: [], //拆分标准的选择框 - dataList: [], + //选择人的数据 + roleForm: { + startUserName: this.$store.getters.userInfo.userName, + startUser: this.$store.getters.userInfo.userId, + serviceManager: "", //业务经理 + serviceManagerName: "", + }, + modalshowflag: false, // drawer开关 + drawerTitle: "", //drawer标题 + nodeList: [], + selectStandList: [], + commentText: "", + projectModel: false, //项目抽屉开关 + projectId: "", //项目id 用来查询标准 + standId: [], //标准id 用来条款 + zrbmOptions: [], + searching: false, + //项目检索条件 + projectSearch: { + projectNumber: "", + projectName: "" + }, + //项目数据 + ProjectDatas: [], page: 1, - total: 0, pageSize: this.$store.getters.userInfo.configContent, + total: 0, pageNo: 1, - totalNo: 0, pageSizeNo: this.$store.getters.userInfo.configContent, - product: new Map(), - listForm: { - standNumber: "", //标准编号 - standName: "",//标准名称 - endTime:'', - standType: "", //标准类型 - XCXSSRQ: "", //新车型实施日期 - ZCCSSRQ: "", //在产车实施日期 - certifiedEngineer: "", //认证工程师 - qualityEngineer: "", //质量工程师 - breakdownList: [{ - applyArctic: "", - busStandCover: "", - claimType: "", - id: "", - itemsName: "", - itemsNum: "", - responsibleUnit: "", //责任部门 - responsibleEngineer: "", //责任工程师 - standId: "", - svpps: "" - }], - dataList: [{ - projectLine: "", //产品线 - uname: "",//产品线责任人 - projectManager: "",// 产品线责任人id - distributePerson: "", //分发责任人 - distributePersonId: "", //分发责任人id - id: "", - pastProject: [], //用来存放上次选中的产品线信息 - sarStandProjectLibraries: [{ - projectManager: "", - projectLevel: "", - projectNumber: "", - projectEndDate: "", - currentNode: "", - projectGroup: "", - productLine: "", - projectClassification: "", - projectStatus: "", - projectStartDate: "", - id: "", - projectName: "", - projectPlatfor: "" - }] - }] - }, - choiceForm: {}, //选择标准清单列表 - showColumn: true, - textStatusMap: {}// 文本状态id与name对应 + totalNo: 0, + //存放被勾选的项目的数据 + selectedList: [] }; }, methods: { + fileTypeChange(type){ + this.fileType = type + let ids = []; + let fileTypes = [] + this.dataList.forEach(item => { + ids.push(item.standId); + fileTypes.push(item.fileType) + }); + this.standId = ids.join(","); + this.fileType = fileTypes.join(",") + if(fileTypes.includes('')){ + return + }else{ + this.getClauseData() + } + }, + // 表格勾选 + handleSelectionChange(selection, val) { + if (selection.length > 1) { + let del_row = selection.shift(); + this.$refs.selection.toggleRowSelection(del_row, false); + // this.$refs.listSelection.toggleRowSelection(del_row, false); + } + }, + handleSelectionChanges(selection, val) { + if (selection.length > 1) { + let del_row = selection.shift(); + this.$refs.listSelection.toggleRowSelection(del_row, false); + } + }, //折叠/展开基础信息方法 foldForm() { - this.foldFormFlag = !this.foldFormFlag - }, - checkedRole(data) { - if (this.type === "dockUser") { - this.roleForm.dockUser = data[0].id; - this.roleForm.dockUserName = data[0].name; - } else if (this.type === "ministerUser") { - this.roleForm.ministerUser = data[0].id; - this.roleForm.ministerUserName = data[0].name; - } else if (this.type === "qualityEngineer") { - this.roleForm.qualityEngineer = data[0].id; - this.roleForm.qualityEngineerName = data[0].name; - this.listForm.qualityEngineer = data[0].id; - this.listForm.qualityEngineerName = data[0].name; - } else if (this.type === "certifiedEngineer") { - this.roleForm.certifiedEngineer = data[0].id; - this.roleForm.certifiedEngineerName = data[0].name; - this.listForm.certifiedEngineer = data[0].id; - this.listForm.certifiedEngineerName = data[0].name; - } else if (this.type === "distributePerson") { - // 如果有勾选,则视为批量选择责任人 - if (this.selectList.length) { - this.dataList.forEach((item, index) => { - if (this.selectList.includes(item.productLine)) { - const newItem = JSON.parse(JSON.stringify(item)); - newItem.distributePersonId = data[0].id; - newItem.distributePerson = data[0].name; - this.$set(this.dataList, index, newItem); - } - }); - } else { - const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex])); - newItem.distributePersonId = data[0].id; - newItem.distributePerson = data[0].name; - this.$set(this.dataList, this.currentIndex, newItem); - this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id; - this.listForm.dataList[this.currentIndex].distributePerson = data[0].name; - this.currentIndex = -1; - } - } - this.modalshowflag = false; - }, - cancelUserInfo() { - this.modalshowflag = false; + this.foldFormFlag = !this.foldFormFlag; }, //tab发生变化 - handleTabs(name) { - this.active = name; - }, - typeChange(type) { - this.standardSearch.standType = type; + handleTabs(type) { + this.active = type; }, + //点击选择项目事件 choiceShow() { - if(!this.fileType){ - this.$message.warning('请先选择分解单来源') - }else{ - this.getStandData(); - this.ListModel = true; - } - + this.projectModel = 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]; - } + //项目查询按钮 + getProjectDataBtn(){ + this.page = 1; + this.getProjectData(); }, - //导入功能 - leading() { - - }, - //点击添加事件 - addList() { - this.standModel = true; - this.$nextTick(() => { - this.$refs.projectTable.clearSelection(); + //获取项目数据 + getProjectData() { + this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", { + page: this.page, + pageSize: this.pageSize, + ...this.projectSearch + }, { + _this: this + }, res => { + if (res.data === null) { + this.ProjectDatas = ""; + this.total = 0; + } else { + this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total; + } }); + + }, + //点击清空按钮事件 + clearSearch() { + this.projectSearch = { + projectName: "", + projectNumber: "" + }; + this.getProjectData(); + }, + //带入项目确定事件 + OkDrawer() { + if (this.selectedList.length > 1) { + this.$message.warning("您只能选择一条数据进行带入"); + } else if (this.selectedList.length === 0) { + this.$message.warning("请选择一条数据进行带入"); + } else { + this.addShow = false + this.projectId = this.selectedList[0].id; + this.listForm.projectId = this.selectedList[0].id; + this.listForm.projectNumber = this.selectedList[0].projectNumber; + this.listForm.projectName = this.selectedList[0].projectName; + this.listForm.productLine = this.selectedList[0].productLine; + this.projectModel = false; + } + }, + //带入项目取消事件 + closeDrawer() { + this.projectModel = false; + }, + closeStand() { + this.standModel = false; + }, + OkStand(){ + if(!this.selectStandList){ + this.$message.warning('请至少选择一条数据进行添加') + }else{ + if(!this.dataList.length){ + this.dataList = this.selectStandList + }else{ + this.selectStandList.map(item => { + let addIndex + addIndex = this.dataList.findIndex(items =>{ + return items.standId === item.standId + }) + if(addIndex > -1){ + this.$message.warning('请勿重复添加数据') + }else{ + this.dataList.push(item) + } + }) + } + this.standModel = false + } }, // 点击批量删除事件 deleteList() { - if (this.selectList.length < 1) { + if (this.standList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { this.$confirm("您确认删除这些数据？", "提示", { @@ -766,75 +619,92 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { - this.selectList.map(item => { + this.standList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.productLine === item; + return items === item; }); if (index > -1) { this.dataList.splice(index, 1); } }); - this.selectList = []; - this.$refs.selection.clearSelection() + this.standList = []; + this.$refs.selection.clearSelection(); }).catch(() => { }); } }, - //取消添加事件 - cancelStand() { - this.standModel = false; + addList(){ + this.getStandData() + this.standModel = true }, - //确认添加事件 - okStand() { - this.pastProject = JSON.parse(localStorage.getItem('projectList')) - let proData = []; - if (this.dataList.length >= 1) { - this.dataList.forEach(item => { - if (proData.length === 0) { - proData.push(item.productLine); - } else if (!proData.includes(item.productLine)) { - proData.push(item.productLine); + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { + _this: this + }, res => { + res.data.records.forEach(item => { + if(item.zrbm === "[]"){ + item.zrbm = '' } + }) + this.standData = res.data.records; + let ids = []; + this.standData.forEach(item => { + ids.push(item.standId); }); - this.standList.forEach(items => { - if (!proData.includes(items.productLine)) { - this.dataList.push(items); - } - }); - this.standModel = false; - } else { - if (this.standList.length >= 1) { - if (this.pastProject === null){ - this.dataList = this.standList; - }else { - this.pastProject.forEach(item => { - this.standList.map(items => { - if( item.productLine === items.productLine){ - items.distributePersonId = item.distributePersonId - items.distributePerson = item.distributePerson - } - }) - }) - this.dataList = this.standList - } - this.listForm.dataList = this.standList; - this.roleForm.directorUser = this.dataList[0].uname; - this.standModel = false; - } else { - this.$message.warning("请选择一条数据进行添加"); - } - } + this.standId = ids.join(","); + }); }, - //保存事件 + //查询标准下的条款 + getClauseData() { + this.$http.get("SarStandItems/sar-stand-items/workflowFindItems", { + ids: this.standId, + types: this.fileType + }, + { + _this: this + }, res => { + this.listForm.breakdownList = res.data; + }); + }, + //标准的多选框改变 + selectStandChange(data) { + this.standList = data + }, + //项目的多选框改变 + selectListChange(data) { + this.selectedList = data; + }, + selectStandListChange(data) { + this.selectStandList = data + }, + pageChange(page) { + this.page = page; + this.getProjectData(); + }, + pageSizeChange(pageSize) { + this.pageSize = pageSize; + this.getProjectData(); + }, + pageChangeNo(page) { + this.pageNo = page; + this.getStandData(); + }, + pageSizeChangeNo(pageSize) { + this.pageSizeNo = pageSize; + this.getStandData(); + }, + //流程保存事件 handleSave() { this.saveLoading = true; + this.listForm.dataList = this.dataList let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); _formData.append("createUser", this.$store.getters.userInfo.userId); - _formData.append("createUserName", this.$store.getters.userInfo.uName); - _formData.append("prcType", "5"); + _formData.append("createUserName", this.$store.getters.userInfo.userName); + _formData.append("prcType", "6"); _formData.append("json", JSON.stringify({ - taskInfo: "选择已拆分标准", form: this.listForm, roleForm: this.roleForm, commentText: this.commentText @@ -842,275 +712,164 @@ export default { saveTaskFirst(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); + this.bpnId = res.result; }).catch(e => { this.saveLoading = false; }); }, - //提交事件 + //流程提交事件 handleSubmit() { - if (this.dataList.length < 1) { - this.satisfyFlag = false - this.$message.warning("请添加产品线信息"); - }else { - this.satisfyFlag = true - } + let fileFlag = true this.dataList.forEach(item => { - if (!item.distributePerson) { - this.satisfyFlag = false - this.$message.warning("请选择分发责任人"); - }else { - this.satisfyFlag = true + if(!item.fileType){ + fileFlag = false } - }); - if(this.satisfyFlag){ - this.isSubmit = true; - this.listForm.commentText = this.commentText; - let json = Object.assign(this.listForm, this.roleForm); - localStorage.setItem('projectList', JSON.stringify(this.dataList)) - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '5', - json: JSON.stringify({ - taskInfo: "选择已拆分标准", - form: this.listForm, - roleForm: this.roleForm, - commentText: this.commentText - }) - }, { - _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); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId + }) + if(!fileFlag){ + this.$message.warning('请选择分解单来源') + }else{ + if (!this.dataList.length) { + this.$message.warning("请至少添加一条标准"); + } else { + this.listForm.dataList = this.dataList + 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.userName; + json.standId = this.standId; + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { + _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); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) } - taskDel(taskId).then(res=>{ - return res - }) + this.$router.push("/processCenter"); } - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善人员信息"); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善基础信息"); - } - }); + this.isSubmit = false; + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); + } } }, - //选择拆分标准取消事件 - closeDrawer() { - this.ListModel = false; - }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, + id: item.standId, pageType: "INLAND_STAND" } }); window.open(routeUrl.href, "_blank"); }, - - //选择拆分标准确定事件 - OkDrawer() { - if (this.selectedList.length === 1) { - this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear; - this.listForm.standName = this.selectedList[0].standName; - this.listForm.standType = this.selectedList[0].standType; - this.listForm.standId = this.selectedList[0].id; - this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj; - this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj; - this.listForm.id = this.selectedList[0].id; - this.$http.get("SarStandItems/sar-stand-items/findAllItems", { - ids: this.listForm.id, - type: this.fileType - }, { - _this: this - }, res => { - let breakdown = res.data - breakdown.forEach(item => { - delete item.termsConditions - }) - this.listForm.breakdownList = breakdown; - this.ListModel = false; - }, e => { - this.$message.error("添加失败"); - }); - } else if (this.selectedList.length > 1) { - this.$message.warning("您只能选择一条数据进行带入"); - } else { - this.$message.warning("请选择一条数据带入"); - } - }, - //选择拆分标准选择框改变 - selectListChange(data) { - this.selectedList = data; - }, - //标准表格选择框改变 - selectStandChange(data) { - this.selectList = []; - for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].productLine); - } - }, - //添加产品线select的改变 - selectThree(data) { - this.standList = data; - }, - choiceZRR(scope, type, title, id) { - if (scope != null) { - this.currentIndex = scope.$index; - } + choiceZRR(type, title, id) { this.nodeList = []; - this.nodeList.push(id); + if (this.roleForm.serviceManager.length > 0) { + this.nodeList = this.roleForm.serviceManager.split(","); + } this.type = type; this.drawerTitle = title; this.modalshowflag = true; }, - getTree() { - this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { - this.treeData = res.data; - }); - }, - pageChange(page) { - this.page = page; - this.getStandData(); - }, - pageSizeChange(pageSize) { - this.pageSize = pageSize; - this.getStandData(); - }, - pageChangeNo(page) { - this.pageNo = page; - this.getProductData(); - }, - pageSizeChangeNo(pageSize) { - this.pageSizeNo = this.$store.getters.userInfo.configContent; - this.getProductData(); - }, - //清空产品线数据 - clearProject(){ - this.projectSearch = { - productLine: '', - uname: '', - } - this.getProductData() - }, - //获取产品线数据 - getProductData() { - this.$http.get("sarStandProjectLibrary/queryProjectManager", { - current: this.pageNo, - PageSize: this.pageSizeNo, - ...this.projectSearch - }, { - _this: this - }, res => { - this.productData = res.data.records.map(item => { - item.sarStandProjectLibraries = [] - return item - }) - this.totalNo = res.data.total; - }, e => { - - }); - }, - //获取标准查询按钮 - getStandDataBtn() { - this.page = 1; - this.getStandData(); - }, - fileTypeChange(type){ - this.fileType = type - }, - //获取标准数据 - getStandData() { - this.tableLoading = true - this.$http.post("SarStandItems/sar-stand-items/findStand", { - page: this.page, - size: this.pageSize, - fileType: this.fileType, - ...this.standardSearch - }, { - _this: this - }, res => { - this.sarAccessListDatas = res.records; - this.total = res.total; - this.tableLoading = false - }, e => { - - }); - }, - clearSearch() { - this.standardSearch = { - standName: "", - standType: "" - }; - this.getStandData(); - }, - // 将文本状态的id与name对应 - setMap(data) { + checkedRole(data) { + let idList = "", nameList = ""; data.forEach(item => { - this.$set(this.textStatusMap, item.value, item.label); + if(nameList.length){ + nameList += ','; + idList += ','; + } + idList += item.id + nameList += item.name + }) + this.roleForm.serviceManager = idList; + this.roleForm.serviceManagerName = nameList; + }, + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes); + console.log(mes); + if(mes.form.projectNumber){ + this.addShow = false + } + this.projectId = mes.form.projectId + this.listForm = mes.form; + this.dataList = mes.form.dataList; + this.roleForm = mes.roleForm; + this.commentText = mes.commentText; }); - } - }, - computed: {}, - watch: { - // dataList: { - // deep: true, - // handler (val) { - // console.log('dataList update', val) - // } - // } + }, }, mounted() { - //从数据库中查询下拉框数据 - this.$http.get("sys/dictype/getDicTypeListCode", {}, { - _this: this + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() + } + this.getProjectData(); + // 查询各下拉框数据 + this.$http.get("sys/dictype/getDicTypeListCode", "", { + _this: this, + loading: "loading" }, res => { - this.countryOptions = res.data.COUNTRY; - this.standStateOptions = res.data.WBZTCLASS; // 文本状态 - this.setMap(this.standStateOptions); + this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门 + }, e => { }); //查找分解单来源数据 this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ _this: this }, res => { + this.decomposeOptions.push( + { + attrField: 'BDR', + attrName: '不带入' + } + ) res.data.forEach(item => { if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ this.decomposeOptions.push(item) } }) }) - this.getTree(); - this.getProductData(); } - }; @@ -1125,6 +884,10 @@ export default { } } + /deep/ .el-table__header-wrapper .el-checkbox { + display: none; + } + .choiceBtn { .el-button--primary { width: 150px; @@ -1182,11 +945,6 @@ export default { height: 100%; } } - .input-jump { - /deep/.el-input__inner{ - color: #409EFF; - } - } } .demo-drawer-content { @@ -1194,4 +952,3 @@ export default { } } - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 64aaa2992..97ebc194b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -1,277 +1,146 @@ - @@ -279,171 +148,159 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpgStep2", components: { + ProcessTitle, ProcessHeader, - ProcessFooter, - ProcessTitle + ProcessFooter }, data() { return { - //折叠的标志，true为折叠，false为不折叠 - foldFormFlag: false, - nodeList:[], isTransfer: false, - drawerTitle:'', // 调整处理人抽屉状态 drawerModal: false, - detailData: [], + workPeopleList: [], + //防止按钮点击过快的按钮loading + buttonLoading: false, + //刷新表格 + refreshTable: true, + //展开表格 + // tableExpand: false, + hasChildren: true, + active: "1", + loading: false, // 当前流程类型(1待办/2已办) processType: 1, - loading: false, - dataList: [],//清单里的标准数据 - active: "1", - userId:this.$store.getters.userInfo.userId, - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, - listType: "country", //选择的清单类型 isSubmit: false, saveLoading: false, - tabValue: "listOfCountries", - selectedList: [], //选择清单的选择框 - selectList: [], //选择标准的选择框 - bringData: [], - commentText: "", //填写会签意见 - page: 1, - total: 0, - pageSize: this.$store.getters.userInfo.configContent, - listForm: { - passFlag: " ", //空为审批通过 1 为驳回 - standNumber: "", //标准编号 - standName: "",//标准名称 - certifiedEngineer: "", //认证工程师 - qualityEngineer: "", //质量工程师 - certifiedEngineerName: "", //认证工程师 - qualityEngineerName: "", //质量工程师 - breakdownList: [{ - applyArctic: "", - busStandCover: "", - claimType: "", - id: "", - itemsName: "", - itemsNum: "", - responsibleUnit: "", //责任部门 - responsibleEngineer: "", //责任工程师 - standId: "", - svpps: "" - }], - dataList: [{ - projectLine: "", //产品线 - uname: "",//产品线责任人 - projectManager:"",// 产品线责任人id - distributePerson: "", //分发责任人 - distributePersonId: "", //分发责任人id - id: "", - sarStandProjectLibraries: [{ - projectManager: '', - projectLevel: '', - projectNumber: '', - projectEndDate: '', - currentNode: '', - projectGroup: '', - productLine: '', - projectClassification: '', - projectStatus: '', - projectStartDate: '', - id: '', - projectName: '', - projectPlatfor: '' - }] - }] + showColumn: true, + drawerTitle: "", //drawer标题 + modalshowflag: false, // drawer开关 + selectList: [], + treeData: [], // 人员数据 + roleForm: { + workPeople: "" }, - choiceForm: {}, //选择标准清单列表 - countryOptions: [], //适用区域下拉框数据 - user1: "", - user2: "", - user3: "", - user4: "", - user5: "", - standMap: new Map() + peopleFlag: true, + nodeList: [], + defaultProps: { + children: "children", + label: "name" + }, + //表单的数据 + listForm: { + projectNumber: "", //项目编号 + projectName: "", //项目名称 + dataList: [], //项目下的标准数据 + children: [] //标准下的分解单数据 + }, + dataList: [], //展示的标准数据 + commentText: "", //审批意见 + detailData: [], //流程历史数据 + userId: this.$store.getters.userInfo.userId, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, + selectedId: "" }; }, methods: { - //折叠/展开基础信息方法 - foldForm() { - this.foldFormFlag = !this.foldFormFlag - }, //确认转办 - checkedRole (data) { - this.assigneeNewLoading = true + checkedTransferRole(data) { + this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false + this.isTransfer = false; if (res.success) { - this.drawerModal = false - this.$message.success('调整成功') + this.drawerModal = false; + this.$message.success("调整成功"); this.$router.push("/processCenter"); - this.processNum() + this.processNum(); } else { - this.$message.warning(res.message) + this.$message.warning(res.message); } - }) + }); }, // 请求转换流程图 - processNum (row) { + processNum(row) { axios.request({ - url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), - responseType: 'blob', - method: 'get', + url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(), + responseType: "blob", + method: "get", params: { prcNum: this.$route.query.prcNum } }).then(res => { // let blob = new Blob([res.data], {type: 'image/jpg'}) // let url = window.URL.createObjectURL(res.data) - this.processStep = window.URL.createObjectURL(res.data) - }) + this.processStep = window.URL.createObjectURL(res.data); + }); }, //转办事件 - handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row - }, - processTable () { - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.$route.query.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu - }, { - loading: 'loading', - _this: this - }, res => { - this.detailData = res - }, e => {}) - }, - //tab发生变化 - handleTabs(name) { - this.active = name; + handleTransfer() { + this.drawerModal = true; + this.drawerTitle = "转办处理人"; + this.selectPeople = row; }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, + id: item.standId, pageType: "INLAND_STAND" } }); window.open(routeUrl.href, "_blank"); }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo + }, { + _this: this + }, res => { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }); + this.totalNo = res.data.count; + }, e => { + }); + }, + processTable() { + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res; + }, e => { + }); + }, + //tab改变 + handleTabs(type) { + this.active = type; + }, + //获取数据 getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -451,85 +308,344 @@ export default { pId: this.pId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - this.getFormFieldList(processForm) + const processForm = JSON.parse(res.mesg); + this.getFormFieldList(processForm); } }).catch(e => { - }) - }) + }); + }); }, - /** - * @description: 动态表单读取 - */ - getFormFieldList (item) { + //动态表单读取 + getFormFieldList(item) { + console.log(item); this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.listForm['id'] = item.id - this.listForm.dataList = item.dataList - this.dataList = item.dataList - this.dataList.distributePerson = item.dataList[0].distributePerson - this.listForm.breakdownList = item.breakdownList - }) + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.dataList = item.dataList; + this.dataList = item.dataList; + // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear + let children = []; + item.breakdownList.forEach( + item => { + let aa = { + key: item.standId, + id: item.id, + standId: item.id, + itemsNum: item.itemsNum, + itemsName: item.itemsName, + xcxssrq: item.xcxssrq, + zccssrq: item.zccssrq, + workPeople: "请选择责任人" + }; + children.push(aa); + } + ); + this.dataList.forEach(key => { + key["children"] = []; + children.forEach(breakDown => { + if (key.standId === breakDown.key) { + key["children"].push(breakDown); + } + }); + if (key["children"].length === 0) { + delete key["children"]; + } + }); + let keyList = [] + children.forEach(item => { + if(keyList.length){ + if(!keyList.includes(item.key)){ + keyList.push(item.key) + } + }else{ + keyList.push(item.key) + } + }) + this.listForm.children = children; + this.dataList.forEach(item => { + keyList.forEach(items =>{ + if(items === item.standId){ + this.$set(item, "people", "有条款"); + }else{ + this.$set(item, "workPeople", "请选择责任人"); + } + }) + }); + } else { + this.listForm = item.form; + this.dataList = item.form.dataList; + this.commentText = item.commentText; + } + }); }, - //驳回事件 - beforeBack () { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - }else{ - this.listForm.passFlag = '1' - this.handleSubmit() - } + //保存事件 + handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "6"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { - this.listForm.commentText = this.commentText - const json = JSON.stringify(this.listForm); - this.isSubmit = true - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { + let dataChildren = []; + let dataListChildren = []; + this.dataList.forEach(item => { + dataChildren.push(item.children); + }); + dataChildren.forEach((item, index) => { + dataListChildren = dataListChildren.concat(item); + }); + this.isSubmit = true; + this.listForm.breakdownList.map(item => { + if(item.termsConditions){ + item.termsConditions = '' + } + }) + this.listForm.commentText = this.commentText; + this.listForm.children = dataListChildren; + this.listForm.dataList = this.dataList; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + }, + //批量分发按钮 + choiceZRRS(row, type, index) { + this.selectedId = row.id || row.standId; + this.type = type; + if (type === 1) { + this.drawerTitle = "选择责任人"; + this.nodeList = []; + this.zrIndex = index; + this.zrType = type; + if (row.workPeopleId) { + this.nodeList = row.workPeopleId.split(","); + } else { + 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 = "批量选择责任人"; + this.selectList.forEach(item => { + if (item.workPeopleId) { + this.nodeList = item.workPeopleId.split(","); + } + }); + } else { + this.$message.warning("请选择要分发的数据"); + } + } + //批量分发某标准下的责任人 + else if (type === 3) { + + //弹出选人框 + // if (this.tableExpand === false){ + this.modalshowflag = true; + this.drawerTitle = "批量选择责任人"; + // } + //展开表格 + this.workPeopleList = row; + // console.log('279',row.children) + this.refreshTable = false; + // this.tableExpand = !this.tableExpand + this.$nextTick(() => { + this.refreshTable = true; }); + } + }, + checkedRole(data) { + var idList = ""; + var nameList = ""; + data.forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); + //单选操作 + if (this.type === 1) { + this.dataList.forEach(item => { + if (item.standId === this.selectedId) { + item.workPeople = nameList || "请选择责任人"; + item.workPeopleId = idList; + } + if (item.children) { + item.children.forEach(items => { + if (items.id === this.selectedId) { + items.workPeople = nameList; + items.workPeopleId = idList; + // this.$set(items,'workPeople',data[0].name) + //this.$set(items,'workPeopleId',data[0].id) + } + }); + } + }); + this.dataList = JSON.parse(JSON.stringify(this.dataList)); + } else if (this.type === 2) { + this.selectList.forEach(item => { + this.dataList.map(items => { + if (item.standId === items.standId) { + items.workPeople = nameList || "请选择责任人"; + items.workPeopleId = idList; + // this.$message.warning('您只能针对条款进行分发') + } + if (items.children) { + items.children.map(childrenItem => { + if (childrenItem.id === item.id) { + childrenItem.workPeople = nameList; + childrenItem.workPeopleId = idList; + } + }); + } + }); + }); + this.dataList = JSON.parse(JSON.stringify(this.dataList)); + } else if (this.type === 3) { + // console.log("529",this.workPeopleList) + for (let i = 0; i < this.workPeopleList.children.length; i++) { + + this.workPeopleList.children[i].workPeople = data[0].name; + this.workPeopleList.children[i].workPeopleId = data[0].id; + // console.log(row.children[i].id) + // console.log(row.children[i].workPeople) + } + + // items.children.map(childrenItem => { + // + // childrenItem.workPeople = data[0].name; + // childrenItem.workPeopleId = data[0].id; + // }) + + } + this.modalshowflag = false; + }, + setChildren(children, type) { + // 编辑多个子层级 + children.map(j => { + this.toggleSelection(j, type); + if (j.children) { + this.setChildren(j.children, type); + } + }); + }, + // 选中父节点时，子节点一起选中取消 + select(selection, row) { + const hasSelect = selection.some(el => { + return row.id === el.id; + }); + if (hasSelect) { + if (row.children) { + // 解决子组件没有被勾选到 + this.setChildren(row.children, true); + } + } else { + if (row.children) { + this.setChildren(row.children, false); + } + } + }, + toggleSelection(row, select) { + if (row) { + this.$nextTick(() => { + this.$refs.myTable && + this.$refs.myTable.toggleRowSelection(row, select); + }); + } + }, + // 选择全部 + selectAll(selection) { + // dataList第一层只要有在selection里面就是全选 + const isSelect = selection.some(el => { + const dataListIds = this.dataList.map(j => j.id); + return dataListIds.includes(el.id); + }); + // dataList第一层只要有不在selection里面就是全不选 + const isCancel = !this.dataList.every(el => { + const selectIds = selection.map(j => j.id); + return selectIds.includes(el.id); + }); + if (isSelect) { + selection.map(el => { + if (el.children) { + // 解决子组件没有被勾选到 + this.setChildren(el.children, true); + } + }); + } + if (isCancel) { + this.dataList.map(el => { + if (el.children) { + // 解决子组件没有被勾选到 + this.setChildren(el.children, false); + } + }); + } }, //标准表格选择框改变 selectStandChange(data) { - this.selectList = []; - for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].id); + this.selectList = data; + }, + getTree() { + this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { + this.treeData = res.data; + }); + }, + 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]; } }, - selectThree() { - - }, - pageChange(page) { - this.page = page; - this.searchData(); - }, - pageSizeChange(pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent; - this.searchData(); + cancleUserInfo() { + this.modalshowflag = false; } }, computed: { - listNoDataText () { - return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' - }, + listNoDataText() { + return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; + } }, mounted() { - this.processTable() - this.getData() + this.processTable(); + this.getData(); + this.getTree(); } }; @@ -602,11 +718,6 @@ export default { height: 100%; } } - .input-jump { - /deep/.el-input__inner{ - color: #409EFF; - } - } } .demo-drawer-content { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index d44502ae5..214dd3bdb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -1,250 +1,286 @@ - @@ -435,136 +489,89 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process"; +import { changeAssigneeNew, execTask, inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpgStep3", components: { + ProcessTitle, ProcessHeader, - ProcessFooter, - ProcessTitle + ProcessFooter }, data() { return { - projectModel: false, - projectData: [], - projectLineId: [], - projectJson: {}, - totalNo: 0, - selectProject: [], - //查询添加标准相关数据 - standardSearch: { - projectNumber: "", - projectName: "", - pageNo: 1, - pageSizeNo: this.$store.getters.userInfo.configContent - }, - breakdownList: [], - pageNo: 1, - pageSizeNo: this.$store.getters.userInfo.configContent, - //折叠的标志，true为折叠，false为不折叠 - foldFormFlag: false, + comFlag: 0, + total: 0, currentPage: 1, + pageSize: 20, + nodeList: [], isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, + batchEditForm: { + remarks: "", //不涉及理由 + // 在研产品 + // 合规 + complianceReasons: "", + // 不合规 + noCompliance: "", + // 应对措施 + countermeasures: "", + // 完成时间 + completionTime: "", + + // 在产产品 + // 合规 + zcComplianceReasons: "", + // 不合规 + zcNoCompliance: "", + // 应对措施 + zcCountermeasures: "", + // 完成时间 + zcCompletionTime: "" + }, + hasChildren: true, + active: "1", + loading: false, + // 当前流程类型(1待办/2已办) + processType: 1, + isSubmit: false, + saveLoading: false, + submitShow: false, + acceptShow: false, + todoId: "", showColumn: true, drawerTitle: "", //drawer标题 - modalshowflag: false, // drawer开关 - modalshowflag2: false, + modalShowFlag: false, // drawer开关 + selectList: [], treeData: [], // 人员数据 - nodeList: [], + roleForm: { + workPeople: "" + }, + itemFlag: true, + peopleFlag: true, defaultProps: { children: "children", label: "name" }, - detailData: [], - sarProStateTableHeight: null, // 项目列表高度 - // 当前流程类型(1待办/2已办) - processType: 1, - sarFlag: true, - loading: false, - // dataList: [],//清单里的标准数据 - active: "1", + complianceReasons: "", + zcComplianceReasons: "", + //表单的数据 + listForm: { + projectNumber: "", //项目编号 + projectName: "", //项目名称 + dataList: [], //项目下的标准数据 + children: [] //标准下的分解单数据 + }, + dataList: [], //展示的标准数据 + commentText: "", //审批意见 + detailData: [], //流程历史数据 userId: this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, - listType: "country", //选择的清单类型 - isSubmit: false, - saveLoading: false, - tabValue: "listOfCountries", - selectedList: [], //选择清单的选择框 - selectList: [], //选择标准的选择框 - selectStandList: [], //点开批量弹窗选择数据丢失 - lsIndex: "", - lsType: "", - bringData: [], - commentText: "", //填写会签意见 - page: 1, - total: 0, - pageSize: this.$store.getters.userInfo.configContent, - listForm: { - passFlag: "1", //1为审批通过 2 为驳回 - standNumber: "", //标准编号 - standName: "",//标准名称 - certifiedEngineer: "", //认证工程师 - qualityEngineer: "", //质量工程师 - breakdownList: [{ //分解单数据 - implementer: "", - implementerId: "", - applyArctic: "", - busStandCover: "", - claimType: "", - id: "", - itemsName: "", - itemsNum: "", - responsibleUnit: "", - standId: "", - svpps: "" - }], - dataList: [{ - implementer: "", - implementerId: "", - projectLine: "", //产品线 - uname: "",//产品线责任人 - distributePerson: "", //分发责任人 - distributePersonId: "", //分发责任人id - id: "", - sarStandProjectLibraries: [{ - projectManager: "", - projectLevel: "", - projectNumber: "", - projectEndDate: "", - currentNode: "", - projectGroup: "", - productLine: "", - projectClassification: "", - projectStatus: "", - projectStartDate: "", - id: "", - projectName: "", - projectPlatfor: "" - }] - }] - }, - roleForm: { - implementer: "", - implementerId: "" - }, - choiceForm: {}, //选择标准清单列表 - user1: "", - user2: "", - user3: "", - user4: "", - user5: "", - standMap: new Map() + pId: this.$route.query.prcId }; }, methods: { - //折叠/展开基础信息方法 - foldForm() { - this.foldFormFlag = !this.foldFormFlag - }, //确认转办 checkedTransferRole(data) { this.assigneeNewLoading = true; @@ -606,6 +613,80 @@ export default { this.drawerTitle = "转办处理人"; this.selectPeople = row; }, + //批量编辑确定按钮事件 + saveBatchEditForm() { + this.selectList = JSON.parse(localStorage.getItem("selectList")); + this.dataList.forEach(item => { + this.selectList.forEach(items => { + if (item.id === items ||item.standId === items) { + item.complianceReasons = this.batchEditForm.complianceReasons; + //不合规 + item.noCompliance = this.batchEditForm.noCompliance; + //应对措施 + item.countermeasures = this.batchEditForm.countermeasures; + //完成时间 + item.completionTime = this.batchEditForm.completionTime; + //不涉及理由 + item.remarks = this.batchEditForm.remarks; + } + }); + }); + this.modalShowFlag = false; + }, + cancelBatchEditForm() { + this.modalShowFlag = false; + }, + //批量编辑 + batchEdit() { + if (this.selectList.length > 0) { + //合规 + this.batchEditForm.complianceReasons = ""; + //不合规 + this.batchEditForm.noCompliance = ""; + //应对措施 + this.batchEditForm.countermeasures = ""; + //完成时间 + this.batchEditForm.completionTime = ""; + this.modalShowFlag = true; + } else { + this.$message.warning("请选择要编辑的数据"); + } + }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo + }, { + _this: this + }, res => { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }); + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -619,28 +700,11 @@ export default { }, e => { }); }, - //tab发生变化 - handleTabs(name) { - this.active = name; - }, - //点击查看详情 - handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.id, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); - }, - // 分页 - handleCurrentChange(currentPage) { - this.currentPage = currentPage; - }, - handleSizeChange(pageSize) { - this.pageSize = pageSize; + //tab改变 + handleTabs(type) { + this.active = type; }, + //获取数据 getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -649,236 +713,121 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg); + let commitStatus = res.commitStatus; + if (commitStatus && commitStatus > 0) { + this.acceptShow = true; + this.submitShow = false; + } else { + this.acceptShow = false; + this.submitShow = true; + } + this.todoId = res.id; this.getFormFieldList(processForm); } }).catch(e => { }); }); }, - /** - * @description: 动态表单读取 - */ + //动态表单读取 getFormFieldList(item) { console.log(item); - this.projectJson = JSON.parse(JSON.stringify(item)); - this.listForm = JSON.parse(JSON.stringify(item)); - if (item.form === undefined) { - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0])); - let projectLineList = item.pepdtos[0].dataList; - let ids = [] - projectLineList.forEach(item => { - ids.push(item.productLine); - }); - this.projectLineId = ids.join(',') - this.getProject(); - } else { - this.listForm = item.form; - this.breakdownList = item.form.breakdownList; - } - - }, - getProjectBtn(){ - this.pageNo = 1, - this.getProject() - }, - getProject() { - this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", { - productLine: this.projectLineId, - current: this.pageNo, - PageSize: this.pageSizeNo, - projectName: this.standardSearch.projectName, - projectNumber: this.standardSearch.projectNumber - }, { - _this: this - }, res => { - this.projectData = res.data.records; - this.totalNo = res.data.total; - }); - }, - clearStandSearch() { - this.standardSearch = { - projectName: "", - projectNumber: "" - }; - this.getProject(); - }, - okStand() { - if (!this.selectProject.length) { - this.$message.warning("请至少选择一条产品线进行添加"); - } else { - let proList = this.projectJson.pepdtos[0].dataList; - this.selectProject.map(item => { - proList.forEach(items => { - if (item.productLine === items.productLine) { - items.sarStandProjectLibraries.push(item); + this.$nextTick(() => { + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + let dataChildren = []; + let dataListChildren = []; + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.dataList = item.dataList; + this.dataList = item.dataList; + this.dataList.forEach(item =>{ + if(item.children){ + item.children.forEach(items =>{ + dataChildren.push(items) + }) } - }); - }); - this.projectJson.pepdtos[0].dataList = proList; - this.$http.post("activityData/backData", { - json: JSON.stringify(this.projectJson.pepdtos[0]) - }, { - _this: this - }, res => { - let item = JSON.parse(res.data); - for (let i = 0; i < item.pepdtos.length; i++) { - for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { - if (item.pepdtos[i].xcxssrq === null) { - item.pepdtos[i].xcxssrq = ""; - } - if (item.pepdtos[i].zccssrq === null) { - item.pepdtos[i].zccssrq = ""; - } - this.breakdownList.push({ - itemsName: item.pepdtos[i].breakdownList[j].itemsName, - itemNum: item.pepdtos[i].breakdownList[j].itemsNum, - technicalRequir: item.pepdtos[i].breakdownList[j].technicalRequir, - changePoint: item.pepdtos[i].breakdownList[j].changePoint, - responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, - responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit, - productLine: item.pepdtos[i].sarStandProjectLibraries.productLine, - projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber, - projectName: item.pepdtos[i].sarStandProjectLibraries.projectName, - implementer: item.pepdtos[i].breakdownList[j].implementer || null, - distributePerson: item.pepdtos[i].distributePerson, - distributePersonId: item.pepdtos[i].distributePersonId, - uname: item.pepdtos[i].uname, - projectManager: item.pepdtos[i].projectManager, - certifiedEngineerName: item.pepdtos[i].certifiedEngineerName, - qualityEngineerName: item.pepdtos[i].qualityEngineerName, - standNumber: item.pepdtos[i].standNumber, - standName: item.pepdtos[i].standName, - id: item.pepdtos[0].id, - xcxssrq: item.pepdtos[i].XCXSSRQ, - zccssrq: item.pepdtos[i].ZCCSSRQ - }); - this.total = this.breakdownList.length; - } - } - }); - this.$refs.table.clearSelection() - this.projectModel = false; - } - - }, - //批量删除 - deleteList() { - if (!this.selectList.length) { - this.$message.warning("请至少选择一条数据进行删除"); - } else { - this.$confirm("您确认删除这些数据?", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - let exits = []; - this.selectList.map(item => { - let index; - index = this.breakdownList.findIndex(items => { - return items.itemsName === item.itemsName && items.projectName === item.projectName; - }); - if (index > -1) { - this.breakdownList.splice(index, 1); - } - exits.push(item); - }); - this.selectList = []; - }).catch(() => { - }); - } - }, - cancelStand() { - this.projectModel = false; - }, - pageChangeNo(page) { - this.pageNo = page; - this.getProject(); - }, - pageSizeChangeNo(pageSize) { - this.pageSizeNo = pageSize; - this.getProject(); - }, - checkedRole(data) { - var idList = ""; - var nameList = ""; - data.forEach(item => { - if (nameList.length > 0) { - nameList += ","; - idList += ","; - } - idList += item.id; - nameList += item.name; - }); - if (this.type === 1) { - this.breakdownList[this.lsIndex].implementerId = idList; - this.breakdownList[this.lsIndex].implementer = nameList; - } else if (this.type === 2) { - this.breakdownList.forEach(item => { - this.selectStandList.forEach(items => { - if (item === items) { - item.implementerId = idList; - item.implementer = nameList; - } - }); - }); - this.$refs.multipleTable.clearSelection(); - } - this.modalshowflag = false; - }, - addProject() { - this.projectModel = true; - }, - choiceZRRS(row, type, index) { - this.selectStandList = this.selectList; - this.type = type; - if (type === 1) { - this.drawerTitle = "选择责任人"; - this.nodeList = []; - this.lsIndex = index; - this.lsType = type; - if (row.implementerId) { - this.nodeList = row.implementerId.split(","); - } else { - this.nodeList.push(row); - } - this.modalshowflag = true; - } else if (type === 2) { - // 批量 - if (this.selectList.length > 0) { - this.lsType = type; - this.nodeList = []; - this.modalshowflag = true; - this.drawerTitle = "批量选择责任人"; - this.selectList.forEach(item =>{ - if(item.implementerId){ - this.nodeList = item.implementerId.split(","); - } }) - // if(row.implementerId){ - // this.nodeList = row.implementerId.split(","); - // } + this.dataList.forEach(item => { + dataChildren.forEach(items =>{ + if (items.key === item.standId) { + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + dataChildren.forEach((item, index) => { + dataListChildren = dataListChildren.concat(item); + }); + dataListChildren = this.dataList.concat(dataListChildren); + let index = dataListChildren.findIndex(item => { + return item.people + }) + if(index > -1){ + dataListChildren.splice(index, 1) + } + this.dataList = dataListChildren; + this.total = this.dataList.length; } else { - this.$message.warning("请选择要分发的数据"); + this.listForm = item.form; + this.commentText = item.commentText; + let dataChildren = []; + let dataListChildren = []; + this.dataList = item.dataList; + this.dataList.forEach(item =>{ + if(item.children){ + item.children.forEach(items =>{ + dataChildren.push(items) + }) + } + }) + this.dataList.forEach(item => { + dataChildren.forEach(items =>{ + if (items.key === item.standId) { + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children); + }); + dataChildren.forEach((item, index) => { + dataListChildren = dataListChildren.concat(item); + }); + dataListChildren = this.dataList.concat(dataListChildren); + let index = dataListChildren.findIndex(item => { + return item.people + }) + if(index > -1){ + dataListChildren.splice(index, 1) + } + this.total = this.dataList.length; + // this.dataList = item.form.dataList[0].children; + // this.total = item.form.dataList[0].children.length; } - } - }, - getTree() { - this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { - this.treeData = res.data; + }); }, - + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, + handleSizeChange(size) { + this.pageSize = size; + }, //保存事件 handleSave() { this.saveLoading = true; - this.listForm.breakdownList = this.breakdownList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); - _formData.append("prcType", "5"); + _formData.append("prcType", "6"); _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: this.listForm, @@ -892,30 +841,59 @@ export default { this.saveLoading = false; }); }, + // 接受按钮 + handleAccept() { + this.isSubmit = true; + execTask({ + todoId: this.todoId // 当前节点ID + }).then(res => { + if (res.sign && res.sign === "0") { + this.$message.success("接收成功"); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + }, + handlePrice() { + this.dataList.forEach(item =>{ + if(item.remarks || item.complianceReasons){ + this.comFlag = 0; + return + }else{ + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].complianceReasons !== "" || (this.dataList[i].noCompliance !== "" && this.dataList[i].countermeasures !== "" && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance === "" && this.dataList[i].countermeasures === "" && this.dataList[i].completionTime === undefined)) { + } else { + this.comFlag++; + } + } + } + }) + }, //提交事件 handleSubmit() { - if(this.breakdownList < 1){ - this.$message.warning('请添加产品线数据') - }else{ - let standList = []; - this.breakdownList.forEach(item => { - if (item.implementer) { - standList.push(item); - } - }); - if(standList.length < 1){ - this.$message.warning('请选择落实人') - }else{ - this.listForm.breakdownList = standList; - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - const json = JSON.stringify(this.listForm.breakdownList); + let submitFlag = 0; + this.dataList.forEach(item => { + if (item.complianceReasons || item.noCompliance || item.remarks) { + submitFlag = 1; + } + return; + }); + if (submitFlag === 0) { + this.$message.warning("请至少对一条信息进行评估"); + } else { + this.handlePrice(); + if (this.comFlag > 0) { + this.$message.warning("请填写完整的不符合项信息"); + this.comFlag = 0; + } else { + this.listForm.dataList.forEach(item => { + if (item.workPeople === "请选择责任人") { + item.workPeople = ""; + } + }); this.isSubmit = true; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -933,30 +911,27 @@ export default { } } }, + //标准表格选择框改变 + selectStandChange(data) { + this.selectList = []; + for (let i = 0; i < data.length; i++) { + this.selectList.push(data[i].id || data[i].standId); + localStorage.setItem("selectList", JSON.stringify(this.selectList)); + } + }, + getTree() { + this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { + this.treeData = res.data; + }); + }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if (getlist.length === 1) { + if (getlist.length == 1) { this.roleRow = getlist[0]; } else { this.$refs.tree.setCheckedKeys([data.id]); this.roleRow = this.$refs.tree.getCheckedNodes()[0]; } - }, - //标准表格选择框改变 - selectStandChange(data) { - console.log(data); - this.selectList = data; - }, - selectThree(data) { - this.selectProject = data; - }, - pageChange(page) { - this.page = page; - this.searchData(); - }, - pageSizeChange(pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent; - this.searchData(); } }, computed: { @@ -965,9 +940,9 @@ export default { } }, mounted() { - this.getTree(); this.processTable(); this.getData(); + this.getTree(); } }; @@ -982,14 +957,16 @@ export default { padding: 0 20px 0; } } - position: relative; - height: 100%; + .choiceBtn { .el-button--primary { width: 150px; } } + position: relative; + height: 100%; + .headerTabs { height: 52px; display: flex; @@ -1038,9 +1015,14 @@ export default { height: 100%; } } - .input-jump { - /deep/.el-input__inner{ - color: #409EFF; + + .accessStandardsAndRegulations { + height: 100%; + } + + .datePickLen { + /deep/ .el-icon-circle-close:before { + margin-left: -100px; } } } @@ -1048,9 +1030,13 @@ export default { .demo-drawer-content { margin-top: 10px; } - .table-height{ - height: calc(~'100% - 65px'); - overflow: auto; + + /deep/ .el-table th > .cell { + font-size: 14px; + } + + /deep/ .el-table thead.is-group th { + padding: 0px; } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index c56e7c3fd..59291d9f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -1,336 +1,197 @@ - @@ -517,104 +285,48 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import Moment from 'moment'; -import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process"; +import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process"; export default { name: "xmpgStep4", components: { + ProcessTitle, ProcessHeader, - ProcessFooter, - ProcessTitle + ProcessFooter }, data() { return { - //折叠的标志，true为折叠，false为不折叠 - foldFormFlag: false, - comFlag: 0, + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, - modalShowFlag: false, // 批量编辑开关 - batchEditForm: { - // 在研产品 - // 合规 - complianceReasons: "", - // 不合规 - noCompliance: "", - // 应对措施 - countermeasures: "", - // 完成时间 - completionTime: "", - }, - detailData: [], - sarProStateTableHeight: null, // 项目列表高度 + active: "1", + loading: false, // 当前流程类型(1待办/2已办) processType: 1, - loading: false, - dataList: [],//清单里的标准数据 - active: "1", - userId: this.$store.getters.userInfo.userId, - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, - listType: "country", //选择的清单类型 isSubmit: false, saveLoading: false, - submitShow: false, - acceptShow: false, - todoId: '', - tabValue: "listOfCountries", - selectedList: [], //选择清单的选择框 - selectList: [], //选择标准的选择框 - bringData: [], - commentText: "", //填写会签意见 - page: 1, - total: 0, - pageSize: this.$store.getters.userInfo.configContent, + //表单的数据 listForm: { - standNumber: "", //标准编号 - standName: "",//标准名称 - certifiedEngineerName: "", //认证工程师 - qualityEngineerName: "", //质量工程师 - dataList: [{ - projectManager: "", - itemsName: "", - uname: "", - projectNumber: "", - implementer: "", - implementerId: "", - productLine: "", - itemNum: "", - distributePerson: "", - projectName: "", - distributePersonId: "", - complianceReasons: "", //在研合规原因 - noCompliance: "", //在研不合规项目 - countermeasures: "", //在研应对措施 - completionTime: "", //在研完成时间 - zcComplianceReasons: "", //在产的合规原因 - zcNoCompliance: "", //在产不合规项目 - zcCountermeasures: "", //在产的应对措施 - zcCompletionTime: "" //在产的完成时间 - }] + passFlag: " ", //0审批通过 1为驳回 + projectNumber: "", //项目编号 + projectName: "", //项目名称 + dataList: [], //项目下的标准数据 + breakdownList: [] //标准下的分解单数据 }, - choiceForm: {}, //选择标准清单列表 - countryOptions: [], //适用区域下拉框数据 - user1: "", - user2: "", - user3: "", - user4: "", - user5: "", - standMap: new Map() + dataList: [], //展示的标准数据 + commentText: "", //审批意见 + detailData: [],//流程历史数据 + userId: this.$store.getters.userInfo.userId, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId }; }, methods: { - //折叠/展开基础信息方法 - foldForm() { - this.foldFormFlag = !this.foldFormFlag - }, //确认转办 checkedTransferRole (data) { this.assigneeNewLoading = true @@ -656,6 +368,41 @@ export default { this.drawerTitle = '转办处理人' this.selectPeople = row }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo + }, { + _this: this + }, res => { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }); + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -669,32 +416,11 @@ export default { }, e => { }); }, - //tab发生变化 - handleTabs(name) { - this.active = name; - }, - //点击查看详情 - handlePreview(item){ - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.id, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank") - }, - //将时间戳转换为日期格式 - getLocalTime(item) { - return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " "); - }, - -// 时间戳（毫秒）转化为标准时间格式 - getFullTime(item) { - const stamp = new Date(item); - const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss'); - return item = time + //tab改变 + handleTabs(type) { + this.active = type; }, + //获取数据 getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -703,210 +429,107 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg); - let commitStatus = res.commitStatus - if(commitStatus && commitStatus > 0){ - this.acceptShow = true - this.submitShow = false - }else { - this.acceptShow = false - this.submitShow = true - } - this.todoId = res.id this.getFormFieldList(processForm); } }).catch(e => { }); }); }, - /** - * @description: 动态表单读取 - */ + //动态表单读取 getFormFieldList(item) { console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - if (item.form === undefined) { - if (item.fenFlag === undefined) { - item.step3DTOS.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId; - item.implementer = this.$store.getters.userInfo.userName; - }); - // this.commentText = '' - this.dataList = item.step3DTOS; - this.dataList.forEach(item => { - this.$set(item,'complianceReasons', '') - this.$set(item,'noCompliance', '') - this.$set(item,'countermeasures', '') - this.$set(item,'completionTime', '') + let dataChildren = [] + let dataListChildren = [] + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.dataList = item.dataList; + this.dataList = item.dataList; + this.dataList.forEach(item =>{ + if(item.children){ + item.children.forEach(items =>{ + dataChildren.push(items) }) - } else { - this.dataList = item.dataList; - // this.commentText = '' - this.dataList.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId; - item.implementer = this.$store.getters.userInfo.userName; - }); } - // this.getLocalTime() - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.standName = item.step3DTOS[0].standName; - this.listForm.standNumber = item.step3DTOS[0].standNumber; - this.listForm.id = item.step3DTOS[0].id; - this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName; - this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName; - this.listForm.itemsName = item.step3DTOS[0].itemsName; - this.listForm.itemNum = item.step3DTOS[0].itemNum; - this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit; - this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer; - } else { - this.listForm = item.form; - this.dataList = item.form.dataList; + }) + this.dataList.forEach(item => { + dataChildren.forEach(items =>{ + if (items.key === item.standId) { + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + dataChildren.forEach((item, index) => { + dataListChildren = dataListChildren.concat(item); + }); + dataListChildren = this.dataList.concat(dataListChildren); + let index = dataListChildren.findIndex(item => { + return item.people + }) + if(index > -1){ + dataListChildren.splice(index, 1) } - + this.dataList = dataListChildren; + this.total = this.dataList.length; }); }, - - - //保存事件 - handleSave() { - this.saveLoading = true; - let _formData = new FormData(); - this.listForm.dataList = this.dataList; - _formData.append("id", this.bpnId || ""); - _formData.append("prcType", "5"); - _formData.append("taskIds", this.taskIds); - _formData.append("json", JSON.stringify({ - form: this.listForm, - commentText: this.commentText - })); - saveTaskForPub(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); - }, - // 接受按钮 - handleAccept(){ - this.isSubmit = true - execTask({ - todoId: this.todoId // 当前节点ID - }).then(res => { - if (res.sign && res.sign === '0') { - this.$message.success('接收成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - }, - handlePrice(){ - for (let i = 0; i < this.dataList.length; i++) { - if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ - }else { - this.comFlag ++ - } + //驳回事件 + beforeBack() { + if (!this.commentText) { + this.$message.warning("请填写审批意见"); + } else { + this.listForm.passFlag = "1"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); } }, //提交事件 handleSubmit() { - let submitFlag = 0; - this.dataList.forEach(item => { - if(item.complianceReasons || item.noCompliance){ - submitFlag = 1 - } - return - }) - if(submitFlag === 0 ){ - this.$message.warning('请至少对一条信息进行评估') - }else{ - this.handlePrice() - if(this.comFlag > 0) { - this.$message.warning('请填写完整的不符合项信息') - this.comFlag = 0 - }else{ - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - this.listForm.dataList = this.dataList; - const json = JSON.stringify(this.listForm); - this.isSubmit = true - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - - }); + this.isSubmit = true; + this.listForm.passFlag = "0"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); } - } - }, - //批量编辑 - batchEdit() { - if (this.selectList.length > 0) { - //合规 - this.batchEditForm.complianceReasons = ""; - //不合规 - this.batchEditForm.noCompliance = ""; - //应对措施 - this.batchEditForm.countermeasures = ""; - //完成时间 - this.batchEditForm.completionTime = ""; - this.modalShowFlag = true; - } else { - this.$message.warning("请选择要编辑的数据"); - } - }, - //批量编辑确定按钮事件 - saveBatchEditForm() { - this.dataList.forEach(item => { - this.selectList.forEach(items => { - if (item.itemNum === items.itemNum && item.projectName === items.projectName) { - item.complianceReasons = this.batchEditForm.complianceReasons; - //不合规 - item.noCompliance = this.batchEditForm.noCompliance; - //应对措施 - item.countermeasures = this.batchEditForm.countermeasures; - //完成时间 - item.completionTime = this.batchEditForm.completionTime; - } - }); + this.isSubmit = false; + }, e => { }); - this.$refs.multipleTable.clearSelection() - this.modalShowFlag = false; }, - cancelBatchEditForm() { - this.modalShowFlag = false; + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; }, - //标准表格选择框改变 - selectStandChange(data) { - this.selectList = data; - // for (let i = 0; i < data.length; i++) { - // this.selectList.push(data[i].id); - // } + handleSizeChange(size) { + this.pageSize = size; }, - selectThree() { - - }, - pageChange(page) { - this.page = page; - this.searchData(); - }, - pageSizeChange(pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent; - this.searchData(); - } }, computed: { listNoDataText() { @@ -988,17 +611,8 @@ export default { height: 100%; } } - .datePickLen { - /deep/ .el-icon-circle-close:before { - margin-left: -180px; - } - } - .input-jump { - /deep/.el-input__inner{ - color: #409EFF; - } - } } + .demo-drawer-content { margin-top: 10px; } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 365050bf3..fec5e76c9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -1,276 +1,195 @@ - @@ -372,97 +288,42 @@ import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/proces export default { name: "xmpgStep5", components: { + ProcessTitle, ProcessHeader, - ProcessFooter, - ProcessTitle + ProcessFooter }, data() { return { - //折叠的标志，true为折叠，false为不折叠 - foldFormFlag: false, + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, - detailData: [], - sarProStateTableHeight: null, // 项目列表高度 + active: "1", + loading: false, // 当前流程类型(1待办/2已办) processType: 1, - loading: false, - dataList: [], - active: "1", - userId:this.$store.getters.userInfo.userId, - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, - listType: "country", //选择的清单类型 isSubmit: false, saveLoading: false, - tabValue: "listOfCountries", - selectedList: [], //选择清单的选择框 - selectList: [], //选择标准的选择框 - bringData: [], - commentText: "", //填写会签意见 - page: 1, - total: 0, - pageSize: this.$store.getters.userInfo.configContent, + //表单的数据 listForm: { - fenFlag: " ", //1为驳回 2为通过 - standNumber: "", //标准编号 - standName: "",//标准名称 - certifiedEngineerName: "", //认证工程师 - qualityEngineerName: "", //质量工程师 - breakdownList: [{ //分解单数据 - implementer: "", - applyArctic: "", - busStandCover: "", - claimType: "", - id: "", - itemsName: "", - itemsNum: "", - responsibleUnit: "", - standId: "", - svpps: "" - }], - dataList: [{ - implementer: "", - projectLine: "", //产品线 - uname: "",//产品线责任人 - distributePerson: "", //分发责任人 - distributePersonId: "", //分发责任人id - id: "", - sarStandProjectLibraries: [{ - projectManager: "", - projectLevel: "", - projectNumber: "", - projectEndDate: "", - currentNode: "", - projectGroup: "", - productLine: "", - projectClassification: "", - projectStatus: "", - projectStartDate: "", - id: "", - projectName: "", - projectPlatfor: "" - }] - }] + projectNumber: "", //项目编号 + projectName: "", //项目名称 + dataList: [], //项目下的标准数据 + breakdownList: [] //标准下的分解单数据 }, - choiceForm: {}, //选择标准清单列表 - countryOptions: [], //适用区域下拉框数据 - user1: "", - user2: "", - user3: "", - user4: "", - user5: "", - standMap: new Map() + dataList: [], //展示的标准数据 + commentText: "", //审批意见 + detailData: [],//流程历史数据 + userId: this.$store.getters.userInfo.userId, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId }; }, methods: { - //折叠/展开基础信息方法 - foldForm() { - this.foldFormFlag = !this.foldFormFlag - }, //确认转办 checkedTransferRole (data) { this.assigneeNewLoading = true @@ -504,33 +365,59 @@ export default { this.drawerTitle = '转办处理人' this.selectPeople = row }, - processTable () { - this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.$route.query.prcNum, - sortWord: this.shunxu ? this.paixu : '', - shunxu: this.shunxu + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo }, { - loading: 'loading', _this: this }, res => { - this.detailData = res - }, e => {}) + this.standardData = res.data.list; + this.standardData.forEach(item => { + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }); + this.totalNo = res.data.count; + }, e => { + }); }, - //tab发生变化 - handleTabs(name) { - this.active = name; + processTable() { + this.$http.get("lawss/activiti/get_list_by_instance", { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : "", + shunxu: this.shunxu + }, { + loading: "loading", + _this: this + }, res => { + this.detailData = res; + }, e => { + }); }, - //点击查看详情 - handlePreview(item){ - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.id, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank") + //tab改变 + handleTabs(type) { + this.active = type; }, + //获取数据 getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -538,109 +425,93 @@ export default { pId: this.pId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - this.getFormFieldList(processForm) + const processForm = JSON.parse(res.mesg); + this.getFormFieldList(processForm); } }).catch(e => { - }) - }) - }, - /** - * @description: 动态表单读取 - */ - getFormFieldList (item) { - this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.dataList = item.dataList - this.listForm.standName = item.standName - this.listForm.standNumber = item.standNumber - this.listForm.id = item.id - this.listForm.qualityEngineerName = item.qualityEngineerName - this.listForm.certifiedEngineerName = item.certifiedEngineerName - this.listForm.responsibleUnit = item.responsibleUnit - this.listForm.responsibleEngineer = item.responsibleEngineer - }) - }, - //驳回事件 - beforeBack () { - if(!this.commentText){ - this.$message.warning('请填写审批意见') - }else{ - this.isSubmit = true - this.listForm.applyUpdUserId = this.dataList[0].distributePersonId - this.listForm.commentText = this.commentText; - this.listForm.dataList = this.dataList - this.listForm.fenFlag = '1' - const json = JSON.stringify(this.listForm); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { }); - } + }); + }, + //动态表单读取 + getFormFieldList(item) { + console.log(item); + this.$nextTick(() => { + this.listForm = JSON.parse(JSON.stringify(item)); + let dataChildren = [] + let dataListChildren = [] + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.dataList = item.dataList; + this.dataList.forEach(item =>{ + if(item.children){ + item.children.forEach(items =>{ + dataChildren.push(items) + }) + } + }) + this.dataList.forEach(item => { + dataChildren.forEach(items =>{ + if (items.key === item.standId) { + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + dataChildren.forEach((item, index) => { + dataListChildren = dataListChildren.concat(item); + }); + dataListChildren = this.dataList.concat(dataListChildren); + let index = dataListChildren.findIndex(item => { + return item.people + }) + if(index > -1){ + dataListChildren.splice(index, 1) + } + this.dataList = dataListChildren; + this.total = this.dataList.length; + }); }, //提交事件 handleSubmit() { - this.listForm.applyUpdUserId = this.dataList[0].distributePersonId - this.listForm.dataList = this.dataList - this.listForm.fenFlag = '2' - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.isSubmit = true - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); - + this.isSubmit = true; + this.listForm.dataList = this.dataList + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); }, - //标准表格选择框改变 - selectStandChange(data) { - this.selectList = []; - for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].id); - } + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; }, - selectThree() { - + handleSizeChange(size) { + this.pageSize = size; }, - pageChange(page) { - this.page = page; - this.searchData(); - }, - pageSizeChange(pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent; - this.searchData(); - } }, computed: { - listNoDataText () { - return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' - }, + listNoDataText() { + return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; + } }, mounted() { - this.processTable() - this.getData() + this.processTable(); + this.getData(); } }; @@ -713,11 +584,6 @@ export default { height: 100%; } } - .input-jump { - /deep/.el-input__inner{ - color: #409EFF; - } - } } .demo-drawer-content { @@ -730,4 +596,4 @@ export default { padding: 0px; } } -> + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue deleted file mode 100644 index 3452a93fc..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ /dev/null @@ -1,717 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue deleted file mode 100644 index 34161e456..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ /dev/null @@ -1,716 +0,0 @@ - - - - - - - - diff --git a/src/pages/processCenter/pages/processAcceptDetail/index.vue b/src/pages/processCenter/pages/processAcceptDetail/index.vue index 8029f34f0..3200ed478 100644 --- a/src/pages/processCenter/pages/processAcceptDetail/index.vue +++ b/src/pages/processCenter/pages/processAcceptDetail/index.vue @@ -235,11 +235,7 @@ export default { this.toProcessDetail('bzpgStep8-1',row) }else if(prcType === '6'){ //标准项目合规评估 项目维度 - if(row.taskInfo === '标准法规部部长审批'){ - this.toProcessDetail('xmpg2Step1-12',row) - }else{ - this.toProcessDetail('xmpg2Step1-2',row) - } + this.toProcessDetail('xmpgStep1-5',row) } else if (prcType === '8') { // 未符合项整改 this.toProcessDetail('wfhxzgStep5-1',row) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 0cd0210f2..8ace4e093 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -244,11 +244,7 @@ export default { this.toProcessDetail('bzpgStep8-1',row) }else if(prcType === '6'){ //标准项目合规评估 项目维度 - if(row.taskInfo === '标准法规部部长审批'){ - this.toProcessDetail('xmpg2Step1-12',row) - }else{ - this.toProcessDetail('xmpg2Step1-2',row) - } + this.toProcessDetail('xmpgStep1-5',row) } else if (prcType === '8') { // 未符合项整改 this.toProcessDetail('wfhxzgStep5-1',row) diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 055a2f4ae..2f00bbe89 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -501,7 +501,7 @@ export default { case '10': //项目评估流程- 项目 this.$router.push({ - name: 'xmpg2Step1' + name: 'xmpgStep1' }) break case '11': diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b468f8785..c30037169 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1050,9 +1050,9 @@ export default { break //项目评估流程-项目 case '6': - if(row.taskInfo === '标准法规部业务经理审批'){ + if(row.taskInfo === '任务分发'){ this.$router.push({ - name: 'xmpg2Step2', + name: 'xmpgStep2', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -1061,9 +1061,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '工程经理转办'){ + }else if(row.taskInfo === '合规评估'){ this.$router.push({ - name: 'xmpg2Step3', + name: 'xmpgStep3', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -1072,9 +1072,9 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '架构经理任务分发') { + } else if(row.taskInfo === '审核') { this.$router.push({ - name: 'xmpg2Step4', + name: 'xmpgStep4', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -1083,9 +1083,9 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '分发责任人下发') { + } else if(row.taskInfo === '批准') { this.$router.push({ - name: 'xmpg2Step5', + name: 'xmpgStep5', query: { taskIds: row.taskIds, prcId: row.prcId, diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 0019a5ff9..e309d8511 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -627,7 +627,7 @@ export default { break case '6': this.$router.push({ - name: 'xmpg2Step1-1', + name: 'xmpgStep1', query: { type: '6', processName: '项目合规评估流程-项目', diff --git a/src/router/index.js b/src/router/index.js index 5e06cf72a..c3225a014 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -610,34 +610,6 @@ const routes = [ title: '项目合规评估流程' } }, - //流程保存界面 - { - path: '/xmpgStep1-1', - name: 'xmpgStep1-1', - component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue'), - meta: { - requireAuth: true, - title: '项目合规评估流程' - } - }, - { - path: '/xmpgStep1-2', - name: 'xmpgStep1-2', - component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue'), - meta: { - requireAuth: true, - title: '项目合规评估流程' - } - }, - { - path: '/xmpgStep1-7', - name: 'xmpgStep1-7', - component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue'), - meta: { - requireAuth: true, - title: '项目合规评估流程' - } - }, { path: '/xmpgStep2', name: 'xmpgStep2', @@ -675,18 +647,9 @@ const routes = [ } }, { - path: '/xmpgStep6', - name: 'xmpgStep6', - component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step6.vue'), - meta: { - requireAuth: true, - title: '项目合规评估流程' - } - }, - { - path: '/xmpgStep7', - name: 'xmpgStep7', - component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step7.vue'), + path: '/xmpgStep1-5', + name: 'xmpgStep1-5', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue'), meta: { requireAuth: true, title: '项目合规评估流程'