Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin

src/views/finance/application/index.vue

@@ -129,8 +129,7 @@
         </el-table>
       </div>
       <div class="dialog-pagination">
-        <el-pagination layout="prev, pager, next" :total="waterData.length" :page-size="5"
-          @current-change="waterChange">
+        <el-pagination layout="prev, pager, next" :total="waterTotal" :page-size="5" @current-change="waterChange">
         </el-pagination>
       </div>
     </el-dialog>
@@ -181,6 +180,7 @@ export default {
       confirmInfo: "确认信息",
       // 流水信息表格数据
       waterData: [],
+      waterTotal: null,
       watherInfo: {},
       // 获取流水数据参数
       watherParameter: {
@@ -296,23 +296,35 @@ export default {
             inputErrorMessage: '输入的拒绝打款理由不能为空！！！'
           }).then(({ value }) => {
             this.rejectReason = value
-            // console.log(value);
+            //  二次确认是否拒绝打款
+            this.$confirm('此操作将决绝为该用户打款, 是否继续?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(async () => {
+              const res = await applicationHandle({
+                withdrawalId: this.dioObj.arr.withdrawalId,
+                state: 2,
+                rejectReason: this.rejectReason
+              })
+              if (res.code === '') {
+                this.$message.success('成功拒绝打款')
+                this.dioObj.show = false
+                this.getAll(this.formInline)
+              }
+            }).catch(() => {
+              this.$message({
+                type: 'info',
+                message: '已取消拒绝打款'
+              });
+            });
             this.infoList.push({ name: "拒绝打款理由", value: value, fields: 'rejectReason' })
+
           }).catch(() => {
             this.rejectReason = ""
           });
           return false
         }
-        const res = await applicationHandle({
-          withdrawalId: this.dioObj.arr.withdrawalId,
-          state: 2,
-          rejectReason: this.rejectReason
-        })
-        if (res.code === '') {
-          this.$message.success('成功拒绝打款')
-          this.dioObj.show = false
-          this.getAll(this.formInline)
-        }
       }
     },
     // 查询详情
@@ -365,6 +377,7 @@ export default {
       try {
         let res = await getWaterRecord(this.watherParameter)
         this.waterData = res.data.list
+        this.waterTotal = res.data.total
         this.watherFlag = false
       } catch (error) {
 

src/views/order/pending/index.vue

@@ -68,6 +68,7 @@
             <template slot-scope="scope">{{ scope.row.orderId }}</template>
           </el-table-column>
           <el-table-column prop="number" label="商品数量" width="100" />
+          <el-table-column prop="orderFormid" label="订单编号" width="220" />
           <el-table-column prop="shopName" label="商户名称" width="220" show-overflow-tooltip />
           <el-table-column prop="customerName" label="下单账户" show-overflow-tooltip />
           <el-table-column prop="receiveName" label="收件人" show-overflow-tooltip />