From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/views/experiment/inspectionApplication/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 1c91d27..5b93901 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -53,7 +53,12 @@
<div v-if="scope.row.type === 1"><el-tag type="warning">鎴愬搧妫�楠�</el-tag></div>
</template>
</el-table-column>
- <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px" />
+ <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px">
+ <template slot-scope="scope">
+ <p v-if="scope.row.type!=1">{{scope.row.formTime}}</p>
+ <p v-else>/</p>
+ </template>
+ </el-table-column>
<el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip />
<el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px" />
<el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="90px" />
@@ -769,7 +774,7 @@
//鎴愬搧
if (this.type === 1) {
obj = {
- supplier:"supplier",
+ supplier:"/",
formTime: "2023-09-09",
endTime: this.finishedTable.checkdate[1],
mcode: this.finishedTable.code,
--
Gitblit v1.9.3