diff --git a/.env.development b/.env.development
index 4b745c0..f4e6773 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
ENV = 'development'
# base api
-#VUE_APP_DOMIAN=http://192.168.60.99:9003/
-VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
+VUE_APP_DOMIAN=http://192.168.60.99:9003/
+#VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
VUE_APP_BASE_API = ''
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
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index 3a919a7..622a076 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -89,7 +89,7 @@
日志
-
+
@@ -161,10 +161,9 @@
customFn: (row) => {
const typeSwitch = (type) => {
{
- let res = this.planTypes.filter(item => {
+ return this.planTypes.find(item => {
return item.id === type
- })
- return res[0]?.value || '未知'
+ })?.value || '未知'
}
}
return ( <
@@ -240,6 +239,7 @@
planTable: [{
prop: 'date',
label: '日期',
+ width: 120,
sortable: false,
formatter: (cell, data, value) => {
return parseTime(new Date(value), '{y}-{m}-{d}')
@@ -260,6 +260,7 @@
label: '内容',
align: 'left',
sortable: false,
+ minWidth: 160,
},
{
prop: 'remark',
@@ -365,6 +366,9 @@
}
})
this.detail.plans = linkPlanTable
+ if (this.detail.log instanceof Array) {
+ this.detail.log = this.detail.log.reverse()
+ }
console.log(this.detail)
let plan = await getContractSign({
@@ -387,6 +391,7 @@
},
},
computed: {
+
typeFormatter() {
return function(type) {
switch (type) {