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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
zyx.net
2023-03-27 11:33:47 +08:00
parent b6aa877716 e7612a478c
commit d966eff293
8 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/processCenter/components/circulationHistory.vue
+6 -1
View File
@@ -11,7 +11,7 @@
ref="table"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
:scroll="{x: '100%'}"
:data-source="dataSource"
:columns="columns"
>
@@ -47,18 +47,21 @@
title: this.$t('OperationNode'),
dataIndex: 'name',
align: 'left',
ellipsis: true,
width:200,
},
{
title: this.$t('Operator'),
dataIndex: 'assignee',
align: 'left',
ellipsis: true,
width:200,
},
{
title: this.$t('result'),
dataIndex: 'approvalResult',
align: 'left',
ellipsis: true,
width:200,
scopedSlots: { customRender: 'approvalResult' }
},
@@ -66,6 +69,7 @@
title: this.$t('opinion'),
dataIndex: 'approvalOpinion',
align: 'left',
ellipsis: true,
width:200,
},
{
@@ -73,6 +77,7 @@
dataIndex: 'createTime',
align: 'left',
width:200,
ellipsis: true,
customRender: function(t, r, index) {
return moment(t).format('YYYY-MM-DD HH:mm:ss')
}
jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+7 -3
View File
@@ -11,11 +11,11 @@
:components="drag(columns,'columns')"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
:scroll="{x: '100%'}"
:data-source="dataSource"
:columns="columns"
>
<span slot="reviewResult" slot-scope="text,result">
<span slot="reviewResult" :title="text" slot-scope="text,result">
{{text}}
</span>
</a-table>
@@ -49,18 +49,21 @@
title: this.$t('OperationNode'),
dataIndex: 'name',
align: 'left',
ellipsis: true,
width: 470
},
{
title: this.$t('Operator'),
dataIndex: 'assignee',
align: 'left',
ellipsis: true,
width: 270
},
{
title: this.$t('result'),
dataIndex: 'reviewResult',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'reviewResult' },
width: 270
},
@@ -68,14 +71,15 @@
title: this.$t('opinion'),
dataIndex: 'approvalOpinion',
align: 'left',
ellipsis: true,
width: 270
},
{
title: this.$t('operationTime'),
dataIndex: 'createTime',
align: 'left',
ellipsis: true,
width: 200,
fixed: 'right'
}
],
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'
jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+13 -5
View File
@@ -88,7 +88,7 @@
align: 'left',
ellipsis: true,
width: 223
},
}
],
dataList: [],
content: [],
@@ -96,7 +96,7 @@
pageNo: 1,
pageSize: 10,
total: 0,
ids:'',
ids: ''
}
},
mounted() {
@@ -165,19 +165,27 @@
}).then((res) => {
if (res.success) {
this.confirmLoading = false
this.$message.success(this.$t('OperationSuccessful'))
if (res.result) {
this.$message.warning(res.result)
} else {
this.$message.success(this.$t('OperationSuccessful'))
}
this.visible = false
this.selectedRowKeys = []
this.$emit('referenceDeliverablesListForm')
} else {
this.$message.warning(this.$t('operationFailed'))
if (res.result) {
this.$message.warning(res.result)
} else {
this.$message.warning(this.$t('operationFailed'))
}
this.confirmLoading = false
}
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
}
}
}
</script>
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+14 -4
View File
@@ -1279,7 +1279,7 @@
isDisplay: false,
flowType: 2,
Sponsor: 'regulationOwnerName',
personLiable: 'designDutyName',
personLiable: 'designDutyIdName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
@@ -1309,7 +1309,7 @@
flowType: 4,
isDisplay: false,
Sponsor: 'regulationOwnerName',
personLiable: 'verifyDutyName',
personLiable: 'verifyDutyIdName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
@@ -1685,13 +1685,23 @@
let _this = this
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
let isTrue
let content = []
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
isTrue = true
content.push(this.dataSource[i])
}
}
}
for (let i = 0; i < content.length; i++) {
if (content[i].designFlowStatus == 'List to be released' &&
content[i].verifyFlowStatus == 'List to be released') {
isTrue = false
} else {
isTrue = true
}
}
if (isTrue) {
this.changeInterface(selectedRowKeys)
}
@@ -2559,7 +2569,7 @@
},
download(item) {
downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
},
}
}
}
</script>
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+2 -2
View File
@@ -242,7 +242,7 @@
isDisplay: false,
flowType: 2,
Sponsor: 'regulationOwnerName',
personLiable: 'designDutyName',
personLiable: 'designDutyIdName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
@@ -310,7 +310,7 @@
flowType: 4,
isDisplay: false,
Sponsor: 'regulationOwnerName',
personLiable: 'verifyDutyName',
personLiable: 'verifyDutyIdName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+5 -3
View File
@@ -30,9 +30,10 @@
<div style="width: 100%">
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
:scroll="{x: '100%'}"
:data-source="dataSource"
:columns="columns"
>
@@ -104,7 +105,7 @@
title: this.$t('Operator'),
dataIndex: 'assignee',
align: 'left',
width: 200,
width: 120,
ellipsis: true
},
{
@@ -128,7 +129,7 @@
title: this.$t('resultofhandling'),
dataIndex: 'operatorResultName',
align: 'left',
width: 200,
width: 160,
ellipsis: true,
},
{
@@ -246,6 +247,7 @@
</script>
<style scoped lang="less">
@import '~@assets/less/common.less';
.box {
padding: 0 0 24px 0;
box-sizing: border-box;
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+5 -5
View File
@@ -78,7 +78,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 110
width: 150
},
{
title: this.$t('standardInformation'),
@@ -121,7 +121,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 110,
width: 160,
scopedSlots: { customRender: 'endTime' }
},
// {
@@ -136,7 +136,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 80,
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
@@ -297,7 +297,7 @@
isDisplay: true,
flowType: 2,
Sponsor: 'regulationOwnerName',
personLiable: 'designDutyName',
personLiable: 'designDutyIdName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
@@ -367,7 +367,7 @@
flowType: 4,
isDisplay: true,
Sponsor: 'regulationOwnerName',
personLiable: 'verifyDutyName',
personLiable: 'verifyDutyIdName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+2 -2
View File
@@ -237,7 +237,7 @@
isDisplay: false,
flowType: 2,
Sponsor: 'regulationOwnerName',
personLiable: 'designDutyName',
personLiable: 'designDutyIdName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
@@ -304,7 +304,7 @@
flowType: 4,
isDisplay: false,
Sponsor: 'regulationOwnerName',
personLiable: 'verifyDutyName',
personLiable: 'verifyDutyIdName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',