From a2ba3b5171732cf4feb89fd4240abf2dbfe85474 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 14 五月 2024 13:42:35 +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 | 4 ++--
src/components/view/b1-expenses.vue | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index be06f02..cd5ee69 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -66,9 +66,9 @@
</div>
</div>
<div class="search_thing">
- <div class="search_label">濮旀墭浜猴細</div>
+ <div class="search_label">濮旀墭鍗曚綅锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.company" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -102,7 +102,7 @@
return {
componentData: {
entity: {
- name: null,
+ company: null,
dates: null,
orderBy: {
field: 'id,ins_sample_id',
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 895743d..54a6f86 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -245,9 +245,9 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- /* disabFun: (row, index) => {
+ disabFun: (row, index) => {
return row.userId == null || row.insState != 3 || row.verifyUser != 1
- } */
+ }
}, {
id: '',
font: '璁ら',
--
Gitblit v1.9.3