+
{{ item.name }}
-
+
@@ -299,75 +299,129 @@
:data="form.infoList"
border
default-expand-all>
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
-
-
-
- {{value.name | ellipsis}}
-
-
- - -
-
-
-
-
+
+
+ {{scope.$index + 1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ {{filterOp(scope.row.opinionsAdopted)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{value.name}}
-
-
- - -
-
+
+ {{ item.name }}
+
+
+
+
@@ -442,9 +496,10 @@ export default {
},
data () {
return {
- opinionsAdoptedOptions:[
- {value: '1',label: '采纳'},
- {value: '2',label: '不采纳'},
+ opinionsAdoptedOptions:[
+ {value: '1',label: '采纳'},
+ {value: '2',label: '部分采纳'},
+ {value: '3',label: '不采纳'},
],
countryOptions:[],//国家地区
standSortOptions: [], // 标准类别
@@ -484,6 +539,16 @@ export default {
...mapGetters(['userInfo'])
},
methods: {
+ filterOp(data){
+ if(!data){
+ return ""
+ }
+ const map = new Map();
+ map.set("1","采纳");
+ map.set("2","部分采纳");
+ map.set("3","不采纳");
+ return map.get(data)
+ },
// 文件预览及下载
handleFilePreview(file,type) {
let attId = ""
@@ -530,6 +595,8 @@ export default {
},
},
mounted () {
+ console.log(this.form.infoList)
+ console.log(this.form)
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index a65fd2c8d..15247bb0c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -1927,10 +1927,16 @@
this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area)
// 采标程度
this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel)
- // 采用标准
+ // 采用标准drafter
this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
// 引用标准
this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
+ // 起草人带入
+ this.form.QCRBUSS = this.filterDate(this.standardCheckedList[0].drafterName)
+ this.form.QCRBUSSID = this.filterDate(this.standardCheckedList[0].drafter)
+ // 起草部门带入
+ this.form.QCDW = this.filterDate(this.standardCheckedList[0].unitName)
+ this.form.QCDWID = this.filterDate(this.standardCheckedList[0].unit)
this.standardDrawer = false
this.verifySarStandard = true
this.planDisabled = false
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 3915e44b1..207baf1d3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -26,10 +26,13 @@
:BZSMBUSSFileListSub = "BZSMBUSSFileList"
:QTWJBUSSFileListSub = "QTWJBUSSFileList"
:GLWJBUSSFileListSub = "GLWJBUSSFileList"
+ :summaryFileListSub = "summaryFileList"
+ :madelSubListSub = "madelSubList"
:disabledState = "disabledState"
:verifySarStandard = "verifySarStandard"
:fileMadelSub = "fileMadel"
:fbgDown = "false"
+ :opinionsShow = "true"
@formCancel="formCancel"
@formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
@@ -665,6 +668,7 @@
QTWJBUSSFileList: [],
GLWJBUSSFileList: [],
summaryFileList: [],
+ madelSubList: [],
caFileList: [],
FBGBJBDFileList: [],
xgdFileList: [],
@@ -807,6 +811,8 @@
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
+ madelSub:'',
+ madelSubName:'',
summaryFile:'',
summaryFileName:'',
country:[],
@@ -1123,13 +1129,14 @@
this.replaceLawType = replaceLawType
this.getReplaceLawsNumRow()
},
- formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+ formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) {
this.form = form
this.FBGBUSSFileList = list1
this.LSBBBUSSFileList = list2
this.BZSMBUSSFileList = list3
this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5
+ this.madelSubList = list6
if(fileMadel){
this.fileType = fileType
this.fileUpload(fileType)
@@ -1343,6 +1350,8 @@
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+ this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
+ this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
@@ -1944,6 +1953,23 @@
})
})
},
+ handleFilePreview2(file,type) {
+ let attId = ""
+ if(file && file.id){
+ attId = file.id
+ }else {
+ attId = file.response.data.id
+ }
+ if (type === 'down') {
+ if (attId) {
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+ } else {
+ this.$message.warning('文件不存在,下载失败')
+ }
+ } else {
+ this.$preview(attId)
+ }
+ },
// 文件预览及下载
handleFilePreview(file) {
const attId = file.response.data.id
@@ -1979,25 +2005,41 @@
// this.fileList = fileList.splice(0, 1)
// }
if (response.ok) {
-
+ const fileObj = {}
+ fileObj.id = file.response.data.id
+ fileObj.name = file.response.data.name
switch (this.fileType){
case 'FBGBUSS':
- this.FBGBUSSFileList = fileList
+ this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+ this.FBGBUSSFileList.push(fileObj)
break;
case 'BZSMBUSS' :
- this.BZSMBUSSFileList = fileList
+ this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+ this.BZSMBUSSFileList.push(fileObj)
break;
case 'LSBBBUSS':
- this.LSBBBUSSFileList = fileList
+ this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+ this.LSBBBUSSFileList.push(fileObj)
break;
case 'GLWJLAWS':
- this.QTWJBUSSFileList = fileList
+ this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+ this.GLWJLAWSFileList.push(fileObj)
break;
case 'GLWJBUSS':
- this.GLWJBUSSFileList = fileList
+ this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+ this.GLWJBUSSFileList.push(fileObj)
+ break;
+ case 'summaryFile':
+ this.summaryFileList = this.summaryFileList.filter ( item => item.response === undefined);
+ this.summaryFileList.push(fileObj)
+ break;
+ case 'madelSub':
+ this.madelSubList = this.madelSubList.filter ( item => item.response === undefined);
+ this.madelSubList.push(fileObj)
break;
default : ;
}
+ this.formKey++
this.$message({
showClose: true,
message: response.message,
@@ -2031,6 +2073,12 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
+ case 'summaryFile':
+ this.fileList=this.summaryFileList
+ break;
+ case 'madelSub':
+ this.fileList=this.madelSubList
+ break;
default : ;
}
this.fileMadel = true;
@@ -2054,6 +2102,12 @@
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
break;
+ case 'summaryFile':
+ this.summaryFileList = fileList
+ break;
+ case 'madelSub':
+ this.madelSubList = fileList
+ break;
default : ;
}
},
@@ -2186,21 +2240,27 @@
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
- this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
- this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
- this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
- this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
- this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
+ this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
+ this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
+
+ this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
+ this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
+
},
// 删除方法
deletedId(data, ids) {
@@ -2287,6 +2347,7 @@
// } else if (val === '') {
// this.form.country = []
// }
+ this.fileInfoHandle()
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
@@ -2305,7 +2366,9 @@
// this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面
this.isSubmit = false
- this.processCreateBuss(json)
+ this.submitLoading = false
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ // this.processCreateBuss(json)
// if(this.formTongGuo.approvalOpinion === '1'){
// this.$message.warning("驳回成功")
// this.isSubmit = false
@@ -2375,12 +2438,14 @@
getFormFieldList (item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
+ console.log(this.form)
this.form.topId = this.pId
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id
- this.getStandInfoByReviseStatus()
+ this.formKey++
+ // this.getStandInfoByReviseStatus()
})
},
assemble(ids,names){
@@ -2416,6 +2481,7 @@
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
+ this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
this.formKey++
}
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 18b46c0b5..34e7df7ab 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -26,10 +26,14 @@
:BZSMBUSSFileListSub = "BZSMBUSSFileList"
:QTWJBUSSFileListSub = "QTWJBUSSFileList"
:GLWJBUSSFileListSub = "GLWJBUSSFileList"
+ :summaryFileListSub = "summaryFileList"
+ :madelSubListSub = "madelSubList"
:disabledState = "disabledState"
:verifySarStandard = "verifySarStandard"
:fileMadelSub = "fileMadel"
:fbgDown = "false"
+ :opinionsShow = "true"
+ :fbNode = "true"
@formCancel="formCancel"
@formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
@@ -665,6 +669,7 @@
QTWJBUSSFileList: [],
GLWJBUSSFileList: [],
summaryFileList: [],
+ madelSubList: [],
caFileList: [],
FBGBJBDFileList: [],
xgdFileList: [],
@@ -809,6 +814,8 @@
modelDataZrUserVerify:[],
summaryFile:'',
summaryFileName:'',
+ madelSub:'',
+ madelSubName:'',
country:[],
// 基础信息
standSort: '',
@@ -1123,13 +1130,14 @@
this.replaceLawType = replaceLawType
this.getReplaceLawsNumRow()
},
- formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+ formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) {
this.form = form
this.FBGBUSSFileList = list1
this.LSBBBUSSFileList = list2
this.BZSMBUSSFileList = list3
this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5
+ this.madelSubList = list6
if(fileMadel){
this.fileType = fileType
this.fileUpload(fileType)
@@ -1343,6 +1351,8 @@
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+ this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
+ this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
@@ -1979,25 +1989,41 @@
// this.fileList = fileList.splice(0, 1)
// }
if (response.ok) {
-
+ const fileObj = {}
+ fileObj.id = file.response.data.id
+ fileObj.name = file.response.data.name
switch (this.fileType){
case 'FBGBUSS':
- this.FBGBUSSFileList = fileList
+ this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+ this.FBGBUSSFileList.push(fileObj)
break;
case 'BZSMBUSS' :
- this.BZSMBUSSFileList = fileList
+ this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+ this.BZSMBUSSFileList.push(fileObj)
break;
case 'LSBBBUSS':
- this.LSBBBUSSFileList = fileList
+ this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+ this.LSBBBUSSFileList.push(fileObj)
break;
case 'GLWJLAWS':
- this.QTWJBUSSFileList = fileList
+ this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+ this.GLWJLAWSFileList.push(fileObj)
break;
case 'GLWJBUSS':
- this.GLWJBUSSFileList = fileList
+ this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+ this.GLWJBUSSFileList.push(fileObj)
+ break;
+ case 'summaryFile':
+ this.summaryFileList = this.summaryFileList.filter ( item => item.response === undefined);
+ this.summaryFileList.push(fileObj)
+ break;
+ case 'madelSub':
+ this.madelSubList = this.madelSubList.filter ( item => item.response === undefined);
+ this.madelSubList.push(fileObj)
break;
default : ;
}
+ this.formKey++
this.$message({
showClose: true,
message: response.message,
@@ -2031,10 +2057,15 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
+ case 'summaryFile':
+ this.fileList=this.summaryFileList
+ break;
+ case 'madelSub':
+ this.fileList=this.madelSubList
+ break;
default : ;
}
this.fileMadel = true;
-
},
removeOneFile(file, fileList) {
@@ -2054,6 +2085,12 @@
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
break;
+ case 'summaryFile':
+ this.summaryFileList = fileList
+ break;
+ case 'madelSub':
+ this.madelSubList = fileList
+ break;
default : ;
}
},
@@ -2186,21 +2223,27 @@
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
- this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
- this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
- this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
- this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
- this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
+ this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
+ this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
+
+ this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
+ this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
+
},
// 删除方法
deletedId(data, ids) {
@@ -2287,6 +2330,7 @@
// } else if (val === '') {
// this.form.country = []
// }
+ this.fileInfoHandle()
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
@@ -2381,6 +2425,7 @@
this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id
this.getStandInfoByReviseStatus()
+ this.formKey++
})
},
assemble(ids,names){
@@ -2416,6 +2461,7 @@
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
+ this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
this.formKey++
}
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index bfc3831b0..c038eb5d8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -187,7 +187,7 @@