’修改bug添加需求‘

src/App.vue

@@ -41,7 +41,7 @@ export default {
 
 
 
- /* #app .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
+/* #app .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
 #app .sidebar-container .el-submenu .el-menu-item {
   width: 203px !important;
 } */
@@ -66,6 +66,10 @@ export default {
   border-radius: 6px !important;
   margin-left: 8px;
 } */
+/* 提示框字体颜色红色 */
+.box-logout .el-message-box__message p {
+  color: red !important;
+}
 
 .el-collapse-item__arrow {
   transform: rotate(270deg);
@@ -465,10 +469,12 @@ body {
   text-align: center;
 }
 
-.el-table__body tr.hover-row > td.el-table__cell, .el-table__body tr.hover-row.current-row > td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped > td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row > td.el-table__cell {
+.el-table__body tr.hover-row>td.el-table__cell,
+.el-table__body tr.hover-row.current-row>td.el-table__cell,
+.el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell,
+.el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell {
   background-color: rgba(0, 0, 0, 0) !important
 }
-
 </style>
 <style scoped>
 #app .theme-picker {

src/main.js

@@ -33,7 +33,8 @@ import {
   addSESDateRange,
   calcRange,
   download,
-  today
+  today,
+  BeiJingDate,
 } from "@/utils/ruoyi";
 
 
@@ -72,6 +73,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.today = today
+Vue.prototype.BeiJingDate = BeiJingDate
 Vue.prototype.$md5 = md5;
 Vue.prototype.handleTree = handleTree
 Vue.prototype.msgSuccess = function (msg) {

src/utils/ruoyi.js

@@ -37,6 +37,11 @@ export function calcRange(array) {
   return range;
 }
 
+
+// 时区北京
+export function BeiJingDate() {
+  return new Date(new Date().getTime()+(parseInt(new Date().getTimezoneOffset()/60) + 8)*3600*1000);
+}
 // 通用下载方法
 export function download(fileName) {
   window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;

src/views/carddealer/carddealerCard/index.vue

@@ -175,7 +175,12 @@
           <el-input v-model="form.singleMax" placeholder="" style="width:150px" @input="change" />
 
         </el-form-item>
-
+        <el-form-item label="日限额" prop="">
+          <el-input v-model="form.dayReceiveMax" placeholder="" style="width:150px" @input="change" />
+        </el-form-item>
+        <el-form-item label="日收款笔数" prop="">
+          <el-input v-model="form.dayMaxNumber" placeholder="" style="width:150px" @input="change" />
+        </el-form-item>
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -465,6 +470,8 @@ export default {
         this.form = response.data;
         this.form.singleMax = this.NumberDiv(this.form.singleMax, 100)
         this.form.singleMin = this.NumberDiv(this.form.singleMin, 100)
+        this.form.dayReceiveMax = this.NumberDiv(this.form.dayReceiveMax, 100)
+        this.form.todayReceived = this.NumberDiv(this.form.todayReceived, 100)
         this.open = true;
         this.title = "修改卡商-银行卡";
       });
@@ -497,9 +504,12 @@ export default {
         if (valid) {
           let singleMax = this.NumberMul(this.form.singleMax, 100)
           let singleMin = this.NumberMul(this.form.singleMin, 100)
+          let dayReceiveMax = this.NumberMul(this.form.dayReceiveMax, 100)
           payShouCard.updateInfo({
             singleMax: singleMax,
             singleMin: singleMin,
+            dayMaxNumber: this.form.dayMaxNumber,
+            dayReceiveMax: dayReceiveMax,
             id: this.form.id
           }).then((res) => {
             if (res.code === 200) {

src/views/carddealer/carddealerSms/index.vue

@@ -73,7 +73,7 @@
         <el-table-column :label="'识别状态'" align="center" prop="verifyStatus">
           <template slot-scope="scope">
             {{ scope.row.verifyStatus == 2 ? '识别失败短信列表' :
-              scope.row.verifyStatus == 1 ? '匹配失败短信列' : '匹配成功短信列表' }}
+              scope.row.verifyStatus == 1 && scope.row.orderNo? '匹配成功短信列表' : '匹配失败短信列表' }}
           </template>
         </el-table-column>
         <el-table-column label="失败原因" align="center" prop="verifyRemarks" min-width="180" />

src/views/carddealer/carddealerSms/indexIdentify.vue

@@ -73,7 +73,7 @@
           <el-table-column :label="'识别状态'" align="center" prop="verifyStatus">
           <template slot-scope="scope">
             {{ scope.row.verifyStatus == 2 ? '识别失败短信列表' :
-                scope.row.verifyStatus == 1 ? '匹配失败短信列' : '匹配成功短信列表' }}
+              scope.row.verifyStatus == 1 && scope.row.orderNo? '匹配成功短信列表' : '匹配失败短信列表' }}
           </template>
         </el-table-column>
           <el-table-column label="失败原因" align="center" prop="verifyRemarks" min-width="180" />

src/views/carddealer/carddealerSms/indexSuccess.vue

@@ -72,7 +72,7 @@
           <el-table-column :label="'识别状态'" align="center" prop="verifyStatus">
           <template slot-scope="scope">
             {{ scope.row.verifyStatus == 2 ? '识别失败短信列表' :
-                scope.row.verifyStatus == 1 ? '匹配失败短信列' : '匹配成功短信列表' }}
+              scope.row.verifyStatus == 1 && scope.row.orderNo? '匹配成功短信列表' : '匹配失败短信列表' }}
           </template>
         </el-table-column>
           <el-table-column label="失败原因" align="center" prop="verifyRemarks" min-width="180" />

src/views/carddealer/carddealerSmsTemp/index.vue

@@ -73,7 +73,7 @@
           <template slot-scope="scope">
             <el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff">修改</el-button>
             <el-button size="small" type="text" @click="switchStatusChange(scope.row, 'status')" style="color: #006eff">
-              {{ scope.row.status == 1 ? '启用' : '禁用' }}
+              {{ scope.row.status == 1 ? '禁用' : '启用' }}
             </el-button>
             <el-button size="small" type="text" @click="handleDelete(scope.row)" style="color: #006eff">删除</el-button>
             <el-button size="small" type="text" @click="handleCode(scope.row)" style="color: #006eff">测试</el-button>
@@ -209,7 +209,7 @@ export default {
       const id = row.id || this.ids;
       getCarddealerSmsTemp(id).then((response) => {
         this.form = response.data;
-        row.status == 1 ? this.form.status = 0 : this.form.status = 1
+        row.status == 1 ? this.form.status = 2 : this.form.status = 1
         updateCarddealerSmsTemp(this.form).then((res) => {
           if (res.code === 200) {
             this.$message.success("编辑成功");
@@ -278,7 +278,8 @@ export default {
     // 发送
     toSubmit(){
       paySes.test(this.form).then(response => {
-        this.form.msg=response.data.result
+        this.form.msg= JSON.stringify(response.data)
+        this.$forceUpdate()
       }).catch((err)=>{
         
       })

src/views/dashboard/PanelGroup.vue

@@ -487,7 +487,7 @@ export default {
   methods: {
     // 获取今天
     addDate() {
-      let nowDate = new Date();
+      let nowDate = this.BeiJingDate()
       let date = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,

src/views/order/TransferOrder/readyOrder.vue

@@ -909,6 +909,23 @@ export default {
         /** 成功按钮操作 */
         handleSuccess(row) {
             const ids = row.orderNo || this.ids;
+            //  row.payeeRealAmount > 0 针对未完成订单里面有成交数量的提示
+            if (row.payeeRealAmount > 0) {
+                this.$confirm(`该笔订单未全部完成，需要确认吗？`, "警告", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                    customClass: 'box-logout',
+                }).then(function () {
+                    return payOutOrder.setPayOrderSuccess({
+                        orderNo: ids,
+                        isSuccess: 1,
+                    });
+                }).then(() => {
+                    this.getList();
+                    this.msgSuccess("操作成功");
+                })
+            } else {
                 this.$confirm('是否确认订单编号为"' + ids + '"的数据项?', "警告", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -922,6 +939,8 @@ export default {
                     this.getList();
                     this.msgSuccess("操作成功");
                 })
+            }
+
         },
         /** 关闭按钮操作 */
         handleOut(row) {
@@ -978,6 +997,8 @@ export default {
 };
 </script>
 <style>
+
+
 .purpleTransfer {
     background: #FDF7FF !important;
 }
@@ -1012,9 +1033,11 @@ export default {
 .yellow {
     color: #F49300 !important;
 }
-.green{
+
+.green {
     color: #67c23a !important;
 }
+
 ::v-deep .el-table tbody tr:hover>td {
     background-color: rgba(0, 0, 0, 0) !important
 }

src/views/order/payOrder/wwc.vue

@@ -45,8 +45,8 @@
       </el-form-item>
 
       <el-form-item label="付款人" prop="payerName">
-        <el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人"
-          @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
+        <el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人" @keyup.enter.native="handleQuery"
+          style="width: 180px; border-color: #e6f1ff" />
       </el-form-item>
 
       <el-collapse>
@@ -153,7 +153,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
             <el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff">详情</el-button>
-            <el-button size="small" type="text" @click="handleOver(scope.row)" style="color: #006eff">已收款</el-button>
+            <el-button size="small" type="text" @click="handleOver(scope.row)" style="color: #006eff" :disabled="scope.row.sameMark==1">已收款</el-button>
             <!-- <el-button size="small" type="text" @click="handleNotify(scope.row)" style="color: #006eff">通知</el-button> -->
           </template>
         </el-table-column>
@@ -345,7 +345,7 @@ export default {
         carddealerCardHolder: null,
         reqAmount: null,
         platformChannelId: null,
-        downstreamMerchantOrderNo:null
+        downstreamMerchantOrderNo: null
       },
       // 显示详情
       isShowDetail: false,
@@ -490,6 +490,9 @@ export default {
   },
   methods: {
     tableRowClassName({ row, rowIndex }) {
+      if (row.sameMark == 1) {
+        return "greyd6";
+      }
       if (row.orderStatus == 3) {
         return "redOrder";
       }
@@ -541,7 +544,7 @@ export default {
         carddealerCardHolder: this.queryParams.carddealerCardHolder,
         reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount),
         platformChannelId: this.queryParams.platformChannelId,
-        downstreamMerchantOrderNo:this.queryParams.downstreamMerchantOrderNo
+        downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
       }
       listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
         this.infoList = response.rows;
@@ -566,7 +569,7 @@ export default {
         carddealerCardHolder: this.queryParams.carddealerCardHolder,
         reqAmount: typeof (reqAmount) == 'object' ? null : !reqAmount ? null : parseFloat(reqAmount),
         platformChannelId: this.queryParams.platformChannelId,
-        downstreamMerchantOrderNo:this.queryParams.downstreamMerchantOrderNo
+        downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
       }
       listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
         this.infoList = response.rows;
@@ -679,14 +682,14 @@ export default {
         if (this.dateRange[0]) {
           this.queryParams.beginTime = this.dateRange[0][0]
           this.queryParams.endTime = this.dateRange[0][1]
-                }else{
+        } else {
           this.queryParams.beginTime = null
           this.queryParams.endTime = null
         }
         if (this.dateRange[1]) {
           this.queryParams.updateBeginTime = this.dateRange[1][0]
           this.queryParams.updateEndTime = this.dateRange[1][1]
-                }else{
+        } else {
           this.queryParams.updateBeginTime = null
           this.queryParams.updateEndTime = null
         }
@@ -711,6 +714,10 @@ export default {
 };
 </script>
 <style>
+.greyd6 {
+  background: #d6d6d6 !important;
+}
+
 .yellowOrder {
   background: #FEFEE5 !important;
 }

src/views/staticsRecord/cardTimeStatistics.vue

@@ -186,7 +186,7 @@ export default {
     methods: {
         // 获取今天
         addDate() {
-            let nowDate = new Date();
+            let nowDate = this.BeiJingDate()
             let date = {
                 year: nowDate.getFullYear(),
                 month: nowDate.getMonth() + 1,

src/views/staticsRecord/mechantTimeStatistics.vue

@@ -231,7 +231,7 @@ export default {
 
         // 获取今天
         addDate() {
-            let nowDate = new Date();
+            let nowDate = this.BeiJingDate()
             let date = {
                 year: nowDate.getFullYear(),
                 month: nowDate.getMonth() + 1,

src/views/staticsRecord/merchantCardStat.vue

@@ -185,7 +185,7 @@ export default {
     methods: {
         // 获取今天
         addDate() {
-            let nowDate = new Date();
+            let nowDate = this.BeiJingDate()
             let date = {
                 year: nowDate.getFullYear(),
                 month: nowDate.getMonth() + 1,