From 582f7cf488db280431284fc3a0ab49a0ffb56b39 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Wed, 19 Feb 2025 14:48:44 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=8A=E4=BC=A0=E5=8C=BB=E4=BF=9D?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=202?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderStatsNew.vue | 98 +++++++++++-----------
 src/views/collect/newCreateCodeDetail.vue  | 63 +++++++-------
 2 files changed, 83 insertions(+), 78 deletions(-)

diff --git a/src/views/collect/CollectOrderStatsNew.vue b/src/views/collect/CollectOrderStatsNew.vue
index 68c182ca..f2b96801 100644
--- a/src/views/collect/CollectOrderStatsNew.vue
+++ b/src/views/collect/CollectOrderStatsNew.vue
@@ -1,55 +1,58 @@
 <template>
   <div class="app-container home">
     <div>
-<!--      <h2>单据上传统计</h2>-->
-<!--      <el-divider/>-->
-      <el-card>
+      <div class="mt10 grid-container grid-container1">
 
 
-        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
-                 size="mini" label-width="100px"
-        >
+        <el-card class="grid-item" body-style="padding:0px;height:100%"  >
+
           <el-row >
-            <el-col :span="8">
-              <el-form-item label="时间统计:">
-                <el-date-picker
-
-                  :picker-options="pickerOptions"
-                  v-model="actDateRange"
-                  type="daterange"
-                  format="yyyy 年 MM 月 dd 日"
-                  style="width: 90%"
-                  value-format="yyyy-MM-dd"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
-
-              </el-form-item>
-
-            </el-col>
-            <el-form-item >
-
-              <el-button-group>
-                <el-button
-                  type="primary"
-                  icon="el-icon-refresh"
-                  @click="onReset"
-                >重置
-                </el-button>
-                <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
-                >查询
-                </el-button
-                >
-              </el-button-group>
-
-            </el-form-item>
+            <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
+                     size="mini" label-width="100px"
+            >
+              <el-row >
+                <el-col :span="8">
+                  <el-form-item label="时间统计:">
+                    <el-date-picker
+
+                      :picker-options="pickerOptions"
+                      v-model="actDateRange"
+                      type="daterange"
+                      format="yyyy 年 MM 月 dd 日"
+                      style="width: 90%"
+                      value-format="yyyy-MM-dd"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+
+                  </el-form-item>
+
+                </el-col>
+                <el-form-item >
+
+                  <el-button-group>
+                    <el-button
+                      type="primary"
+                      icon="el-icon-refresh"
+                      @click="onReset"
+                    >重置
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
+                    >查询
+                    </el-button
+                    >
+                  </el-button-group>
+
+                </el-form-item>
+              </el-row>
+            </el-form>
           </el-row>
-        </el-form>
+        </el-card>
 
-      </el-card>
-      <div class="mt10 grid-container grid-container3" style="height: 20%">
+      </div>
+      <div class="mt10 grid-container grid-container3">
 
 
         <el-card class="grid-item" body-style="padding:0px;height:100%"  >
@@ -482,7 +485,7 @@ export default {
       let piedata = {
         name: "医保上传率",
         type: "pie",
-        radius: ["42%", "65%", "65%"],
+        radius: ["40%", "65%", "65%"],
         avoidLabelOverlap: false,
         itemStyle: {
           borderRadius: 4,
@@ -574,8 +577,8 @@ export default {
               },
             },
             labelLine: {
-              length: 20, // 第一段线 长度
-              length2: 36, // 第二段线 长度
+              length: 10, // 第一段线 长度
+              length2: 18, // 第二段线 长度
               show: true,
 
             },
@@ -819,7 +822,6 @@ export default {
 
 .grid-container1 {
   grid-template-columns: repeat(1, 1fr);
-  padding: 10px;
 }
 
 
diff --git a/src/views/collect/newCreateCodeDetail.vue b/src/views/collect/newCreateCodeDetail.vue
index f90d0643..1cb3e3e1 100644
--- a/src/views/collect/newCreateCodeDetail.vue
+++ b/src/views/collect/newCreateCodeDetail.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
     <el-row :gutter="30">
-      <el-col :span="15" style="border: 1px solid #e3dfe1; padding:15px; height: 700px; margin-left: 20px;">
+      <el-col :span="15" style="border: 1px solid #e3dfe1; padding:15px; height: 700px; margin-left: 20px; overflow-y: scroll;">
         <h2 style="font-weight: bold;">上货信息</h2>
         <div v-for="(item, index) in detailList" :key="index" class="product-info">
           <div class="info-item">
-          <p>产品通用名: {{ item.coName }}</p>
-          <p>规格: {{ item.bzgg }}</p>
-          <p>产品标识: {{ item.nameCode }}</p>
-          <p>批次号: {{ item.batchNo }}</p>
+          <p class="p-title">产品通用名: {{ item.coName }}</p>
+          <p class="p-title">规格: {{ item.bzgg }}</p>
+            <p class="p-title">产品标识: {{ item.nameCode }}</p>
+            <p class="p-title">批次号: {{ item.batchNo }}</p>
           </div>
           <div class="count-items">
-          <p>扫码数量: <span class="scan-count">{{ item.count }}</span></p>
-          <p>实际数量: <span class="actual-count">{{ item.reCount }}{{ item.prepnUnit }}</span></p>
+            <p class="p-title">扫码数量: <span class="scan-count">{{ item.count }}</span></p>
+            <p class="p-title">实际数量: <span class="actual-count">{{ item.reCount }}{{ item.prepnUnit }}</span></p>
           </div>
         </div>
 
@@ -21,44 +21,44 @@
         <h2 style="font-weight: bold;">扫码明细({{codeCount}})</h2>
         <!--<el-divider></el-divider>-->
         <div style=" border-top: 1px solid #ccc;">
-          <el-table v-loading="loading" :data="codeArray" style="width: 100%;margin-top: 20px" max-height="350"
+          <el-table v-loading="loading" :data="codeArray" style="width: 100%; margin-top: 20px" max-height="600px"
                     ref="multipleTable">
             <!--      <el-table-column-->
             <!--        type="selection"-->
             <!--        width="55">-->
             <!--      </el-table-column>-->
-            <el-table-column label="序号" type="index" width="55">
+            <el-table-column label="序号" type="index" width="55" style="text-align: right;">
 
             </el-table-column>
             <el-table-column
               label="追溯码"
               prop="code"
               show-overflow-tooltip
-            >
+              style="text-align: right;">
               <template slot-scope="scope">
                 <div style="font-size: 20px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
                   {{ scope.row.code }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="small"
-                  @click.native.stop="deleteCode(scope.$index, scope.row)"
-                >减一
-                </el-button
-                >
-                <el-button
-                  type="text"
-                  size="small"
-                  @click.native.stop="editCode(scope.row)"
-                >编辑
-                </el-button
-                >
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="操作" width="100" fixed="right">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click.native.stop="deleteCode(scope.$index, scope.row)"-->
+<!--                >减一-->
+<!--                </el-button-->
+<!--                >-->
+<!--                <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click.native.stop="editCode(scope.row)"-->
+<!--                >编辑-->
+<!--                </el-button-->
+<!--                >-->
+<!--              </template>-->
+<!--            </el-table-column>-->
           </el-table>
 
         </div>
@@ -286,13 +286,16 @@ export default {
 
 .scan-count {
   color: red;
-  font-size: 45px;
+  font-size: 65px;
   font-weight: bold; /* 添加这行代码，使字体加粗 */
 }
 
 .actual-count {
   color: green;
-  font-size: 24px;
+  font-size: 38px;
 }
+.p-title{
+  font-size: 24px;
 
+}
 </style>