From 2a9256b4a3121c3f9eeb25a1b1ca24e5c3eb2f49 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 七月 2024 14:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b1-inspect-order-plan.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 54a6f86..ca954d6 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -102,11 +102,16 @@
.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">
<div v-show="activeFace == 0&&state==0" style="height: 100%;">
- <p style="font-size: 16px;padding:19.5px 0px">妫�楠屼换鍔�</p>
+ <p style="font-size: 16px;padding-left: 20px;text-align: left;height: 60px;line-height: 60px;">妫�楠屼换鍔�</p>
<div class="search">
<div class="search_thing">
<div class="search_label">濮旀墭缂栧彿锛�</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"
@@ -228,7 +233,10 @@
font: '妫�楠�',
type: 'text',
method: 'handleInspection',
- disabFun: (row, index) => {
+ // disabFun: (row, index) => {
+ // return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
+ // }
+ disabFun: (row, index) => {
return row.userId == null || row.insState == 3 || row.insState == 5
}
}, {
@@ -237,7 +245,7 @@
type: 'text',
method: 'handleConnect',
disabFun: (row, index) => {
- return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3
+ return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3||JSON.parse(localStorage.getItem("user")).name != row.userName
}
},
{
@@ -246,7 +254,7 @@
type: 'text',
method: 'handleReview',
disabFun: (row, index) => {
- return row.userId == null || row.insState != 3 || row.verifyUser != 1
+ return row.userId == null || row.insState != 3 || row.verifyUser != 1||JSON.parse(localStorage.getItem("user")).name != row.userName
}
}, {
id: '',
@@ -383,15 +391,15 @@
this.loading = false;
this.$message.success("璁ら鎴愬姛")
this.claimVisible = false
- this.refreshTable()
+ this.refreshTable('page')
}
}).catch(error => {
console.error(error)
this.loading = false;
})
},
- refreshTable() {
- this.$refs.insOrderPlan.selectList()
+ refreshTable(e) {
+ this.$refs.insOrderPlan.selectList(e)
},
changeRowClass({
row,
@@ -486,7 +494,7 @@
},
goback() {
this.state = 0
- this.refreshTable()
+ this.refreshTable('page')
},
handleInspection(row){
this.state = 1;
@@ -506,7 +514,7 @@
if (res.code === 200) {
this.loading = false;
this.$message.success("鎿嶄綔鎴愬姛")
- this.refreshTable()
+ this.refreshTable('page')
}
this.connectVisible = false
}).catch(error => {
--
Gitblit v1.9.3