修复查询日期置空不生效 -zzx

config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://192.168.110.241:9120/zs/channel/admin"'
-  BASE_API: '"http://192.168.2.21:9120/zs/channel/admin"'
+  BASE_API: '"http://192.168.110.241:9120/zs/channel/admin"'
+  // BASE_API: '"http://192.168.2.21:9120/zs/channel/admin"'
   // BASE_API: '"http://channel.admin.dev.zonelife.cn/zs/channel/admin"'
 })

src/api/distribution.js

@@ -92,11 +92,11 @@ export function recordsList(params) {
 }
 
 // 更新财务结算状态
-export function updateStatus(data) {
+export function updateStatus(id,params) {
   return request({
-    url: "/ums/umsAdminUser/financialSettlement",
+    url: "/ums/umsAdminUser/financialSettlement?settleRecordIds="+id,
     method: "post",
-    data: data,
+    params: params,
   });
 }
 

src/router/index.js

@@ -110,7 +110,7 @@ export const asyncRouterMap = [
       path: 'finance',
       name: 'finance',
       component: () => import('@/views/distribution/finance/index'),
-      meta: {title: '结算记录', icon: 'marker'}
+      meta: {title: '结算记录', icon: 'order-return-reason'}
     },
     {
       path: 'changePwd',

src/styles/index.scss

@@ -157,3 +157,9 @@ a:hover {
   color: #909399;
 }
 
+.tips{
+  font-size: 14px;
+  color: red;
+  margin-left: 20px;
+}
+

src/views/channel/info/index.vue

@@ -109,7 +109,7 @@
         </el-form-item>
         <el-form-item label="渠道服务费：">
           <el-input v-model="admin.serviceMoney" type="text" :rows="5" style="width: 250px"></el-input>
-          <div>当前平台服务费为0.1</div>
+          <div>当前平台服务费为0.1元/度</div>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -184,6 +184,7 @@ export default {
   methods: {
     // 重置搜索框
     handleResetSearch() {
+      this.date = "";
       this.listQuery = Object.assign({}, defaultListQuery);
     },
 

src/views/channel/upCheck/index.vue

@@ -47,11 +47,11 @@
                         {{ scope.row.money||"--" }}
                     </template>
                 </el-table-column>
-                <el-table-column label="凭证" align="center" prop="updateBy">
+                <!-- <el-table-column label="凭证" align="center" prop="updateBy">
                     <template slot-scope="scope">
                         <img class="icon" :src="scope.row.voucherPic" alt="">
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="操作人" align="center" prop="updateBy"></el-table-column>
                 <el-table-column label="操作时间" width="160" align="center" prop="updateTime"></el-table-column>
             </el-table>
@@ -115,6 +115,7 @@ export default {
     },
     methods: {
         handleResetSearch() {
+            this.date="",
             this.listQuery = Object.assign({}, defaultListQuery);
         },
         handleSearchList() {

src/views/channel/useCondition/index.vue

@@ -25,12 +25,6 @@
                         <el-input v-model="listQuery.ecName" class="input-width" placeholder="请输入渠道名称"
                             clearable></el-input>
                     </el-form-item>
-                    <el-form-item label="更新时间：">
-                        <el-date-picker v-model="date" size="small" value-format="yyyy-MM-dd"
-                            class="item-width-350 ml10" type="datetimerange" range-separator="至"
-                            start-placeholder="开始日期" end-placeholder="结束日期">
-                        </el-date-picker>
-                    </el-form-item>
                 </el-form>
             </div>
         </el-card>
@@ -125,10 +119,10 @@
                         style="width: 250px"></el-input>
                     <el-checkbox v-if="!isEdit" v-model="admin.checked">负数</el-checkbox>
                 </el-form-item>
-                <el-form-item label="上传凭证：">
+                <!-- <el-form-item label="上传凭证：">
                     <uploadImg :limit="1" :file-list="fileList" @getUrl="getUrl($event)" @delUrl="delUrl($event)"
                         :disabled="true"></uploadImg>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false" size="small">取 消</el-button>
@@ -145,8 +139,6 @@ const defaultListQuery = {
     pageNum: 1,
     pageSize: 10,
     ecName: null,
-    startTime: "",
-    endTime: "",
 };
 const defaultAdmin = {
     id: null,
@@ -165,7 +157,6 @@ export default {
             fileList: [],
             upImg: '',
             setQuery: {},
-            date: "",
             isforbidden: false,
             forbiddenDialogVisible: false,
             listQuery: Object.assign({}, defaultListQuery),
@@ -183,17 +174,7 @@ export default {
             },
         };
     },
-    watch: {
-        date(val) {
-            if (val) {
-                this.listQuery.startTime = Date.parse(val[0]);
-                this.listQuery.endTime = Date.parse(val[1]);
-            } else {
-                this.listQuery.startTime = "";
-                this.listQuery.endTime = "";
-            }
-        },
-    },
+    watch: {},
     created() {
         this.getList();
     },

src/views/distribution/finance/index.vue

@@ -28,14 +28,14 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="结算时间：">
-                        <el-date-picker v-model="colseDate" size="mini" value-format="yyyy-MM-dd"
+                    <el-form-item label="提现时间：">
+                        <el-date-picker v-model="txDate" size="mini" value-format="yyyy-MM-dd"
                             class="item-width-350 ml10" type="datetimerange" range-separator="至"
                             start-placeholder="开始日期" end-placeholder="结束日期">
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item label="提现时间：">
-                        <el-date-picker v-model="txDate" size="mini" value-format="yyyy-MM-dd"
+                    <el-form-item label="结算时间：">
+                        <el-date-picker v-model="colseDate" size="mini" value-format="yyyy-MM-dd"
                             class="item-width-350 ml10" type="datetimerange" range-separator="至"
                             start-placeholder="开始日期" end-placeholder="结束日期">
                         </el-date-picker>
@@ -89,10 +89,8 @@ const defaultListQuery = {
     pageNum: 1,
     pageSize: 10,
     status: null,
-    // startSettleTime: "",
-    // endSettleTime: "",
-    settleStartTime: "",
-    settleEndTime: "",
+    startSettleTime: "",
+    endSettleTime: "",
     startWithdrawTime: "",
     endWithdrawTime: "",
 };
@@ -130,15 +128,13 @@ export default {
         },
         colseDate(val) {
             if (val) {
-                // this.listQuery.startSettleTime = Date.parse(val[0]);
-                // this.listQuery.endSettleTime = Date.parse(val[1]);
-                this.listQuery.settleStartTime = Date.parse(val[0]);
-                this.listQuery.settleEndTime = Date.parse(val[1]);
+                this.listQuery.startSettleTime = Date.parse(val[0]);
+                this.listQuery.endSettleTime = Date.parse(val[1]);
+
             } else {
-                // this.listQuery.startSettleTime = "";
-                // this.listQuery.endSettleTime = "";
-                this.listQuery.settleStartTime = "";
-                this.listQuery.settleEndTime = "";
+                this.listQuery.startSettleTime = "";
+                this.listQuery.endSettleTime = "";
+
             }
         },
     },
@@ -164,6 +160,7 @@ export default {
                 path: "/distribution/records",
                 query: {
                     adminUserId: row.adminUserId,
+                    recordId: row.id,
                 },
             });
         },
@@ -201,6 +198,8 @@ export default {
         },
 
         handleResetSearch() {
+            this.colseDate='',
+            this.txDate='',
             this.listQuery = Object.assign({}, defaultListQuery);
         },
         handleSearchList() {

src/views/distribution/peopleManage/index.vue

@@ -73,7 +73,7 @@
                             查看二维码</el-button>
                         <el-button size="mini" type="success" plain
                             @click="checkJunior(scope.$index, scope.row)">查看下级</el-button>
-                        <el-button size="mini" :disabled="scope.row.isSelf==0" type="info" plain @click="userEdit(scope.row)">编辑</el-button>
+                        <el-button size="mini" v-if="scope.row.isSelf==1" type="info" plain @click="userEdit(scope.row)">编辑</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -258,6 +258,7 @@ export default {
             });
         },
         handleResetSearch() {
+            this.date=''
             this.listQuery = Object.assign({}, defaultListQuery);
         },
         handleSearchList() {

src/views/distribution/records/index.vue

@@ -146,7 +146,8 @@ const defaultListQuery = {
     withdrawEndTime: "",
     status: "",
     chargeOrderNo: "",
-    adminUserId: "",
+    adminUserId: null,
+    recordId: null
 };
 export default {
     name: "records",
@@ -159,22 +160,18 @@ export default {
             updateLoading: false,
             listQuery: Object.assign({}, defaultListQuery),
             list: null,
+            financeList: [],
             total: null,
             listLoading: false,
             forbiddenDialogVisible: false,
-            options: [
-                {
-                    value: 0,
-                    label: "未提现",
-                },
-                {
-                    value: 1,
-                    label: "待结算",
-                },
-                {
-                    value: 2,
-                    label: "已结算",
-                },
+            options: [{
+                value: 1,
+                label: "待结算",
+            },
+            {
+                value: 2,
+                label: "已结算",
+            },
             ],
         };
     },
@@ -190,27 +187,28 @@ export default {
         },
         withdrawDate(val) {
             if (val) {
-                this.listQuery.settleStartTime = Date.parse(val[0]);
-                this.listQuery.settleEndTime = Date.parse(val[1]);
+                this.listQuery.withdrawStartTime = Date.parse(val[0]);
+                this.listQuery.withdrawEndTime = Date.parse(val[1]);
             } else {
-                this.listQuery.settleStartTime = "";
-                this.listQuery.settleEndTime = "";
+                this.listQuery.withdrawStartTime = "";
+                this.listQuery.withdrawEndTime = "";
             }
         },
         colseDate(val) {
             if (val) {
-                this.listQuery.withdrawStartTime = Date.parse(val[0]);
-                this.listQuery.withdrawEndTime = Date.parse(val[1]);
+                this.listQuery.settleStartTime = Date.parse(val[0]);
+                this.listQuery.settleEndTime = Date.parse(val[1]);
             } else {
-                this.listQuery.withdrawStartTime = "";
-                this.listQuery.withdrawEndTime = "";
+                this.listQuery.settleStartTime = "";
+                this.listQuery.settleEndTime = "";
             }
         },
     },
     created() {
         this.getList();
-        if(this.$route){
+        if (this.$route) {
             this.listQuery.adminUserId = this.$route.query.adminUserId
+            this.listQuery.recordId = this.$route.query.recordId
         }
     },
     filters: {
@@ -225,23 +223,36 @@ export default {
     methods: {
         // 更新结算状态
         financeStatus() {
-            this.updateLoading = true
-            updateStatus().then((res) => {
-            this.updateLoading = false
-                if (res.code === 200) {
-                    this.$message({
-                        message: "更新成功",
-                        type: "success",
-                    });
-                    this.getList();
-                } else {
-                    this.$message({
-                        message: res.msg,
-                        type: "error",
-                    })
-                }
-            })
+            let query = JSON.parse(JSON.stringify(this.listQuery))
+            query.pageSize = this.total
+            query.page = 0
+            query.status = 1
+            recordsList(query).then((response) => {
+                this.financeList.push(...response.data.list);
+                let updateList = Object.values(this.financeList.reduce((acc, r) => {
+                    acc[r.settleRecordId] = r
+                    return acc
+                }, {}))
+                this.financeList = updateList.map(item => item.chargeOrderId)
+                this.updateLoading = true
+                updateStatus(this.financeList).then((res) => {
+                    this.updateLoading = false
+                    if (res.code === 200) {
+                        this.$message({
+                            message: "更新成功",
+                            type: "success",
+                        });
+                        this.getList();
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error",
+                        })
+                    }
+                })
+            });
         },
+
         // 导出
         exportAllExcel() {
             this.downloadLoading = true
@@ -286,6 +297,9 @@ export default {
         },
 
         handleResetSearch() {
+            this.completeDate=''
+            this.withdrawDate=''
+            this.colseDate=''
             this.listQuery = Object.assign({}, defaultListQuery);
         },
         handleSearchList() {

src/views/distribution/statistics/index.vue

@@ -54,19 +54,20 @@
                     <template slot-scope="scope">
                         <!-- <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.unSettleAccountMoney ||
                             '0' }}</span> -->
-                            {{scope.row.unSettleAccountMoney ||'0' }}
+                        {{ scope.row.unSettleAccountMoney || '0' }}
                     </template>
                 </el-table-column>
                 <el-table-column label="已结算佣金/元" align="center">
                     <template slot-scope="scope">
                         <!-- <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.settleAccountMoney ||
                             '0' }}</span> -->
-                            {{scope.row.settleAccountMoney ||'0' }}
+                        {{ scope.row.settleAccountMoney || '0' }}
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" width="180" align="center">
                     <template slot-scope="scope">
-                        <el-button v-if="isAdmin!=0" size="mini" type="warning" plain @click="withdrawApplyfor(scope.row)">
+                        <el-button v-if="isAdmin != 0" size="mini" type="warning" plain
+                            @click="withdrawApplyfor(scope.row)">
                             提现申请
                         </el-button>
                     </template>
@@ -83,14 +84,15 @@
             <el-descriptions border>
                 <el-descriptions-item label="分销员姓名">{{ dialogQuery.userName }}</el-descriptions-item>
                 <el-descriptions-item label="分销员手机号">{{ dialogQuery.phone }}</el-descriptions-item>
-                <el-descriptions-item label="本次提现订单数/笔">{{ dialogQuery.orderCount||'--' }}</el-descriptions-item>
+                <el-descriptions-item label="本次提现订单数/笔">{{ dialogQuery.orderCount || '--' }}</el-descriptions-item>
                 <el-descriptions-item label="本次提现金额/元">{{ dialogQuery.unSettleAccountMoney }}</el-descriptions-item>
             </el-descriptions>
-            <div style="margin-top: 10px;font-size: 14px;color: #F4B01D ;">说明:提现的订单为今天( {{ new Date().toLocaleDateString() }} )之前</div>
+            <div style="margin-top: 10px;font-size: 14px;color: #F4B01D ;">说明:提现的订单为今天( {{ new
+                Date().toLocaleDateString() }}
+                )之前</div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="forbiddenDialogVisible = false" size="small">取 消</el-button>
-                <el-button type="primary" @click="confirmRequest" size="small">确
-                    定</el-button>
+                <el-button type="primary" @click="confirmRequest" :loading="requestLoading" size="small">确定</el-button>
             </span>
         </el-dialog>
     </div>
@@ -112,8 +114,9 @@ export default {
     name: "statistics",
     data() {
         return {
-            isAdmin:null,
+            isAdmin: null,
             downloadLoading: false,
+            requestLoading: false,
             date: "",
             listQuery: Object.assign({}, defaultListQuery),
             list: null,
@@ -135,7 +138,7 @@ export default {
         },
     },
     created() {
-        this.isAdmin= localStorage.getItem("isAdmin");
+        this.isAdmin = localStorage.getItem("isAdmin");
         this.getList();
     },
     filters: {
@@ -201,6 +204,11 @@ export default {
 
         // 确认
         confirmRequest() {
+            this.requestLoading = true;
+            setTimeout(() => {
+                this.requestLoading = false;
+                
+            },1000)
             withdrawRequest({ adminUserId: this.dialogQuery.adminUserId }).then(res => {
                 if (res.code == 200) {
                     this.$message({

src/views/distribution/userList/index.vue

@@ -4,7 +4,7 @@
  * @Author: zzx
  * @Date: 2024-11-09 16:08:16
  * @LastEditors: zzx tigerzouzx@foxmail.com
- * @LastEditTime: 2024-11-20 18:00
+ * @LastEditTime: 2024-11-22 18:00
 -->
 <template>
     <div class="app-container">
@@ -21,7 +21,7 @@
             </div>
             <div style="margin-top: 15px">
                 <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
-                    <el-form-item label="用户姓名：">
+                    <el-form-item label="用户昵称：">
                         <el-input v-model="listQuery.nickName" class="input-width" placeholder="请输入用户名称"
                             clearable></el-input>
                     </el-form-item>
@@ -188,11 +188,6 @@ export default {
                             type: "success",
                         });
                         this.getList()
-                    } else {
-                        this.$message({
-                            message: response.msg,
-                            type: "error",
-                        });
                     }
                 });
             });
@@ -206,6 +201,7 @@ export default {
             this.getList();
         },
         handleResetSearch() {
+            this.date=''
             this.listQuery = Object.assign({}, defaultListQuery);
         },
         handleSearchList() {
@@ -259,10 +255,4 @@ export default {
     },
 };
 </script>
-<style scoped>
-.tips{
-    font-size: 14px;
-    color: red;
-    margin-left: 20px;
-}
-</style>
+<style scoped></style>