浏览代码

1. 应付改为应收 实付改为实收

MONSTER-ygh 11 月之前
父节点
当前提交
698d336683

+ 2 - 2
src/views/order/groupBuyingMr/dialog/details.vue

@@ -65,10 +65,10 @@
             <div class="grid-content bg-purple item-class">支付总额: <span>¥{{ form.orderPrice || '' }}</span></div>
           </el-col> -->
           <el-col :span="12">
-            <div class="grid-content bg-purple item-class">应金额: <span>¥{{ form.orderPrice || form.orderPrice == 0 ? form.orderPrice : '' }}</span></div>
+            <div class="grid-content bg-purple item-class">应金额: <span>¥{{ form.orderPrice || form.orderPrice == 0 ? form.orderPrice : '' }}</span></div>
           </el-col>
           <el-col :span="12">
-            <div class="grid-content bg-purple item-class">实金额: <span>¥{{ form.realPrice || form.realPrice == 0 ? form.realPrice : '' }}</span></div>
+            <div class="grid-content bg-purple item-class">实金额: <span>¥{{ form.realPrice || form.realPrice == 0 ? form.realPrice : '' }}</span></div>
           </el-col>
           <el-col :span="12">
             <div class="grid-content bg-purple item-class">团购人数: <span>{{ form.quantity || '' }}</span></div>

+ 2 - 2
src/views/order/groupBuyingMr/index.vue

@@ -178,12 +178,12 @@
               <span>¥{{ scope.row.orderPrice }}</span>
             </template>
           </el-table-column> -->
-          <el-table-column label="应金额" align="center" prop="orderPrice">
+          <el-table-column label="应金额" align="center" prop="orderPrice">
             <template slot-scope="scope">
               <span>¥{{ scope.row.orderPrice }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实金额" align="center" prop="realPrice">
+          <el-table-column label="实金额" align="center" prop="realPrice">
             <template slot-scope="scope">
               <span>¥{{ scope.row.realPrice }}</span>
             </template>

+ 2 - 2
src/views/order/orderMr/dialog/details.vue

@@ -63,11 +63,11 @@
               <div class="grid-content bg-purple item-class">支付总额: <span>¥{{ form.orderPrice || '' }}</span></div>
             </el-col> -->
           <el-col :span="12">
-            <div class="grid-content bg-purple item-class">应金额: <span>¥{{ form.orderPrice || form.orderPrice == 0 ?
+            <div class="grid-content bg-purple item-class">应金额: <span>¥{{ form.orderPrice || form.orderPrice == 0 ?
               form.orderPrice : '' }}</span></div>
           </el-col>
           <el-col :span="12">
-            <div class="grid-content bg-purple item-class">实金额: <span>¥{{ form.realPrice || form.realPrice == 0 ?
+            <div class="grid-content bg-purple item-class">实金额: <span>¥{{ form.realPrice || form.realPrice == 0 ?
               form.realPrice : '' }}</span></div>
           </el-col>
           <el-col :span="12">

+ 2 - 2
src/views/order/orderMr/index.vue

@@ -213,12 +213,12 @@
           </el-table-column>
           <el-table-column label="下单时间" align="center" prop="createTime" />
           <el-table-column label="购票数量" align="center" prop="quantity" />
-          <el-table-column label="应金额" align="center" prop="orderPrice">
+          <el-table-column label="应金额" align="center" prop="orderPrice">
             <template slot-scope="scope">
               <span>¥{{ scope.row.orderPrice }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实金额" align="center" prop="realPrice">
+          <el-table-column label="实金额" align="center" prop="realPrice">
             <template slot-scope="scope">
               <span>¥{{ scope.row.realPrice }}</span>
             </template>

+ 2 - 2
src/views/order/viewers/dialog/details.vue

@@ -60,10 +60,10 @@
           <div class="grid-content bg-purple item-class">支付总额: <span>¥{{ form.orderPrice || '' }}</span></div>
         </el-col> -->
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">应金额: <span>¥{{ form.orderPrice || form.orderPrice == 0 ? form.orderPrice : '' }}</span></div>
+          <div class="grid-content bg-purple item-class">应金额: <span>¥{{ form.orderPrice || form.orderPrice == 0 ? form.orderPrice : '' }}</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">实金额: <span>¥{{ form.realPrice || form.realPrice == 0 ? form.realPrice : '' }}</span></div>
+          <div class="grid-content bg-purple item-class">实金额: <span>¥{{ form.realPrice || form.realPrice == 0 ? form.realPrice : '' }}</span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">下单时间: <span>{{ form.createTime || '' }}</span></div>

+ 2 - 2
src/views/order/viewers/index.vue

@@ -117,12 +117,12 @@
           <el-table-column label="购票人" align="center" prop="memberName" />
           <el-table-column label="取票码" align="center" prop="qrcodeNo" width="100" />
           <el-table-column label="购票人手机号" align="center" prop="memberMobile" />
-          <el-table-column label="订单应总额" align="center">
+          <el-table-column label="订单应总额" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.priceTotal || scope.row.priceTotal == 0  ? '¥' + scope.row.priceTotal : '-' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="订单实总额" align="center">
+          <el-table-column label="订单实总额" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.realPriceTotal || scope.row.realPriceTotal == 0 ? '¥' + scope.row.realPriceTotal : '-' }}</span>
             </template>

+ 10 - 10
src/views/windowTicketSales/model/increaseViewers.vue

@@ -95,12 +95,12 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    label="应金额(元)">
+                    label="应金额(元)">
                     <template slot-scope="scope">
                         <span v-if="(scope.$index!=0 && oneMany ==1 && personnelNum != 0)">{{ scope.row.realPrice }}</span>
                         <div v-else>
                             <span v-if="actionIndex != scope.row.id">{{ scope.row.realPrice }}</span>
-                            <el-input-number size="mini" style="width: 120px;" v-else v-model="tableForm.realPrice" controls-position="right" label="请输入应金额(元)"></el-input-number>
+                            <el-input-number size="mini" style="width: 120px;" v-else v-model="tableForm.realPrice" controls-position="right" label="请输入应金额(元)"></el-input-number>
                         </div>
                     </template>
                 </el-table-column>
@@ -178,10 +178,10 @@
                         <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="3">对公支付</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="应金额 :">
+                <el-form-item label="应金额 :">
                     ¥{{ moneyAll }}元
                 </el-form-item>
-                <el-form-item v-if="ruleForm.paymentType == 2 || ruleForm.paymentType == 3" label="实金额 :" prop="realPrice">
+                <el-form-item v-if="ruleForm.paymentType == 2 || ruleForm.paymentType == 3" label="实金额 :" prop="realPrice">
                     <el-input @input="setRealPrice" style="width: 200px;" v-model="ruleForm.realPrice"></el-input>
                 </el-form-item>
                 <el-form-item label="找零金额 :" v-if="ruleForm.paymentType == 2">
@@ -274,7 +274,7 @@ import {
             identity: '', // 观影人身份
             remark: '', // 备注信息
             salePrice: '', // 原价
-            realPrice: '', // 实金额
+            realPrice: '', // 实金额
             seatId: '', // 座位ID
             seatName: '', // 座位名称
             seatType: '', // 座位类型
@@ -292,7 +292,7 @@ import {
             orderIdOrQrCode: '',
             paymentType: '', // 支付方式
             small: '',// 找零
-            realPrice: '', // 实金额
+            realPrice: '', // 实金额
         },
         viewerList: [], // 观影人列表
         rules: {
@@ -306,7 +306,7 @@ import {
                 { required: true, message: '请选择支付方式', trigger: ['blur','change']},
             ],
             realPrice: [
-                { required: true, message: '请输入实金额', trigger: ['blur','change']},
+                { required: true, message: '请输入实金额', trigger: ['blur','change']},
             ],
             sourceRemark: [
                 { required: true, message: '请输入备注', trigger: ['blur','change']},
@@ -357,8 +357,8 @@ import {
                     viewerList: [], // 观影人列表
                     orderIdOrQrCode: '',
                     paymentType: '', // 支付方式
-                    small: '',// 实金额
-                    realPrice: '', // 实金额
+                    small: '',// 实金额
+                    realPrice: '', // 实金额
                     remark: '', // 订单备注
                     sourceRemark: '', //  来源备注
                 }
@@ -386,7 +386,7 @@ import {
                         identity: '', // 观影人身份
                         remark: '', // 备注信息
                         salePrice: this.oneMany == 2 || (this.oneMany == 1 && this.personnelNum != 0)  ? index == 0 ? perform.money  : 0 : perform.money, // 原价
-                        realPrice: this.oneMany == 2 || (this.oneMany == 1 && this.personnelNum != 0)  ? index == 0 ? perform.money  : 0 : perform.money, // 实金额
+                        realPrice: this.oneMany == 2 || (this.oneMany == 1 && this.personnelNum != 0)  ? index == 0 ? perform.money  : 0 : perform.money, // 实金额
                         seatId: item.id, // 座位ID
                         seatName: item.name?item.name:'暂无命名', // 座位名称
                         seatType: perform.seatTypeId, // 座位类型