From 238de511e070c23bfd87a24f33da5c507875a259 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 02 七月 2024 09:53:23 +0800
Subject: [PATCH] 正式库lucksheet 优化
---
index.html | 14 ++++++++++----
src/components/do/b1-inspect-order-plan/Inspection.vue | 5 ++++-
src/components/view/b1-inspection-order.vue | 6 +++---
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/index.html b/index.html
index 483f242..ffb57f2 100644
--- a/index.html
+++ b/index.html
@@ -9,10 +9,14 @@
<title>LIMS瀹為獙瀹ょ鐞嗙郴缁�</title>
<link rel="icon" type="image/x-icon" href="./static/img/logo.png">
- <link href="./static/luckysheet/plugins/css/pluginsCss.css" rel="stylesheet" />
+ <!-- <link href="./static/luckysheet/plugins/css/pluginsCss.css" rel="stylesheet" />
<link href="./static/luckysheet/plugins/plugins.css" rel="stylesheet" />
<link href="./static/luckysheet/css/luckysheet.css" rel="stylesheet" />
- <link href="./static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" />
+ <link href="./static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" /> -->
+ <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet/dist/plugins/css/pluginsCss.css' />
+ <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet/dist/plugins/plugins.css' />
+ <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet/dist/css/luckysheet.css' />
+ <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet/dist/assets/iconfont/iconfont.css' />
<style>
#app{
overflow: hidden;
@@ -26,7 +30,9 @@
<body>
<div id="app"></div>
<script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
- <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
- <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script>
+ <!-- <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
+ <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script> -->
+ <script src="https://cdn.jsdelivr.net/npm/luckysheet/dist/plugins/js/plugin.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/luckysheet/dist/luckysheet.umd.js"></script>
</body>
</html>
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 9526916..31ee0db 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -274,7 +274,7 @@
</el-radio-group>
</div>
</div>
- <div class="center-box" id="nav" v-loading="tableLoading">
+ <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
@@ -380,6 +380,9 @@
</tbody>
</table>
</div>
+ <div class="center-box" v-loading="tableLoading" v-else>
+ <h4>娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+ </div>
<el-upload :action="action"
:data="{
orderId:id
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d7870f2..7e989b0 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -343,7 +343,7 @@
<el-col style="font-weight: bold;"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
+ <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
<el-col style="font-weight: bold;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
@@ -389,9 +389,9 @@
<el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="font-size: 8px;">
- <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
+ <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
</el-row>
- <el-row style="font-size: 8px;">
+ <el-row style="font-size: 8px;width: 140px;">
<el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
<el-row style="margin-top: 3px;font-size: 8px;">
--
Gitblit v1.9.3