1. 优化

src/views/finance/flowingWaterMr/index.vue

@@ -123,17 +123,17 @@
       </el-table-column>
       <el-table-column label="购票数量" align="center" prop="quantity" />
       <el-table-column label="实付单价" align="center" prop="price" />
-      <el-table-column label="金额(元)" align="center" prop="type">
+      <el-table-column label="支付方式" align="center" prop="payWay">
         <template slot-scope="scope">
-          <span>￥{{ scope.row.orderPrice }}</span>
+          <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
         </template>
       </el-table-column>
-      <el-table-column label="支付方式" align="center" prop="payWay">
+      <el-table-column label="变动类型" align="center" prop="incomeExpenses" />
+      <el-table-column label="变动金额(元)" align="center" prop="type">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
+          <span>￥{{ scope.row.orderPrice && scope.row.orderPrice != 0 ? ( (scope.row.incomeExpenses=='支出'?'-':'') + scope.row.orderPrice) : '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="收支类型" align="center" prop="incomeExpenses" />
       <el-table-column label="业务类型" align="center" prop="businessType" />
       <el-table-column label="产生渠道" align="center" prop="refundTime" width="160" >
         <template slot-scope="scope">

src/views/finance/refundMr/index.vue

@@ -75,7 +75,7 @@
       <el-table-column label="支付单号" align="center" prop="transactionId" />
       <el-table-column label="退款金额" align="center" prop="type">
         <template slot-scope="scope">
-          <span>￥{{ scope.row.refundAmount }}</span>
+          <span>{{ scope.row.refundAmount && scope.row.refundAmount != 0 ? ( '￥-' + scope.row.refundAmount) : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请原因" align="center" prop="refundReason" />

src/views/order/groupBuyingMr/index.vue

@@ -241,7 +241,7 @@
           </el-table-column>
           <el-table-column label="退票金额" align="center" prop="refundPriceTotal">
             <template slot-scope="scope">
-              <span>{{ scope.row.refundPriceTotal }}</span>
+              <span>{{ scope.row.refundPriceTotal && scope.row.refundPriceTotal !=0 ?('-' + scope.row.refundPriceTotal) : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="是否成功开票" align="center">

src/views/order/orderMr/index.vue

@@ -276,7 +276,7 @@
           </el-table-column>
           <el-table-column label="退票金额" align="center" prop="refundPriceTotal">
             <template slot-scope="scope">
-              <span>{{ scope.row.refundPriceTotal }}</span>
+              <span>{{ scope.row.refundPriceTotal && scope.row.refundPriceTotal !=0 ? ('-' + scope.row.refundPriceTotal) : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="是否成功开票" align="center">

src/views/otaMr/tiktok/index.vue

@@ -27,10 +27,15 @@
     <el-table ref="tables" v-loading="loading" :data="dataList" border>
       <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
       <el-table-column label="门店POIID" align="center" prop="poiId" />
-      <el-table-column label="商品类目ID" align="center" prop="categoryId" />
+      <el-table-column label="商品类目ID" align="center" prop="categoryId">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tiktok_category" :value="scope.row.categoryId"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="演出厅" align="center" prop="performHallName" />
       <el-table-column label="剧目名称" align="center" prop="performName" />
       <el-table-column label="商品名称" align="center" prop="goodsName" />
-      <el-table-column label="时刻信息" align="center" prop="goodsName">
+      <el-table-column label="时刻信息" align="center" prop="goodsName1">
         <template slot-scope="scope">
           <span>{{ scope.row.times }}</span>
         </template>
@@ -104,7 +109,7 @@ import dataEdit from "./dialog/dataEdit.vue";
 
 export default {
   name: "agreement",
-  dicts: ['tiktok_process','tiktok_online'],
+  dicts: ['tiktok_process','tiktok_online','tiktok_category'],
   components: { addAndEdit, dataEdit },
   data() {
     return {