订单：列表、详情，支付方式处理对公支付、挂账支付。

src/views/order/groupBuyingMr/dialog/childOrder.vue

@@ -32,7 +32,8 @@
           </el-table-column>
           <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 v-if="scope.row.payWay == 'corporate' && scope.row.ifTeamCredit == 1">挂账支付</span>
+              <dict-tag v-else :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
             </template>
           </el-table-column>
           <el-table-column label="支付时间" align="center" prop="payTime" width="160" >
@@ -41,6 +42,12 @@
             </template>
           </el-table-column>
           <el-table-column label="支付单号" align="center" prop="paymentId" />
+          <el-table-column label="是否付款" align="center" width="100">
+            <template slot-scope="scope">
+              <el-tag type="danger" v-if="scope.row.ifPay == '0'">未付款</el-tag>
+              <el-tag type="success" v-else-if="scope.row.ifPay == '1'">已付款</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="订单状态" align="center" prop="status">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>

src/views/order/groupBuyingMr/dialog/details.vue

@@ -109,9 +109,13 @@
             <div class="grid-content bg-purple item-class">支付团队: <span v-if="form.status != 0">{{ form.repayName || '' }}</span></div>
           </el-col>
           <el-col :span="12">
-            <div class="grid-content bg-purple item-class" style="display: flex;">支付方式: <span
-                style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.pay_way_type"
-                  :value="form.payWay" /></span></div>
+            <div class="grid-content bg-purple item-class" style="display: flex;">支付方式: 
+              <span v-if="form.payWay == 'corporate' && form.ifTeamCredit == 1" style="display: block;margin-left: 5px;">挂账支付</span>
+              <span v-else style="display: block;margin-left: 5px;">
+                <dict-tag :options="dict.type.pay_way_type"
+                  :value="form.payWay" />
+                </span>
+              </div>
           </el-col>
           <el-col :span="12">
             <div class="grid-content bg-purple item-class">支付时间: <span>{{ form.payTime || '' }}</span></div>
@@ -130,6 +134,9 @@
           <el-col :span="12">
             <div class="grid-content bg-purple item-class">是否其他团队代付: <span v-if="form.status != 0">{{ form.ifRepay === 0 ?'否':'是' }}</span></div>
           </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">是否付款: <span>{{ form.ifPay === 0 ?'未付款':'已付款' }}</span></div>
+          </el-col>
           <el-col :span="12" v-if="form.payWay === 'quota'">
             <div class="grid-content bg-purple item-class">账期: <span>{{ form.repaymentTime }}</span></div>
           </el-col>
@@ -137,12 +144,12 @@
 
         <!-- 对公支付信息 -->
         <div v-if="form.payWay=='corporate' && form.status>0 && (form.corporate || form.teamCredit)">
-          <div class="title-class">对公支付信息</div>
+          <div class="title-class">{{ form.ifTeamCredit == 1 ? '挂账支付': '对公支付' }}信息</div>
             <el-row>
               <el-col class="pay-type-remark" :span="24">
-                对公类型：{{form.payOrCredit == 1 ? '对公支付': form.payOrCredit == 2 ? '挂账':''}}
+                对公类型：{{form.ifTeamCredit == 1 ? '挂账支付': '对公支付'}}
               </el-col>
-              <el-col v-if="form.payOrCredit == 2" class="pay-type-remark" :span="24">
+              <el-col v-if="form.ifTeamCredit == 1" class="pay-type-remark" :span="24">
                 账期：{{form.rePaymentTime}}
               </el-col>
               <el-col :span="24">
@@ -157,10 +164,10 @@
               </el-col>
               <el-col class="pay-type-remark" :span="24">
                 凭证上传人：
-                <span v-if="form.corporate || form.teamCredit">{{form.corporate ? form.corporate.createBy : form.teamCredit.createBy}}</span>
+                <span v-if="form.corporate || form.teamCredit">{{form.corporate ? form.corporate.updateBy : form.teamCredit.updateBy}}</span>
               </el-col>
               <el-col class="pay-type-remark" :span="24">
-                对公支付备注：{{corporateRremark}}
+                备注：{{corporateRremark}}
               </el-col>
             </el-row>
         </div>
@@ -383,7 +390,13 @@ export default {
           this.corporateRremark =  res.data.corporate.remark;
         }else if(res.data.teamCredit && JSON.stringify(res.data.teamCredit) != '{}'){
           this.form.payOrCredit = 2
-          this.voucherUrl = res.data.teamCredit.voucherUrl.split(',')||[]
+          // this.voucherUrl = res.data.teamCredit.voucherUrl.split(',')||[]
+          if(res.data.teamCredit?.repaymentStatus == 1) {
+            this.voucherUrl = res.data.teamCredit.repaymentVoucherUrl.split(',')||[]
+          } else {
+            this.voucherUrl = res.data.teamCredit.voucherUrl.split(',')||[]
+          }
+          // this.voucherUrl = res.data.teamCredit.voucherUrl.split(',')||[]
           this.corporateRremark =  res.data.teamCredit.remark
           this.form['rePaymentTime'] = res.data.teamCredit.repaymentTime
         }

src/views/order/groupBuyingMr/dialog/payOrCredit.vue

@@ -14,7 +14,7 @@
       <div v-loading="loading" element-loading-text="加载详情中...">
         <!-- 对公支付信息 -->
         <el-form :model="form" ref="form" size="mini" :rules="rules" label-width="150px">
-          <el-form-item label="对公支付凭证上传：" prop="voucherUrl">
+          <el-form-item :label="ifTeamCredit == 1 ? '挂账支付凭证上传：' : '对公支付凭证上传：'" prop="voucherUrl">
             <div style="display: flex;flex-wrap: wrap;">
               <div v-for="(item, index) in form.voucherUrl" :key="index"
                 style="width: 100px; height: 100px;margin-top: 5px; position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
@@ -82,6 +82,7 @@ export default {
         Headers: { Authorization: "Bearer " + getToken() },
       },
       actionUrlLoading:false,
+      ifTeamCredit: null,
     };
   },
   methods: {
@@ -93,6 +94,7 @@ export default {
      */
     async openDialog(title, obj, type) {
       this.orderType = type;
+      this.ifTeamCredit = obj.ifTeamCredit;
       this.title = title
       this.open = true;
       await this.getSelectByIdApi(obj);

src/views/order/groupBuyingMr/index.vue

@@ -217,8 +217,8 @@
       <div class="app-container-table-info">
         <el-table ref="tables" v-loading="loading" height="100%" :data="dataList" border>
           <el-table-column label="序号" align="center" :fixed="fixed" type="index" width="60"></el-table-column>
-          <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" />
-          <el-table-column label="团队名称" align="center" :fixed="fixed" prop="teamName" />
+          <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" width="170" />
+          <el-table-column label="团队名称" align="center" :fixed="fixed" prop="teamName" width="170" />
           <el-table-column label="团队类型" align="center" :fixed="fixed" prop="type">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.team_type" :value="scope.row.teamType"/>
@@ -254,15 +254,22 @@
           </el-table-column>
           <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 v-if="scope.row.payWay == 'corporate' && scope.row.ifTeamCredit === 1">挂账支付</span>
+              <dict-tag v-else :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
             </template>
           </el-table-column>
-          <el-table-column label="支付时间" align="center" prop="payTime" width="160" >
+          <el-table-column label="支付时间" align="center" prop="payTime" width="170">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.payTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="支付单号" align="center" prop="paymentId" />
+          <el-table-column label="支付单号" align="center" prop="paymentId" width="170" />
+          <el-table-column label="是否付款" align="center" width="100">
+            <template slot-scope="scope">
+              <el-tag type="danger" v-if="scope.row.ifPay == '0'">未付款</el-tag>
+              <el-tag type="success" v-else-if="scope.row.ifPay == '1'">已付款</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="订单状态" align="center" prop="status">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
@@ -464,7 +471,7 @@
               <el-radio :label="5">储值余额</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.payWay === 1 || form.payWay === 2">
+          <el-form-item v-if="!form.eaitType && (form.payWay === 1 || form.payWay === 2)">
             <i class="el-icon-warning" style="font-size: 22px;color: #ee6767;margin-right: 10px;"></i>
             <span style="font-size: 18px;color: #ee6767;" v-if="form.payWay === 1">请务必向财务确认此订单账款是否到账，若没有收到款项请选择挂账</span>
             <span style="font-size: 18px;color: #ee6767;" v-else>请务必向财务确认此订单账款是否到账，若已经收到款项请选择对公转账</span>
@@ -981,7 +988,7 @@ export default {
           this.getTeamList(res.data.teamId);
           this.$set(this.form,'payerId',res.data.teamId)
           if(res.data.corporate && JSON.stringify(res.data.corporate) != '{}'){
-            let urlList = res.data.corporate.voucherUrl.split(',')||[]
+            let urlList = res.data.corporate.voucherUrl?.split(',')||[]
             this.form.eaitType = 1
             this.$set(this.form,'payWay',1)
             // this.$set(this.form,'payerId',res.data.corporate.payerId)
@@ -990,7 +997,7 @@ export default {
             this.$set(this.form.corporate,'remark',res.data.corporate.remark)
           }else if(res.data.teamCredit && JSON.stringify(res.data.teamCredit) != '{}'){
             this.form.eaitType = 2
-            let urlList = res.data.teamCredit.voucherUrl.split(',')||[]
+            let urlList = res.data.teamCredit.voucherUrl?.split(',')||[]
             this.$set(this.form,'payWay',2)
             // this.$set(this.form,'payerId',res.data.corporate.payerId)
             this.$set(this.form,'rePaymentTime',res.data.teamCredit.repaymentTime)

src/views/order/orderMr/dialog/details.vue

@@ -89,9 +89,12 @@
             <div class="grid-content bg-purple item-class">支付时间: <span>{{ form.payTime || '' }}</span></div>
           </el-col>
           <el-col :span="12">
-            <div class="grid-content bg-purple item-class" style="display: flex;">支付方式: <span
-                style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.pay_way_type"
-                  :value="form.payWay" /></span></div>
+            <div class="grid-content bg-purple item-class" style="display: flex;">支付方式: 
+              <span v-if="form.payWay == 'corporate' && form.ifTeamCredit === 1" style="display: block;margin-left: 5px;">挂账支付</span>
+              <span v-else style="display: block;margin-left: 5px;">
+                <dict-tag :options="dict.type.pay_way_type":value="form.payWay" />
+              </span>
+            </div>
           </el-col>
           <el-col :span="12">
             <div class="grid-content bg-purple item-class" style="display: flex;">订单状态: <span

src/views/order/orderMr/index.vue

@@ -258,7 +258,7 @@
       <div class="app-container-table-info">
         <el-table ref="tables" height="100%" v-loading="loading" :data="dataList" border>
           <el-table-column label="序号" align="center" :fixed="fixed" type="index" width="60"></el-table-column>
-          <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" />
+          <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" width="170" />
           <el-table-column label="购票人手机号" align="center" :fixed="fixed" prop="memberMobile" />
           <el-table-column label="剧目名称" align="center" :fixed="fixed" prop="performName" />
           <el-table-column label="票务名称" align="center" :fixed="fixed" prop="goodsName" />
@@ -268,13 +268,13 @@
               <dict-tag :options="dict.type.order_form_type" :value="scope.row.source"/>
             </template>
           </el-table-column>
-          <el-table-column label="场次时间" align="center" prop="performDate" />
+          <el-table-column label="场次时间" align="center" prop="performDate" width="100" />
           <el-table-column label="场次" width="120" align="center" prop="timeSnapshot">
             <template slot-scope="scope">
               <span>{{ scope.row.timeSnapshot }} <br /> ({{ scope.row.performTimeStart + '-' + scope.row.performTimeEnd }})</span>
             </template>
           </el-table-column>
-          <el-table-column label="下单时间" align="center" prop="createTime" />
+          <el-table-column label="下单时间" align="center" prop="createTime" width="100" />
           <el-table-column label="购票数量" align="center" prop="quantity" />
           <el-table-column label="应收金额" align="center" prop="orderPrice">
             <template slot-scope="scope">
@@ -289,7 +289,8 @@
           <el-table-column label="优惠券额度" align="center" prop="preferentialPrice" width="120" />
           <el-table-column label="支付方式" align="center" prop="payWay">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
+              <span v-if="scope.row.payWay == 'corporate' && scope.row.ifTeamCredit === 1">挂账支付</span>
+              <dict-tag v-else :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
             </template>
           </el-table-column>
           
@@ -298,7 +299,7 @@
               <span>{{ parseTime(scope.row.payTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="支付单号" align="center" prop="paymentId" />
+          <el-table-column label="支付单号" align="center" prop="paymentId" width="170" />
           <el-table-column label="订单状态" align="center" prop="status">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
@@ -331,7 +332,7 @@
               <el-tag type="success" v-else-if="scope.row.ifSuccessInvoice  == '1'">是</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="开票时间" align="center" prop="invoiceTime">
+          <el-table-column label="开票时间" align="center" prop="invoiceTime" width="160">
             <template slot-scope="scope">
               <span>{{ scope.row.invoiceTime }}</span>
             </template>

src/views/order/viewers/dialog/details.vue

@@ -75,7 +75,10 @@
           <div class="grid-content bg-purple item-class">支付时间: <span>{{ form.payTime || '' }}</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class" style="display: flex;">支付方式: <span style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.pay_way_type" :value="form.payWay"/></span></div>
+          <div class="grid-content bg-purple item-class" style="display: flex;">支付方式: 
+            <span v-if="form.payWay == 'corporate' && form.ifTeamCredit === 1" style="display: block;margin-left: 5px;">挂账支付</span>
+            <span v-else style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.pay_way_type" :value="form.payWay"/></span>
+          </div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class" style="display: flex;">订单状态: <span style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.order_status_type" :value="form.status"/></span></div>

src/views/order/viewers/index.vue

@@ -118,25 +118,25 @@
           type="selection"
           :fixed="fixed"
           width="55"></el-table-column>
-          <el-table-column label="订单号" :fixed="fixed" align="center" prop="orderId" />
+          <el-table-column label="订单号" :fixed="fixed" align="center" prop="orderId" width="170" />
           <el-table-column label="观影人名称" :fixed="fixed" align="center" prop="name" />
-          <el-table-column label="身份证号" :fixed="fixed" align="center" prop="idcard" />
-          <el-table-column label="票务名称" :fixed="fixed" align="center" prop="goodsName" />
+          <el-table-column label="身份证号" :fixed="fixed" align="center" prop="idcard" width="130" />
+          <el-table-column label="票务名称" :fixed="fixed" align="center" prop="goodsName" width="130" />
           <el-table-column label="座位类型" :fixed="fixed" align="center" prop="seatTypeName" />
           <el-table-column label="购买渠道" :fixed="fixed" align="center" prop="source">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_form_type" :value="scope.row.source" />
             </template>
           </el-table-column>
-          <el-table-column label="场次时间" align="center" prop="performDate" />
+          <el-table-column label="场次时间" align="center" prop="performDate" width="100"/>
           <el-table-column label="场次" width="120" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.performTimeStart + '-' + scope.row.performTimeEnd }}</span>
             </template>
           </el-table-column>
-          <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" prop="memberName" width="120" />
+          <el-table-column label="取票码" align="center" prop="qrcodeNo" width="120" />
+          <el-table-column label="购票人手机号" align="center" prop="memberMobile" width="120" />
           <el-table-column label="订单应收总额" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.priceTotal || scope.row.priceTotal == 0  ? '￥' + scope.row.priceTotal : '-' }}</span>
@@ -152,9 +152,10 @@
               <span>{{ scope.row.realPrice || scope.row.realPrice == 0 ? '￥' + scope.row.realPrice : '-' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="支付方式" align="center" prop="payWay">
+          <el-table-column label="支付方式" align="center" prop="payWay" width="120">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay" />
+              <span v-if="scope.row.payWay == 'corporate' && scope.row.ifTeamCredit === 1">挂账支付</span>
+              <dict-tag v-else :options="dict.type.pay_way_type" :value="scope.row.payWay" />
             </template>
           </el-table-column>
           <el-table-column label="支付时间" align="center" prop="payTime" width="160">
@@ -175,7 +176,7 @@
           </el-table-column>
           <el-table-column label="打印次数/次" align="center" prop="ticketPrintTotal" />
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" @click="openDetails(scope.row)"
                 v-hasPermi="['order:viewers:details']">详情</el-button>