WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_third_stage' 到 'master'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!78
This commit is contained in:
李雪涛
2022-07-12 15:19:56 +08:00
parent 42da284c26 c98befca4c
commit 128c501e19
31 changed files with 1011 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+11 -7
View File
@@ -44,13 +44,13 @@
/>
</div>
<div>
<span class="text">对外意见归档:</span>
<div @click="clickButtonToUpload('opinionArchiveId')"
<span class="text">{{$t('filingExternalOpinions')}}:</span>
<div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
<a-icon type="cloud-upload" />
{{$t('clickUpload')}}
</div>
<div @click="seeFileClick(formInline.opinionArchiveId)" class="operator-text">
<div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
<a-icon type="eye" />
{{$t('viewFile')}}
</div>
@@ -177,11 +177,13 @@
//导出
handleExport() {
let query = {
lawsOpinionGatherId: this.lawsOpinionGatherId,
actiProcInstId: this.actiProcInstId
pageSize:this.pageSize,
pageNo:this.pageNo
// lawsOpinionGatherId: this.lawsOpinionGatherId,
// actiProcInstId: this.actiProcInstId
}
downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
this.$t('evaluationResults') + '.xls', query)
this.$t('evaluationResults') + '.zip', query)
},
getData(row) {
this.visible = true
@@ -206,7 +208,9 @@
getList() {
let query = {
lawsOpinionGatherId: this.lawsOpinionGatherId,
actiProcInstId: this.actiProcInstId
actiProcInstId: this.actiProcInstId,
pageSize:this.pageSize,
pageNo:this.pageNo
}
this.loading = true
getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => {
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+30 -16
View File
@@ -135,20 +135,20 @@
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('releaseDate')">{{$t('releaseDate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="issueTime">
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.issueTime"
:placeholder="$t('PleaseEnter')+$t('releaseDate')"/>
</a-form-model-item>
</div>
</a-col>
<!-- <a-col :span="12">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- <span class="title-text-text"-->
<!-- :title="$t('releaseDate')">{{$t('releaseDate')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="issueTime">-->
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model="formInline.issueTime"-->
<!-- :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>-->
<!-- </a-form-model-item>-->
<!-- </div>-->
<!-- </a-col>-->
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -163,8 +163,6 @@
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -180,6 +178,9 @@
</div>
</a-col>
</a-row>
<!-- <a-row :gutter="24">-->
<!-- </a-row>-->
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
@@ -391,8 +392,21 @@
methods: {
...mapGetters(['userInfo']),
getStandData(value) {
console.log(value)
this.formInline.titleCn = value.serial_number + ' ' + value.title
this.formInline.titleEn = value.serial_number + ' ' + value.title_en
this.formInline.technologyTerritory = value.technology_territory_dict
this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict
this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict
this.formInline.state = value.state_dict
this.formInline.newCarImplementTime = value.xin1_che1_xing2_shi2_shi1_ri4_qi1
this.formInline.productionCarImplementTime = value.implement_time
var curPath = window.document.location.href
var pathname = window.document.location.pathname
var pos = curPath.indexOf(pathname)
var localhostPath = curPath.substring(0, pos)
this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id
this.formInline = {...this.formInline}
},
getSysCategoryTree() {
getAction('/sys/category/getSysCategoryTree', {}).then((res) => {
jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+11
View File
@@ -50,6 +50,7 @@
v-model="formInline.memoriesChapter"
:maxTagCount="1"
:disabled="disabled"
@change="changeTree"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input"
style="width: 100%"
@@ -187,6 +188,9 @@
getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => {
if (res.success) {
this.chapterContentsList = res.result || []
this.chapterContentsList.forEach(val => {
val.disabled = true
})
} else {
this.chapterContentsList = []
}
@@ -245,6 +249,13 @@
handleCancel() {
this.visible = false
},
changeTree(value, node, extra) {
if (value.length > 1) {
value.shift()
}
this.formInline.memoriesChapter = value
this.formInline = { ...this.formInline }
},
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
jero-web/src/views/dashboard/components/myList.vue
+2 -2
View File
@@ -86,8 +86,8 @@
})
},
prcClick(row) {
let index = row.taskIds.lastIndexOf(',')
row.taskIds = row.taskIds.slice(0, index)
// let index = row.taskIds.lastIndexOf(',')
// row.taskIds = row.taskIds.slice(0, index)
if (row.prcType == '1') {
let newUrl = this.$router.resolve({
path: '/handshakeProcess',
jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+316
View File
@@ -0,0 +1,316 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text">
{{title}}
</div>
</div>
<div class="content-text">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
</div>
<a-form-model-item class="itemModel" prop="flag">
<a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.flag">
<a-radio value="0">
{{$t('accord')}}
</a-radio>
<a-radio value="1">
{{$t('nonConformity')}}
</a-radio>
</a-radio-group>
</a-form-model-item>
</div>
</a-col>
</a-row>
<div v-for="(item,index) in formInline.dataList" :key="index">
<div class="feedbackPoint">
{{$t('feedbackPoint')+(index+1)}}
<a-icon class="icon-size"
@click="addData"
v-if="(formInline.dataList.length-1) == index"
type="plus-circle"/>
<a-icon class="icon-size"
@click="deleteData"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
type="minus-circle"/>
</div>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.relatedSection'"
:rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
v-model="item.relatedSection"
:placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('problemDescription')">{{$t('problemDescription')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
:rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('problemDescription') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
v-model="item.issueOrSuggest"
:placeholder="$t('PleaseEnter')+$t('problemDescription')"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<a-form-model-item class="itemModel" prop="accessoryFile">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('accessoryFile',index)">
{{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div>
</a-col>
</a-row>
</div>
</a-form-model>
</div>
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'evaluatorFeedback',
components: {
uploadFile
},
props: {
title: {
type: String,
default: ''
},
feedbackDataList: {
type: Array,
default: (() => {
return []
})
}
},
data() {
return {
formInline: {},
disabled: false,
rules: {
flag:[
{
required: true,
message: this.$t('complianceResults') + this.$t('cannotEmpty'),
trigger: 'change'
},
],
relatedSection: [
{
required: true,
message: this.$t('relevantSections') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('relevantSections') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
issueOrSuggest: [
{
required: true,
message: this.$t('problemDescription') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('problemDescription') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
]
},
uploadIndex: '',
dataList: []
}
},
mounted() {
this.$nextTick(() => {
if (this.feedbackDataList && this.feedbackDataList.length > 0) {
this.formInline.dataList = this.feedbackDataList
} else {
this.formInline.dataList = [
{
relatedSection: '',
issueOrSuggest: '',
reason: '',
accessoryFile: ''
}
]
}
this.formInline = { ...this.formInline }
})
},
methods: {
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.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
})
}
/** 赋值给当前对应的表单文件 */
this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.formInline = [...this.formInline]
},
addData() {
this.formInline.dataList.push({
relatedSection: '',
issueOrSuggest: '',
reason: '',
accessoryFile: ''
})
this.formInline = [...this.formInline]
},
deleteData() {
this.formInline.dataList.pop()
this.formInline = [...this.formInline]
},
submitData(callBack){
this.$refs.ruleForm.validate(valid => {
if (valid) {
callBack && callBack(this.formInline)
}
})
},
}
}
</script>
<style scoped lang="less">
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.box-text {
display: flex;
justify-content: space-between;
height: 60px;
line-height: 40px;
.header-text {
font-size: 16px;
font-weight: 400;
color: #000F16;
}
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 88px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
color: #000F16;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
margin-bottom: 12px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.button-text {
height: 38px;
width: calc(100% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
.feedbackPoint {
font-size: 14px;
font-weight: 400;
color: #000F16;
margin-bottom: 10px;
}
.icon-size {
font-size: 18px;
margin-left: 8px;
cursor: pointer;
}
</style>
jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+217
View File
@@ -0,0 +1,217 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text">
{{title}}
</div>
</div>
<div class="content-text">
<a-table
ref="table"
:loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
:data-source="dataSource"
:columns="columns"
>
</a-table>
</div>
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'evaluatorFeedback',
components: {
uploadFile
},
props: {
title: {
type: String,
default: ''
},
},
data() {
return {
disabled:false,
loading:false,
uploadIndex:'',
dataSource:[],
columns:[
{
title: this.$t('clauseNo'),
dataIndex: 'items_num',
align: 'center',
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'items_name',
align: 'center',
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'iterms_conditions',
align: 'center',
ellipsis: true
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethod',
align: 'center',
ellipsis: true
},
{
title: this.$t('nameTechnicalDocument'),
dataIndex: 'nameTechnicalDocument',
align: 'center',
ellipsis: true
},
{
title: this.$t('chapter'),
dataIndex: 'chapter',
align: 'center',
ellipsis: true
},
{
title: this.$t('opinion'),
dataIndex: 'opinion',
align: 'center',
ellipsis: true
},
{
title: this.$t('enclosure'),
dataIndex: 'enclosure',
align: 'center',
ellipsis: true
},
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResults',
align: 'center',
ellipsis: true
},
],
}
},
mounted() {
},
methods: {
clickButtonToUpload(item,index) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
this.uploadIndex = index
getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
})
}
/** 赋值给当前对应的表单文件 */
this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.dataList = [...this.dataList]
},
}
}
</script>
<style scoped lang="less">
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.box-text {
display: flex;
justify-content: space-between;
height: 60px;
line-height: 40px;
.header-text {
font-size: 16px;
font-weight: 400;
color: #000F16;
}
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 88px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
color: #000F16;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
margin-bottom: 12px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.button-text {
height: 38px;
width: calc(100% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
.feedbackPoint {
font-size: 14px;
font-weight: 400;
color: #000F16;
margin-bottom: 10px;
}
.icon-size {
font-size: 18px;
margin-left: 8px;
cursor: pointer;
}
</style>
jero-web/src/views/processCenter/components/feedbackInformation.vue
+43 -32
View File
@@ -7,16 +7,16 @@
</div>
<div class="content-text">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<div v-for="(item,index) in dataList" :key="index">
<div v-for="(item,index) in formInline.dataList" :key="index">
<div class="feedbackPoint">
{{$t('feedbackPoint')+(index+1)}}
<a-icon class="icon-size"
@click="addData"
v-if="(dataList.length-1) == index"
v-if="(formInline.dataList.length-1) == index"
type="plus-circle"/>
<a-icon class="icon-size"
@click="deleteData"
v-if="dataList.length > 1 && (dataList.length - 1) == index"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
type="minus-circle"/>
</div>
<a-row :gutter="24">
@@ -26,7 +26,11 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<a-form-model-item class="itemModel" prop="relatedSection">
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.relatedSection'"
:rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
v-model="item.relatedSection"
@@ -41,7 +45,10 @@
<span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div>
<a-form-model-item class="itemModel" prop="issueOrSuggest">
<a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
:rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
v-model="item.issueOrSuggest"
@@ -101,44 +108,48 @@
type: String,
default: ''
},
feedbackDataList:{
feedbackDataList: {
type: Array,
default: (()=>{
return []
default: (() => {
return []
})
},
}
},
data() {
return {
formInline: {},
disabled:false,
disabled: false,
rules: {},
uploadIndex:'',
uploadIndex: '',
dataList: []
}
},
mounted() {
if (this.feedbackDataList && this.feedbackDataList.length > 0){
this.dataList = this.feedbackDataList
this.dataList = [...this.dataList]
}else{
this.dataList = [
{
relatedSection: '',
issueOrSuggest: '',
reason: '',
accessoryFile: ''
}
]
}
this.$nextTick(() => {
if (this.feedbackDataList && this.feedbackDataList.length > 0) {
this.formInline.dataList = this.feedbackDataList
this.formInline = { ...this.formInline }
} else {
this.formInline.dataList = [
{
relatedSection: '',
issueOrSuggest: '',
reason: '',
accessoryFile: ''
}
]
}
this.formInline = { ...this.formInline }
})
},
methods: {
clickButtonToUpload(item,index) {
clickButtonToUpload(item, index) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
this.uploadIndex = index
getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
@@ -155,21 +166,21 @@
})
}
/** 赋值给当前对应的表单文件 */
this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.dataList = [...this.dataList]
this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
addData() {
this.dataList.push({
this.formInline.dataList.push({
relatedSection: '',
issueOrSuggest: '',
reason: '',
accessoryFile: ''
})
this.dataList = [...this.dataList]
this.formInline = { ...this.formInline }
},
deleteData() {
this.dataList.pop()
this.dataList = [...this.dataList]
this.formInline.dataList.pop()
this.formInline = { ...this.formInline }
}
}
}
jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+27 -17
View File
@@ -12,11 +12,16 @@
:url="url"
:standardContentQuery="queryProject"
/>
<feedbackInformation
<evaluatorFeedback
v-if="isDisplay"
ref="feedbackInformationRef"
ref="evaluatorFeedbackRef"
:feedbackDataList="feedbackDataList"
:title="$t('feedbackInformation')"
:title="$t('evaluatorFeedback')"
/>
<evaluatorFeedbackList
v-if="isDisplay"
ref="evaluatorFeedbackListRef"
:title="$t('evaluatorFeedback')"
/>
<footerProcess
v-if="isDisplay"
@@ -37,7 +42,8 @@
import standardContent from '../../components/standardContent'
import circulationHistory from '../../components/regulatoryCirculationHistory'
import footerProcess from '../../components/footerProcess'
import feedbackInformation from '../../components/feedbackInformation'
import evaluatorFeedback from '../../components/evaluatorFeedback'
import evaluatorFeedbackList from '../../components/evaluatorFeedbackList'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import moment from 'moment'
import { mapGetters } from 'vuex'
@@ -48,10 +54,10 @@
standardContent,
circulationHistory,
footerProcess,
feedbackInformation
evaluatorFeedback,
evaluatorFeedbackList
},
data() {
return {
title: this.$t('collectionOfRegulatoryOpinions'),
url: {
@@ -80,14 +86,17 @@
value: 'endTime'
},
{
title: this.$t('enclosure'),
value: 'accessory_id',
title: this.$t('evaluationMethod'),
value: 'evaluationMethod',
},
{
title: this.$t('RelevantMaterials'),
value: 'RelevantMaterials',
type: 2
},
{},
{
title: this.$t('taskDescription'),
value: 'taskExplain'
title: this.$t('processBackground'),
value: 'processBackground'
}
// {
// title: this.$t('remarks'),
@@ -97,10 +106,10 @@
}
},
mounted() {
this.isDisplay = false
this.queryTaskDetailByTask(() => {
this.lawsOpinionAssessmentResult()
})
this.isDisplay = true
// this.queryTaskDetailByTask(() => {
// this.lawsOpinionAssessmentResult()
// })
},
methods: {
...mapGetters(['userInfo']),
@@ -161,8 +170,9 @@
})
},
submit() {
let dataList = this.$refs.feedbackInformationRef.dataList
this.insertBatch(dataList, 2)
this.$refs.evaluatorFeedbackRef.submitData()
// let dataList = this.$refs.feedbackInformationRef.dataList
// this.insertBatch(dataList, 2)
},
completeTask() {
let query = {
jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+2 -2
View File
@@ -134,7 +134,7 @@
},
preservation() {
this.loading = true
let dataList = this.$refs.feedbackInformationRef.dataList
let dataList = this.$refs.feedbackInformationRef.formInline.dataList
this.insertBatch(dataList, 1)
},
insertBatch(list, num) {
@@ -162,7 +162,7 @@
})
},
submit() {
let dataList = this.$refs.feedbackInformationRef.dataList
let dataList = this.$refs.feedbackInformationRef.formInline.dataList
this.insertBatch(dataList, 2)
},
completeTask() {
jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+2 -2
View File
@@ -154,8 +154,8 @@
})
},
dealWith(row) {
let index = row.taskIds.lastIndexOf(',')
row.taskIds = row.taskIds.slice(0, index)
// let index = row.taskIds.lastIndexOf(',')
// row.taskIds = row.taskIds.slice(0, index)
if (row.prcType == '1') {
let newUrl = this.$router.resolve({
path: '/handshakeProcess',