Browse Source

feature:卡务中心->卡务操作前后端
1、错扣补款界面样式调整

luoyb 1 month ago
parent
commit
f450119312

+ 9 - 7
src/views/cardCenter/cardOperation/ptCard/ErrorFillForm.vue

@@ -1,6 +1,6 @@
1
 <template>
1
 <template>
2
   <div class="e-dialog">
2
   <div class="e-dialog">
3
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="70%" align-center :draggable="draggable" :show-close="false">
3
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="70%" align-center :draggable="draggable">
4
       <el-card>
4
       <el-card>
5
         <template #header>
5
         <template #header>
6
           <div class="card-header">
6
           <div class="card-header">
@@ -58,18 +58,18 @@
58
           v-loading="loading"
58
           v-loading="loading"
59
           :data="xfConsumeDetailList"
59
           :data="xfConsumeDetailList"
60
           stripe
60
           stripe
61
-          height="300"
61
+          height="300px"
62
           highlight-current-row
62
           highlight-current-row
63
           @current-change="handleCurrentChange"
63
           @current-change="handleCurrentChange"
64
         >
64
         >
65
-          <el-table-column label="序列号" type="index" width="70" />
66
-          <el-table-column label="消费时间" align="center" prop="consumeDate" width="180">
65
+          <el-table-column label="序列号" type="index" width="100" />
66
+          <el-table-column label="消费时间" align="center" prop="consumeDate" width="250">
67
             <template #default="scope">
67
             <template #default="scope">
68
               <span>{{ parseTime(scope.row.consumeDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
68
               <span>{{ parseTime(scope.row.consumeDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
69
             </template>
69
             </template>
70
           </el-table-column>
70
           </el-table-column>
71
           <el-table-column label="消费金额" align="center" prop="consumeMoney" />
71
           <el-table-column label="消费金额" align="center" prop="consumeMoney" />
72
-          <el-table-column label="设备名称" align="center" prop="termName" width="200" />
72
+          <el-table-column label="设备名称" align="center" prop="termName" width="300" />
73
           <el-table-column label="设备编号" align="center" prop="termNo" />
73
           <el-table-column label="设备编号" align="center" prop="termNo" />
74
           <el-table-column label="钱包类型" align="center" prop="bagType">
74
           <el-table-column label="钱包类型" align="center" prop="bagType">
75
             <template #default="scope">
75
             <template #default="scope">
@@ -99,7 +99,7 @@
99
             <span>补款信息</span>
99
             <span>补款信息</span>
100
           </div>
100
           </div>
101
         </template>
101
         </template>
102
-        <el-form ref="formRef" :model="formData" :rules="formRules" :inline="true" label-width="80px" class="-mb-25px -mt-6px" @submit="getList">
102
+        <el-form ref="formRef" :model="formData" :rules="formRules" :inline="true" label-width="6rem" class="-mb-25px -mt-6px" @submit="getList">
103
           <el-form-item label="消费时间" prop="consumeDate">
103
           <el-form-item label="消费时间" prop="consumeDate">
104
             <el-input v-model="formData.consumeDate" disabled></el-input>
104
             <el-input v-model="formData.consumeDate" disabled></el-input>
105
           </el-form-item>
105
           </el-form-item>
@@ -116,7 +116,7 @@
116
           <el-form-item label="补款时间" prop="fillDate">
116
           <el-form-item label="补款时间" prop="fillDate">
117
             <el-date-picker v-model="formData.fillDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请设置补款时间" />
117
             <el-date-picker v-model="formData.fillDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请设置补款时间" />
118
           </el-form-item>
118
           </el-form-item>
119
-          <el-form-item label="补款金额" prop="operatorMoney" label-width="100px">
119
+          <el-form-item label="补款金额" prop="operatorMoney" label-width="7rem">
120
             <template #label>
120
             <template #label>
121
               补款金额:
121
               补款金额:
122
               <el-tooltip content="消费金额为负数时,补款金额也要设置为负数" placement="left-start">
122
               <el-tooltip content="消费金额为负数时,补款金额也要设置为负数" placement="left-start">
@@ -415,6 +415,8 @@ onMounted(() => {
415
 
415
 
416
 :deep() .el-dialog__headerbtn .el-dialog__close {
416
 :deep() .el-dialog__headerbtn .el-dialog__close {
417
   color: white !important;
417
   color: white !important;
418
+  top: 15px;
419
+  right: 10px;
418
 }
420
 }
419
 
421
 
420
 :deep() .el-overlay .el-overlay-dialog .el-dialog .el-dialog__body {
422
 :deep() .el-overlay .el-overlay-dialog .el-dialog .el-dialog__body {

+ 1 - 1
src/views/cardCenter/cardOperation/ptCard/RechargeForm.vue

@@ -1,6 +1,6 @@
1
 <template>
1
 <template>
2
   <div class="p-2">
2
   <div class="p-2">
3
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="800px" :draggable="draggable" :show-close="false">
3
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="50%" :draggable="draggable" :show-close="false">
4
       <div class="panel">
4
       <div class="panel">
5
         <h4 class="panel-title">{{ labelInfo }}</h4>
5
         <h4 class="panel-title">{{ labelInfo }}</h4>
6
         <el-form ref="formAccountRef" :model="accountFormData" label-width="100px">
6
         <el-form ref="formAccountRef" :model="accountFormData" label-width="100px">

+ 1 - 2
src/views/cardCenter/cardOperation/ptCard/index.vue

@@ -107,7 +107,6 @@
107
             <el-table-column v-if="columns[0].visible" label="姓名" align="center" prop="realName" width="100" :show-overflow-tooltip="true" />
107
             <el-table-column v-if="columns[0].visible" label="姓名" align="center" prop="realName" width="100" :show-overflow-tooltip="true" />
108
             <el-table-column v-if="columns[1].visible" label="学/工号" align="center" prop="userNumb" width="100" :show-overflow-tooltip="true" />
108
             <el-table-column v-if="columns[1].visible" label="学/工号" align="center" prop="userNumb" width="100" :show-overflow-tooltip="true" />
109
             <el-table-column v-if="columns[2].visible" label="部门" align="center" prop="deptName" width="150" :show-overflow-tooltip="true" />
109
             <el-table-column v-if="columns[2].visible" label="部门" align="center" prop="deptName" width="150" :show-overflow-tooltip="true" />
110
-            -->
111
             <el-table-column v-if="columns[3].visible" label="人员类型" align="center" prop="category" :show-overflow-tooltip="true">
110
             <el-table-column v-if="columns[3].visible" label="人员类型" align="center" prop="category" :show-overflow-tooltip="true">
112
               <template #default="scope">
111
               <template #default="scope">
113
                 <dict-tag :options="CATEGORY" :value="scope.row.category" />
112
                 <dict-tag :options="CATEGORY" :value="scope.row.category" />
@@ -125,7 +124,7 @@
125
               </template>
124
               </template>
126
             </el-table-column>
125
             </el-table-column>
127
             <el-table-column v-if="columns[7].visible" label="账户余额" align="center" prop="accountBalance" />
126
             <el-table-column v-if="columns[7].visible" label="账户余额" align="center" prop="accountBalance" />
128
-            <el-table-column v-if="columns[8].visible" label="账户流水号" align="center" prop="userNo" width="100" />
127
+            <el-table-column v-if="columns[8].visible" label="账户流水号" align="center" prop="userNo" width="110" />
129
             <el-table-column v-if="columns[9].visible" label="发卡情况" align="center" prop="accountCard" width="100">
128
             <el-table-column v-if="columns[9].visible" label="发卡情况" align="center" prop="accountCard" width="100">
130
               <template #default="scope">
129
               <template #default="scope">
131
                 <span :style="{ color: getCardInfoColor(scope.row.accountCard) }">{{ scope.row.accountCard }}</span>
130
                 <span :style="{ color: getCardInfoColor(scope.row.accountCard) }">{{ scope.row.accountCard }}</span>