diff --git a/src/api/process.js b/src/api/process.js index bcf94246b..bb866770b 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -76,6 +76,14 @@ export function processCreateStand (data) { data }) } + +export function processCreateLaws (data) { + return axios({ + url: '/api/lawss/actSarItemsLaws/processCreateLaws', + method: 'post', + data + }) +} // 流程3 法规流程入库 export function processCreatePG (data) { return axios({ diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index 94d623b60..e28290abc 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -33,7 +33,7 @@ export function dicTypeData (data) { } export function StandardsInfoPage (data) { return axios({ - url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', + url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak', method: 'get', params: data }) diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue index 36f515e05..f8ef14b9d 100644 --- a/src/pages/home2/components/searchGroup/index.vue +++ b/src/pages/home2/components/searchGroup/index.vue @@ -22,7 +22,8 @@ placeholder="请输入关键词" clearable > - 搜索 + 搜索 + 高级搜索 @@ -74,6 +75,15 @@ export default { } }) }, + seniorSearch(){ + this.$router.push({ + name: 'AdvancedSearch', + params: { + selectKey: this.checkState, + searchValue: this.checkContent || undefined + } + }) + }, }, mounted(){ diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 6fa355143..1934c16bf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -185,7 +185,7 @@ +
+ + + + +
+
基础信息
+
流程信息
+
+
+
+ + + +
+ + + + + {{ hh_pageData.comityName || '-' }} + + + + + {{ hh_pageData.comityNameOne || '-' }} + + + + + {{ hh_pageData.comityNameGroup || '-' }} + + + + + + + {{ hh_pageData.partPeople || '-' }} + + + + + {{ hh_pageData.meetingStartTime || '-' }} + + + + + + + {{ hh_pageData.meetingName || '-' }} + + + + +
+ 添加 + 批量删除 +
+ + + + + + + + + + + + + + + +
+ 添加(测试用) +
+ + + + + + + + + + + + + 点击上传 + + + +
+
+
+
+
+ + + + + +

流程发起人

+
+ + +
+ + + + + + +

法规工程师

+
+ + + +
+ + + + + +
+
+ + + +
+ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue new file mode 100644 index 000000000..4b1fe7f77 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index 84c7e41dc..d2f7884cf 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -36,7 +36,7 @@
+ @click.native="choiceZRR('dockUser', '选择责任部门对接人', roleForm.dockUser)">
@@ -60,12 +60,12 @@ - + + + + + + 0) { - this.nodeList2 = this.roleForm.dockUser.split(","); - } - this.modalshowflag2 = true; - }, + // choiceZRRS() { + // this.nodeList2 = []; + // if (this.roleForm.dockUser.length > 0) { + // this.nodeList2 = this.roleForm.dockUser.split(","); + // } + // this.modalshowflag2 = true; + // }, checkedRole(data) { if (this.type === "dockUser") { - this.roleForm.dockUser = this.roleRow.id; - this.roleForm.dockUserName = this.roleRow.name; + this.roleForm.dockUser = data[0].id; + this.roleForm.dockUserName = data[0].name; } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; } this.modalshowflag = false; }, - checkedRole2(data) { - var idList = ""; - var nameList = ""; - data.forEach(item => { - if (nameList.length > 0) { - nameList += ","; - idList += ","; - } - idList += item.id; - nameList += item.name; - }); - this.roleForm.dockUser = idList; - this.roleForm.dockUserName = nameList; - }, + // checkedRole2(data) { + // var idList = ""; + // var nameList = ""; + // data.forEach(item => { + // if (nameList.length > 0) { + // nameList += ","; + // idList += ","; + // } + // idList += item.id; + // nameList += item.name; + // }); + // this.roleForm.dockUser = idList; + // this.roleForm.dockUserName = nameList; + // }, handleSubmit(){ var json = this.roleForm this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "15"}, { + this.$http.get("lawss/activiti/startProcess", {type: "14"}, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue index 4b989be1a..92aaecb9b 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue @@ -50,7 +50,7 @@
+ @click.native="choiceZRR('workPeople', '选择责任工程师', roleForm.workPeople)">
@@ -103,6 +103,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; +import { inboundLiaisonDetail } from "api/process"; export default { name: "cywbbzzxdStep2", @@ -131,19 +132,44 @@ export default { directorUserName: "" }, roleFormRules: { - dockUserName: [ - {required: true, message: "请选择标准化员", trigger: "change"} - ], - workPeopleName: [ - {required: true, message: '请选择责任工程师', trigger: "change"} - ], - directorUserName: [ - {required: true, message: "请选择标准法规部部长", trigger: "change"} - ] + // dockUserName: [ + // {required: true, message: "请选择标准化员", trigger: "change"} + // ], + // workPeopleName: [ + // {required: true, message: '请选择责任工程师', trigger: "change"} + // ], + // directorUserName: [ + // {required: true, message: "请选择标准法规部部长", trigger: "change"} + // ] }, }; }, + mounted() { + this.getData(); + }, methods:{ + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg); + this.getFormFieldList(processForm); + } + }).catch(e => { + }); + }); + }, + /** + * @description: 动态表单读取 + */ + getFormFieldList(item) { + this.$nextTick(() => { + this.roleForm = item + }); + }, choiceZRR(type, title, id) { this.nodeList = []; this.nodeList.push(id); @@ -186,33 +212,31 @@ export default { this.roleForm.workPeopleName = nameList; }, handleSubmit(){ - var json = this.roleForm - this.$refs["Form"].validate((valid) => { - if (valid) { - this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "15"}, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); + if(this.roleForm.workPeople !== undefined){ + var json = this.roleForm + this.$refs["Form"].validate((valid) => { + if (valid) { + this.isSubmit = true + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + }else{ + this.$message.warning('请选择责任工程师') + } }, handleSave(){ diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 0f07d0d97..8025f3886 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -38,9 +38,9 @@ clearable> - +
- +
- + - + - + @@ -80,9 +81,9 @@ clearable> - +
- +
- +
- +
- + - {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} + {{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} + @@ -134,17 +138,17 @@ fontWeight: 'bold', height: '48px'}" @selection-change="handleSelectionChange1" row-key="id"> - + @@ -283,34 +290,44 @@ export default { active: "1", foldFormFlag: true, isSubmit: false, + recordLoading: false, saveLoading: false, loading: false, detailData: [], //审批历史信息 wbbzform: { - reportingUnit:'', - associationName: '', - committee:'', - workingGroup:'', - personnelRole:'', - membershipTime:'', + reportingUnit: "", + standNumber: "", + hostOrTask: "", + participants: "", + standMechanism: "", + partakeTime: "", + standName: "", + standType: "", + standRevise: "", + releaseTime: "" }, - formRules: {}, - participantsData: [{ - projectNumber: '', - projectName: '', - expenses: '', - costBudget:'', - }], //参与人表格信息 + formRules: { + reportingUnit: [ + { required: true, message: "请输入提报单位", trigger: "change" } + ] + }, + participantsData: [], + // participantsData: [{ + // projectNumber: '', + // projectName: '', + // expenses: '', + // costBudget:'', + // }], //参与人表格信息 associationOptions: [{ - value: '选项1', - label: '1' + value: "选项1", + label: "1" }, { - value: '选项2', - label: '2' - },{ - value: '选项3', - label: '3' - }], + value: "选项2", + label: "2" + }, { + value: "选项3", + label: "3" + }] }; }, methods: { @@ -332,35 +349,73 @@ export default { this.active = type; }, foldForm() { - this.foldFormFlag = !this.foldFormFlag + this.foldFormFlag = !this.foldFormFlag; + }, + handleSave() { + }, + //不备案 + handleRecord(){ + }, - handleSave() {}, handleSubmit() { - console.log(this.wbbzform); + if (this.participantsData.length < 1) { + this.$message.warning("项目信息不能为空"); + } else { + this.participantsData.forEach(item => { + if (item.projectNumber === undefined) { + this.$message.warning("请完善项目信息"); + } + }); + this.wbbzform.commentText = this.commentText; + let json = { + participantsData: this.participantsData, + wbbzform: this.wbbzform, + dlFlag: '1', + }; + this.$refs["wbbzForm"].validate((valid) => { + if (valid) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); + } }, //添加按鈕事件 - addProject(){ - var list = { - projectNumber: this.projectNumber, - projectName: this.projectName, - expenses: this.expenses, - costBudget: this.costBudget - } - this.participantsData.push(list) + addProject() { + var list = { + projectNumber: this.projectNumber, + projectName: this.projectName, + expenses: this.expenses, + costBudget: this.costBudget + }; + this.participantsData.push(list); }, //批量刪除按鈕事件 - deleteProject(){ + deleteProject() { }, - handleSelectionChange1(data){ + handleSelectionChange1(data) { - }, + } }, computed: { listNoDataText() { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } - }, + } }; @@ -368,15 +423,18 @@ export default { .wbbz-step1 { height: 100%; position: relative; + .content { display: flex; flex-direction: column; justify-content: space-between; height: calc(~'100% - 103px'); overflow: auto; - .form-select{ + + .form-select { display: flex; } + .tableTitle { margin-bottom: 10px; height: 30px; @@ -392,6 +450,7 @@ export default { } } } + .headerTabs { display: flex; align-items: center; diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue new file mode 100644 index 000000000..48690df4b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -0,0 +1,477 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index b56fdd7dd..4e2e244b3 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -157,8 +157,8 @@ export default { }, checkedRole(data) { if (this.type === "dockUser") { - this.roleForm.dockUser = this.roleRow.id; - this.roleForm.dockUserName = this.roleRow.name; + this.roleForm.dockUser = data[0].id; + this.roleForm.dockUserName = data[0].name; } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index f34b1c8a3..190d4a4b2 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -634,46 +634,84 @@ export default { }, // 提交按钮 handleSubmit() { - if (this.dataList.length < 1) { - this.$message.warning("标准不能为空"); - } else { - this.dataList.forEach(item => { - if( item.workPeople === ''){ - this.$message.warning('请选择推荐署名人及单位') - } - }) - let json = { - commentText: this.commentText, - roleForm: this.roleForm, - dataList: this.dataList, - } - this.$refs["Form"].validate((valid) => { - if (valid) { - this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "16"}, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); + if(this.$route.query.prcNum === undefined){ + if (this.dataList.length < 1) { + this.$message.warning("标准不能为空"); + } else { + this.dataList.forEach(item => { + if( item.workPeople === ''){ + this.$message.warning('请选择推荐署名人及单位') + } + }) + let json = { + commentText: this.commentText, + roleForm: this.roleForm, + dataList: this.dataList, } - }); + this.$refs["Form"].validate((valid) => { + if (valid) { + this.isSubmit = true + this.$http.get("lawss/activiti/startProcess", {type: "16"}, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } + }else{ + if (this.dataList.length < 1) { + this.$message.warning("标准不能为空"); + } else { + this.dataList.forEach(item => { + if( item.workPeople === ''){ + this.$message.warning('请选择推荐署名人及单位') + } + }) + let json = { + commentText: this.commentText, + roleForm: this.roleForm, + dataList: this.dataList, + } + this.$refs["Form"].validate((valid) => { + if (valid) { + this.isSubmit = true + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } } + }, // 流程阶段负责人选择 choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue index f8575f7a1..1554ae504 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue @@ -603,7 +603,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' + import {inboundLiaisonDetail,processCreateLaws,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; export default { @@ -1081,6 +1081,7 @@ this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); + this.processCreateLaws(json) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -1095,8 +1096,7 @@ // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else{ - // ?????????????????????????????/ - // this.processCreateStand(json) + this.processCreateLaws(json) } } }) @@ -1108,10 +1108,10 @@ * @date: 2020-11-18 21:47:58 * @auth: chenxiaoxi */ - processCreateStand(json) { + processCreateLaws(json) { const _formData = new FormData() _formData.append('infoJson', json) - processCreateStand(_formData).then(res => { + processCreateLaws(_formData).then(res => { if (res.result === '操作成功' || res.data === '入库成功') { this.$message.success(res.data) setTimeout(() => { diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 0a73a8524..f6ed92d04 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -363,7 +363,7 @@ export default { case 'laws1': // 政策入库流程 this.$router.push({ - name: 'zcrkStep1' + name: 'zcrkwStep1' }) break case '1': diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b6b603dcc..d1e0901ab 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -894,6 +894,43 @@ export default { }) } break + case '14': + //参与外部标准制修订信息提报 + if (row.taskInfo === '下发责任工程师') { + this.$router.push({ + name: 'cywbbzzxdStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '填写备案信息'){ + this.$router.push({ + name: 'cywbbzzxdStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '责任部门对接人审核'){ + this.$router.push({ + name: 'cywbbzzxdStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break case '15': //加入标准化协会信息备案流程 if (row.taskInfo === '填写入会信息') { @@ -1159,7 +1196,7 @@ export default { }) } break - // 政策会后流程 + case '21': if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') { this.$router.push({ @@ -1256,6 +1293,18 @@ export default { } break + case '22': + this.$router.push({ + name: 'bzhhStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index fc987487f..38197dec4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1177,6 +1177,15 @@ const routes = [ title: '参与外部标准制修订信息提报流程' } }, + { + path: '/cywbbzzxdStep4', + name: 'cywbbzzxdStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, { path: '/jrbzhxhStep1', name: 'jrbzhxhStep1', @@ -1324,6 +1333,24 @@ const routes = [ title: '外部标准化协会参会流程（审定）' } }, + { + path: '/bzhhStep1', + name: 'bzhhStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue'), + meta: { + requireAuth: true, + title: '外部标准化会后管理流程（流程发起）' + } + }, + { + path: '/bzhhStep2', + name: 'bzhhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue'), + meta: { + requireAuth: true, + title: '外部标准化会后管理流程（审批）' + } + }, ] }, // 本地工具 @@ -2358,7 +2385,7 @@ const routes = [ } }, { - path: '/advancedSearch', + path: '/advancedSearch/:selectKey?/:searchValue?', name: 'AdvancedSearch', component: () => import('@/pages/searchCenter/pages/advancedSearch'), @@ -2368,6 +2395,17 @@ const routes = [ menuId: 'K9BAYUPZBC' } }, + // { + // path: '/advancedSearch', + // name: 'AdvancedSearch', + // component: () => + // import('@/pages/searchCenter/pages/advancedSearch'), + // meta: { + // requireAuth: true, + // title: '高级检索', + // menuId: 'K9BAYUPZBC' + // } + // }, { path: '/customReport', name: 'CustomReport',