Merge remote-tracking branch 'origin/master'

src/views/order/TransferOrder/daifuSonOrder.vue

@@ -53,13 +53,14 @@
                     </el-form-item>
 
                     <el-form-item label="订单金额" prop="amount">
-                <el-input size="medium" v-model="queryParams.amount" placeholder="请输入订单金额" @keyup.enter.native="handleQuery"
+                        <el-input size="medium" v-model="queryParams.amount" placeholder="请输入订单金额"
-                    style="width: 180px; border-color: #e6f1ff" />
+                            @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
                     </el-form-item>
 
                     <el-form-item label="状态" prop="orderStatus">
                         <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
-                    <el-option v-for="(item, i) in showAll" :key="i" :label="item.label" :value="item.value"></el-option>
+                            <el-option v-for="(item, i) in showAll" :key="i" :label="item.label"
+                                :value="item.value"></el-option>
                         </el-select>
                     </el-form-item>
 
@@ -71,15 +72,17 @@
                     </el-form-item>
 
                     <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                        <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px"
-                    type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                            value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
-                    :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+                            start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
+                            :default-time="['00:00:00', '23:59:59']"></el-date-picker>
                     </el-form-item>
 
                     <el-form-item label="更新时间">
-                <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
+                        <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px"
-                    type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                            value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
-                    :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+                            start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
+                            :default-time="['00:00:00', '23:59:59']"></el-date-picker>
                     </el-form-item>
                 </el-collapse-item>
             </el-collapse>
@@ -138,9 +141,10 @@
                 </el-table-column>
 
                 <el-table-column label="码商" align="center" prop="carddealerName" />
+                
                 <el-table-column :label="'付款卡(必须一致)'" align="center" prop="payeeRealAmount" min-width="180">
                     <template slot-scope="scope">
-                        {{ scope.row.accountName }}（{{ scope.row.bankName }}）（{{ scope.row.cardNumber }}）
+                        <span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}（{{ scope.row.payCarddealerCard.bankName }}）（{{ scope.row.payCarddealerCard.cardNumber }}）</span>
                     </template>
                 </el-table-column>
 
@@ -173,6 +177,9 @@
                         </el-button>
                         <el-button v-if="scope.row.orderStatus != 1" size="small" type="text"
                             @click="handleCertificate(scope.row)" style="color: #006eff">查看凭证</el-button>
+                            
+                        <el-button size="small" type="text" v-clipboard:copy="getReadableText(scope.row)"
+                            v-clipboard:success="handleClipboardSuccess" style="color: #006eff">复制</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -416,6 +423,13 @@ export default {
         this.init();
     },
     methods: {
+        getReadableText(data) {
+            return `${data.cardNumber}/${data.accountName}/${data.bankName}/${this.NumberDiv(data.amount, 100)}`
+        },
+        /** 复制代码成功 */
+        handleClipboardSuccess() {
+            this.$modal.msgSuccess("复制成功");
+        },
         tableRowClassName({ row, rowIndex }) {
             if (row.orderStatus == 4) {
                 return "redOrder";