From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspect-order-plan.vue | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index f344c46..307d332 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
}
@@ -132,7 +132,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>
@@ -189,7 +189,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,19 +229,25 @@
type: 'text',
method: 'handleInspection',
disabFun: (row, index) => {
- return row.userId == null
+ return row.userId == null || row.insState == 3 || row.insState == 5
}
}, {
id: '',
font: '浜ゆ帴',
type: 'text',
- method: 'handleConnect'
+ method: 'handleConnect',
+ disabFun: (row, index) => {
+ return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3
+ }
},
{
id: '',
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
+ /* disabFun: (row, index) => {
+ return row.userId == null || row.insState != 3
+ } */
}, {
id: '',
font: '璁ら',
@@ -280,10 +286,6 @@
}]
}
},
- spanConfig:{
- rows:'entrustCode',//鍚堝苟琛�,閫氬父娑夊強涓�涓瓧娈�
- cols:[],//鍚堝苟鍒�,閫氬父娑夊強鍑犱釜瀛楁
- },
selectField: {},
requiredAdd: [],
requiredUp: []
@@ -300,6 +302,7 @@
connectVisible:false,
connectPerson:'',
loading:false,
+ currentTime: null
}
},
created() {
@@ -307,6 +310,7 @@
this.getTypeDicts()
this.getInsStateDicts()
this.getAuthorizedPerson()
+ this.currentTime = getYearAndMonthAndDays()
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -393,10 +397,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 ''
@@ -499,17 +502,13 @@
this.$axios.post(this.$api.insOrderPlan.upPlanUser, {
orderId:this.orderId,
userId:this.connectPerson
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if (res.code === 200 && res.data) {
+ }).then(res => {
+ if (res.code === 200) {
this.loading = false;
- this.$message.success("浜ゆ帴鎴愬姛")
- this.connectVisible = false
+ this.$message.success("鎿嶄綔鎴愬姛")
this.refreshTable()
}
+ this.connectVisible = false
}).catch(error => {
console.error(error)
this.loading = false;
--
Gitblit v1.9.3