From b580f0402ff66d0c5b74460edcb920a516b1ce6e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 18:00:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/inspectionManagement/commissionInspection/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index fe1527d..707c3b1 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -24,7 +24,7 @@
</el-form-item>
</el-form>
<el-form>
- <el-popover placement="left" width="400" trigger="click">
+ <el-popover placement="left" width="410" trigger="click">
<div class="vue_qr_div">
<el-row>
<el-col>
@@ -39,7 +39,7 @@
v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime2)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
</el-row>
</div>
- <el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
+ <el-button size="small" slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
</el-popover>
</el-form>
</div>
@@ -251,7 +251,7 @@
this.addReportDialog = false
},
checkSelect(row) {
- if (row.type === 1) {
+ if (row.inspection_status === 2) {
return false;
} else {
return true;
@@ -474,7 +474,7 @@
selectViewUUID({
day: this.day
}).then(res => {
- this.view = `${this.vueIp}addCommision/${res.data.id}`
+ this.view = `${this.vueIp}/#/addCommision/${res.data.id}`
this.viewId = res.data.id
this.viewTime2 = res.data.time
})
@@ -484,7 +484,7 @@
day: this.viewTime == null ? 1 : this.viewTime
}).then(res => {
this.viewId = res.data
- this.view = `${this.vueIp}addCommision/${res.data.id}`
+ this.view = `${this.vueIp}/#/addCommision/${res.data.id}`
this.viewDia = false
this.$message.success('閾炬帴宸茬敓鎴愶紝鐐瑰嚮澶嶅埗鎸夐挳杩涜澶嶅埗')
})
--
Gitblit v1.9.3