From a5ef6d362535738f86cc25f380832cf75ca03533 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 26 Oct 2021 17:21:36 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=B8=A6=E5=85=A5=E6=A0=87=E5=87=86,?=
=?UTF-8?q?=E5=8B=98=E8=AF=AF=E4=BB=B6=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?.switch=E6=B2=A1=E5=86=99break(=EF=BC=A0=5F=EF=BC=A0;)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 86 ++++++++++---------
1 file changed, 46 insertions(+), 40 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index da2503594..90c8e7b01 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1814,47 +1814,52 @@
// 带入
case 2:
if (this.standardCheckedList.length === 1) {
- const bringData = this.standardCheckedList[0]
- bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
- bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
+ this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
+ _this: this
+ }, res => {
+ 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,8 +1895,8 @@
this.getFileList(value,this.kwjFileList);
break;
case 'jdwj':
- debugger
this.getFileList(value,this.jdwjFileList);
+ console.log("初始",this.jdwjFileList)
break;
case 'bpg':
this.getFileList(value,this.bpgFileList);
@@ -1909,7 +1914,7 @@
}, {
_this: this
}, res => {
- debugger
+
let fileList = res.data
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
@@ -2454,6 +2459,7 @@
break;
case 'jdwj':
this.fileList=this.jdwjFileList
+ break;
case 'kwj':
this.fileList=this.kwjFileList
break;
From 2119620fd4df39250a2432b61e787b3de1fecd5a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 27 Oct 2021 09:53:19 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E6=95=B4=E4=B8=AA=E6=B5=81=E7=A8=8B=E5=AE=9E=E7=8E=B0=E5=A4=9A?=
=?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 22 +-
.../pages/creatProcess/bzrk/step2.vue | 291 +++++++++++++-----
.../pages/creatProcess/bzrk/step3.vue | 9 +-
3 files changed, 219 insertions(+), 103 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 90c8e7b01..c93f23518 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1896,7 +1896,6 @@
break;
case 'jdwj':
this.getFileList(value,this.jdwjFileList);
- console.log("初始",this.jdwjFileList)
break;
case 'bpg':
this.getFileList(value,this.bpgFileList);
@@ -2370,7 +2369,6 @@
// this.form.zbjbdName += response.data.name+',';
// }
-
switch (this.fileType){
case 'fbgbjbd':
this.FBGBJBDFileList=fileList;
@@ -2629,34 +2627,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..34ecbacec 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}}
+
+
+ - -
+
+
+
+
适用范围
@@ -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..254cbc5cd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -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 {
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]
From 453ae18ff9e0fca6b8fa84596ba0fffeee3dc1c3 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Fri, 29 Oct 2021 14:13:09 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/components/ProcessFooter.vue | 6 +-
.../pages/creatProcess/bzhHd-rh/step1.vue | 269 +++++++---
.../pages/creatProcess/bzhHd-rh/step2.vue | 161 +++---
.../pages/creatProcess/bzhHd-rh/step3.vue | 95 +++-
.../pages/creatProcess/bzhHd-rh/step4.vue | 147 +++---
.../pages/creatProcess/bzhHd-rh/step5.vue | 103 ++--
.../pages/creatProcess/bzhHd-rh/step6.vue | 473 ++++++++++++++++++
.../tabComponents/processCenter/index.vue | 37 +-
src/router/index.js | 9 +
9 files changed, 999 insertions(+), 301 deletions(-)
create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index d594b5bb4..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 }}
@@ -239,7 +239,7 @@ export default {
type: Boolean,
default: false
},
- // 保存按钮loading
+ // 退回按钮loading
isSubmitBack: {
type: Boolean,
default: false
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index dd60c72b3..a2e046905 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -15,7 +15,7 @@
基础信息
-
+
@@ -156,7 +156,7 @@
-
+
@@ -196,35 +196,35 @@
fontWeight: 'bold', height: '20px'}">
-
+
-
+
-
+
-
+
@@ -252,7 +252,7 @@
-
+
技术委员会分委会主任/技术主管部门负责人
@@ -264,85 +264,85 @@
-
+
-
+
责任工程师
-
-
+
+
-
+
-
+
参会人员所在部门负责人
-
-
+
+
-
+
-
+
标准法规部人员
-
-
+
+
-
+
-
+
标准法规部主管领导
-
-
+
+
-
+
-
+
费用管理部门
-
-
+
+
-
+
-
+
技术委员会常务副主任/总院院长
-
-
+
+
-
+
-
+
总院技术委员会主任
-
-
+
+
@@ -363,6 +363,12 @@
+ {
+ let mes = JSON.parse(res.mes)
+ this.rh_pageData = mes.rh_pageData
+ this.roleForm = mes.roleForm
+ });
+ },
//上传按钮
- uploadFile (val) {
+ uploadFile(val) {
},
// 文件上传限制条件
handleBeforeUpload(file) {
@@ -489,8 +521,8 @@ export default {
handleBeforeRemove(file, fileList) {
this.fileData = fileList
this.fileTextList.forEach((item, index) => {
- if (item.name === file.name || item.id === file.id ) {
- this.fileTextList.splice(index,1)
+ if (item.name === file.name || item.id === file.id) {
+ this.fileTextList.splice(index, 1)
}
})
},
@@ -509,7 +541,7 @@ export default {
name: res.data.standName
})
}
- this.fileListData.fileText = this.newDataList
+ this.rh_pageData.infoSources = this.newDataList
this.$message({
showClose: true,
message: res.message,
@@ -563,31 +595,86 @@ export default {
},
// 流程阶段负责人选择
- choiceZRR (type, title, id) {
+ choiceZRR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.roleShowflag = true
},
- drawerCheck (data) {
+ drawerCheck(data) {
+ var idList = ''
+ var nameList = ''
+ data.forEach(item => {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
+ console.log(this.type)
+ if (this.type === 'feeUser') {
+ this.roleForm.feeUser = nameList
+ this.roleForm.feeUserId = idList
+ } else {
+ this.roleForm.dockUser = idList
+ this.roleForm.dockUserName = nameList
+ this.rh_pageData.comityInRole = nameList
+ this.rh_pageData.comityInRoleId = idList
+ }
+ this.roleShowflag = false
+ },
+
+ // 流程阶段人选择
+ choiceZRROne(type, title, id) {
+ this.nodeListOne = []
+ this.nodeListOne.push(id)
+ this.type = type
+ this.drawerTitleOne = title
+ this.roleShowflagOne = true
+ },
+ drawerCheckOne(data) {
this.unqualidiedData.forEach(item => {
item.engineer = data[0].name
item.engineerId = data[0].id
})
- this.roleForm.dockUser = data[0].id
- this.roleForm.dockUserName = data[0].name
- this.roleShowflag = false
+ if (this.type === 'leaderUser') {
+ this.roleForm.leaderUser = data[0].name
+ this.roleForm.leaderUserId = data[0].id
+ } else {
+ this.roleForm.engineerUser = data[0].name
+ this.roleForm.engineerUserId = data[0].id
+ }
+ this.roleShowflagOne = false
},
+
// 保存按钮
- 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', '20')
+ _formData.append('json', JSON.stringify({
+ roleForm: this.roleForm,
+ rh_pageData: this.rh_pageData
+ }))
+ saveTaskFirst(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
// 提交按钮
handleSubmit() {
let json = {
- prcCreateUser: this.$store.getters.userInfo.userId,
- prcCreateUserName: this.$store.getters.userInfo.userName,
+ roleList: this.roleForm,
rh_pageData: this.rh_pageData,
- directorList: this.roleForm.dockUser,
+ directorList: this.rh_pageData.comityInRoleId,
}
this.$refs['rh_pageData'].validate((valid) => {
if (valid) {
@@ -595,16 +682,16 @@ export default {
if (valid) {
this.isSubmit = true
const paramsInfo = {
- type: '11'
+ type: '20'
}
- startProcess(paramsInfo).then(res=>{
+ startProcess(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskID)
completeTask(params).then(res => {
- if(res.success === true) {
+ if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
@@ -613,7 +700,8 @@ export default {
})
}
})
- } })
+ }
+ })
}
}
}
@@ -621,15 +709,18 @@ export default {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 150e4b0ea..bb98c0b53 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -919,7 +919,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '入会代表填写入会信息表') {
this.$router.push({
name: 'bzrhStep3',
query:{
@@ -930,7 +930,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '入会人员所在部门负责人审核') {
this.$router.push({
name: 'bzrhStep4',
query:{
@@ -941,7 +941,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '标准法规工程师汇总修订') {
this.$router.push({
name: 'bzrhStep5',
query:{
@@ -952,13 +952,11 @@ export default {
prcType: row.prcType
}
})
- }
- break
- case '17':
- if (row.taskInfo === '法规认证部副部长审核') {
+ }else if (row.taskInfo === '标准法规部主管领导审核') {
this.$router.push({
- name: 'zcrhStep2',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
@@ -966,10 +964,11 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '法规认证部副总监批准') {
+ } else if (row.taskInfo === '费用管理部门会签') {
this.$router.push({
- name: 'zcrhStep3',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
@@ -977,10 +976,11 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '公司副总批准') {
+ } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
this.$router.push({
- name: 'zcrhStep4',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
@@ -988,10 +988,11 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '修订入会信息') {
+ } else if ('标准法规工程师汇总修订'){
this.$router.push({
- name: 'zcrhStep1-1',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
diff --git a/src/router/index.js b/src/router/index.js
index 7ae3a1428..ba365c489 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1205,6 +1205,15 @@ const routes = [
title: '外部标准化协会入会流程(修订)'
}
},
+ {
+ path: '/bzrhStep6',
+ name: 'bzrhStep6',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程(审批)'
+ }
+ },
// 外部标准化协会参会流程
{
From 339caf77e197d4f136677b74b5fd3b3ee87288eb Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Fri, 29 Oct 2021 17:45:50 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzhHd-rh/step1.vue | 1 -
.../pages/creatProcess/bzhHd-rh/step4.vue | 2 +-
.../pages/creatProcess/bzhHd-rh/step6.vue | 33 +++++++++++++++++++
.../tabComponents/processCenter/index.vue | 2 +-
.../tabComponents/taskDraft/index.vue | 10 ++++++
5 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index a2e046905..9d714ddac 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -613,7 +613,6 @@ export default {
idList += item.id;
nameList += item.name;
});
- console.log(this.type)
if (this.type === 'feeUser') {
this.roleForm.feeUser = nameList
this.roleForm.feeUserId = idList
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 068ef9cec..9e1605eea 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -334,7 +334,7 @@ export default {
let json = {
member: this.selfUser,
passFlag: '0',
- engineerSum: this.roleForm.startUser,
+ roleList: this.roleForm,
commentText: this.textarea,
rh_pageData: this.rh_pageData,
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index 73e688bc4..b82f77cb2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -348,6 +348,39 @@ export default {
},
// 退回按钮
handleSubmitNo() {
+ let json = {
+ rh_pageData: this.rh_pageData,
+ roleList: this.roleForm
+ }
+ if (this.taskInfo === '标准法规部主管领导审核') {
+ json.passFlag = '0',
+ json.manageDepartmentList = this.roleForm.feeUserId
+ } else if (this.taskInfo === '费用管理部门会签') {
+ json.passFlag = '0',
+ json.manageDepartment = this.$store.getters.userInfo.userId
+ json.president = this.roleForm.engineerUserId
+ } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ json.passFlag = '0',
+ json.engineerSumDone = this.roleForm.startUser
+ } else {
+ json = json
+ }
+ this.$refs['rh_pageData'].validate((valid) => {
+ if (valid) {
+ this.isBack = true
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskId', this.taskIds)
+ completeTask(params).then(res => {
+ if (res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ this.isBack = false
+ });
+ }
+ })
},
// 提交按钮
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index bb98c0b53..6b6f87bfc 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -988,7 +988,7 @@ export default {
prcType: row.prcType
}
})
- } else if ('标准法规工程师汇总修订'){
+ } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){
this.$router.push({
name: 'bzrhStep6',
query:{
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 1673f66fb..21d8ebce5 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -389,6 +389,16 @@ export default {
}
})
break
+ case '20':
+ this.$router.push({
+ name: 'bzrhStep1',
+ query: {
+ type: '20',
+ processName: '外部标准化协会入会流程',
+ bpnId: id
+ }
+ })
+ break
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
From 5e2951a5336126702865001483bc9877679c7a73 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 29 Oct 2021 17:50:04 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E5=85=B3=E8=81=94=E6=96=87=E4=BB=B6-=E5=A4=9A=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 5 ++++-
.../pages/creatProcess/bzrk/step2.vue | 6 +++---
.../pages/creatProcess/bzrk/step3.vue | 5 ++---
.../pages/creatProcess/bzrk/step4.vue | 16 ++++++++++++++--
4 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index c93f23518..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
>
-
+
-
- {{ form.glwjName }}
-
+
+ {{value.name}}
+
- -
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 254cbc5cd..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}}
- -
@@ -1027,7 +1027,6 @@ export default {
-
this.getFormFieldList(processForm)
}
}).catch(e => {
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 }}
+
+
+
+
+ 查看已上传的文件
+
Date: Sat, 30 Oct 2021 00:52:07 +0800
Subject: [PATCH 06/10] feat: There is no way the
---
src/components/navMenu/index.vue | 10 +-
.../pages/attributeCustom/components/laws.vue | 14 +-
.../config/pages/attributeCustom/index.vue | 4 +-
.../details/otherLawsStandDetails/index.vue | 2369 ++++++++
.../components/CollectionLaws.vue | 29 +-
.../personal/pages/my-collection/index.vue | 10 +-
.../foreignRegulationsDatabase/index.vue | 5023 ++++++++++++++---
.../js/foreignRegulationsDatabase.js | 2 +
src/router/index.js | 13 +-
9 files changed, 6641 insertions(+), 833 deletions(-)
create mode 100644 src/pages/details/otherLawsStandDetails/index.vue
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index aa23dabc5..90a5e4c11 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -130,11 +130,11 @@ export default {
menuId: '2b25c67f10abbbadf37d60daaaec54d3'
},
- // {
- // title: '国内外政策',
- // path: '/foreignRegulationsDatabase',
- // menuId: '4DB4Y2H3NH'
- // },
+ {
+ title: '国内外政策',
+ path: '/foreignRegulationsDatabase',
+ menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
+ },
// // // {
// // // title: '标准制修订管理',
// // // path: '/demo2One'
diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue
index ddb33e2fe..0282e8977 100644
--- a/src/pages/config/pages/attributeCustom/components/laws.vue
+++ b/src/pages/config/pages/attributeCustom/components/laws.vue
@@ -2,8 +2,8 @@
- 新增
- 展示区域管理
+ 新增
+ 展示区域管理
数据处理中
@@ -282,7 +282,7 @@
+
+
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/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 58011f326..8b84c1756 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -1,521 +1,643 @@
-
+
-
-
-
-
clickDropMenu('addMenu', treeNode)"
- @treeEdit="(treeId, treeNode) => clickDropMenu('editMenu', treeNode)"
- @treeClick="(treeId, treeNode) => treeClick(treeNode)"
- @treeRightClick="(treeId, treeNode) => treeRightClick(treeNode)"
- @treeRemove="(treeId, treeNode) => clickDropMenu('deleteMenu', treeNode)"
- @drag="drag"
- >
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ node.label}}
+
+ append(data)">
+ 新增
+
+ update(data)">
+ 编辑
+
+ remove(node, data)">
+ 删除
+
+
+
+
+
+
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ :loading="searching"
+ type="primary"
+ size="mini"
+ class="common-button-primary"
+ v-btn-permission="'d451a3e980f0536386a09443f40af772'"
+ @click="getBussionStandTableBtn(lawsStandInfoSearch)">
+ 查询
+
- 高级查询
+ size="mini"
+ class="common-button-default"
+ v-btn-permission="'4819e2ee2a92fdcba7643e27dba4a41b'"
+ @click="clearAllSearch('lawsStandInfoSearch')">清空
+
+ 高级检索
+
-
+
-
-
- 新增
- 导入
- 导出
-
-
-
-
-
-
- 批量删除
- 移除政策
- 模板下载
- 配置政策
-
-
-
-
-
-
-
- {{ scope.row.lawsNumber }}
-
-
-
-
- {{ scope.row.lawsName }}
-
-
-
-
- {{ formatIssueDate(scope.row.issueTime) }}
-
-
-
-
- {{ scope.row.attrInfoMap.XCXSSRQ || '' }}
- {{ scope.row.attrInfoMap.XCXSSRQ }}
-
-
-
-
- {{ getLawsState(scope.row.lawsState) }}
-
-
-
-
-
-
-
-
-
-
- {{$t('m.collection')}}
-
-
- {{$t('m.cancelCollection')}}
-
- {{$t('m.edit')}}
- {{$t('m.share')}}
-
- {{$t('m.delete')}}
-
-
-
-
-
-
-
{{$t('m.dataAcquisition')}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+ 配置标准
+ 移除标准
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 该节点下有记录,是否删除?
-
- {{$t('m.cancel')}}
- {{$t('m.sure')}}
-
-
-
-
-
-
- {{ shareUser.account }}
-
-
-
- {{$t('m.cancel')}}
- {{$t('m.sure')}}
-
-
-
-
-
- treeOnCheck(checkedList)"
- allDept
- showUser
- check-enable
- :editable="false"
- style="padding: 0 15px">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.lawsNumber }}
+ {{ scope.row.lawsNumber }}
+ {{ scope.row.lawsNumber }}
+
+
+
+
+ {{ scope.row.lawsName }}
+ {{ scope.row.lawsName }}
+ {{ scope.row.lawsName }}
+
+
+
+
+ {{ scope.row.lawsEnName }}
+ {{ scope.row.lawsEnName }}
+ {{ scope.row.lawsEnName }}
+
+
+
+
+ {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+
+
+
+
+ {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+ {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+ {{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}
+
+
+
+
+
+
+ {{scope.row.standStatusShow}}
+
+
+ {{scope.row.standStatusShow}}
+
+
+ {{scope.row.standStatusShow}}
+
+
+
+
+
+
+
+
+
+
+ 收藏
+
+
+ 取消收藏
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
数据获取中
+
+
+
+
+
-
-
+
+
@@ -548,240 +668,202 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
- {{$t('m.entryNumber')}}:{{lawsShowItemEO.itemsNum}}
-
-
- {{$t('m.entryName')}}:{{lawsShowItemEO.itemsName}}
-
-
-
-
- {{$t('m.partsInvolved')}}:{{lawsShowItemEO.parts}}
-
-
- {{$t('m.specialEffectiveDate')}}:{{lawsShowItemEO.tackTime}}
-
-
-
-
- {{$t('m.applicableModels')}}:{{lawsShowItemEO.applyArcticShow}}
-
-
- {{$t('m.typesOfEnergy')}}:{{lawsShowItemEO.energyKindShow}}
-
-
-
-
- {{$t('m.responsibilityDepartment')}}:{{lawsShowItemEO.responsibleUnitShow}}
-
-
- {{$t('m.remarks')}}:{{lawsShowItemEO.remarks}}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{$t('m.Loading')}}
+ ref="selection"
+ :data="configStandList"
+ tooltip-effect="dark"
+ style="width: 100%; flex: auto;"
+ height="100%"
+ border
+ :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+ @selection-change="selectConfigStandChange">
+ type="selection"
+ width="55"
+ align="center">
+ show-overflow-tooltip
+ prop="standCode"
+ label="标准号"
+ align="center"
+ >
+ prop="standName"
+ label="标准名称"
+ width="200"
+ align="center">
+ prop="issueTime"
+ label="发布日期"
+ width="180"
+ sortable
+ align="center">
+ prop="putTime"
+ label="实施日期"
+ width="180"
+ sortable
+ align="center">
+
+
+
+
+
+
+
+
-
+
+
加载中...
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 该节点下有记录,是否删除?
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ treeOnCheck(checkedList)"
+ check-enable
+ allDept
+ showUser
+ :editable="false"
+ style="padding: 0 15px">
+
+
+
+
+
导入失败
@@ -793,121 +875,3458 @@
确认
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.lawsNumber }}
-
-
-
-
-
-
-
-
-
- {{$t('m.dataAcquisition')}}
-
-
-
-
-
-
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 实施日期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 适用范围
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
导入中...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
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..f8575f7a1
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
@@ -0,0 +1,1228 @@
+
+
+
+
+ 标准入库流程
+ 经理人审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 实施日期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 文本信息
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+ 适用范围
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+ 责任人
+
+
+
+
+
+
+
+ 责任人
+
+
+
+
+
+
+
+ 标准法规工程师
+
+
+
+
+
+
+
+ 责任对接人,标准法规部部门负责人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
new file mode 100644
index 000000000..ce8ba31e6
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
@@ -0,0 +1,1052 @@
+
+
+
+
+ 标准入库流程
+ 流程数据信息
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 实施日期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 文本信息
+
+
+
+
+
+
+ {{ form.xgdName }}
+
+
+ - -
+
+
+
+
+ {{ form.fbgbjbdName }}
+
+
+ - -
+
+
+
+
+ {{ form.zbjbdName }}
+
+
+ - -
+
+
+
+
+ {{ form.ssgName }}
+
+
+ - -
+
+
+
+
+ {{ form.caName }}
+
+
+ - -
+
+
+
+
+
+
+ {{ form.kwjName }}
+
+
+ - -
+
+
+
+
+ {{ form.jdwjName }}
+
+
+ - -
+
+
+
+
+ {{ form.bpgName }}
+
+
+ - -
+
+
+
+
+ {{ form.zqyjgName }}
+
+
+ - -
+
+
+
+
+
+
+ 适用范围
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.glwjName }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+ 责任人
+
+
+
+
+
+
+
+ 责任人
+
+
+
+
+
+
+
+ 标准法规工程师
+
+
+
+
+
+
+
+ 责任对接人,标准法规部部门负责人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index af4c10e45..19ce20615 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -142,6 +142,21 @@
+
+
+
+
+
+
![]()
+
+
+
+
+
+
@@ -360,6 +375,12 @@ export default {
name: 'bzdyStep1'
})
break
+ case 'laws1':
+ // 政策入库流程
+ this.$router.push({
+ name: 'zcrkStep1'
+ })
+ break
case '1':
// 标准入库流程
this.$router.push({
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 6b6f87bfc..e6095ecd0 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -320,6 +320,31 @@ export default {
})
}
break
+ case 'laws1':
+ if (row.taskInfo === '政策入库审批') {
+ this.$router.push({
+ name: 'zcrkStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '重新发起入库流程'){
+ this.$router.push({
+ name: 'zcrkStep1',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 21d8ebce5..221de273f 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -398,6 +398,32 @@ export default {
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 {
+ this.$router.push({
+ name: 'zcrkStep1',
+ query: {
+ type: '1',
+ processName: '申请人发起流程',
+ bpnId: id,
+ verifySarStandard: true,
+ }
+ })
+ }
break
}
},
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 7c11b86dd..25e3b968a 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -351,7 +351,7 @@
diff --git a/src/router/index.js b/src/router/index.js
index 4f74016e4..d53ae292e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -709,6 +709,33 @@ const routes = [
title: '标准入库流程'
}
},
+ {
+ path: '/zcrkStep1',
+ name: 'zcrkStep1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策入库流程'
+ }
+ },
+ {
+ path: '/zcrkStep2',
+ name: 'zcrkStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策入库流程'
+ }
+ },
+ {
+ path: '/zcrkStep5',
+ name: 'zcrkStep5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策入库流程'
+ }
+ },
{
path: '/bzdyStep1',
name: 'bzdyStep1',
From 38baa9aeff79a04d2041bf49ae23635cffa6119d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 1 Nov 2021 10:49:14 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E4=BF=A1=E6=81=AF=E5=A4=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/cywbbzzxd/step1.vue | 14 +-
.../pages/creatProcess/cywbbzzxd/step2.vue | 256 +++++++++++++++++-
.../pages/creatProcess/jrbzhxh/step1.vue | 34 ++-
.../pages/creatProcess/jrbzhxh/step2.vue | 59 +++-
.../pages/creatProcess/jrbzhxh/step3.vue | 4 +
.../pages/creatProcess/jrbzhxh/step4.vue | 4 +
.../tabComponents/taskDraft/index.vue | 34 +++
7 files changed, 392 insertions(+), 13 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
index 18e8c2297..84c7e41dc 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
@@ -1,8 +1,8 @@
-
+
- 参与外部标准制修订信息备案流程
+ 参与外部标准制修订信息提报流程
发起流程
@@ -28,14 +28,14 @@
-
- 标准化员
+ 责任部门对接人
-
@@ -116,7 +116,7 @@ export default {
},
roleFormRules: {
dockUserName: [
- {required: true, message: "请选择标准化员", trigger: "change"}
+ {required: true, message: "请选择责任部门对接人", trigger: "change"}
],
directorUserName: [
{required: true, message: "请选择标准法规部部长", trigger: "change"}
@@ -201,7 +201,7 @@ export default {
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
index e666ae495..b56fdd7dd 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
@@ -89,6 +89,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
+import { queryTaskFirst, saveTaskFirst } from "api/process";
export default {
name: "jrbzhxhStep1",
@@ -124,7 +125,22 @@ export default {
},
};
},
+ mounted() {
+ this.bpnId = this.$route.query.bpnId
+ if (this.bpnId !== undefined) {
+ this.getData()
+ }
+ },
methods:{
+ getData() {
+ queryTaskFirst({
+ bpnId: this.$route.query.bpnId
+ }).then(res => {
+ let mes = JSON.parse(res.mes)
+ this.roleForm = mes.roleForm
+ });
+ },
+
choiceZRR(type, title, id) {
this.nodeList = [];
this.nodeList.push(id);
@@ -194,7 +210,23 @@ export default {
},
handleSave(){
-
+ this.saveLoading = true;
+ let _formData = new FormData();
+ _formData.append("id", this.bpnId || "");
+ _formData.append("createUser", this.$store.getters.userInfo.userId);
+ _formData.append("createUserName", this.$store.getters.userInfo.userName);
+ _formData.append("prcType", "15");
+ _formData.append("json", JSON.stringify({
+ taskInfo: '备案任务下发',
+ roleForm: this.roleForm,
+ }));
+ saveTaskFirst(_formData).then(res => {
+ this.saveLoading = false;
+ this.$message.success("保存成功");
+ this.bpnId = res.result;
+ }).catch(e => {
+ this.saveLoading = false;
+ });
},
},
};
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index e23460f88..4012ab90e 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -329,7 +329,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
-import { inboundLiaisonDetail } from "api/process";
+import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, saveTaskForPub } from "api/process";
export default {
name: "jrbzhxhStep2",
@@ -353,6 +353,7 @@ export default {
nodeList: [],
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
+ fileName:'',
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
dlFlag: '', // 1为通过 0为不通过
@@ -416,6 +417,18 @@ export default {
}, e => {
});
},
+ getDatas() {
+ queryTaskFirst({
+ bpnId: this.$route.query.bpnId
+ }).then(res => {
+ let mes = JSON.parse(res.mes);
+ console.log(mes);
+ this.wbbzform = mes.form
+ this.associationData = mes.form.associationData
+ this.getFileInfo();
+ this.processTable();
+ });
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -430,6 +443,27 @@ export default {
});
});
},
+ // 请求上传的文件信息
+ getFileInfo() {
+ this.$http.get("att/attFile/getMultiFileInfos", {
+ fileIds: this.fileIds
+ }, {
+ _this: this
+ }, res => {
+ this.$nextTick(() => {
+ res.data.map(item => {
+ // 赋值要回显的上传文件内容
+ this.fileList.push({
+ name: item.oldFileName,
+ uid: item.uid,
+ status: item.status,
+ id: item.id
+ });
+ });
+ });
+ }, e => {
+ });
+ },
/**
* @description: 动态表单读取
*/
@@ -506,11 +540,28 @@ export default {
});
},
//流程保存
- handleSave() {},
+ handleSave() {
+ this.saveLoading = true
+ this.wbbzform.fileName = this.fileInfoList
+ let _formData = new FormData()
+ _formData.append('taskIds', this.taskIds)
+ _formData.append('json', JSON.stringify({
+ roleList: this.roleForm,
+ wbbzform: this.wbbzform,
+ }))
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
//流程提交
handleSubmit() {
this.isSubmit = true
this.wbbzform.dlFlag = '1',
+ this.wbbzform.fileName = this.fileInfoList
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
@@ -634,6 +685,10 @@ export default {
},
},
mounted() {
+ this.bpnId = this.$route.query.bpnId
+ if (this.bpnId !== undefined) {
+ this.getDatas()
+ }
this.getData()
this.processTable()
},
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
index c1ebc0c98..ed7a190c6 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
@@ -484,6 +484,10 @@ export default {
this.wbbzform = JSON.parse(JSON.stringify(item));
this.associationData = item.associationData
this.participantsData = item.participantsData
+ item.fileName.forEach(itemId => {
+ this.fileIds = itemId.id
+ this.getFileInfo();
+ });
});
},
// 请求上传的文件信息
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
index 1258d603e..320410b88 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
@@ -484,6 +484,10 @@ export default {
this.wbbzform = JSON.parse(JSON.stringify(item));
this.associationData = item.associationData
this.participantsData = item.participantsData
+ item.fileName.forEach(itemId => {
+ this.fileIds = itemId.id
+ this.getFileInfo();
+ });
});
},
// 请求上传的文件信息
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 221de273f..6388b651e 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -389,6 +389,40 @@ export default {
}
})
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 '20':
this.$router.push({
name: 'bzrhStep1',