From 467fb91019b7b0449724ad6886b896250c348616 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Sun, 29 Sep 2024 15:30:09 +0800
Subject: [PATCH] 9.27

---
 fuintAdmin/src/views/login.vue                |   4 +-
 .../views/cashier/NewComponents/credit.vue    | 348 +++++++-----------
 2 files changed, 128 insertions(+), 224 deletions(-)

diff --git a/fuintAdmin/src/views/login.vue b/fuintAdmin/src/views/login.vue
index 7724f00d7..9e60206c3 100644
--- a/fuintAdmin/src/views/login.vue
+++ b/fuintAdmin/src/views/login.vue
@@ -340,13 +340,13 @@ export default {
   .gangs{
     width: 100%;
     height: 5px;
-    background: #00aaff;
+    background: #ff9c5a;
     border-radius: 50px;
   }
   .box-left{
     width: 50%;
     height: 100%;
-    background: #00aaff;
+
     background-image: url("../assets/images/loginleft.png");
     background-size: cover;
     background-repeat: no-repeat;
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index eb24faf12..8fe68ea0e 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -2,11 +2,7 @@
 <template>
   <div class="app-center">
 <!--    查询-->
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>挂账</span>
-      </div>
-
+    <div class="top_new">
       <el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="80px">
         <el-form-item label="" prop="unitName">
           <el-input
@@ -64,16 +60,12 @@
         <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
+          <el-button type="primary" size="mini" @click="addUnit">新增挂账单位</el-button>
         </el-form-item>
       </el-form>
-
-    </el-card>
-
+    </div>
 <!--    统计-->
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>统计</span>
-      </div>
+    <div class="top_news">
       <div class="box-gang">
         <div class="box">
           <div class="size-bole">{{ total3 }}</div>
@@ -136,116 +128,105 @@
 <!--          <div class="size-bole">{{ noReturnAllAmount }}</div>-->
 <!--        </div>-->
 <!--      </div>-->
-    </el-card>
-
-<!--    挂账列表-->
-    <el-card class="box-card">
-      <div class="wgang">
-           <div>列表</div>
-           <div style="display: flex ">
-             <el-button type="primary" size="mini" @click="addUnit">新增挂账单位</el-button>
-<!--             <el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button>-->
-           </div>
-         </div>
       <div class="table-box">
-          <el-table
-            :data="creditUnitList"
-            style="width: 100%">
-            <el-table-column type="expand" >
-              <template slot-scope="props">
-                <el-table ref="tables" :data="props.row.hangBillVos">
-                  <el-table-column type="index" width="80" align="center" label="序号"/>
-                  <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
-                    <el-table-column prop="returnType" align="center" label="类型">
-                      <template slot-scope="scope">
-                        <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
-                        <el-tag v-else type="success">归还</el-tag>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
-                    <el-table-column prop="status" align="center" label="状态">
-                      <template slot-scope="scope">
-                        <span v-if="scope.row.status == 0">未归还</span>
-                        <span v-else-if="scope.row.status == 1" type="success">已归还</span>
-                        <span v-else type="success">部分归还</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
-                    <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
-                  <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
-                  <el-table-column prop="createTime" align="center" label="创建时间" width="220">
-                    <template slot-scope="scope">
-                      <span>{{ parseTime(scope.row.createTime) }}</span>
-                    </template>
-                  </el-table-column>
+        <el-table
+          :data="creditUnitList"
+          style="width: 100%">
+          <el-table-column type="expand" >
+            <template slot-scope="props">
+              <el-table ref="tables" :data="props.row.hangBillVos">
+                <el-table-column type="index" width="80" align="center" label="序号"/>
+                <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
+                <el-table-column prop="returnType" align="center" label="类型">
+                  <template slot-scope="scope">
+                    <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
+                    <el-tag v-else type="success">归还</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
+                <el-table-column prop="status" align="center" label="状态">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.status == 0">未归还</span>
+                    <span v-else-if="scope.row.status == 1" type="success">已归还</span>
+                    <span v-else type="success">部分归还</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
+                <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
+                <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
+                <el-table-column prop="createTime" align="center" label="创建时间" width="220">
+                  <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+                </el-table-column>
 
-                  <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                    <template slot-scope="scope">
-                      <el-button
-                        size="mini"
-                        type="text"
-                        :disabled="scope.row.status == 1"
-                        @click="repay(scope.row.id)"
-                      >归还</el-button>
-                      <el-button
-                        size="mini"
-                        type="text"
-                        @click="returnRecord(scope.row.id)"
-                      >归还详情</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </el-table-column>
-            <el-table-column label="单位名称" prop="unitName" align="center"/>
-            <el-table-column label="挂账人" prop="personCredit" align="center"/>
-            <el-table-column label="联系电话" prop="contactMobile" align="center" width="110"/>
-            <el-table-column label="预设挂账额度" prop="creditLimit" align="center" width="100"/>
-            <el-table-column label="已使用挂账额度" prop="usedCreditLimit" align="center" width="115"/>
-            <el-table-column label="剩余可挂账额度" prop="residueCreditLimit" align="center" width="115"/>
-            <el-table-column label="操作人" prop="staffName" align="center"/>
-            <el-table-column label="挂账订单总数" prop="hangBillTotal" align="center" width="110"/>
-            <el-table-column label="挂账总金额" prop="hangBillAmount" align="center"/>
-            <el-table-column label="归还笔数" prop="returnTotal" align="center"/>
-            <el-table-column label="归还总金额" prop="returnAmount" align="center"/>
-            <el-table-column label="未归还笔数" prop="noReturnTotal" align="center"/>
-            <el-table-column label="未归还总额" prop="noReturnAmount" align="center"/>
-            <el-table-column label="备注" prop="remark" align="center">
-              <template slot-scope="scope">
-                <span>{{scope.row.remark || "--"}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="状态" align="center" prop="status">
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.status=='qy'">启用</el-tag>
-                <el-tag type="info" v-if="scope.row.status=='jy'">禁用</el-tag>
-                <!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" width="150" prop="createTime">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160" fixed='right'>
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="batchReturn(scope.row)"
-                >归还</el-button>
-              </template>
-            </el-table-column>
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      :disabled="scope.row.status == 1"
+                      @click="repay(scope.row.id)"
+                    >归还</el-button>
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click="returnRecord(scope.row.id)"
+                    >归还详情</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </template>
+          </el-table-column>
+          <el-table-column label="单位名称" prop="unitName" align="center"/>
+          <el-table-column label="挂账人" prop="personCredit" align="center"/>
+          <el-table-column label="联系电话" prop="contactMobile" align="center" width="110"/>
+          <el-table-column label="预设挂账额度" prop="creditLimit" align="center" width="100"/>
+          <el-table-column label="已使用挂账额度" prop="usedCreditLimit" align="center" width="115"/>
+          <el-table-column label="剩余可挂账额度" prop="residueCreditLimit" align="center" width="115"/>
+          <el-table-column label="操作人" prop="staffName" align="center"/>
+          <el-table-column label="挂账订单总数" prop="hangBillTotal" align="center" width="110"/>
+          <el-table-column label="挂账总金额" prop="hangBillAmount" align="center"/>
+          <el-table-column label="归还笔数" prop="returnTotal" align="center"/>
+          <el-table-column label="归还总金额" prop="returnAmount" align="center"/>
+          <el-table-column label="未归还笔数" prop="noReturnTotal" align="center"/>
+          <el-table-column label="未归还总额" prop="noReturnAmount" align="center"/>
+          <el-table-column label="备注" prop="remark" align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.remark || "--"}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.status=='qy'">启用</el-tag>
+              <el-tag type="info" v-if="scope.row.status=='jy'">禁用</el-tag>
+              <!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" width="150" prop="createTime">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="160" fixed='right'>
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="batchReturn(scope.row)"
+              >归还</el-button>
+            </template>
+          </el-table-column>
 
-          </el-table>
-        </div>
+        </el-table>
+      </div>
       <div class="pagination-box">
         <el-pagination
           background
@@ -257,110 +238,11 @@
           @current-change="getList">
         </el-pagination>
       </div>
-    </el-card>
-<!--&lt;!&ndash;    挂账列表&ndash;&gt;-->
-<!--    <el-card class="box-card">-->
-<!--      <div class="wgang">-->
-<!--           <div>列表</div>-->
-<!--           <div style="display: flex ">-->
-<!--             <el-button type="primary" size="mini" @click="addRecord">新增挂账记录</el-button>-->
-<!--             <el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button>-->
-<!--           </div>-->
-<!--         </div>-->
-<!--      <div class="table-box">-->
-<!--          <el-table-->
-<!--            :data="hangBillList"-->
-<!--            style="width: 100%">-->
-<!--            <el-table-column type="expand">-->
-<!--              <template slot-scope="props">-->
-<!--                <el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand">-->
-<!--                  <el-form-item label="操作人手机号">-->
-<!--                    <span>{{ props.row.mobile }}</span>-->
-<!--                  </el-form-item><br/>-->
-<!--                  <el-form-item label="更新时间">-->
-<!--                    <span>{{ props.row.updateTime ? props.row.updateTime:"&#45;&#45;" }}</span>-->
-<!--                  </el-form-item><br/>-->
-<!--                  <el-form-item label="单据备注">-->
-<!--                    <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
-<!--                  </el-form-item><br/>-->
-<!--                  <el-form-item label="单据金额">-->
-<!--                    <span>{{ props.row.amount ? props.row.amount:"0" }}</span>-->
-<!--                  </el-form-item>-->
-<!--                  <el-form-item label="已还金额">-->
-<!--                    <span>{{ props.row.repaidAmount ? props.row.repaidAmount:"0" }}</span>-->
-<!--                  </el-form-item>-->
-<!--                  <el-form-item label="未还金额">-->
-<!--                    <span>{{ props.row.outstandAmount ? props.row.outstandAmount:"0" }}</span>-->
-<!--                  </el-form-item>-->
-<!--                </el-form>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>-->
-<!--            <el-table-column align="center" label="挂账单位">-->
-<!--              <el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>-->
-<!--              <el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>-->
-<!--              <el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column label="记录明细" align="center">-->
-<!--              <el-table-column prop="returnType" align="center" label="类型">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>-->
-<!--                  <el-tag v-else type="success">归还</el-tag>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column prop="amount" align="center" label="金额"> </el-table-column>-->
-<!--              <el-table-column prop="status" align="center" label="状态">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span v-if="scope.row.status == 0">未归还</span>-->
-<!--                  <span v-else-if="scope.row.status == 1" type="success">已归还</span>-->
-<!--                  <span v-else type="success">部分归还</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>-->
-<!--            <el-table-column prop="createTime" align="center" label="创建时间" width="220">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ parseTime(scope.row.createTime) }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--              <template slot-scope="scope">-->
-<!--&lt;!&ndash;                  <el-button&ndash;&gt;-->
-<!--&lt;!&ndash;                    size="mini"&ndash;&gt;-->
-<!--&lt;!&ndash;                    type="text"&ndash;&gt;-->
-<!--&lt;!&ndash;                    icon="el-icon-edit"&ndash;&gt;-->
-<!--&lt;!&ndash;                  >修改</el-button>&ndash;&gt;-->
-<!--                <el-button-->
-<!--                  size="mini"-->
-<!--                  type="text"-->
-<!--                  :disabled="scope.row.status == 1"-->
-<!--                  @click="repay(scope.row.id)"-->
-<!--                >归还</el-button>-->
-<!--                <el-button-->
-<!--                  size="mini"-->
-<!--                  type="text"-->
-<!--                  @click="returnRecord(scope.row.id)"-->
-<!--                >归还详情</el-button>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+    </div>
+
+
 
-<!--          </el-table>-->
-<!--        </div>-->
-<!--      <div class="pagination-box">-->
-<!--        <el-pagination-->
-<!--          background-->
-<!--          layout="prev, pager, next"-->
-<!--          v-show="total>0"-->
-<!--          :total="total"-->
-<!--          :page.sync="queryParams.page"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @current-change="getList">-->
-<!--        </el-pagination>-->
-<!--      </div>-->
-<!--    </el-card>-->
 
-<!--    归还记录信息-->
     <el-drawer
       title="归还详情"
       :visible.sync="drawer"
@@ -1721,7 +1603,7 @@ import {getLodop} from "@/api/LodopFuncs";
     border: 1px solid #fe8c4a;
   }
   .el-form--inline .el-form-item {
-    margin-right: 44px;
+    margin-right: 25px !important;
   }
   .size-hui{
     display: flex;
@@ -1798,4 +1680,26 @@ import {getLodop} from "@/api/LodopFuncs";
     border-radius: 6px 6px 6px 6px;
     border: 1px solid #FF9655;
   }
+  .top_new{
+    display: flex;
+    justify-content: space-between;
+
+    background: #fff;
+    width: 98%;
+    margin: 10px auto;
+    border-radius: 8px;
+    box-sizing: border-box;
+    padding: 15px;
+    margin-bottom: 10px;
+  }
+  .top_news{
+
+    background: #fff;
+    width: 98%;
+    margin: 10px auto;
+    border-radius: 8px;
+    box-sizing: border-box;
+    padding: 15px;
+    margin-bottom: 10px;
+  }
 </style>