1. 新增

src/views/tourism/financialManagement/detailsBox/cateringRefundManagementDetails.vue

@@ -21,68 +21,67 @@
         <el-form :model="form" ref="form" :rules="rules" label-width="120px">
           <div class="form-title"><span>订单信息</span></div>
           <div style="display: flex;">
-            <el-form-item label="订单号：">
-              <span style="display: block; min-width: 250px;">{{ form.orderId }}</span>
+            <el-form-item label="订单编号：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.orderId }}</span>
             </el-form-item>
-            
             <el-form-item label="支付单号：">
-              <span style="display: block; min-width: 250px;">{{ form.transactionId }}</span>
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.transactionId }}</span>
             </el-form-item>
-            <el-form-item label="应付金额：">
-              <span style="display: block; min-width: 250px;">{{ form.orderPrice }}</span>
+            <el-form-item label="归属门店：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.shopName }}</span>
             </el-form-item>
           </div>
-
-          <!-- <div style="display: flex;">
-            <el-form-item label="商品名称：">
-              <span style="display: block; min-width: 250px;">{{ form.goodsName }}</span>
+          <div style="display: flex;">
+            <el-form-item label="就餐人数：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.useUserNum }}人</span>
             </el-form-item>
-            <el-form-item label="商品单价：">
-              <span style="display: block; min-width: 250px;">{{ form.salePrice }}</span>
+            <el-form-item label="下单数量：">
+              <span style="display: inline-block;width: 250px;">{{ form.quantity }}</span>
             </el-form-item>
-            <el-form-item label="购买数量：">
-              <span style="display: block; min-width: 250px;">{{ form.saleNum }}</span>
+            <el-form-item label="订单金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.orderPrice }}</span>
             </el-form-item>
-            
-          </div> -->
-
+          </div>
           <div style="display: flex;">
-            <el-form-item label="实付金额：">
-              <span style="display: block; min-width: 250px;">{{ form.realPrice }}</span>
+            <el-form-item label="实付金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.realPrice }}</span>
             </el-form-item>
-            <el-form-item label="下单时间：">
-              <span style="display: block; min-width: 250px;">{{ form.orderCreateTime }}</span>
+            <el-form-item label="支付方式：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_payWay" :value="form.payWay"/>
+              </span>
             </el-form-item>
             <el-form-item label="支付时间：">
-              <span style="display: block; min-width: 250px;">{{ form.payTime }}</span>
+              <span style="display: inline-block;width: 250px;">{{ form.payTime }}</span>
             </el-form-item>
           </div>
-          <div class="form-title"><span>商品信息</span></div>
+          <div style="display: flex;">
+            <el-form-item label="联系电话：">
+              <span style="display: inline-block;width: 250px;">{{ form.refundMobile }}</span>
+            </el-form-item>
+            <el-form-item label="订单来源：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="form.source"/>
+              </span>
+            </el-form-item>
+            
+          </div>
+          <div class="form-title"><span>下单信息</span></div>
           <div style="display: flex;padding: 10px 0 15px;">
             <el-table :data="tableList">
               <el-table-column type="index" label="编号" align="center"  />
-              <el-table-column label="商品名称" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
-              <el-table-column label="分类" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
-              <el-table-column label="单价(元)" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
-              <el-table-column label="数量" align="center" key="saleNum" prop="saleNum" :show-overflow-tooltip="true" />
-              <el-table-column label="实付金额(元)" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
+              <el-table-column label="菜品名称" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
+              <el-table-column label="价格(元)" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
+              <el-table-column label="下单数量" align="center" key="saleNum" prop="saleNum" :show-overflow-tooltip="true" />
+              <el-table-column label="实付金额(元)" align="center" key="realPrice" prop="realPrice" :show-overflow-tooltip="true" />
             </el-table>
           </div>
-          <div class="form-title"><span>下单人信息</span></div>
-          <div style="display: flex;">
-            <el-form-item label="姓名：">
-              <span style="display: block;min-width: 250px;">{{ form.refundName }}</span>
-            </el-form-item>
-            <el-form-item label="手机号：">
-              <span style="display: block;min-width: 250px;">{{ form.refundMobile }}</span>
-            </el-form-item>
-          </div>
           <div class="form-title"><span>退款信息</span></div>
           <div style="display: flex;">
             <el-form-item label="退款单号：">
               <span style="display: block; min-width: 250px;">{{ form.refundNo }}</span>
             </el-form-item>
-            <el-form-item label="退款金额：">
+            <el-form-item label="退款金额(元)：">
               <span style="display: block; min-width: 250px;">{{ form.refundAmount }}</span>
             </el-form-item>
             <!-- <el-form-item label="申请类型：">
@@ -110,22 +109,6 @@
               <span style="display: block; min-width: 250px;">{{ form.remark }}</span>
             </el-form-item>
           </div>
-          <div>
-            <el-form-item label="凭证：" prop="imags">
-              <div style="display: flex;flex-wrap: wrap;">
-                <div 
-                v-for="(item,index) in form.imags" 
-                :key="index"
-                style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
-                  <el-image 
-                    style="width: 100%; height: 100%"
-                    :src="item" 
-                    :preview-src-list="form.imags">
-                  </el-image>
-                </div>
-              </div>
-            </el-form-item>
-          </div>
           <div v-if="model=='DEATILSADD'">
             <div class="form-title" style="display: flex;align-items: flex-end;"><span>审核操作</span><i>(注意：驳回时需填写驳回原因)</i></div>
               <div>
@@ -166,7 +149,7 @@ import {
 
 export default {
   name: "addAndEdit",
-  dicts: ['tourism_orderRefund_status'],
+  dicts: ['tourism_orderRefund_status','tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
   data() {
     return {
       title: "",

src/views/tourism/financialManagement/detailsBox/hotelsRefundManagementDetails.vue

@@ -21,73 +21,67 @@
         <el-form :model="form" ref="form" :rules="rules" label-width="120px">
           <div class="form-title"><span>订单信息</span></div>
           <div style="display: flex;">
-            <el-form-item label="订单号：">
-              <span style="display: block; min-width: 250px;">{{ form.orderId }}</span>
+            <el-form-item label="订单编号：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.orderId }}</span>
             </el-form-item>
-            
             <el-form-item label="支付单号：">
-              <span style="display: block; min-width: 250px;">{{ form.transactionId }}</span>
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.transactionId }}</span>
             </el-form-item>
-            <el-form-item label="应付金额：">
-              <span style="display: block; min-width: 250px;">{{ form.orderPrice }}</span>
+            <el-form-item label="归属门店：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.shopName }}</span>
             </el-form-item>
           </div>
-
-          <!-- <div style="display: flex;">
-            <el-form-item label="商品名称：">
-              <span style="display: block; min-width: 250px;">{{ form.goodsName }}</span>
+          <div style="display: flex;">
+            <el-form-item label="预订数量：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.quantity }}间</span>
             </el-form-item>
-            <el-form-item label="商品单价：">
-              <span style="display: block; min-width: 250px;">{{ form.salePrice }}</span>
+            <el-form-item label="房型单价(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.salePrice }}</span>
             </el-form-item>
-            <el-form-item label="购买数量：">
-              <span style="display: block; min-width: 250px;">{{ form.saleNum }}</span>
+            <el-form-item label="订单金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.orderPrice }}</span>
             </el-form-item>
-            
-          </div> -->
-
+          </div>
           <div style="display: flex;">
-            <el-form-item label="实付金额：">
-              <span style="display: block; min-width: 250px;">{{ form.realPrice }}</span>
+            <el-form-item label="实付金额(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.realPrice }}</span>
             </el-form-item>
-            <el-form-item label="下单时间：">
-              <span style="display: block; min-width: 250px;">{{ form.orderCreateTime }}</span>
+            <el-form-item label="支付方式：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_payWay" :value="form.payWay"/>
+              </span>
             </el-form-item>
             <el-form-item label="支付时间：">
-              <span style="display: block; min-width: 250px;">{{ form.payTime }}</span>
+              <span style="display: inline-block;width: 250px;">{{ form.payTime }}</span>
             </el-form-item>
           </div>
-          <div class="form-title"><span>商品信息</span></div>
+          <div style="display: flex;">
+            <el-form-item label="订单来源：">
+              <span style="display: inline-block;width: 250px;">
+                <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="form.source"/>
+              </span>
+            </el-form-item>
+            
+          </div>
+          <div class="form-title"><span>入驻信息</span></div>
           <div style="display: flex;padding: 10px 0 15px;">
             <el-table :data="tableList">
               <el-table-column type="index" label="编号" align="center"  />
-              <el-table-column label="商品名称" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
-              <el-table-column label="分类" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
-              <el-table-column label="单价(元)" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
-              <el-table-column label="数量" align="center" key="saleNum" prop="saleNum" :show-overflow-tooltip="true" />
-              <el-table-column label="实付金额(元)" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
+              <el-table-column label="入驻人" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
+              <el-table-column label="联系电话" align="center" key="mobile" prop="mobile" :show-overflow-tooltip="true" />
             </el-table>
           </div>
-          <div class="form-title"><span>下单人信息</span></div>
-          <div style="display: flex;">
-            <el-form-item label="姓名：">
-              <span style="display: block;min-width: 250px;">{{ form.refundName }}</span>
-            </el-form-item>
-            <el-form-item label="手机号：">
-              <span style="display: block;min-width: 250px;">{{ form.refundMobile }}</span>
-            </el-form-item>
-          </div>
           <div class="form-title"><span>退款信息</span></div>
           <div style="display: flex;">
             <el-form-item label="退款单号：">
               <span style="display: block; min-width: 250px;">{{ form.refundNo }}</span>
             </el-form-item>
-            <el-form-item label="退款金额：">
+            <el-form-item label="扣除手续费(元)：">
+              <span style="display: block; min-width: 250px;">{{ form.deductionFee }}</span>
+            </el-form-item>
+            <el-form-item label="实际退款金额(元)：">
               <span style="display: block; min-width: 250px;">{{ form.refundAmount }}</span>
             </el-form-item>
-            <!-- <el-form-item label="申请类型：">
-              <span style="display: block; min-width: 250px;">{{ form.memberName }}</span>
-            </el-form-item> -->
           </div>
           <div style="display: flex;">
             <el-form-item label="退款原因：">
@@ -110,22 +104,6 @@
               <span style="display: block; min-width: 250px;">{{ form.remark }}</span>
             </el-form-item>
           </div>
-          <div>
-            <el-form-item label="凭证：" prop="imags">
-              <div style="display: flex;flex-wrap: wrap;">
-                <div 
-                v-for="(item,index) in form.imags" 
-                :key="index"
-                style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
-                  <el-image 
-                    style="width: 100%; height: 100%"
-                    :src="item" 
-                    :preview-src-list="form.imags">
-                  </el-image>
-                </div>
-              </div>
-            </el-form-item>
-          </div>
           <div v-if="model=='DEATILSADD'">
             <div class="form-title" style="display: flex;align-items: flex-end;"><span>审核操作</span><i>(注意：驳回时需填写驳回原因)</i></div>
               <div>
@@ -166,7 +144,7 @@ import {
 
 export default {
   name: "addAndEdit",
-  dicts: ['tourism_orderRefund_status'],
+  dicts: ['tourism_orderRefund_status','tourism_ticketOrders_source','tourism_ticketOrders_status','tourism_ticketOrders_payStatus','tourism_ticketOrders_payWay'],
   data() {
     return {
       title: "",

src/views/tourism/orderManagement/cateringOrders/detailsBox/cateringOrdersDetails.vue

@@ -28,7 +28,7 @@
               <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.name }}</span>
             </el-form-item>
             <el-form-item label="就餐人数：">
-              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.useUserNum }}</span>
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.useUserNum }}人</span>
             </el-form-item>
           </div>
           <div style="display: flex;">