From 976d776e39ec9bb87076fcfa11273af4729f519e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 四月 2024 15:44:43 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspect-order-plan.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index f344c46..1827d74 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -235,13 +235,19 @@
id: '',
font: '浜ゆ帴',
type: 'text',
- method: 'handleConnect'
+ method: 'handleConnect',
+ disabFun: (row, index) => {
+ return row.userId == null
+ }
},
{
id: '',
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
+ // disabFun: (row, index) => {
+ // return row.userId == null || row.insState != 4
+ // }
}, {
id: '',
font: '璁ら',
@@ -300,6 +306,7 @@
connectVisible:false,
connectPerson:'',
loading:false,
+ currentTime: null
}
},
created() {
@@ -307,6 +314,7 @@
this.getTypeDicts()
this.getInsStateDicts()
this.getAuthorizedPerson()
+ this.currentTime = getYearAndMonthAndDays()
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -393,10 +401,9 @@
row,
rowIndex
}) {
- let currentTime = getYearAndMonthAndDays()
- if (currentTime === row.appointed) {
+ if (this.currentTime === row.appointed) {
return 'highlight-warning-row-border'
- } else if (currentTime > row.appointed) {
+ } else if (this.currentTime > row.appointed) {
return 'highlight-danger-row-border'
}
return ''
@@ -507,9 +514,9 @@
if (res.code === 200 && res.data) {
this.loading = false;
this.$message.success("浜ゆ帴鎴愬姛")
- this.connectVisible = false
this.refreshTable()
}
+ this.connectVisible = false
}).catch(error => {
console.error(error)
this.loading = false;
--
Gitblit v1.9.3