From 948af5e99d9a30a8fb1a7afe74e22c6528b716bc Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 02 七月 2024 13:37:16 +0800
Subject: [PATCH] 修改lukyseet
---
index.html | 14 ++--
src/components/do/b1-inspect-order-plan/Inspection.vue | 141 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 145 insertions(+), 10 deletions(-)
diff --git a/index.html b/index.html
index ffb57f2..1eedf5f 100644
--- a/index.html
+++ b/index.html
@@ -13,10 +13,10 @@
<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 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' />
+ <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet\plugins\css/pluginsCss.css' />
+ <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/plugins.css' />
+ <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/css/luckysheet.css' />
+ <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/assets/iconfont/iconfont.css' />
<style>
#app{
overflow: hidden;
@@ -30,9 +30,7 @@
<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="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>
+ <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
+ <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/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 31ee0db..1711c52 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -143,6 +143,10 @@
>>>input[type=number] {
-moz-appearance: textfield !important; /* 閽堝 Firefox */
}
+ >>>.el-form-item__content{
+ display: inline-flex;
+ align-items: center;
+ }
</style>
<style>
.inspection .el-form-item__label {
@@ -381,7 +385,134 @@
</table>
</div>
<div class="center-box" v-loading="tableLoading" v-else>
- <h4>娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+ <h4 style="margin-bottom: 20px;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+ <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px">
+ <el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm.entrustCode" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm.sampleCode" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="妫�娴嬩緷鎹�:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm.sample" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="寰幆娆℃暟:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in numOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娓╁害:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <span style="margin-left: 4px;">鈩�</span>
+ </el-form-item>
+ </el-form>
+ <el-divider></el-divider>
+ <el-form :inline="true" :model="wareForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;margin-bottom: 20px;">
+ <el-form-item label="浠櫒鍚嶇О:">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-left: 80px;">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="wareForm.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-table
+ :data="wareTableData"
+ border
+ style="width: 100%">
+ <el-table-column
+ fixed
+ prop="date"
+ label="绠¤壊鏍�"
+ width="150">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍏夌氦甯︾紪鍙�"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="province"
+ label="鍏夌氦鑹叉爣"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="澶栫"
+ width="120">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.input" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍐呯"
+ width="300">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.input" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="骞冲潎鍊�"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="琛板噺鏌�"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="妫�娴嬩汉"
+ width="120">
+ </el-table-column>
+ </el-table>
</div>
<el-upload :action="action"
:data="{
@@ -632,7 +763,13 @@
temptList:null,
fiber:[],
fibers:[],
- currentTab:null
+ currentTab:null,
+ wareForm:{},
+ numOptions:[],
+ temperatureOptions:[],
+ wareTableData:[
+ {}
+ ]
}
},
computed: {
--
Gitblit v1.9.3