Просмотр исходного кода

加投结算管理增加结算功能

lihongxiao 2 лет назад
Родитель
Сommit
762a601ea0

+ 2 - 2
config/dev.env.js

@@ -6,7 +6,7 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',//正式服务器
+  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"', //凯森
   // BASE_URL: '"http://192.168.0.106:8080/"',//屈晨
@@ -18,7 +18,7 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.0.250:8080/"',//
   // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
   // BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
-  // BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
+  BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
   CONSOLE_BASE_URL: '"http://localhost:8080/"', //控制台测试服务器
   // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台正式服务器
   APP_BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',    // app打包上传地址

+ 10 - 10
src/assets/css/common.css

@@ -124,9 +124,9 @@
 
 .el-button--primary,
 .el-button--primary:focus {
-  background-color: var(--themeColor) !important;
+  background-color: var(--themeColor) ;
   color: #fff;
-  border-color: var(--themeColor) !important;
+  border-color: var(--themeColor) ;
 }
 
 .el-button--primary.is-plain {
@@ -141,13 +141,7 @@
   border-color: var(--themeColorHover);
 }
 
-.el-button--primary.is-plain:hover,
-.el-button--primary.is-disabled,
-.el-button--primary.is-disabled:hover {
-  background-color: #D2D2D2;
-  color: var(--themeColor);
-  border-color: #D2D2D2;
-}
+
 
 .el-tabs__active-bar,
 .el-date-table td.start-date span,
@@ -220,7 +214,13 @@
 .el-button--primary.is-plain:focus {
   background-color: #C8CDD9;
 }
-
+.el-button--primary.is-plain:hover,
+.el-button--primary.is-disabled,
+.el-button--primary.is-disabled:hover {
+  background-color: #D2D2D2;
+  color: var(--themeColor);
+  border-color: #D2D2D2;
+}
 .themeColor {
   color: var(--themeColor);
 }

+ 7 - 0
src/http/moudules/sys.js

@@ -374,4 +374,11 @@ export const sysChannelCostAudit = (data) => {
         method: 'post',
         data
     })
+}
+export const sysChannelCostSettle = (data) => {
+    return axios({
+        url: '/sysChannelCost/settle/',
+        method: 'post',
+        data
+    })
 }

+ 88 - 11
src/views/FinancialManagement/AddInvestment.vue

@@ -1,7 +1,28 @@
 <template>
     <div>
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
-            @getList="getList" :btnGroup="btnGroup" @handleSearchList="handleSearchList" :pagination="page">
+        @selectionChange="selectionChange"
+            @getList="getList" :btnGroup="btnGroup" @handleSearchList="handleSearchList"  :pagination="page">
+            <template slot="批量结算">
+                <el-upload
+                style="display: inline-block"
+                action="#"
+                :show-file-list="false"
+                class="upload-demo"
+                :limit="1"
+                :auto-upload="false"
+                :on-change="drivingupload"
+                ref="upload1"
+                accept=".png, .jpg, .jpeg"
+                >
+                <el-button
+                    size="small"
+                    type="primary"
+                    :disabled="selectionList.length == 0"
+                    >批量修改</el-button
+                >
+                </el-upload>
+            </template>
         </templateTable>
         <el-dialog title="编辑" width="60%" :visible.sync="dialogVisibleadd">
             <templateForm ref="templateForm" :ruleForm="ruleForm" :formData="formData" :inline="false" :rules="rules"
@@ -22,6 +43,7 @@ export default {
     components: { templateTable, templateForm },
     data() {
         return {
+            selectionList:[],
             formData: {},
             dialogVisible: false,
             dialogVisibleadd: false,
@@ -42,6 +64,10 @@ export default {
                 {
                     name: '导出',
                     click: () => this.export()
+                },
+                {
+                    name: '批量结算',
+                    slot: true,
                 }
             ],
             formList: [
@@ -156,6 +182,21 @@ export default {
                         label: "渠道名称",
                         type: "text"
                     },
+                    {
+                        prop: "settleStatus",
+                        label: "结算状态",
+                        type: "statMap",
+                        options: [
+                            {
+                                label: '未结算',
+                                value: '0'
+                            },
+                            {
+                                label: '已结算',
+                                value: '1'
+                            }
+                        ]
+                    },
                     {
                         prop: "leaderName",
                         label: "维护人员",
@@ -331,6 +372,7 @@ export default {
                 loading: true,
                 isPaginationShow: true,
                 operationWidth: 300,
+        isCheckBox: true,
                 optBtns: [
                     {
                         type: "primary",
@@ -339,16 +381,16 @@ export default {
                             return this.handleTableUpload(row);
                         },
                     },
-                    {
-                        type: "primary",
-                        label: "审核通过",
-                        hide: (row) => {
-                            return !row.status
-                        },
-                        click: (row, index) => {
-                            return this.handleTableAudit(row);
-                        },
-                    },
+                    // {
+                    //     type: "primary",
+                    //     label: "审核通过",
+                    //     hide: (row) => {
+                    //         return !row.status
+                    //     },
+                    //     click: (row, index) => {
+                    //         return this.handleTableAudit(row);
+                    //     },
+                    // },
                     {
                         type: "primary",
                         label: "删除",
@@ -367,6 +409,38 @@ export default {
 
     },
     methods: {
+        selectionChange(val, ref) {
+      this.selectionList = val;
+    },
+        drivingupload(file, fileList) {
+      this.$refs.upload1.clearFiles();
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", file.raw);
+      params.append("type", "image");
+      this.$api.letter.uploadFile(params).then((res) => {
+        if (res.code == "200") {
+          this.$api.sys
+            .sysChannelCostSettle({
+                voucherNumber: res.data.id,
+              ids: this.selectionList.map((val) => val.id),
+            })
+            .then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  message: res.msg || "保存成功",
+                  type: "success",
+                });
+                this.getList();
+                this.selectionList = [];
+              } else {
+                this.$message.error(res.msg);
+              }
+            });
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
         jqCostsProportionFun(val) {
             this.formData.jqJtPremium = (Number(val) * Number(this.formData.jqPremium)).toFixed(2)
         },
@@ -406,6 +480,9 @@ export default {
                         this.$message.error(res.msg);
                     }
                 });
+        },
+        batch(){
+
         },
         // 查询
         handleSearchList(data) {

+ 27 - 5
src/views/PeopleManage/PcLoginRecord.vue

@@ -32,11 +32,17 @@
         <span>代理</span>
         <el-switch v-model="sourcedl" @change="sourcedlChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">在线</span>
+        <el-switch v-model="lineZx" @change="onLineChange">
+        </el-switch> -->
       </div>
       <div>
         <span>渠道</span>
         <el-switch v-model="sourceqd" @change="sourceqdChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">离线</span>
+        <el-switch v-model="lineLx" @change="offlineChange">
+        </el-switch> -->
       </div>
     </div>
     <div v-if="infoWindowVisible" class="infohis-window" >
@@ -255,7 +261,9 @@ export default {
       onlineHisData:'',
       radius:'100000',
       markers: [],
-
+      lineZx:null,
+      lineLx:null,
+      status:null
     };
   },
   mounted() {
@@ -586,6 +594,20 @@ export default {
       this.source = 1
       this.initMap();
     },
+    onLineChange(val) {
+      if (val) {
+        this.lineLx = null
+      }
+      this.status = 1
+      this.initMap();
+    },
+    offlineChange(val) {
+      if (val) {
+        this.lineZx = null
+      }
+      this.status = 0
+      this.initMap();
+    },
     handleClose() {
       this.infoWindowVisible = false;
     },
@@ -667,7 +689,7 @@ export default {
                   id: item.id,
                   userId: item.userId,
                   address: item.address,
-                  leaderName: item.leaderName,
+                  leaderName: item.leaderName?item.leaderName:'无',
                   // onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
                   onlineImg: "Frame-1(2).png",
                   operationTime: item.operationTime,
@@ -811,8 +833,8 @@ export default {
     padding: 3px;
   }
 
-  span::before {
-    content: '';
+  span:first-child::before {
+      content: '';
     display: inline-block;
     width: 9px;
     height: 9px;
@@ -830,7 +852,7 @@ export default {
   }
 
   span {
-    margin-right: 15px;
+    margin-right: 5px;
   }
 }
 

+ 26 - 2
src/views/PeopleManage/UserMap.vue

@@ -32,11 +32,17 @@
         <span>代理</span>
         <el-switch v-model="sourcedl" @change="sourcedlChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">在线</span>
+        <el-switch v-model="lineZx" @change="onLineChange">
+        </el-switch> -->
       </div>
       <div>
         <span>渠道</span>
         <el-switch v-model="sourceqd" @change="sourceqdChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">离线</span>
+        <el-switch v-model="lineLx" @change="offlineChange">
+        </el-switch> -->
       </div>
     </div>
     <div v-if="infoWindowVisible" class="infohis-window" >
@@ -251,6 +257,10 @@ export default {
       historyDate: '',
       onlineData:'',
       onlineHisData:'',
+      lineZx:null,
+      lineLx:null,
+      status:null
+
     };
   },
   mounted() {
@@ -473,6 +483,20 @@ export default {
       this.source = 1
       this.initMap();
     },
+    // onLineChange(val) {
+    //   if (val) {
+    //     this.lineLx = null
+    //   }
+    //   this.status = 1
+    //   this.initMap();
+    // },
+    // offlineChange(val) {
+    //   if (val) {
+    //     this.lineZx = null
+    //   }
+    //   this.status = 0
+    //   this.initMap();
+    // },
     handleClose() {
       this.infoWindowVisible = false;
     },
@@ -750,7 +774,7 @@ export default {
     padding: 3px;
   }
 
-  span::before {
+  span:first-child::before {
     content: '';
     display: inline-block;
     width: 9px;
@@ -769,7 +793,7 @@ export default {
   }
 
   span {
-    margin-right: 15px;
+    margin-right: 5px;
   }
 }