master
xy 2 years ago
parent aa8b11ad3d
commit 847e3c7459

@ -2,8 +2,8 @@
ENV = 'development' ENV = 'development'
# base api # base api
#VUE_APP_DOMIAN=http://192.168.60.99:9003/ VUE_APP_DOMIAN=http://192.168.60.99:9003/
VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/ #VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
VUE_APP_BASE_API = '' VUE_APP_BASE_API = ''
VUE_APP_UPLOAD=http://hdcontract.ali251.langye.net/api/admin/upload-file VUE_APP_UPLOAD=http://hdcontract.ali251.langye.net/api/admin/upload-file
#VUE_APP_UPLOAD=http://192.168.60.99:9003/api/admin/upload-file #VUE_APP_UPLOAD=http://192.168.60.99:9003/api/admin/upload-file

@ -89,7 +89,7 @@
</div> </div>
<div class="journal"> <div class="journal">
<div class="journal-title">日志</div> <div class="journal-title">日志</div>
<xy-table :height="240" :table-item="journalTable" :list="detail.log" :show-index="false"> <xy-table :height="240" :table-item="journalTable" :list="(detail.log)" :show-index="false">
<template v-slot:btns> <template v-slot:btns>
<div></div> <div></div>
</template> </template>
@ -161,10 +161,9 @@
customFn: (row) => { customFn: (row) => {
const typeSwitch = (type) => { const typeSwitch = (type) => {
{ {
let res = this.planTypes.filter(item => { return this.planTypes.find(item => {
return item.id === type return item.id === type
}) })?.value || '未知'
return res[0]?.value || '未知'
} }
} }
return ( < return ( <
@ -240,6 +239,7 @@
planTable: [{ planTable: [{
prop: 'date', prop: 'date',
label: '日期', label: '日期',
width: 120,
sortable: false, sortable: false,
formatter: (cell, data, value) => { formatter: (cell, data, value) => {
return parseTime(new Date(value), '{y}-{m}-{d}') return parseTime(new Date(value), '{y}-{m}-{d}')
@ -260,6 +260,7 @@
label: '内容', label: '内容',
align: 'left', align: 'left',
sortable: false, sortable: false,
minWidth: 160,
}, },
{ {
prop: 'remark', prop: 'remark',
@ -365,6 +366,9 @@
} }
}) })
this.detail.plans = linkPlanTable this.detail.plans = linkPlanTable
if (this.detail.log instanceof Array) {
this.detail.log = this.detail.log.reverse()
}
console.log(this.detail) console.log(this.detail)
let plan = await getContractSign({ let plan = await getContractSign({
@ -387,6 +391,7 @@
}, },
}, },
computed: { computed: {
typeFormatter() { typeFormatter() {
return function(type) { return function(type) {
switch (type) { switch (type) {

Loading…
Cancel
Save