diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index a0c3d8489..83b65895a 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -293,6 +293,15 @@
dateChange(item) {
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
},
+ getUUID(){
+ var str=[];
+ var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
+ for(var i=0;i<36;i++){
+ str[i]=Chars.substr(Math.floor(Math.random()*16),1)
+ }
+ str[0]=str[8]=str[13]=str[18]=str[23]='-';
+ return str.join("")
+ },
submit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
@@ -302,6 +311,7 @@
let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
value.standId = value.id
delete value.id
+ value.id = this.getUUID()
value.currentUserName = this.userInfo().username
Object.keys(value).forEach(res => {
if (value[res] && value[res] instanceof String) {
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 5e82f8b97..559d8ce6f 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -26,10 +26,10 @@
*
{{$t('relevantSections')}}
-
+
@@ -41,10 +41,10 @@
{{$t('questionsSuggestions')}}
-
+
@@ -58,8 +58,8 @@
@@ -71,9 +71,9 @@
- {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' ||
- formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ @click="clickButtonToUpload('accessoryFile',index)">
+ {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+ item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
@@ -83,6 +83,7 @@
+
@@ -104,7 +105,9 @@
data() {
return {
formInline: {},
+ disabled:false,
rules: {},
+ uploadIndex:'',
dataList: [
{
relatedSection: '',
@@ -116,10 +119,11 @@
}
},
methods: {
- clickButtonToUpload(item) {
+ clickButtonToUpload(item,index) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
+ this.uploadIndex = index
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
@@ -137,8 +141,8 @@
})
}
/** 赋值给当前对应的表单文件 */
- this.formInline[this.uploadName] = attIdList.join(',')
- this.formInline = { ...this.formInline }
+ this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+ this.dataList = [...this.dataList]
},
addData() {
this.dataList.push({
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 5f980019f..a79ddd595 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -13,6 +13,7 @@
:standardContentQuery="queryProject"
/>
@@ -35,6 +36,7 @@
import circulationHistory from '../../components/regulatoryCirculationHistory'
import footerProcess from '../../components/footerProcess'
import feedbackInformation from '../../components/feedbackInformation'
+ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
export default {
name: 'index',
@@ -49,7 +51,10 @@
return {
title: this.$t('collectionOfRegulatoryOpinions'),
- url: {},
+ url: {
+ queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+ list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
+ },
isDisplay: true,
queryProject: {},
standardContentList: [
@@ -87,8 +92,35 @@
}
},
mounted() {
+ this.queryTaskDetailByTask(() => {
+ this.lawsOpinionAssessmentResult()
+ })
},
methods: {
+ queryTaskDetailByTask(callback) {
+ this.loading = true
+ getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+ if (res instanceof String) {
+ this.queryProject = JSON.parse(res) || {}
+ callback && callback()
+ } else {
+ this.queryProject = res || {}
+ callback && callback()
+ }
+ })
+ },
+ lawsOpinionAssessmentResult() {
+ getAction(this.url.list, {
+ lawsOpinionGatherId: this.queryProject.id,
+ actiProcInstId: this.$route.query.prcId
+ }).then((res) => {
+ if (res.success) {
+ this.loading = false
+ } else {
+ this.loading = false
+ }
+ })
+ },
preservation() {
},