From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspect-order-plan.vue | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 9311104..2b397b2 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,11 +204,15 @@
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: '浜ゆ帴',
@@ -241,6 +245,21 @@
},
insState: {
select: []
+ },
+ insResult: {
+ select: [{
+ value: 0,
+ label: '涓嶅悎鏍�',
+ type: 'danger'
+ },{
+ value: 1,
+ label: '鍚堟牸',
+ type: 'success'
+ },{
+ value: '',
+ label: '鏈嚭缁撴灉',
+ type: 'info'
+ }]
}
},
selectField: {},
@@ -253,6 +272,8 @@
state:0,//0:鍙拌处椤碉紝1锛氭楠岄〉闈紝榛樿涓�0
activeFace: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
currentId: null,
+ entityCopy: {},
+ orderId: 0,
}
},
created() {
@@ -260,9 +281,20 @@
this.getTypeDicts()
this.getInsStateDicts()
},
+ 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) {
@@ -384,8 +416,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