From 5250374a8999fd6144de64befa6fd6167ce50936 Mon Sep 17 00:00:00 2001
From: 罗媛媛 <2454262093@qq.com>
Date: 星期一, 01 四月 2024 15:25:19 +0800
Subject: [PATCH] 功能调整
---
src/components/view/b1-inspect-order-plan.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 9311104..c78d830 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -164,7 +164,7 @@
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
<Add :active="activeFace" :currentId="currentId"/>
</div>
- <Inspection v-if="state==1" @goback="state=0"/>
+ <Inspection v-if="state==1" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory"/>
</div>
</template>
@@ -204,22 +204,30 @@
showSelect: false,
select: false,
sort: false,
+ init: false,
do: [{
id: '',
font: '妫�楠�',
type: 'text',
- method: 'handleInspection'
+ method: 'handleInspection',
+ disabFun: (row, index) => {
+ return row.userId == null
+ }
}, {
id: '',
font: '浜ゆ帴',
type: 'text',
- method: ''
+ disabFun: (row, index) => {
+ return row.userId == null
+ }
},
{
id: '',
font: '澶嶆牳',
type: 'text',
- method: ''
+ disabFun: (row, index) => {
+ return row.userId == null || row.insState != 4
+ }
}, {
id: '',
font: '璁ら',
@@ -241,6 +249,21 @@
},
insState: {
select: []
+ },
+ insResult: {
+ select: [{
+ value: 0,
+ label: '涓嶅悎鏍�',
+ type: 'danger'
+ },{
+ value: 1,
+ label: '鍚堟牸',
+ type: 'success'
+ },{
+ value: '',
+ label: '鏈嚭缁撴灉',
+ type: 'info'
+ }]
}
},
selectField: {},
@@ -253,16 +276,31 @@
state:0,//0:鍙拌处椤碉紝1锛氭楠岄〉闈紝榛樿涓�0
activeFace: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
currentId: null,
+ entityCopy: {},
+ orderId: 0,
+ currentTime: null
}
},
created() {
this.getLaboratoryDicts()
this.getTypeDicts()
this.getInsStateDicts()
+ this.currentTime = getYearAndMonthAndDays()
+ },
+ mounted() {
+ this.entityCopy = this.HaveJson(this.componentData.entity)
},
methods: {
changeCheckBox(val) {
this.componentData.entity.userId = val?0:null
+ this.refreshTable()
+ },
+ refresh() {
+ this.componentData.entity = this.HaveJson(this.entityCopy)
+ if(this.tabList.length>0){
+ this.tabIndex = 0
+ this.componentData.entity.sonLaboratory = this.tabList[0].value
+ }
this.refreshTable()
},
claimFun(row) {
@@ -296,10 +334,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 ''
@@ -384,8 +421,13 @@
playOrder(num) {
this.activeFace = num
},
+ goback() {
+ this.state = 0
+ this.refreshTable()
+ },
handleInspection(row){
this.state = 1;
+ this.orderId = row.id
}
}
}
--
Gitblit v1.9.3