-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
+
@@ -229,27 +208,20 @@
v-model="form.QTWJBUSSName"
clearable
>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -573,12 +532,12 @@
-
+
-
@@ -776,7 +735,7 @@
取消
+
+
+
+ {{ item.name }}
+
+
+
+
+
-
-
-
- 查看已上传的文件
-
-
-
-
-
- 点击上传
-
+
-
-
+
+
-
-
+
+
@@ -366,49 +332,42 @@
v-model="form.GLWJBUSSName"
clearable
>
-
-
+
@@ -263,15 +235,12 @@
+
+ {{ item.name }}
+
+
+
+
+
-
-
-
- 查看已上传文件
-
-
-
-
-
-
- 点击上传
-
+
-
- {{'手动查找'}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
-
- 模块信息
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 维护
- 删除
-
-
-
-
- 其他起草人
+
+
+ 主起草人汇总修订人
-
技术委员会负责刃/起草中心主任
+技术委员会负责人/起草中心主任
-
+
{{value.name}}
@@ -455,10 +441,12 @@
v-show="verifySarStandard"
show-save
show-submit
- show-edit
+ :uploadFile="uploadFileStatus"
+ :uploadedFile="!uploadFileStatus"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
- @onLineEdit="handleOnLineEdit"
+ @uploadFile="handleUploadFile"
+ @uploadedFile="handleUploadedFile"
@save="handleSave"
@submit="handleSubmit"
>
@@ -887,6 +875,7 @@
prcName: this.$route.query.prcName,
detailData: [],
fileList: [],
+ footFileList: [],
FBGBUSSFileList: [],
BZSMBUSSFileList: [],
LSBBBUSSFileList: [],
@@ -971,6 +960,7 @@
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
isSubmit: false,
+ uploadFileStatus: true,
saveLoading: false,
defaultProps: {
children: 'children',
@@ -1027,6 +1017,8 @@
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
+ footFile:'',
+ footFileName:'',
// 基础信息
country:[],
// 基础信息
@@ -1169,7 +1161,7 @@
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
issueTime: [
- { required: true, message: '请选择企标发布日期', trigger: 'change' }
+ { required: false, message: '请选择企标发布日期', trigger: 'change' }
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1468,6 +1460,7 @@
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
+ this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2071,22 +2064,7 @@
this.$message.warning('文件不存在,下载失败')
}
} else {
- this.getBusStandFileByAttId(attId)
- .then(res => {
- if(res){
- const editFileInfo = res
- if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
- window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
- }else {
- const nowTime = new Date().getTime()
- // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
- window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
- }
- }
- }).catch(e => {
- console.log(e)
- this.$message.warning('文件不存在,预览失败')
- })
+ this.$preview(attId)
}
},
// 导入标准数据成功后执行
@@ -2113,6 +2091,10 @@
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
break;
+ case 'footFile':
+ this.footFileList = fileList
+ this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
+ break;
default : ;
}
this.$message({
@@ -2148,6 +2130,9 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
+ case 'footFile':
+ this.fileList=this.footFileList
+ break;
default : ;
}
this.fileMadel = true;
@@ -2171,6 +2156,10 @@
case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList
break;
+ case 'footFile':
+ this.footFileList = fileList
+ this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
+ break;
default : ;
}
},
@@ -2282,6 +2271,17 @@
})
})
},
+ handleUploadFile(){
+ this.fileType = '';
+ this.fileType = 'footFile';
+
+ this.fileList=this.footFileList
+
+ this.fileMadel = true;
+ },
+ handleUploadedFile(){
+ this.fileMadel = true
+ },
// 在线编辑
handleOnLineEdit(){
this.isSubmit = true
@@ -2335,6 +2335,9 @@
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
+ this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
+ this.form.footFileName=this.footFileList.map(item => item.name).join(",")
+
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
@@ -2438,50 +2441,54 @@
// }
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
- this.processModelHisOne(this.pId,this.taskIds)
- .then(res => {
- if(res){
- const editFileInfo = res
- if(editFileInfo && editFileInfo.editStatus === '1'){
- this.isSubmit = true
- this.saveLoading = true
- this.form.commentText = this.formTongGuo.commentText
- this.form.approvalOpinion = this.formTongGuo.approvalOpinion
- const json = JSON.stringify(this.form);
- 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.isSubmit = false
- this.saveLoading = false
- this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
- // if(this.formTongGuo.approvalOpinion === '1'){
- // this.$message.warning("驳回成功")
- // this.isSubmit = false
- // // 流程提交之后，应该流转至待办任务页面
- // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
- // }else{
- // this.processCreateLaws(json)
- // }
- }else {
- this.$message.success(res.message)
- }
- })
- }else {
- this.$message.warning('请先在线编辑,再提交流程')
- }
-
+ if(this.footFileList !== undefined && this.footFileList.length > 0){
+ this.isSubmit = true
+ this.saveLoading = true
+ this.form.commentText = this.formTongGuo.commentText
+ this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+ const json = JSON.stringify(this.form);
+ 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.isSubmit = false
+ this.saveLoading = false
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ // if(this.formTongGuo.approvalOpinion === '1'){
+ // this.$message.warning("驳回成功")
+ // this.isSubmit = false
+ // // 流程提交之后，应该流转至待办任务页面
+ // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ // }else{
+ // this.processCreateLaws(json)
+ // }
+ }else {
+ this.$message.success(res.message)
}
- }).catch(e => {
- console.log(e)
- // this.$message.warning('文件不存在,预览失败')
- })
+ })
+ }else {
+ this.$message.warning('请先上传文件,再提交流程')
+ }
+ // this.processModelHisOne(this.pId,this.taskIds)
+ // .then(res => {
+ // if(res){
+ // const editFileInfo = res
+ // if(editFileInfo && editFileInfo.editStatus === '1'){
+ // }else {
+ // this.$message.warning('请先在线编辑,再提交流程')
+ // }
+ //
+ // }
+ // }).catch(e => {
+ // console.log(e)
+ // // this.$message.warning('文件不存在,预览失败')
+ // })
}})
},
busVsFunc(){
@@ -2547,11 +2554,13 @@
}
this.getFormFieldList(processForm)
+ this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+ this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
}
}).catch(e => {
})
@@ -2590,6 +2599,7 @@
},
},
mounted () {
+ this.getTaskId()
this.getData()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {