’合并

git commit -m ’合并

src/views/pay/payAgentUser/operate.vue

@@ -44,6 +44,12 @@
             </el-switch>
           </el-form-item>
 
+          <el-form-item label="管理后台代付开关" prop="artistName">
+            <el-switch v-model="infoList.sysPaymentManualStatus" active-text="开" inactive-text="关"
+              active-value="open" inactive-value="close">
+            </el-switch>
+          </el-form-item>
+
           <el-form-item label="代付审核类型" prop="artistName">
             <el-radio-group v-model="infoList.paymentAuditType" @input="getValue">
               <!-- <el-radio label="1">手机短信验证码</el-radio> -->

src/views/pay/payAgentUser/pkCouponScopeRangeStoreListWallet.vue

@@ -55,7 +55,7 @@
             <el-button size="small" type="text" style="color: #006EFF;"
               @click="updateBalance(scope.row, 'formUpdate')">修改余额</el-button>
             <el-button size="small" type="text" style="color: #006EFF;"
-              @click="handlePrivateTransfer(scope.row, 'formDai')"
+              @click="handlePrivateTransfer(scope.row, 'formDai')" v-if="dataList.sysPaymentManualStatus != 'close'"
               v-hasPermi="['order:rechargeRecord:storePaymentSave']">私户转入</el-button>
             <el-button size="small" type="text" style="color: #006EFF;" @click="handleFrozen(scope.row, 'formFro')"
               v-hasPermi="['order:rechargeRecord:frozenCapitalSave']">资金冻结</el-button>
@@ -230,6 +230,9 @@
         <el-form-item label="谷歌动态验证码" prop="googleCode">
           <el-input v-model="form.googleCode" placeholder="请输入谷歌动态验证码" />
         </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="subUpdateBalance('balance', 'formUpdate')">确 定</el-button>
@@ -241,7 +244,7 @@
 </template>
 
 <script>
-import { payMoneyCalcu, common_api } from "@/api/form";
+import { payMoneyCalcu, common_api, payAgentUser } from "@/api/form";
 export default {
   name: "pkCouponScopeRangeStoreList",
   props: {
@@ -298,6 +301,7 @@ export default {
       total: 0,
       // 表格数据
       infoList: [],
+      dataList: {},
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -374,6 +378,7 @@ export default {
   },
   created() {
     this.pkCouponId && (this.queryParams.storeId = this.pkCouponId);
+    this.getListOperate(this.pkCouponId)
     this.getList();
     this.init();
   },
@@ -412,7 +417,7 @@ export default {
       this.loading = true;
       this.isCoin = row.isCoin
       // 获取用户出金
-      this.getUserWithdrawalChannel();
+      // this.getUserWithdrawalChannel();
       payMoneyCalcu.getWithdrawalChannel({
         channelType: row.channelType,
         flagCard: 'private_account'
@@ -474,6 +479,7 @@ export default {
               updateUserId: this.form.updateUserId,
               isIncome: this.form.isIncome,
               tranAmt: this.form.afterAmt,
+              remarks: this.form.remarks,
             })
             .then((response) => {
               loading.close();
@@ -637,6 +643,26 @@ export default {
           this.sum = response.data
         });
     },
+
+
+    // 获取商户配置
+    getListOperate(id) {
+      this.loading = true;
+      payAgentUser
+        .getStoreConfig(id)
+        .then((response) => {
+          this.dataList = response.data
+          if (!this.infoList.paymentAuditType) {
+            this.infoList.paymentAuditType = '2'
+          }
+          if (!this.infoList.mediaType) {
+            this.infoList.mediaType = 'json'
+          }
+
+          this.loading = false
+        });
+    },
+
     init() {
       common_api.payChannelAll().then((response) => {
         this.userLevType = response.data

src/views/pay/payOrder/payDaiFuWater.vue

@@ -59,18 +59,18 @@
                 <el-form-item label="创建时间">
                     <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px"
                         value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
-                        end-placeholder="结束日期" :unlink-panels="true"
+                        end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
-                        :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
+                        :picker-options="pickerOptions"></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" type="datetimerange" range-separator="-" start-placeholder="开始日期"
-                        end-placeholder="结束日期" :unlink-panels="true"
+                        end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
-                        :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
+                        :picker-options="pickerOptions"></el-date-picker>
                 </el-form-item>
 
-            
+
                 <el-form-item>
                     <div class="searchTop flexBet" style="align-items: center;">
                         <el-row :gutter="10" class="mb8">
@@ -102,24 +102,24 @@
             <el-table stripe v-loading="loading" :data="infoList" :row-class-name="tableRowClassName">
                 <!-- <el-table-column type="selection" width="55" align="center" :selectable="selectable"  @selection-change="handleSelectionChange" /> -->
 
-                <el-table-column :label="'商户订单号\n平台订单号'" align="center" prop="storeNo" min-width="180">
+                <el-table-column :label="'商户订单号\n平台订单号'" align="center" prop="storeNo" min-width="150">
                     <template slot-scope="scope">
                         {{ scope.row.outTradeNo }}<br />
                         {{ scope.row.noOrder }}
                     </template>
                 </el-table-column>
-                <el-table-column :label="'开户名'" align="center" prop="storeNo" min-width="150">
+                <el-table-column :label="'开户名'" align="center" prop="storeNo" min-width="80">
                     <template slot-scope="scope">
                         {{ scope.row.acctName }}
                     </template>
                 </el-table-column>
 
-                <el-table-column :label="'银行名称'" align="center" prop="storeNo" min-width="150">
+                <el-table-column :label="'银行名称'" align="center" prop="storeNo" min-width="100">
                     <template slot-scope="scope">
                         {{ scope.row.bankName }}
                     </template>
                 </el-table-column>
-                <el-table-column :label="'银行卡号'" align="center" prop="storeNo" min-width="180">
+                <el-table-column :label="'银行卡号'" align="center" prop="storeNo" min-width="120">
                     <template slot-scope="scope">
                         {{ scope.row.acctId }}<br />
                     </template>
@@ -142,17 +142,24 @@
                         {{ scope.row.outChannelName }}
                     </template>
                 </el-table-column>
-                <el-table-column :label="'商户名称\n创建时间'" align="center" prop="storeNo" min-width="150">
+                <el-table-column :label="'商户名称\n创建时间'" align="center" prop="storeNo" min-width="120">
                     <template slot-scope="scope">
                         {{ scope.row.storeName }}<br />
                         {{ scope.row.createTime }}
                     </template>
                 </el-table-column>
-                <el-table-column :label="'订单来源'" align="center" prop="storeNo" min-width="150">
+                <el-table-column :label="'订单来源'" align="center" prop="storeNo" min-width="80">
                     <template slot-scope="scope">
                         {{ scope.row.sourceType == 's_manual' ? '手工提单' : 'API下发' }}
                     </template>
                 </el-table-column>
+
+
+                <el-table-column :label="'订单信息'" align="center" prop="orderMsg" min-width="100" />
+
+                <el-table-column :label="'备注'" align="center" prop="memo" min-width="100" />
+
+
                 <el-table-column :label="'更新时间'" align="center" prop="storeNo" min-width="120">
                     <template slot-scope="scope">
                         {{ scope.row.updateTime }}
@@ -166,8 +173,9 @@
                             v-hasPermi="['record:platform_payment_handle']">手工处理</el-button>
                         <el-button size="small" type="text" style="color: #006EFF;"
                             @click="handleViewMy(scope.row)">详情</el-button>
-                        <el-button size="small" v-if="scope.row.orderStatus == 'processsuccess'" type="text"
+                        <el-button size="small"
-                            style="color: #006EFF;" @click="handleRecharge(scope.row)"
+                            v-if="scope.row.orderStatus == 'processsuccess' || scope.row.orderStatus == 'processfailed'"
+                            type="text" style="color: #006EFF;" @click="handleRecharge(scope.row)"
                             v-hasPermi="['record:paymentReissueNotice']">补发通知</el-button>
 
                     </template>
@@ -177,20 +185,31 @@
                 :limit.sync="queryParams.pageSize" @pagination="getList" />
         </div>
 
+
+
         <!-- 处理当前代付订单 -->
-        <el-dialog v-dialogDrag :close-on-click-modal="false" title="信息" :visible.sync="isShowDetail" width="18%"
+        <el-dialog v-dialogDrag title="信息" :visible.sync="isShowDetail" width="500px" append-to-body
-            append-to-body>
+            :close-on-click-modal="false" :before-close="cancel">
             <div class="m20">确认要处理当前代付订单？</div>
-            <el-form ref="form" :model="form" :rules="rules" label-width="0px">
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-                <el-form-item label="" prop="googleCode">
+                <el-form-item label="订单状态" prop="orderStatus">
-                    <el-input v-model="form.googleCode" placeholder="请输入谷歌动态验证码" />
+                    <el-select v-model="form.orderStatus" placeholder="请选择订单状态" clearable size="medium">
+                        <el-option v-for="(item, i) in orderStatusType" :key="i" :label="item.label"
+                            :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="谷歌动态验证码" prop="googleCode">
+                    <el-input v-model="form.googleCode" placeholder="请输入谷歌动态验证码" style="width:217px" />
                 </el-form-item>
             </el-form>
-            <el-button type="primary" icon="" size="small" @click="submitForm('processsuccess')">置为成功</el-button>
+            <div slot="footer" class="dialog-footer">
-            <el-button plain size="small" @click="submitForm('processfailed')">置为取消</el-button>
+                <el-button :disabled="!form.orderStatus || !form.googleCode" :type="form.orderStatus&&form.googleCode ? 'primary' : 'info'" icon="" size="small"
-            <el-button plain size="small" @click="cancel">取消</el-button>
+                    @click="submitForm('processsuccess')">确定</el-button>
+                <el-button plain size="small" @click="cancel">取消</el-button>
+            </div>
         </el-dialog>
 
+
         <!-- 审核 -->
         <el-dialog v-dialogDrag title="代付审核" :visible.sync="isShowJudege" width="600px" append-to-body
             :close-on-click-modal="false" :before-close="cancel">
@@ -257,11 +276,14 @@
                     <div>
                         <el-form-item label="用户类型">
                             <el-tag :type="detailInfoList.userType == 'store'
-                                    ? 'success' : 'primary'
+                                ? 'success' : 'primary'
                                 ">
                                 {{ detailInfoList.userType == 'store' ? '商户' : '代理商' }}
                             </el-tag>
                         </el-form-item>
+                        <el-form-item label="备注">
+                            {{ detailInfoList.memo }}
+                        </el-form-item>
                         <el-form-item label="创建时间">
                             {{ detailInfoList.createTime }}
                         </el-form-item>
@@ -352,6 +374,16 @@ export default {
     dicts: ['pay_status', 'source_type', 'yes_no', 'payment_status'],
     data() {
         return {
+            orderStatusType: [
+                {
+                    label: '成功',
+                    value: 'processsuccess',
+                },
+                {
+                    label: '驳回',
+                    value: 'processfailed',
+                },
+            ],
             typeCon: [
                 {
                     label: '商户',
@@ -707,6 +739,9 @@ export default {
                             this.isShowJudege = false;
                         })
                     } else {
+                        if (!this.form.orderStatus) {
+                            return;
+                        }
                         const loading = this.$loading({
                             lock: true,
                             text: `正在手动处理`,
@@ -715,7 +750,7 @@ export default {
                         });
                         let form = {
                             id: this.detailData.id,
-                            status: type,
+                            status: this.form.orderStatus,
                             googleCode: this.form.googleCode
                         }
                         platform_payment_list.platform_payment_handle(form).then((response) => {

src/views/pay/payOrder/payMoneyWater.vue

@@ -106,7 +106,7 @@
                         </el-tag>
                     </template>
                 </el-table-column>
-                <el-table-column :label="'业务类型'" align="center" prop="storeNo" min-width="150">
+                <el-table-column :label="'业务类型'" align="center" prop="storeNo" min-width="80">
                     <template slot-scope="scope">
                         {{ scope.row.witType == 'recharge' ? '充值' :
                             scope.row.witType == 'manual' ? '内充' :
@@ -123,6 +123,9 @@
                     </template>
                 </el-table-column>
 
+                <el-table-column :label="'备注'" align="center" prop="remarks" min-width="150"/>
+
+
                 <el-table-column label="添加日期" align="center" prop="createTime" width="180" />
                 <el-table-column label="修改日期" align="center" prop="updateTime" width="180" />
             </el-table>

src/views/pay/payOrder/payOrderWater.vue

@@ -48,8 +48,6 @@
                     </el-select>
                 </el-form-item>
 
-
-
                 <el-form-item label="结算状态" prop="storeSettle">
                     <el-select v-model="queryParams.storeSettle" placeholder="请选择结算状态" size="medium">
                         <el-option v-for="dict in dict.type.settle_status" :key="dict.value" :label="dict.label"
@@ -78,15 +76,15 @@
                 <el-form-item label="创建时间">
                     <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px"
                         value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
-                        end-placeholder="结束日期" :unlink-panels="true"
+                        end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
-                        :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
+                        :picker-options="pickerOptions"></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" type="datetimerange" range-separator="-" start-placeholder="开始日期"
-                        end-placeholder="结束日期" :unlink-panels="true"
+                        end-placeholder="结束日期" :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
-                        :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
+                        :picker-options="pickerOptions"></el-date-picker>
                 </el-form-item>
 
 
@@ -174,9 +172,7 @@
                     </template>
                 </el-table-column>
 
-
                 <!-- <el-table-column label="渠道订单号" align="center" prop="transactionId" min-width="150" /> -->
-
                 <!-- <el-table-column :label="'商户名\n商户号'" align="center" prop="storeNo" min-width="150">
                     <template slot-scope="scope">
                         {{ scope.row.mchName }}<br />
@@ -189,9 +185,6 @@
                         {{ scope.row.mobile }}
                     </template>
                 </el-table-column> -->
-
-
-
                 <!-- <el-table-column label="商户类型" align="center" prop="divideType" /> -->
                 <!-- <el-table-column label="订单描述" align="center" prop="orderMsg" /> -->
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
@@ -218,7 +211,7 @@
         </div>
 
         <!-- 处理当前代付订单 -->
-        <el-dialog v-dialogDrag :close-on-click-modal="false" title="信息" :visible.sync="isShowDetail" width="18%"
+        <!-- <el-dialog v-dialogDrag :close-on-click-modal="false" title="信息" :visible.sync="isShowDetail" width="18%"
             append-to-body>
             <div class="m20">确认要处理当前支付订单？</div>
             <el-form ref="form" :model="form" :rules="rules" label-width="0px">
@@ -229,6 +222,29 @@
             <el-button type="primary" icon="" size="small" @click="submitForm('pay_success')">置为成功</el-button>
             <el-button plain size="small" @click="submitForm('pay_failure')">置为取消</el-button>
             <el-button plain size="small" @click="cancel">取消</el-button>
+        </el-dialog> -->
+
+        <!-- 处理当前代付订单 -->
+        <el-dialog v-dialogDrag title="信息" :visible.sync="isShowDetail" width="500px" append-to-body
+            :close-on-click-modal="false" :before-close="cancel">
+            <div class="m20">确认要处理当前支付订单？</div>
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-form-item label="订单状态" prop="orderStatus">
+                    <el-select v-model="form.orderStatus" placeholder="请选择订单状态" clearable size="medium">
+                        <el-option v-for="(item, i) in orderStatusType" :key="i" :label="item.label"
+                            :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="谷歌动态验证码" prop="googleCode">
+                    <el-input v-model="form.googleCode" placeholder="请输入谷歌动态验证码" style="width:217px" />
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button :disabled="!form.orderStatus || !form.googleCode"
+                    :type="form.orderStatus && form.googleCode ? 'primary' : 'info'" icon="" size="small"
+                    @click="submitForm('pay_success')">确定</el-button>
+                <el-button plain size="small" @click="cancel">取消</el-button>
+            </div>
         </el-dialog>
 
 
@@ -245,10 +261,13 @@
                         </el-form-item>
 
                         <el-form-item label="通知状态">
-                            {{ detailInfoList.notifyStatus=='notify_failed'?'回调失败':detailInfoList.notifyStatus=='notify_success'?'回调成功':'未回调' }}
+                            {{
+                                detailInfoList.notifyStatus == 'notify_failed' ? '回调失败' : detailInfoList.notifyStatus ==
+                                    'notify_success' ? '回调成功' : '未回调'
+                            }}
                         </el-form-item>
 
-                
+
                         <el-form-item label='交易状态'>
                             <el-tag v-if="detailInfoList.orderStatus" :type="detailInfoList.orderStatus == 'pay_unpaid' ? 'warning' : detailInfoList.orderStatus == 'pay_success' ? 'success' :
                                 detailInfoList.orderStatus == 'pay_failure' ? 'danger' : detailInfoList.orderStatus == 'pay_processing' ? 'warning' : 'primary'
@@ -455,6 +474,16 @@ export default {
     dicts: ['pay_status', 'settle_status'],
     data() {
         return {
+            orderStatusType: [
+                {
+                    label: '成功',
+                    value: 'pay_success',
+                },
+                {
+                    label: '驳回',
+                    value: 'pay_failure',
+                },
+            ],
             // 详情
             detailInfoList: {
                 rate: '',
@@ -802,7 +831,7 @@ export default {
                     });
                     let form = {
                         id: this.detailData.keyId,
-                        status: type,
+                        status: this.form.orderStatus,
                         googleCode: this.form.googleCode
                     }
                     payOrder.payHandle(form).then((response) => {

src/views/pay/payOrder/pkCouponScopeRangeStoreList.vue

@@ -228,6 +228,9 @@
         <el-form-item label="谷歌动态验证码" prop="googleCode">
           <el-input v-model="form.googleCode" placeholder="请输入谷歌动态验证码" />
         </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="subUpdateBalance('balance', 'formUpdate')">确 定</el-button>
@@ -407,7 +410,7 @@ export default {
       this.loading = true;
       this.isCoin = row.isCoin
       // 获取用户出金
-      this.getUserWithdrawalChannel();
+      // this.getUserWithdrawalChannel();
       payMoneyCalcu.getWithdrawalChannel({
         channelType: row.channelType,
         flagCard: 'private_account'
@@ -469,6 +472,7 @@ export default {
               updateUserId: this.form.updateUserId,
               isIncome: this.form.isIncome,
               tranAmt: this.form.afterAmt,
+              remarks: this.form.remarks
             })
             .then((response) => {
               loading.close();