From afa3731d4e2ff33c0d1316264d0045cfa1dfc115 Mon Sep 17 00:00:00 2001
From: JIAL <2287346125@qq.com>
Date: Sat, 17 Feb 2024 16:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=85=A4=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logs/JIAL-ss.log                              |  12 ++
 .../static/zmquotation/css/index.css          |   7 +-
 .../templates/zmquotation/index.html          | 187 ++++++++++--------
 3 files changed, 115 insertions(+), 91 deletions(-)

diff --git a/logs/JIAL-ss.log b/logs/JIAL-ss.log
index ac37e19..1dfa8cd 100644
--- a/logs/JIAL-ss.log
+++ b/logs/JIAL-ss.log
@@ -8600,3 +8600,15 @@ Unconditional classes:
 2024-02-17 09:54:31.479  INFO 14788 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter           : 本次请求/static/zmquotation/js/index.js不需要处理
 2024-02-17 09:54:31.820  INFO 14788 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter           : 拦截到请求：/static/image/JNlogo.png
 2024-02-17 09:54:31.820  INFO 14788 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter           : 本次请求/static/image/JNlogo.png不需要处理
+2024-02-17 12:34:43.465  INFO 11004 --- [main] com.JN.JNApplication                     : Starting JNApplication using Java 1.8.0_171 on DESKTOP-OG1MRMC with PID 11004 (D:\JavaProject\JNDemo\target\classes started by Administrator in D:\JavaProject\JNDemo)
+2024-02-17 12:34:43.468  INFO 11004 --- [main] com.JN.JNApplication                     : The following profiles are active: ss
+2024-02-17 12:34:45.638  WARN 11004 --- [Druid-ConnectionPool-Create-1078031260] c.m.s.jdbc.internals.TDS.Channel         : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum.
+2024-02-17 12:34:47.406  INFO 11004 --- [main] com.JN.config.WebMvcConfig               : 扩展消息转换器...
+2024-02-17 12:34:47.414  INFO 11004 --- [main] com.JN.config.WebMvcConfig               : 开始进行静态资源映射...
+2024-02-17 12:34:47.555  WARN 11004 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
+2024-02-17 12:34:47.787  INFO 11004 --- [main] com.JN.JNApplication                     : Started JNApplication in 4.823 seconds (JVM running for 5.746)
+2024-02-17 12:34:47.794  INFO 11004 --- [main] com.JN.JNApplication                     : 项目启动成功...
+2024-02-17 12:35:28.384  INFO 11004 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter           : 拦截到请求：/ZM
+2024-02-17 12:35:28.385  INFO 11004 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter           : 本次请求/ZM不需要处理
+2024-02-17 12:35:28.610  INFO 11004 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter           : 拦截到请求：/static/zmquotation/css/index.css
+2024-02-17 12:35:28.611  INFO 11004 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter           : 本次请求/static/zmquotation/css/index.css不需要处理
diff --git a/src/main/resources/static/zmquotation/css/index.css b/src/main/resources/static/zmquotation/css/index.css
index 4837f5c..afb516a 100644
--- a/src/main/resources/static/zmquotation/css/index.css
+++ b/src/main/resources/static/zmquotation/css/index.css
@@ -1,22 +1,18 @@
 .container {
-    display: flex;
 
-    width: 100%; /* 设置页面宽度为视口宽度的100% */
 }
 
 .center-container {
     text-align: center;
     margin: auto;
-    width: 95%;
     padding: 10px;
+    min-width: 1100px;
 }
 
 .el-input {
 
 }
 
-
-
 .el-input__inner {
     height: 30px;
     /*font-family: Roboto, serif;*/
@@ -41,6 +37,7 @@
 
 
 .el-form-item__label {
+    min-width: 100px;
     text-align: justify;
     font-size: 12px;
 }
diff --git a/src/main/resources/templates/zmquotation/index.html b/src/main/resources/templates/zmquotation/index.html
index bbb61fd..d46c5f1 100644
--- a/src/main/resources/templates/zmquotation/index.html
+++ b/src/main/resources/templates/zmquotation/index.html
@@ -16,7 +16,7 @@
 <div class="container" id="index-app">
     <div class="center-container">
         <div class="form-box">
-            <el-form  label-width="45%" :model="formLabelAlign">
+            <el-form label-width="45%" :model="formLabelAlign">
                 <el-row>
                     <el-col :span="6">
                         <el-form-item label="加工费" title="蒸汽费/钢丝铠装材料及加工费">
@@ -33,7 +33,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="账期" title="账期">
+                        <el-form-item label="额外账期" title="额外账期">
                             <el-input v-model="formLabelAlign.accountPeriod" placeholder="账期">
                                 <template slot="append">%</template>
                             </el-input>
@@ -103,56 +103,12 @@
                 </el-row>
                 <el-row>
                     <el-col :span="6">
-                        <el-form-item label="成本累计" title="成本累计">
-                            <el-input v-model="formLabelAlign.cumulativeCost" placeholder="成本累计">
-                                <template slot="append">￥</template>
-                            </el-input>
-                        </el-form-item>
-                    </el-col >
-                    <el-col :span="6">
-                        <el-form-item label="底价" title="底价">
-                            <el-input v-model="formLabelAlign.floorPrice" placeholder="底价">
-                                <template slot="append">￥</template>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="可下浮" title="可下浮">
+                        <el-form-item label="可下浮点数" title="可下浮点数">
                             <el-input v-model="formLabelAlign.canFloat" placeholder="可下浮">
                                 <template slot="append">%</template>
                             </el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="实际成本比例" title="实际材料成本占厂价比例">
-                            <el-input v-model="formLabelAlign.actualCostRatio" placeholder="实际材料成本占厂价比例">
-                                <template slot="append">%</template>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="厂家金额" title="厂家金额">
-                            <el-input v-model="formLabelAlign.manufAmount" placeholder="厂家金额">
-                                <template slot="append">￥</template>
-                            </el-input>
-                        </el-form-item>
-                    </el-col >
-                    <el-col :span="6">
-                        <el-form-item label="人工费" title="人工费">
-                            <el-input v-model="formLabelAlign.laborCost" placeholder="人工费">
-                                <template slot="append">%</template>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="盘具" title="盘具">
-                            <el-input v-model="formLabelAlign.inventoryCost" placeholder="盘具">
-                                <template slot="append">￥</template>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="6" >
                         <el-form-item label="运费">
                             <el-input v-model="formLabelAlign.freight" placeholder="运费">
@@ -161,6 +117,36 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="净重合计" title="净重合计">
+                            <el-input v-model="formLabelAlign.manufAmount" placeholder="净重合计">
+                                <template slot="append">￥</template>
+                            </el-input>
+                        </el-form-item>
+                    </el-col >
+                    <el-col :span="6">
+                        <el-form-item label="重量合计" title="重量合计">
+                            <el-input v-model="formLabelAlign.laborCost" placeholder="重量合计">
+                                <template slot="append">%</template>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="厂价金额合计" title="厂价金额合计">
+                            <el-input v-model="formLabelAlign.freight" placeholder="厂价金额合计">
+                                <template slot="append">￥</template>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                        <el-form-item label="实际金额合计" title="实际金额合计">
+                            <el-input v-model="formLabelAlign.freight" placeholder="实际金额合计">
+                                <template slot="append">￥</template>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-form>
         </div>
         <div class="button-box">
@@ -171,64 +157,94 @@
         </div>
         <div class="table-box">
             <el-table
-                    :data="tableData"
-                    border
-                    :cell-style="cellStyle"
-                    :header-cell-style="{ background: '#eef1f6', color: '#606266', 'text-align': 'center' }">
-                <el-table-column
+                :data="tableData"
+                border
+                :cell-style="cellStyle"
+                :header-cell-style="{ background: '#eef1f6', color: '#606266', 'text-align': 'center' }">
+                    <el-table-column
+                        fixed
+                        label="编号"
+                        type="index"
+                        width="50">
+                    </el-table-column>
+                    <el-table-column
                         fixed
                         width="180"
                         prop="kunnr1"
-                        label="物料编码">
-                </el-table-column>
-                <el-table-column
+                        label="品名">
+                    </el-table-column>
+                    <el-table-column
                         width="180"
                         prop="kunnr2"
-                        label="物料描述">
-                </el-table-column>
-                <el-table-column
+                        label="数量">
+                    </el-table-column>
+                    <el-table-column
                         width="180"
                         prop="kunnr3"
-                        label="销售单位">
-                    <template slot-scope="scope">
-                        <el-input v-model="scope.row.kunnr3" >
-                        </el-input>
-                    </template>
-                </el-table-column>
-                <el-table-column
+                        label="电压">
+                            <template slot-scope="scope">
+                                <el-input v-model="scope.row.kunnr3" >
+                                </el-input>
+                            </template>
+                    </el-table-column>
+                    <el-table-column
                         width="180"
                         prop="kunnr4"
-                        label="厂价">
-                </el-table-column>
-                <el-table-column
+                        label="标准">
+                    </el-table-column>
+                    <el-table-column
                         width="180"
                         prop="kunnr5"
-                        label="基准成本"
-                        style="color: red">
-                </el-table-column>
-                <el-table-column
+                        label="纤芯">
+                    </el-table-column>
+                    <el-table-column
                         width="180"
                         prop="kunnr6"
-                        label="现行采购成本">
-                </el-table-column>
-                <el-table-column
+                        label="成本价">
+                    </el-table-column>
+                    <el-table-column
                         width="180"
                         prop="kunnr7"
-                        label="保留字段1">
-                </el-table-column>
-                <el-table-column
+                        label="厂价">
+                    </el-table-column>
+                    <el-table-column
                         width="180"
                         prop="kunnr8"
-                        label="保留字段2">
-                </el-table-column>
-                <el-table-column
+                        label="净量">
+                    </el-table-column>
+                    <el-table-column
+                        width="180"
+                        prop="kunnr8"
+                        label="盘具">
+                    </el-table-column>
+                    <el-table-column
+                        width="180"
+                        prop="kunnr8"
+                        label="盘重">
+                    </el-table-column>
+                    <el-table-column
+                        width="180"
+                        prop="kunnr8"
+                        label="总成本">
+                    </el-table-column>
+                    <el-table-column
+                        width="180"
+                        prop="kunnr8"
+                        label="总厂价">
+                    </el-table-column>
+                    <el-table-column
+                        width="180"
+                        prop="kunnr8"
+                        label="总净重">
+                    </el-table-column>
+                    <el-table-column
                         fixed="right"
                         width="80"
                         label="操作">
-                    <template slot-scope="scope">
-                        <el-button @click="handleDeleteClick(scope.row)" style="color: red;" type="text">删除</el-button>
-                    </template>
-                </el-table-column>
+                            <template slot-scope="scope">
+                                <el-button @click="handleDeleteClick(scope.row)" style="color: red;" type="text">删除</el-button>
+                            </template>
+                    </el-table-column>
             </el-table>
         </div>
     </div>
@@ -248,7 +264,6 @@
         el: '#index-app',
         data() {
             return {
-                labelPosition: 'right',
                 formLabelAlign: {
                     processingFee: '0.60',      /*蒸汽费/钢丝铠装材料及加工费*/
                     prodFinancialCost: '0.40',  /*生产财务成本*/