From bf20edf7ef0764a1354de67773af5e466a374e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 25 Oct 2024 09:53:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=9B=E9=94=80?=
 =?UTF-8?q?=E5=AD=98=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/data_forms.vue                 | 14 +++--
 .../invoicing/consumable/information.vue      | 56 ++++++++++---------
 src/views/product/add_shop.vue                |  6 +-
 3 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue
index 4de0dd0..c7d4330 100644
--- a/src/views/home/data_forms.vue
+++ b/src/views/home/data_forms.vue
@@ -114,17 +114,19 @@
         <el-table-column label="单价" prop="price"></el-table-column> -->
         <el-table-column label="商品名称" prop="name"></el-table-column>
         <el-table-column label="销量" prop="salesNum"></el-table-column>
-        <el-table-column label="退单量" prop="refNum"></el-table-column>
-        <el-table-column label="退款金额" prop="refAmount">
-          <template v-slot="scope">
-            ￥{{ scope.row.refAmount }}
-          </template>
-        </el-table-column>
         <el-table-column label="销售金额" prop="salesAmount">
           <template v-slot="scope">
             ￥{{ scope.row.salesAmount }}
           </template>
         </el-table-column>
+        <el-table-column label="退款金额" prop="refAmount">
+          <template v-slot="scope">
+            ￥{{ scope.row.refAmount }}
+          </template>
+        </el-table-column>
+       
+        <el-table-column label="退单量" prop="refNum"></el-table-column>
+
       </el-table>
     </div>
     <div class="head-container">
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index 7d35b21..0969ec0 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -30,35 +30,40 @@
           <el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" value-format="yyyy-MM-dd">
           </el-date-picker>
-          
+
           <el-button type="primary" @click="getTableData">查询</el-button>
           <el-button @click="resetHandle">重置</el-button>
         </div>
         <div class="row">
-          <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
+          <!-- <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
           <el-button @click="routerGo('operation_in')">入库</el-button>
           <el-button @click="routerGo('operation_out')">出库</el-button>
           <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
           <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
           <el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</el-button>
-          <el-button icon="el-icon-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button>
-        </div>
-      </div>
-      <div class="row_wrap" style="margin-top: 12px">
-        <div class="row">
-          <!-- <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
-          <el-button @click="$router.push({ name: 'operation_in' })">入库</el-button>
-          <el-button @click="$router.push({ name: 'operation_out' })">出库</el-button>
-          <el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
-          <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
-          <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button> -->
-        </div>
-        <div class="row">
-          <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
+          <el-button icon="el-icon-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button> -->
+           <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
             <el-option label="创建时间" value="createTime,desc" />
             <el-option label="数量由低到高" value="balance,asc" />
           </el-select>
         </div>
+       
+      </div>
+      <div class="row_wrap" style="margin-top: 12px">
+        <div class="row">
+          <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
+          <el-button @click="$router.push({ name: 'operation_in' })">入库</el-button>
+          <el-button @click="$router.push({ name: 'operation_out' })">出库</el-button>
+          <el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
+          <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
+          <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
+        </div>
+        <!-- <div class="row">
+          <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
+            <el-option label="创建时间" value="createTime,desc" />
+            <el-option label="数量由低到高" value="balance,asc" />
+          </el-select>
+        </div> -->
       </div>
     </div>
     <template>
@@ -162,7 +167,8 @@
           <el-table-column label="原有库存" prop="balance">
             <template v-slot="scope">
               <span>{{ scope.row.balance > 0 ? (scope.row.balance + (scope.row.bizType == '-' ?
-                scope.row.amount : -scope.row.amount)) : Number(scope.row.balance) + Number(scope.row.amount) }}</span>
+                scope.row.amount : -scope.row.amount)).toFixed(2) : (Number(scope.row.balance) +
+                  Number(scope.row.amount)).toFixed(2) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="变动后库存" prop="balance"></el-table-column>
@@ -249,7 +255,7 @@
         <el-table-column label="耗材入库" prop="conIn" />
         <el-table-column label="耗材出库" prop="conOut" />
         <el-table-column label="耗材反还" prop="conReturn" />-->
-        
+
         <el-table-column label="所属商品">
           <template v-slot="scope">
             <div class="goodslang">
@@ -297,7 +303,7 @@
             <el-switch v-model="scope.row.isCheck" active-value="1" inactive-value="0"
               @change="showChange($event, scope.row)"></el-switch>
           </template>
-        </el-table-column> 
+        </el-table-column>
         <!-- <el-table-column label="状态" prop="status">
           <template v-slot="scope">
             <el-switch v-model="scope.row.status" active-value="1" inactive-value="0"
@@ -647,7 +653,7 @@ export default {
       tableDatatype: {
         data: [],
         page: 0,
-        size:100,
+        size: 100,
         loading: false,
         total: 0
       },
@@ -722,13 +728,13 @@ export default {
     this.getTableDatatype();
   },
   methods: {
-    async routerGo (name) {
+    async routerGo(name) {
       let text;
-      if ( name == 'operation_in') { text = "允许耗材入库"}
-      if ( name == 'operation_out') { text = "允许耗材出库"}
+      if (name == 'operation_in') { text = "允许耗材入库" }
+      if (name == 'operation_out') { text = "允许耗材出库" }
       let res = await hasPermission(text);
-      if ( !res) { return; }
-      this.$router.push({ name: name})
+      if (!res) { return; }
+      this.$router.push({ name: name })
     },
     lookDetail(row) {
       this.$refs.recodeDetail.open({
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 24f7a1f..8037377 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -362,10 +362,10 @@
           <el-input-number @change="priceFormat(form, 'stockNumber')" @blur="priceFormat(form, 'stockNumber')"
             v-model="form.stockNumber" controls-position="right"></el-input-number>
         </el-form-item>
-        <el-form-item label="标签打印">
+        <!-- <el-form-item label="标签打印">
           <el-switch v-model="form.enableLabel" :active-value="1" :inactive-value="0"></el-switch>
           <div class="tips">开启后: 收银完成后会自动打印对应数量的标签数</div>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="打包费">
           <el-input-number @change="priceFormat(form, 'packFee')" @blur="priceFormat(form, 'packFee')"
             v-model="form.packFee" controls-position="right"></el-input-number>
@@ -774,7 +774,7 @@ export default {
         });
         return false;
       }
-      
+
       let arr = [];
       this.imgList.forEach((ele) => {
         arr.push(ele.url);

From 486733b788dd31f1154d8d01dda153a47beb5c84 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 25 Oct 2024 09:58:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/home.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index ce5e0eb..8bbbde9 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -194,9 +194,9 @@
             <el-radio-button label="30">30天</el-radio-button>
           </el-radio-group>
         </div>
-        <div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 500px;" v-show="lineChartType == 0">
+        <div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 350px;" v-show="lineChartType == 0">
         </div>
-        <div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 500px;"
+        <div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 350px;"
           v-show="lineChartType == 1">
         </div>
       </div>
@@ -213,13 +213,13 @@
           </el-radio-group>
         </div>
         <div class="sale_data">
-          <div class="card">
+          <!-- <div class="card">
             <div class="sale_data_header">
               <div class="card_title">销售数量</div>
             </div>
             <div class="number">{{ productCount }}</div>
             <div class="product_chart_wrap" ref="productCountChart"></div>
-          </div>
+          </div> -->
           <!-- <div class="card">
             <div class="sale_data_header">
               <div class="card_title">销售金额</div>