修改禅道已知bug
This commit is contained in:
+10
-10
@@ -10,7 +10,7 @@
|
|||||||
:visible="visible"
|
:visible="visible"
|
||||||
style="height: 100%;overflow: auto;padding-bottom: 53px;">
|
style="height: 100%;overflow: auto;padding-bottom: 53px;">
|
||||||
<div class="table-operator-right">
|
<div class="table-operator-right">
|
||||||
<div @click="handleExport" class="operator-text">
|
<div @click="handleExport" v-if="formInline.createBy == userInfoQuery.username" class="operator-text">
|
||||||
<a-icon type="export" :rotate="-90"/>
|
<a-icon type="export" :rotate="-90"/>
|
||||||
{{$t('export')}}
|
{{$t('export')}}
|
||||||
</div>
|
</div>
|
||||||
@@ -47,11 +47,11 @@
|
|||||||
<span class="text">{{$t('filingExternalOpinions')}}:</span>
|
<span class="text">{{$t('filingExternalOpinions')}}:</span>
|
||||||
<div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
|
<div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
|
||||||
v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
|
v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
|
||||||
<a-icon type="cloud-upload" />
|
<a-icon type="cloud-upload"/>
|
||||||
{{$t('clickUpload')}}
|
{{$t('clickUpload')}}
|
||||||
</div>
|
</div>
|
||||||
<div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
|
<div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
|
||||||
<a-icon type="eye" />
|
<a-icon type="eye"/>
|
||||||
{{$t('viewFile')}}
|
{{$t('viewFile')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
dataSource: [],
|
dataSource: [],
|
||||||
formInline: {},
|
formInline: {},
|
||||||
userInfoQuery:{},
|
userInfoQuery: {},
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: this.$t('relevantSections'),
|
title: this.$t('relevantSections'),
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.userInfoQuery = this.userInfo()
|
this.userInfoQuery = this.userInfo()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapGetters(['userInfo']),
|
...mapGetters(['userInfo']),
|
||||||
@@ -178,8 +178,8 @@
|
|||||||
//导出
|
//导出
|
||||||
handleExport() {
|
handleExport() {
|
||||||
let query = {
|
let query = {
|
||||||
pageSize:this.pageSize,
|
pageSize: this.pageSize,
|
||||||
pageNo:this.pageNo,
|
pageNo: this.pageNo,
|
||||||
lawsOpinionGatherId: this.lawsOpinionGatherId,
|
lawsOpinionGatherId: this.lawsOpinionGatherId,
|
||||||
actiProcInstId: this.actiProcInstId
|
actiProcInstId: this.actiProcInstId
|
||||||
}
|
}
|
||||||
@@ -201,7 +201,7 @@
|
|||||||
this.pageNo = page
|
this.pageNo = page
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
},
|
||||||
SizeChange(page,pageSize) {
|
SizeChange(page, pageSize) {
|
||||||
this.pageNo = 1
|
this.pageNo = 1
|
||||||
this.pageSize = pageSize
|
this.pageSize = pageSize
|
||||||
this.getList()
|
this.getList()
|
||||||
@@ -210,8 +210,8 @@
|
|||||||
let query = {
|
let query = {
|
||||||
lawsOpinionGatherId: this.lawsOpinionGatherId,
|
lawsOpinionGatherId: this.lawsOpinionGatherId,
|
||||||
actiProcInstId: this.actiProcInstId,
|
actiProcInstId: this.actiProcInstId,
|
||||||
pageSize:this.pageSize,
|
pageSize: this.pageSize,
|
||||||
pageNo:this.pageNo
|
pageNo: this.pageNo
|
||||||
}
|
}
|
||||||
this.loading = true
|
this.loading = true
|
||||||
getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => {
|
getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => {
|
||||||
|
|||||||
+13
-11
@@ -141,7 +141,7 @@
|
|||||||
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
|
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
JLoading:false,
|
JLoading: false,
|
||||||
dataSource: [],
|
dataSource: [],
|
||||||
selectedRowKeys: [],
|
selectedRowKeys: [],
|
||||||
total: 0,
|
total: 0,
|
||||||
@@ -172,12 +172,14 @@
|
|||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'serial_number',
|
dataIndex: 'serial_number',
|
||||||
width: 170,
|
width: 170,
|
||||||
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'serial_number' }
|
scopedSlots: { customRender: 'serial_number' }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('title'),
|
title: this.$t('title'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'title',
|
dataIndex: 'title',
|
||||||
|
ellipsis: true,
|
||||||
width: 170,
|
width: 170,
|
||||||
scopedSlots: { customRender: 'titleName' }
|
scopedSlots: { customRender: 'titleName' }
|
||||||
},
|
},
|
||||||
@@ -232,7 +234,7 @@
|
|||||||
this.pageNo = page
|
this.pageNo = page
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
},
|
||||||
SizeChange(page,pageSize) {
|
SizeChange(page, pageSize) {
|
||||||
this.pageNo = 1
|
this.pageNo = 1
|
||||||
this.pageSize = pageSize
|
this.pageSize = pageSize
|
||||||
this.getList()
|
this.getList()
|
||||||
@@ -261,7 +263,7 @@
|
|||||||
if (this.selectedRowKeys.length > 1) {
|
if (this.selectedRowKeys.length > 1) {
|
||||||
this.selectedRowKeys.shift()
|
this.selectedRowKeys.shift()
|
||||||
}
|
}
|
||||||
this.selectedRowKeysRecord = record.filter(res=>{
|
this.selectedRowKeysRecord = record.filter(res => {
|
||||||
return res.id == this.selectedRowKeys[0]
|
return res.id == this.selectedRowKeys[0]
|
||||||
})
|
})
|
||||||
this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
|
this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
|
||||||
@@ -297,14 +299,14 @@
|
|||||||
dateChange(item) {
|
dateChange(item) {
|
||||||
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
|
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
|
||||||
},
|
},
|
||||||
getUUID(){
|
getUUID() {
|
||||||
var str=[];
|
var str = []
|
||||||
var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
|
var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
|
||||||
for(var i=0;i<36;i++){
|
for (var i = 0; i < 36; i++) {
|
||||||
str[i]=Chars.substr(Math.floor(Math.random()*16),1)
|
str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
|
||||||
}
|
}
|
||||||
str[0]=str[8]=str[13]=str[18]=str[23]='-';
|
str[0] = str[8] = str[13] = str[18] = str[23] = '-'
|
||||||
return str.join("")
|
return str.join('')
|
||||||
},
|
},
|
||||||
submit() {
|
submit() {
|
||||||
this.$refs.ruleForm.validate(valid => {
|
this.$refs.ruleForm.validate(valid => {
|
||||||
@@ -338,7 +340,7 @@
|
|||||||
postAction('/workFlow/startProcess', query).then((res) => {
|
postAction('/workFlow/startProcess', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.completeTask(value, res.result)
|
this.completeTask(value, res.result)
|
||||||
}else{
|
} else {
|
||||||
this.JLoading = false
|
this.JLoading = false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -92,7 +92,10 @@
|
|||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
>
|
>
|
||||||
<span slot="operation" slot-scope="text,record">
|
<span slot="serialNumber" :title="text" slot-scope="text,result">
|
||||||
|
<span>{{text}}</span>
|
||||||
|
</span>
|
||||||
|
<span slot="operation" slot-scope="text,record">
|
||||||
<a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
|
<a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
|
||||||
<a class="text-operation" v-if="record.gatherResult == 'Completed'"
|
<a class="text-operation" v-if="record.gatherResult == 'Completed'"
|
||||||
@click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
|
@click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
|
||||||
@@ -157,7 +160,8 @@
|
|||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'serialNumber',
|
dataIndex: 'serialNumber',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
width: 170
|
width: 170,
|
||||||
|
scopedSlots: { customRender: 'serialNumber' }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('title'),
|
title: this.$t('title'),
|
||||||
@@ -235,7 +239,7 @@
|
|||||||
this.pageNo = page
|
this.pageNo = page
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
},
|
||||||
SizeChange(page,pageSize) {
|
SizeChange(page, pageSize) {
|
||||||
this.pageNo = 1
|
this.pageNo = 1
|
||||||
this.pageSize = pageSize
|
this.pageSize = pageSize
|
||||||
this.getList()
|
this.getList()
|
||||||
|
|||||||
+3
-1
@@ -250,12 +250,14 @@
|
|||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'serial_number',
|
dataIndex: 'serial_number',
|
||||||
width: 170,
|
width: 170,
|
||||||
|
ellipsis: true,
|
||||||
scopedSlots: { customRender: 'serial_number' }
|
scopedSlots: { customRender: 'serial_number' }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('title'),
|
title: this.$t('title'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'title',
|
dataIndex: 'title',
|
||||||
|
ellipsis: true,
|
||||||
width: 170,
|
width: 170,
|
||||||
scopedSlots: { customRender: 'titleName' }
|
scopedSlots: { customRender: 'titleName' }
|
||||||
},
|
},
|
||||||
@@ -335,7 +337,7 @@
|
|||||||
this.pageNo = page
|
this.pageNo = page
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
},
|
||||||
SizeChange(page,pageSize) {
|
SizeChange(page, pageSize) {
|
||||||
this.pageNo = 1
|
this.pageNo = 1
|
||||||
this.pageSize = pageSize
|
this.pageSize = pageSize
|
||||||
this.getList()
|
this.getList()
|
||||||
|
|||||||
Reference in New Issue
Block a user