diff --git a/src/App.vue b/src/App.vue index dcb78047d..fe37bdd6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,9 +4,9 @@
-
- - 标准法规管理系统 standard and regulations management system +
+ + 标准法规管理系统 Standard and Regulations Management System
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/components/navMenu/index.vue b/src/components/navMenu/index.vue index aa23dabc5..9d33a1b16 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -1,7 +1,7 @@ @@ -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/home2/index.vue b/src/pages/home2/index.vue index 5887e4cc7..711fd9857 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -11,11 +11,13 @@ class="home-tabs" @tab-click="handleTabClick" > - - + + 标准征求意见 + - - + + 标准发布 +
@@ -135,17 +137,17 @@ export default { margin: 0 10px; } ::v-deep.el-tabs__header{ - margin: 0 10px 15px 10px; + margin: 0 10px 15px 10px; border-bottom: 1px solid #F4F4F4; } ::v-deep { .el-tabs__item { font-size: 16px; - font-weight: 500; - color: #333333; + font-weight: 600; + /*color: #333333;*/ } .el-tabs__nav-wrap::after { - background-color: transparent; + /*background-color: transparent;*/ } } } diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue index 2bb479f84..bf6fa495d 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue @@ -50,10 +50,10 @@
标题:{{ item.collectTitle }}
- 创建时间:{{item.creationTime}} + 创建时间:{{getDate(item.creationTime)}}
- {{$t('m.cancelCollection')}} + {{$t('m.cancelCollection')}} @@ -144,6 +144,9 @@ export default { } }, methods: { + getDate (date) { + return date != null ? date.substring(0, date.indexOf(' ')) : '' + }, // 对话框关闭清除表单 noteChange (type) { if (!type) { @@ -271,33 +274,17 @@ export default { this.$http.get('person/personCollect/page', { pageNo: this.page, pageSize: this.$store.getters.userInfo.configContent, - modeType: 'LAWS', + modeType: 'LAWS_STAND', collectTitle: this.search.collectionLaws, userId: this.$store.getters.userInfo.userId }, { _this: this, loading: 'loading' }, res => { - // for (let i = 0; i < res.data.list.length; i++) { - // res.data.list[i].check = false - // res.data.list[i].checked = false - // res.data.list[i].seeBtn = '查看笔记' - // } this.lawsList = [] - res.data.list.map((item, index) => { - item.checked = false - }) - this.lawsList = res.data.list - this.total = res.data.count + this.lawsList = res.data.records + this.total = res.data.total this.contentOpen = true - // if (this.saveNote !== '') { - // this.lawsList[this.saveNote].check = true - // if (this.lawsList[this.saveNote].check === true) { - // this.lawsList[this.saveNote].seeBtn = '关闭笔记' - // } else { - // this.lawsList[this.saveNote].seeBtn = '查看笔记' - // } - // } }, e => {}) }, // 取消收藏 diff --git a/src/pages/personal/pages/my-collection/index.vue b/src/pages/personal/pages/my-collection/index.vue index 2f383b30e..191b8146c 100644 --- a/src/pages/personal/pages/my-collection/index.vue +++ b/src/pages/personal/pages/my-collection/index.vue @@ -25,10 +25,12 @@ export default { // { // title: '已收藏的动态&资料 ', // name: 'CollectionDynamics' - // }, { - // title: '已收藏的政策', - // name: 'CollectionLaws' - // }, { + // }, + { + title: '已收藏的政策', + name: 'CollectionLaws' + }, + // { // title: '已收藏的标准拆分', // name: 'CollectionBreak' // } diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 243e6163e..0e7bcbdb5 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -70,7 +70,7 @@ size="mini" class="common-button-primary" @click="handleSave" - :loading="submitLoading" + :loading="saveLoading" v-if="showSave"> 保存 @@ -80,7 +80,7 @@ size="small" class="common-button-danger" @click="beforeBack" - :loading="submitLoading" + :loading="isSubmitBack" v-if="showBack"> {{ backBTNText }} @@ -111,6 +111,15 @@ :loading="submitLoading" v-if="showAffirm" >确认 + 不备案
@@ -188,6 +197,10 @@ export default { type: Boolean, default: false }, + showRecord:{ + type: Boolean, + default: false + }, showAffirm: { type: Boolean, default: false @@ -206,6 +219,11 @@ export default { type: Boolean, default: false }, + //不备案按钮Loading + recordLoading:{ + type: Boolean, + default: false + }, // 提交按钮loading submitLoading: { type: Boolean, @@ -221,7 +239,7 @@ export default { type: Boolean, default: false }, - // 保存按钮loading + // 退回按钮loading isSubmitBack: { type: Boolean, default: false @@ -255,6 +273,9 @@ export default { type: Boolean, default: false }, + backBTNTexts: { + type: String + }, submitBTNText: { type: String } @@ -285,6 +306,9 @@ export default { handleSubmit2() { this.$emit('submit2') }, + handleRecord(){ + this.$emit('record') + }, handleSubmit() { this.$emit('submit') }, @@ -384,7 +408,7 @@ export default { }, // 退回按钮文字 backBTNText() { - return this.approval ? '驳回' : '退回' + return this.backBTNTexts ? this.backBTNTexts : this.approval ? '驳回' : '退回' }, userId() { return this.userInfo.userId @@ -402,7 +426,7 @@ export default { text-align: right; background: #fff; z-index: 999; - padding: 0; + padding: 0 10px 0 0; .footer-line { height: 1px; box-shadow: 0 -1px 2px 0px #e8e8e8; diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 4748e48ce..74423e94d 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -17,6 +17,10 @@ export default { label: "标准入库流程", value: "1" }, + { + label: "政策入库流程", + value: "laws1" + }, { label: "标准征求意见流程", value: "3" diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue new file mode 100644 index 000000000..1934c16bf --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -0,0 +1,819 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue new file mode 100644 index 000000000..a5422c02b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -0,0 +1,443 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue new file mode 100644 index 000000000..a9adcf329 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -0,0 +1,506 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue new file mode 100644 index 000000000..3b3a6d8c8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -0,0 +1,456 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue new file mode 100644 index 000000000..2afd920d9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -0,0 +1,477 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue new file mode 100644 index 000000000..92532257d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -0,0 +1,520 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue new file mode 100644 index 000000000..f890e76d2 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -0,0 +1,702 @@ + + + + + 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/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue new file mode 100644 index 000000000..1f24cea81 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -0,0 +1,709 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue new file mode 100644 index 000000000..a1ff02ec9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -0,0 +1,405 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue new file mode 100644 index 000000000..d4a574e08 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -0,0 +1,484 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue new file mode 100644 index 000000000..7ca1aff35 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -0,0 +1,422 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue new file mode 100644 index 000000000..32f6573c7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -0,0 +1,431 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue new file mode 100644 index 000000000..72a244334 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -0,0 +1,463 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 7264af330..84017256c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -494,7 +494,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName if (data.form) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index da2503594..6be10951f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -730,7 +730,7 @@ v-model="form.glwjName" clearable > -
+
{ + if(res && res.data){ + const bringData = res.data + bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0' + bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0' - const json = Object.assign(bringData, bringData.attrInfoCaseMap); - this.form = JSON.parse(JSON.stringify(json)) + const json = Object.assign(bringData, bringData.attrInfoCaseMap); + this.form = JSON.parse(JSON.stringify(json)) - this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] - this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] - this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] - this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] - this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] - this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] - this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] - this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] - this.defaultCheckedKeys = [this.form.standSystem]; - this.defaultCheckedKeys1 = [this.form.cycvppsbm]; - this.defaultCheckedKeys2 = [this.form.kccvppsbm]; - this.defaultCheckedKeys3 = [this.form.dybxh]; - this.key++ - this.key1++ - this.key2++ - this.key3++ - this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' - this.form.prcNum = this.prcNum - this.form.prcName = this.prcName - this.form['id'] = bringData.id - this.standardDrawer = false - this.verifySarStandard = true - this.busVsFunc() - this.modelFunc() - this.$forceUpdate() - - console.log("this.form",this.form); - // 遍历对象初始化文件信息 - for(const p in this.form) { - if (typeof (this.form[p]) != "function") { - this.initializeFileList(p,this.form[p]); + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] + this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] + this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] + this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] + this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] + this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] + this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] + this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] + this.defaultCheckedKeys = [this.form.standSystem]; + this.defaultCheckedKeys1 = [this.form.cycvppsbm]; + this.defaultCheckedKeys2 = [this.form.kccvppsbm]; + this.defaultCheckedKeys3 = [this.form.dybxh]; + this.key++ + this.key1++ + this.key2++ + this.key3++ + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = bringData.id + this.standardDrawer = false + this.verifySarStandard = true + this.busVsFunc() + this.modelFunc() + this.$forceUpdate() } - } + // 遍历对象初始化文件信息 + for(const p in this.form) { + if (typeof (this.form[p ]) != "function") { + this.initializeFileList(p,this.form[p]); + } + } + console.log("res",res); + }) } else if (this.standardCheckedList.length > 1) { this.$message.warning('最多可以带入一条标准信息') @@ -1890,7 +1895,6 @@ this.getFileList(value,this.kwjFileList); break; case 'jdwj': - debugger this.getFileList(value,this.jdwjFileList); break; case 'bpg': @@ -1899,6 +1903,9 @@ case 'zqyjg': this.getFileList(value,this.zqyjgFileList); break; + case 'glwj': + this.getFileList(value,this.glwjFileList); + break; default: ; } },getFileList(fileIds,defaultFileList){ @@ -1909,7 +1916,7 @@ }, { _this: this }, res => { - debugger + let fileList = res.data if (fileList != null && fileList.length > 0) { for (let i = 0; i < fileList.length; i++) { @@ -2365,7 +2372,6 @@ // this.form.zbjbdName += response.data.name+','; // } - switch (this.fileType){ case 'fbgbjbd': this.FBGBJBDFileList=fileList; @@ -2454,6 +2460,7 @@ break; case 'jdwj': this.fileList=this.jdwjFileList + break; case 'kwj': this.fileList=this.kwjFileList break; @@ -2623,34 +2630,34 @@ //拼接文件名和id 提交到流程Activity this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",") - this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.response.data.name).join(",") + this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",") this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",") - this.form.xgdName=this.xgdFileList.map(item => item.response.data.name).join(",") + this.form.xgdName=this.xgdFileList.map(item => item.name).join(",") this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",") - this.form.bpgName=this.bpgFileList.map(item => item.response.data.name).join(",") + this.form.bpgName=this.bpgFileList.map(item => item.name).join(",") this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",") - this.form.ssgName=this.ssgFileList.map(item => item.response.data.name).join(",") + this.form.ssgName=this.ssgFileList.map(item => item.name).join(",") this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",") - this.form.zqyjgName=this.zqyjgFileList.map(item => item.response.data.name).join(",") + this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",") this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",") - this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.name).join(",") + this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",") this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") - this.form.kwjName=this.kwjFileList.map(item => item.response.data.name).join(",") + this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") - this.form.caName=this.caFileList.map(item => item.response.data.name).join(",") + this.form.caName=this.caFileList.map(item => item.name).join(",") this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",") - this.form.zbjbdName=this.zbjbdFileList.map(item => item.response.data.name).join(",") + this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",") this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",") - this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",") + this.form.glwjName=this.glwjFileList.map(item => item.name).join(",") }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index a2b44f516..b9ef47549 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -215,84 +215,164 @@
- - - -
- {{ form.xgdName }} -
-
- - - -
-
- -
- {{ form.fbgbjbdName }} -
-
- - - -
-
- -
- {{ form.zbjbdName }} -
-
- - - -
-
- -
- {{ form.ssgName }} -
-
- - - -
-
- -
- {{ form.caName }} -
-
- - - -
-
-
- - -
- {{ form.kwjName }} -
-
- - - -
-
- -
- {{ form.jdwjName }} -
-
- - - -
-
- -
- {{ form.bpgName }} -
-
- - - -
-
- -
- {{ form.zqyjgName }} -
-
- - - -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+
+ + +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+
+
@@ -470,9 +550,9 @@ -
- {{ form.glwjName }} -
+
+ {{value.name}} +
- -
@@ -692,7 +772,22 @@ name: "bzrkStep2", data () { return { - // 调整处理人抽屉状态 + xgdFileMap: [], + fbgbjbdFileMap: [], + bpgFileMap: [], + ssgFileMap: [], + zqyjgFileMap: [], + jdwjFileMap: [], + kwjFileMap: [], + glwjFileMap: [], + caFileMap: [], + zbjbdFileMap: [], + + + + + + // 调整处理人抽屉状态 drawerModal: false, drawerTitle: '', nodeList: [], @@ -895,7 +990,6 @@ if(fileType === 'fbgbjbd'){ if(this.fbgbjbdFileId.search(',')){ this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); - console.log(this.fbgbjbdFileId); } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ @@ -979,6 +1073,16 @@ this.detailData = res }, e => {}) }, + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(var i=0;i { inboundLiaisonDetail({ @@ -987,6 +1091,8 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + + console.log("processFrom",processForm) this.xgdFileId = processForm.xgd this.fbgbjbdFileId = processForm.fbgbjbd this.bpgFileId = processForm.bpg @@ -998,8 +1104,27 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) - console.log(processForm); - console.log("processForm"); + + this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName); + + this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName); + // fbgbjbdFileMap: {}, + this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName); + // bpgFileMap: {}, + this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName); + // ssgFileMap: {}, + this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName); + // zqyjgFileMap: {}, + this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName); + // jdwjFileMap: {}, + this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName); + // kwjFileMap: {}, + this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName); + // glwjFileMap: {}, + this.caFileMap=this.assemble(processForm.ca,processForm.caName); + // caFileMap: {}, + this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName); + // zbjbdFileMap: {}, } }).catch(e => { @@ -1013,7 +1138,6 @@ this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.form.standSystem] - console.log(this.defaultCheckedKeys) this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] @@ -1082,7 +1206,6 @@ }, { _this: this }, res => { - console.log(res); if (res.success) { if(this.formTongGuo.approvalOpinion === '1'){ this.$message.warning("驳回成功") diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index c30de6592..4ade29c0d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -472,8 +472,8 @@ -
- {{ form.glwjName }} +
+ {{value.name}}
- - @@ -973,12 +973,9 @@ export default { }, e => {}) }, assemble(ids,names){ - console.log("name",names) - console.log("id",ids) let list= new Array(); let idArray=ids.split(','); let nameArray=names.split(','); - console.log("idarray",idArray); for(var i=0;i { @@ -1044,8 +1039,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - console.log("this.form"); - console.log(this.form); + console.log("this.form",this.form); this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 8dc9a84ff..95668c70b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -968,8 +968,17 @@ v-model="form.glwjName" clearable > -
- {{ form.glwjName }} +
+ + + + 查看已上传的文件 +
+ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue new file mode 100644 index 000000000..92aaecb9b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue @@ -0,0 +1,287 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue new file mode 100644 index 000000000..dddcfb8de --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -0,0 +1,525 @@ + + + + + + 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..2f1490c90 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -0,0 +1,525 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue new file mode 100644 index 000000000..a9d49dfbf --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue @@ -0,0 +1,525 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue new file mode 100644 index 000000000..45b9aa29a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue @@ -0,0 +1,525 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue new file mode 100644 index 000000000..4e2e244b3 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -0,0 +1,273 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue new file mode 100644 index 000000000..4012ab90e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -0,0 +1,755 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue new file mode 100644 index 000000000..ed7a190c6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue @@ -0,0 +1,682 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue new file mode 100644 index 000000000..320410b88 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue @@ -0,0 +1,682 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index a8f71cc8a..06a8b2058 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -24,42 +24,64 @@ :data="dataList" border ref="entryTable" - height="49%" + height="90%" @selection-change="selectedDelete" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + - + - - - - - - + + + + + + + + + + + -
@@ -70,7 +92,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText">
@@ -104,7 +126,7 @@
+ @click.native="choiceZRR('dockUser', '选择署名人领导', roleForm.dockUser)">
@@ -118,7 +140,7 @@
+ @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)">
@@ -153,6 +175,151 @@
+ + +
+
+
+
+ + + + + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
{ this.standOptions = res.data.STANDCLASSIFY + this.standStateOptions = res.data.WBZTCLASS; // 文本状态 + this.setMap(this.standStateOptions); }, e => { }) }, methods: { + getDatas(){ + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.roleForm = mes.roleForm + this.dataList = mes.dataList + this.commentText = mes.commentText + }); + }, + 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) { + console.log(item); + this.$nextTick(() => { + this.dataList = item.dataList + this.roleForm = item.roleForm + }); + }, //点击新增事件 addList() { + this.standModel = true }, // 批量删除按钮table,选择数据 - selectedDelete(val) { - this.deleteDataList = [] - for (let i = 0; i < val.length; i++) { - this.deleteDataList.push(val[i].id); - } + selectedDelete(data) { + this.deleteDataList = data + // this.deleteDataList = [] + // for (let i = 0; i < val.length; i++) { + // this.deleteDataList.push(val[i].id); + // } }, // 点击批量删除事件 deleteList() { + if(this.deleteDataList.length < 1){ + this.$message.warning('请选择需要删除的数据') + }else{ + this.$confirm('您确认删除这些数据?', '提示', { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + let exits = []; + this.deleteDataList.map(item => { + let index; + index = this.dataList.findIndex(items => { + return items.id === item.id; + }); + if (index > -1) { + this.dataList.splice(index, 1); + } + exits.push(item); + }); + this.deleteDataList = []; + }).catch(() => { + }); + } + }, + // 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label); + }); }, // 点击查看 handlePreview (item) { @@ -264,7 +534,97 @@ export default { handleTabs(name) { this.active = name }, + //添加标准select的改变 + selectThree(data) { + this.standList = data; + }, + choiceZRRS(row, index) { + this.drawerTitle = "选择责任人"; + this.nodeList = []; + this.zrIndex = index; + this.nodeList.push(row); + this.modalshowflag = true; + }, + typeChange(type) { + this.standardSearch.standType = type; + }, + //添加标准取消事件 + cancelStand() { + this.standModel = false; + }, + //添加标准确定事件 + okStand() { + this.getStandData() + if(this.standList.length < 1){ + this.$message.warning('请选择需要添加的数据') + }else{ + let exits = []; + this.standList.map(item => { + let newStand = false; + for (let itemKey of this.dataList) { + if (item.id == itemKey.id) { + newStand = true; + break; + } + } + if (newStand) { + this.$message.warning("请勿重复添加数据"); + } else { + this.$set(item, "workPeople", ''); + this.$set(item, "reason", ''); + this.$set(item, "expenses", ''); + this.dataList.push(item); + exits.push(item.id); + } + }); + this.standardData = []; + this.standModel = false; + } + }, + pageChangeNo(page) { + this.pageNo = page; + this.getStandData(); + }, + pageSizeChangeNo(pageSize) { + this.pageSizeNo = this.$store.getters.userInfo.configContent; + this.getStandData(); + }, + clearStandSearch() { + this.standardSearch = { + standType: "", + standNumber: "" + }; + this.getStandData(); + }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, + //查询项目下的标准 + 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 => { + }); + }, // 保存按钮 handleSave() { this.saveLoading = true @@ -272,7 +632,7 @@ export default { _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '8') + _formData.append('prcType', '16') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, dataList: this.dataList, @@ -288,6 +648,84 @@ export default { }, // 提交按钮 handleSubmit() { + 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) { @@ -310,6 +748,11 @@ export default { }else if(this.type === 'president'){ this.roleForm.president = data[0].id; this.roleForm.presidentName = data[0].name; + }else{ + const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])); + newRow.workPeopleId = data[0].id; + newRow.workPeople = data[0].name + '(' + data[0].institutionName + ')'; + this.$set(this.dataList, this.zrIndex, newRow); } this.modalshowflag = false; }, diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue index 0f501fcc3..10b839be8 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -17,42 +17,46 @@ :data="dataList" border ref="entryTable" - height="49%" - @selection-change="selectedDelete" + height="90%" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + - + - - - - - - - - - - - - - - - + - + + + + + + +
@@ -63,7 +67,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText">
@@ -137,14 +141,15 @@
@@ -155,6 +160,14 @@ :nodeList="nodeList" @checkedRole="drawerCheck" /> + +
@@ -172,8 +185,9 @@ export default { passInfo: 0, detailData: [], loading: false, - textarea: '', // 意见 + commentText: '', // 意见 title: '', // 新增编辑抽屉标题 + isTransfer: false, ListModel: false, // 新增编辑抽屉开关 taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -188,6 +202,7 @@ export default { isSubmit: false, saveLoading: false, turnLoading: false, + drawerModal: false, dataList: [], endDataList: [], lastDataList: [], @@ -240,6 +255,26 @@ export default { } }, methods: { + //确认转办 + 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 + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -254,26 +289,28 @@ export default { }) }, getData() { - const params = { - taskIds: this.taskIds, - pId: this.pId, - // standId: '', // 标准号/名称 - // productName: '', // 项目名称 - // responsibleUnit: '' // 责任部门 - } - inboundLiaisonDetail(params).then(res => { - const processForm = JSON.parse(res.mesg) - this.getFormFieldList(processForm) - }) + 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 => { + }); + }); }, - getFormFieldList (item) { + /** + * @description: 动态表单读取 + */ + getFormFieldList(item) { + console.log(item); this.$nextTick(() => { - if (item.passInfo !== undefined) { - this.passInfo = JSON.parse(JSON.stringify(item)).passInfo - } - this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList - this.textarea = JSON.parse(JSON.stringify(item)).commentText - }) + this.dataList = item.dataList + this.roleForm = item.roleForm + }); }, // 批量选择分发责任人 dutyEngineerList(id) { @@ -327,50 +364,57 @@ export default { // 提交按钮 handleSubmit() { this.isSubmit = true - let zqa = new Map(); - for (let lastDataListElement of this.dataList) { - let a = zqa.get(lastDataListElement.dutyPeopleInfoId) - if( a == null){ - a = { - id: lastDataListElement.dutyPeopleInfoId, - name: lastDataListElement.dutyPeopleInfo, - standardInfoList: [] - } - } - a.standardInfoList.push(lastDataListElement); - zqa.set(a.id, a); + let son = { + signFlag: '1', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - let list = []; - for(let item of zqa) { - list.push(item[1]) - } - let json = { - dockUserList: list, - passInfo: this.passInfo - } - let flag=false - this.dataList.forEach(item => { - if (item.dutyPeopleInfo === '') { - flag=true - this.isSubmit = false - } - }) - if(flag)return this.$message.warning('请选择分发负责人填入') - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskIds', this.taskIds) - completeTask(params).then(res => { - if(res.success === true) { - this.$message.success('提交成功') + var json = JSON.stringify(son) + 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 - }).catch(e => { - this.isSubmit = false - }) + }, e => { + }); + }, + //驳回按钮 + beforeBack(){ + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm + } + var json = JSON.stringify(son) + 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 => { + }); + }, + //转办按钮 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row }, - // 流程阶段负责人选择 choiceZRR (type, title, id) { this.nodeList = [] @@ -415,30 +459,6 @@ export default { } this.modalshowflag = false }, - //查询按钮 - /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 - this.realList = this.dataList.filter(item => { - let matchId = true; // 标准号 筛选 - let matchName = true; // 项目名称 筛选 - let matchUnit = true; // 部门 筛选 - - if (standId) { - const keysId = standId - .toUpperCase() // 转大写 - .replace(' ', '') // 删掉空格 - .split('') // 切割成 单个字 - matchId = keysId.every(key => item.standId.toUpperCase().includes(key)); - } - if (productName) { - matchName = item.productName === productName; - } - if (responsibleUnit) { - matchUnit = item.responsibleUnit === responsibleUnit; - } - return matchId && matchName && matchUnit; - }) - this.dataList = this.realList - },*/ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue new file mode 100644 index 000000000..74b15c08e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue @@ -0,0 +1,539 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue new file mode 100644 index 000000000..ec5ac6e64 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue @@ -0,0 +1,539 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue new file mode 100644 index 000000000..5a6de76a0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue @@ -0,0 +1,539 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 7b021f767..bc73c6b65 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -919,7 +919,7 @@ export default { this.getStandData(); }, pageChangeNo(page) { - this.pageNO = page; + this.pageNo = page; this.getProductData(); }, pageSizeChangeNo(pageSize) { diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue new file mode 100644 index 000000000..17a45d0d9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue @@ -0,0 +1,917 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue index bb568704b..ddde0ba2d 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue @@ -1,18 +1,825 @@ @@ -20,7 +827,62 @@ diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue new file mode 100644 index 000000000..0c294ddad --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue @@ -0,0 +1,434 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue new file mode 100644 index 000000000..b9581e109 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue @@ -0,0 +1,409 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue index 797f86fb4..fc0833f3b 100644 --- a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue @@ -1,26 +1,634 @@ diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue new file mode 100644 index 000000000..33a994a10 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue @@ -0,0 +1,474 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue new file mode 100644 index 000000000..b8435bcba --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue @@ -0,0 +1,894 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue index e9ecaeb3e..d469f4661 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue @@ -11,7 +11,7 @@
+ + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
+
@@ -56,11 +78,19 @@
- {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} + {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} - + +
+ + 添加 + + + 批量删除 + +
+ + + + - + +
+ + 添加 + + + 批量删除 + +
+ + + + + + + + + + +
+ + +
+
+
- 2 +
+ + + + + +

流程发起人

+
+ + +
+
+
+
+ + + +

法规认证部部长

+
+ + +
+
+
+
+ + + +

法规认证部副总监

+
+ + +
+
+
+
+ + + +

公司副总

+
+ + +
+
+
+
+
+
+
+ + +
+ +

点击或拖拽上传文件

+
+
+
+ + +
+ +

点击或拖拽上传文件

+
+
+
+ @@ -182,6 +390,7 @@ }, data() { return { + commentText: '', isSubmit: false, saveLoading: false, active: "1", //默认显示 @@ -189,27 +398,406 @@ title: '', content: '', price: '', - time: '' + time: '', + modelNameList: '', + modelList: [] + }, + formRules: { + title: [ + { required: true, message: '请输入课题名称', trigger: 'blur' }, + ], + content: [ + { required: true, message: '请输入主要议题', trigger: 'blur' }, + ], + price: [ + { required: true, message: '请输入费用', trigger: 'blur' }, + ], + time: [ + { required: true, message: '请选择课题研究周期', trigger: 'change' }, + ], + modelNameList: [ + { required: true, message: '请上传课题组通知', trigger: 'blur' }, + ] }, - formRules: {}, foldFormFlag: true, data1: [], data2: [], + roleForm: { + revisionId: this.$store.getters.userInfo.userId, + revisionIdName: this.$store.getters.userInfo.userName, + ministerId: '', + ministerIdName: '', + inspectorId: '', + inspectorIdName: '', + presidentId: '', + presidentIdName: '', + }, + roleFormRules: { + ministerIdName: [ + {required: true, message: '请选择法规认证部部长', trigger: 'change'}, + ], + inspectorIdName: [ + {required: true, message: '请选择法规认证部总监', trigger: 'change'}, + ], + presidentIdName: [ + {required: true, message: '请选择公司副总', trigger: 'change'}, + ] + }, + fileMadel: false, + fileMadel2: false, + fileUrl: 'api/att/attFile/upload', + idList1: [], + idList2: [], + fileIndex: '', + fileList: [], + nodeList: [], + type: '', + drawerTitle: '', + modalshowflag: false, } }, methods: { + add1() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + var json = { + ContactPerson: '', + Company: '', + Telephone: '', + Email: '', + id: id + } + this.data1.push(json) + }, + add2() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + var json = { + Sindex: '', + Member: '', + Company: '', + Email: '', + id: id, + Department: '', + Telephone: '', + Identity: '', + dataName: '', + data: [], + } + this.data2.push(json) + }, + addDelete1() { + if (this.idList1.length > 0) { + this.$confirm('删除选中数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + for (let a = 0; a < this.data1.length; a++) { + this.idList1.forEach(item => { + if (this.data1[a].id === item) { + this.data1.splice(a, 1) + } + }) + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + } else { + this.$message.warning('请选择要删除的数据') + } + }, + addDelete2() { + if (this.idList2.length > 0) { + this.$confirm('删除选中数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + for (let a = 0; a < this.data2.length; a++) { + this.idList2.forEach(item => { + if (this.data2[a].id === item) { + this.data2.splice(a, 1) + } + }) + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + } else { + this.$message.warning('请选择要删除的数据') + } + }, + // 导入按钮 上传之前的钩子 + beginImportFile(file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + importFileSuccess(response, file) { + if (response.ok) { + this.rhform.modelList.push(response.data) + let list = '' + this.rhform.modelList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.rhform.modelNameList = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } else { + this.$message.error('程序异常,上传失败') + } + }, + importFileRemove(file, fileList) { + let list = '' + this.rhform.modelList = [] + fileList.forEach(item => { + this.rhform.modelList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.rhform.modelNameList = list + }, + importFileSuccess2(response, file) { + if (response.ok) { + this.data2[this.fileIndex].data.push(response.data) + let list = '' + this.data2[this.fileIndex].data.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.data2[this.fileIndex].dataName = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } else { + this.$message.error('程序异常,上传失败') + } + }, + importFileRemove2(file, fileList) { + let list = '' + this.data2[this.fileIndex].data = [] + fileList.forEach(item => { + this.data2[this.fileIndex].data.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.data2[this.fileIndex].dataName = list + }, + fileUpload() { + this.fileMadel = true + }, + fileUpload2(index) { + this.fileIndex = index + this.fileList = this.data2[this.fileIndex].data + this.fileMadel2 = true + }, handleTabs(type) { this.active = type; - }, + }, // 切换tabs foldForm() { this.foldFormFlag = !this.foldFormFlag - }, - handleSave() {}, + }, // 基础信息显隐 + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '17') + _formData.append('json', JSON.stringify({ + form: this.rhform, + roleForm: this.roleForm, + commentText: this.commentText, + data1: this.data1, + data2: this.data2 + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 保存事件 handleSubmit() { - console.log(this.rhform); - }, - handleSelectionChange1() {}, - handleSelectionChange2() {} + this.$refs['rhForm'].validate((valid) => { + if (valid) { + if (this.data1.length) { + if (this.data2.length) { + let ContactPerson = 0,Company = 0,Telephone = 0,Email = 0,Sindex = 0,Member = 0,Telephone2 = 0,Email2 = 0, Company2 = 0,Department = 0,Identity = 0 + this.data1.forEach((item, index) =>{ + if (!item.ContactPerson) { + ContactPerson++ + } else if (!item.Company) { + Company++ + } else if (!item.Telephone) { + Telephone++ + } else if (!item.Email) { + Email++ + } + }) + this.data2.forEach((item, index) =>{ + if (!item.Sindex) { + Sindex++ + } else if (!item.Member) { + Member++ + } else if (!item.Telephone) { + Telephone2++ + } else if (!item.Email) { + Email2++ + } else if (!item.Company) { + Company2++ + } else if (!item.Department) { + Department++ + } else if (!item.Identity) { + Identity++ + } + }) + if (ContactPerson > 0) { + return this.$message.warning('请输入联络人') + } else if (Company > 0) { + return this.$message.warning('请输入课题组联络人单位') + } else if (Telephone > 0) { + return this.$message.warning('请输入课题组联络人电话') + } else if (Email > 0) { + return this.$message.warning('请输入课题组联络人邮箱') + } else if (Sindex > 0) { + return this.$message.warning('请输入工作组排名顺序') + } else if (Member > 0) { + return this.$message.warning('请输入我司成员') + } else if (Telephone2 > 0) { + return this.$message.warning('请输入内部参与人员电话') + } else if (Email2 > 0) { + return this.$message.warning('请输入内部参与人员油邮箱') + } else if (Company2 > 0) { + return this.$message.warning('请输入内部参与人员单位') + } else if (Department > 0) { + return this.$message.warning('请输入内部参与人员部门') + } else if (Identity > 0) { + return this.$message.warning('请输入内部参与人员身份') + } else { + this.$refs['Form'].validate((valid) => { + if (valid) { + this.isSubmit = true + this.$http.get('lawss/activiti/startProcess', { + type: '17' + }, {}, res => { + if (res.ok) { + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false + } + }) + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false + } + }) + } else { + return this.$message.warning('请完善人员信息') + } + }) + } + } else { + return this.$message.warning('请添加集团内部参与人员') + } + } else { + return this.$message.warning('请添加课题组人员') + } + } else { + return this.$message.warning('请完善基础信息') + } + }) + }, // 提交事件 + handleSelectionChange1(val) { + this.idList1 = [] + val.forEach(item => { + this.idList1.push(item.id) + }) + }, // table1选中change事件 + handleSelectionChange2(val) { + this.idList2 = [] + val.forEach(item => { + this.idList2.push(item.id) + }) + }, // table2选中change事件 + choiceZRR(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, // 点击人员input事件 + checkedRole(data) { + if (this.type === 'ministerId') { + this.roleForm.ministerId = data[0].id + this.roleForm.ministerIdName = data[0].name + } else if (this.type === 'inspectorId') { + this.roleForm.inspectorId = data[0].id + this.roleForm.inspectorIdName = data[0].name + } else if (this.type === 'presidentId') { + this.roleForm.presidentId = data[0].id + this.roleForm.presidentIdName = data[0].name + } + }, // 选择人员确认事件 }, mounted() {} }; @@ -263,6 +851,15 @@ background: #E6A23C; } } + .label-input-form { + .add-form-item { + /deep/.el-form-item__content { + .el-date-editor { + width: 400px; + } + } + } + } } diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue new file mode 100644 index 000000000..9e9db0d96 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue new file mode 100644 index 000000000..8c06f1d46 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue new file mode 100644 index 000000000..7dea65683 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue new file mode 100644 index 000000000..08036277e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -0,0 +1,2382 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue new file mode 100644 index 000000000..c65b895c7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue @@ -0,0 +1,1231 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue new file mode 100644 index 000000000..82969e214 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue @@ -0,0 +1,2485 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue new file mode 100644 index 000000000..301d09b3c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue @@ -0,0 +1,985 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index c09a89865..3326007a4 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -142,9 +142,24 @@ - + -
+
+
+
+ +
+
+
政策入库流程
+
+
+
+
+ + + + +
@@ -157,9 +172,9 @@
- + -
+
@@ -174,13 +189,13 @@ -
+
-
政策课题会后流程
+
外部署名推荐审批流程
@@ -189,13 +204,58 @@ -
+
-
外部署名推荐审批流程
+
加入标准化协会信息提报流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
参与外部标准制修订信息提报流程
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
外部标准化协会入会流程
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
外部标准化协会参会流程
@@ -280,6 +340,12 @@ export default { name: 'bzdyStep1' }) break + case 'laws1': + // 政策入库流程 + this.$router.push({ + name: 'zcrkStep1' + }) + break case '1': // 标准入库流程 this.$router.push({ @@ -353,29 +419,54 @@ export default { }) break case '15': + case '17': //政策课题入会流程 this.$router.push({ name: 'zcrhStep1' }) break - case '16': + case '18': //政策课题参会流程 this.$router.push({ name: 'zcchStep1' }) break - case '17': + case '19': //政策课题会后流程 this.$router.push({ name: 'zchhStep1' }) break - case '18': + case '16': //外部署名推荐审批流程 this.$router.push({ name: 'wbsmStep1' }) break + case '15': + //加入标准化协会信息提报流程 + this.$router.push({ + name: 'jrbzhxhStep1' + }) + break + case '14': + //参与外部标准制修订信息提报流程 + this.$router.push({ + name: 'cywbbzzxdStep1' + }) + break + // 外部标准化协会入会流程 + case '20': + this.$router.push({ + name: 'bzrhStep1' + }) + break + // 外部标准化协会参会流程 + case '21': + this.$router.push({ + name: 'bzchStep1' + }) + break } }, checkPermission(permissionIdArray) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e3020aa1a..6c76b6aad 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -283,7 +283,6 @@ export default { dealWith (row) { // 办理 this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType - console.log('286',row) switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { @@ -870,200 +869,6 @@ export default { }) } break - case 'laws2': - if (row.taskInfo === '责任对接人进行任务下发') { - this.$router.push({ - name: 'zczqyjStep2', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } else if(row.taskInfo === '责任人(责任工程师)填写意见'){ - this.$router.push({ - name: 'zczqyjStep3', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '责任对接人审核'){ - this.$router.push({ - name: 'zczqyjStep4', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规工程师单条审核'){ - this.$router.push({ - name: 'zczqyjStep5', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规工程师修订'){ - this.$router.push({ - name: 'zczqyjStep6', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规认证部长审核'){ - this.$router.push({ - name: 'zczqyjStep7', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规认证部副总监审核'){ - this.$router.push({ - name: 'zczqyjStep8', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规认证部总监批准'){ - this.$router.push({ - name: 'zczqyjStep9', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - break - case 'laws3': - if (row.taskInfo === '法规认证部长批准') { - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep2', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } else if(row.taskInfo === '法规认证部副总监批准'){ - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep3', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '责任部门领导任务下发'){ - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep4', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '责任人反馈情况'){ - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep5-1', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '责任部门领导批准'){ - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep6', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规管理员审核'){ - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep7-1', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规认证部长审定'){ - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep8', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - else if(row.taskInfo === '法规认证部副总监批准'){ - this.$router.push({ - name: 'zdrzbzORzchgxxmscStep9', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 1673f66fb..6e9e63fd7 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -389,6 +389,135 @@ export default { } }) break + case '17': + this.$router.push({ + name: 'zcrhStep1-1', + query: { + type: '17', + processName: '政策课题入会流程', + bpnId: id + } + }) + break + case '18': + this.$router.push({ + name: 'zcchStep1-1', + query: { + type: '18', + processName: '政策课题参会流程', + bpnId: id + } + }) + break + case '14': + this.$router.push({ + name: 'cywbbzzxdStep1', + query: { + type: '14', + processName: '参与外部标准制修订信息提报流程', + bpnId: id + } + }) + break + case '15': + if(mes !== null && mes.taskInfo !== null){ + if (mes.taskInfo === '备案任务下发') { + this.$router.push({ + name: 'jrbzhxhStep1', + query: { + type: '15', + processName: '加入标准化协会信息提报流程', + bpnId: id, + verifySarStandard: true, + } + }) + }else if(mes.taskInfo === '入会信息填报'){ + this.$router.push({ + name: 'jrbzhxhStep2', + query: { + type: '15', + processName: '加入标准化协会信息提报流程', + bpnId: id, + } + }) + } + }else{ + this.$router.push({ + name: 'jrbzhxhStep1', + query: { + type: '15', + processName: '加入标准化协会信息提报流程', + bpnId: id + } + }) + } + break + case '16': + this.$router.push({ + name: 'wbsmStep1', + query: { + type: '16', + processName: '外部署名推荐审批流程', + bpnId: id + } + }) + break + case '20': + this.$router.push({ + name: 'bzrhStep1', + query: { + type: '20', + processName: '外部标准化协会入会流程', + bpnId: id + } + }) + break + // 标准入库、 + case 'laws1': + if(mes !== null && mes.taskInfo !== null){ + if (mes.taskInfo === '申请人发起') { + this.$router.push({ + name: 'zcrkStep1', + query: { + type: '1', + processName: '申请人发起流程', + bpnId: id, + verifySarStandard: true, + } + }) + }else if(mes.taskInfo === '申请人重新发起'){ + this.$router.push({ + name: 'zcrkStep3', + query: { + type: '1', + processName: '申请人发起流程', + bpnId: id, + verifySarStandard: true, + } + }) + } + }else { + this.$router.push({ + name: 'zcrkStep3', + query: { + type: '1', + processName: '申请人发起流程', + bpnId: id, + verifySarStandard: true, + } + }) + } + break + case '21': + this.$router.push({ + name: 'bzchStep1', + query: { + type: '21', + processName: '外部标准化协会参会流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 58011f326..25e3b968a 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -1,521 +1,643 @@ - +