From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspect-order-plan.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index e75c561..14cd472 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -1,5 +1,5 @@
<style scoped>
- ins-order-plan-main .title {
+ .ins-order-plan-main .title {
font-size: 20px;
color: #3A7BFA
}
@@ -102,6 +102,11 @@
.ins-order-plan-main .el-form-item__label{
color: #000;
}
+
+ .ins-order-plan-main .el-table th.el-table__cell>.cell{
+ height: 46px;
+ line-height: 30px;
+ }
</style>
<template>
<div class="ins-order-plan-main">
@@ -132,7 +137,7 @@
<el-col :span="21">
<div style="display: flex;align-items: center;margin-bottom: 10px;">
<ul class="tab">
- <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}
+ <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label.replace('璇曢獙瀹�','')}}
</li>
</ul>
<div>
@@ -165,7 +170,7 @@
<div class="search_thing">
<div class="search_label" style="width:90px">浜ゆ帴浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="connectPerson" placeholder="璇烽�夋嫨" style="width: 100%;">
+ <el-select v-model="connectPerson" placeholder="璇烽�夋嫨" style="width: 100%;" filterable>
<el-option
v-for="item in personList"
:key="item.value"
@@ -189,7 +194,7 @@
<script>
import ValueTable from '../tool/value-table.vue'
- import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import {
getYearAndMonthAndDays
} from '../../util/date'
@@ -229,7 +234,7 @@
type: 'text',
method: 'handleInspection',
disabFun: (row, index) => {
- return row.userId == null
+ return row.userId == null || row.insState == 3 || row.insState == 5
}
}, {
id: '',
@@ -237,7 +242,7 @@
type: 'text',
method: 'handleConnect',
disabFun: (row, index) => {
- return row.userId == null
+ return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3
}
},
{
@@ -246,7 +251,7 @@
type: 'text',
method: 'handleReview',
disabFun: (row, index) => {
- return row.userId == null || row.insState != 4
+ return row.userId == null || row.insState != 3 || row.verifyUser != 1
}
}, {
id: '',
@@ -286,10 +291,6 @@
}]
}
},
- spanConfig:{
- rows:'entrustCode',//鍚堝苟琛�,閫氬父娑夊強涓�涓瓧娈�
- cols:[],//鍚堝苟鍒�,閫氬父娑夊強鍑犱釜瀛楁
- },
selectField: {},
requiredAdd: [],
requiredUp: []
@@ -401,7 +402,7 @@
row,
rowIndex
}) {
- if (this.currentTime === row.appointed) {
+ if (this.currentTime == row.appointed) {
return 'highlight-warning-row-border'
} else if (this.currentTime > row.appointed) {
return 'highlight-danger-row-border'
--
Gitblit v1.9.3