新增分销功能接口对接完成

config/dev.env.js

@@ -4,6 +4,6 @@ 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.13:9120/zs/channel/admin"'
+  // BASE_API: '"http://192.168.110.241:9120/zs/channel/admin"'
+  BASE_API: '"http://192.168.2.13:9120/zs/channel/admin"'
 })

package-lock.json

@@ -1522,10 +1522,9 @@
       }
     },
     "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.2.tgz",
+      "integrity": "sha512-y/ie+Faknx7sZA5MfGA2xKlu0GDv8RWrXGsmlteyJQ2lvoKv9GBK/fpRMc2qlSoBAgNxrixICFCBefIq8WCQpQ=="
     },
     "binary-extensions": {
       "version": "2.3.0",
@@ -6147,6 +6146,12 @@
         "json5": "^1.0.1"
       },
       "dependencies": {
+        "big.js": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+          "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+          "dev": true
+        },
         "json5": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "ali-oss": "^6.21.0",
     "axios": "^0.18.0",
+    "big.js": "^6.2.2",
     "echarts": "^4.2.0-rc.2",
     "element-ui": "^2.3.7",
     "file-saver": "^2.0.5",

src/api/distribution.js

@@ -126,3 +126,30 @@ export function financeList(params) {
     params: params,
   });
 }
+
+// 充电桩列表
+export function chargeList(params) {
+  return request({
+    url: "/pms/cChargeStation/list",
+    method: "get",
+    params: params,
+  });
+}
+
+// 分销站时间段销售价
+export function priceList(params) {
+  return request({
+    url: "/ums/distributionStationTimePrice/getStationTimePrice",
+    method: "get",
+    params: params,
+  });
+}
+
+// 设置时段佣金
+export function settingsPrice(data) {
+  return request({
+    url:'/ums/distributionStationTimePrice/setDistributionPrice',
+    method:'post',
+    data:data
+  })
+}

src/views/distribution/peopleManage/firstSetPrice.vue

@@ -23,89 +23,105 @@
                         <el-descriptions class="margin-top" :column="3" size="medium" border>
                             <el-descriptions-item>
                                 <template slot="label"> 电站 </template>
-                                花果园立交南广场停车场
+                                {{ name }}
                             </el-descriptions-item>
                         </el-descriptions>
                     </div>
                 </div>
                 <div>
-                    <back-button></back-button>
+                    <back-button></back-button> 
                 </div>
             </div>
         </el-card>
         <div class="table-container">
             <el-table ref="adminTable" :data="dialogList" style="width: 100%" v-loading="dialogListLoading" border>
-                <el-table-column label="时间段" align="center"></el-table-column>
-                <el-table-column label="销售合计价(元)" align="center"></el-table-column>
-                <el-table-column label="一级代理价(元)" align="center" v-if="isAdmin!=3"></el-table-column>
-                <el-table-column label="二级代理价(元)" align="center"></el-table-column>
-                <el-table-column label="操作" width="350" align="center" v-if="isAdmin!=3">
-                    <template slot-scope="scope">   
-                        <el-button size="mini" type="primary" plain
-                            @click="settingsPrice(scope.row)">设置代理价(元)</el-button>
+                <el-table-column label="时间段" align="center" prop="time"></el-table-column>
+                <el-table-column label="销售合计价(元)" align="center" prop="platformPrice"></el-table-column>
+                <el-table-column label="一级代理价" align="center" prop="firstLevelPrice"></el-table-column>
+                <el-table-column label="二级代理价(元)" align="center">
+                    <template slot-scope="scope">
+                            <el-input v-model="scope.row.secondLevelPrice" :disabled="isAdmin==3" size="small" style="width: 80px;" @blur="saveEdit(scope.row)"></el-input>
                     </template>
                 </el-table-column>
             </el-table>
         </div>
-        <el-dialog title="代理价设置" :visible.sync="forbiddenDialogVisible" width="30%">
-            <el-form :model="forbiddenForm" label-width="120px">
-                <el-form-item label="二级代理价(元)">
-                    <el-input v-model="forbiddenForm.name" size="small" placeholder="请输入二级代理价"></el-input>
-                </el-form-item>
-            </el-form>
-
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="forbiddenDialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="confirmForbidden">确 定</el-button>
-            </span>
-        </el-dialog>
+        <el-divider></el-divider>
+        <el-card class="operate-container" shadow="hover">
+            <div style="text-align: center;">
+                <el-button type="primary" @click="confirmForbidden">提交</el-button>
+            </div>
+        </el-card>
     </div>
 </template>
 <script>
-import { userList, settingType } from "@/api/distribution";
+import { priceList, settingsPrice } from "@/api/distribution";
+import Big from 'big.js';
 const defaultListQuery = {
-    pageNum: 1,
-    pageSize: 10,
-    userId: null,
-    nickName: null,
-    phone: null,
+    adminUserId: null,
+    stationId: null,
 };
 export default {
-    name: "firstSetPrice",
+    name: "settingsPrice",
     data() {
         return {
-            isAdmin:null,
+            isAdmin: null,
+            name: null,
             listQuery: Object.assign({}, defaultListQuery),
-            forbiddenForm:{},
-            dialogList: [
-                {
-                    name: "电费",
-                },
-            ],
+            forbiddenForm: {},
+            dialogList: null,
             dialogListLoading: false,
             total: null,
-            forbiddenDialogVisible: false,
         };
     },
     watch: {},
     created() {
-        this.isAdmin= localStorage.getItem("isAdmin");
+        this.name = this.$route.query.name;
+        this.listQuery.adminUserId = this.$route.query.adminUserId;
+        this.listQuery.stationId = this.$route.query.stationId;
+        this.isAdmin = localStorage.getItem("isAdmin");
         this.getList();
     },
     methods: {
-        // 设置分销
-        settingsPrice(idnex, row) {
-            this.forbiddenDialogVisible = true;
+        priceEdit( row) {
+            row.isEdit = true;
+            console.log(row);
+        },
+        saveEdit(row) {
+            if(row.secondLevelPrice>=row.platformPrice){
+                row.secondLevelPrice=0
+                return this.$message.error('分销价格必须小于平台价格');
+            }
+            if(row.secondLevelPrice<=row.firstLevelPrice){
+                row.secondLevelPrice=0
+                return this.$message.error('二级代理价不能小于一级代理价');
+            }
         },
-        confirmForbidden(){
-
+        confirmForbidden() {
+            const newArray=this.dialogList.map(item=>({
+                adminUserId:this.listQuery.adminUserId,
+                firstLevelPrice:item.firstLevelPrice,
+                id:item.id,
+                platformPrice:item.platformPrice,
+                secondLevelPrice:item.secondLevelPrice,
+                servicePrice:new Big(item.platformPrice).minus(new Big(item.secondLevelPrice)).toNumber(),
+                stationId:this.listQuery.stationId,
+                time:item.time
+            }))
+            settingsPrice(newArray).then((res) => {
+                if (res.code == 200) {
+                    this.$message.success('设置成功');
+                    this.getList();
+                }
+            })
         },
         getList() {
             this.dialogListLoading = true;
-            userList(this.dialogListQuery).then((response) => {
+            priceList(this.listQuery).then((response) => {
                 this.dialogListLoading = false;
-                this.dialogList = response.data.list;
-                this.dialogTotal = response.data.total;
+                this.dialogList = response.data;
+                this.dialogList.map(item => {
+                    item.isEdit=false
+                })
             });
         },
     },

src/views/distribution/peopleManage/index.vue

@@ -76,12 +76,14 @@
                         <el-button size="mini" type="primary" plain @click="checkQrCode(scope.row)">
                             查看二维码</el-button>
                         <el-button size="mini" type="success" plain
-                            @click="checkJunior(scope.$index, scope.row)">查看下级</el-button>
+                            @click="checkJunior(scope.$index, scope.row)" v-if="scope.row.type != 3">查看下级</el-button>
                         <el-button :disabled="scope.row.isWithdraw==0?isWithdraw=false:isWithdraw=true" size="mini" v-if="scope.row.isSelf == 1" type="info" plain
                             @click="userEdit(scope.row)">编辑</el-button>
-                            <el-button size="mini" v-if="isAdmin!=3" type="warning" plain @click="settingsCommission(scope.row)">
+                            <span v-if="isAdmin!=3">
+                                <el-button size="mini" v-if="scope.row.isSelf !=1" type="warning" plain @click="settingsCommission(scope.row)">
                                 {{ isAdmin!=3?'设置分销佣金':'查看分销佣金' }}
                             </el-button>
+                            </span>
                     </template>
                 </el-table-column>
             </el-table>

src/views/distribution/peopleManage/setCommission.vue

@@ -22,18 +22,18 @@
             <div style="margin-top: 15px">
                 <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
                     <el-form-item label="状态：">
-                        <el-select v-model="listQuery.level" clearable placeholder="请选择">
+                        <el-select v-model="listQuery.stationStatus" clearable placeholder="请选择">
                             <el-option v-for="item in options" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="充电站ID：">
-                        <el-input v-model="listQuery.phone" class="input-width" placeholder="请输入充电站ID"
+                        <el-input v-model="listQuery.stationId" class="input-width" placeholder="请输入充电站ID"
                             clearable></el-input>
                     </el-form-item>
                     <el-form-item label="充电站名称：">
-                        <el-input v-model="listQuery.phone" class="input-width" placeholder="请输入充电站名称"
+                        <el-input v-model="listQuery.stationName" class="input-width" placeholder="请输入充电站名称"
                             clearable></el-input>
                     </el-form-item>
                 </el-form>
@@ -52,19 +52,19 @@
                                 <template slot="label">
                                     可设置电站总数
                                 </template>
-                                16
+                                {{ noSetCount - haveSetCount || '0' }}
                             </el-descriptions-item>
                             <el-descriptions-item>
                                 <template slot="label">
                                     已设置
                                 </template>
-                                5
+                                {{ haveSetCount || '0' }}
                             </el-descriptions-item>
                             <el-descriptions-item>
                                 <template slot="label">
                                     未设置
                                 </template>
-                                11
+                                {{ noSetCount || '0' }}
                             </el-descriptions-item>
                         </el-descriptions>
                     </div>
@@ -77,34 +77,56 @@
         <div class="table-container">
             <el-table ref="adminTable" :data="list" style="width: 100%" v-loading="listLoading" border>
                 <el-table-column label="充电站ID" width="100" align="center">
-                    <template slot-scope="scope">{{ scope.row.nickName || '--' }}</template>
+                    <template slot-scope="scope">{{ scope.row.id || '--' }}</template>
                 </el-table-column>
                 <el-table-column label="充电站名称" align="center">
-                    <template slot-scope="scope">{{ scope.row.phone || '--' }}</template>
+                    <template slot-scope="scope">{{ scope.row.name || '--' }}</template>
                 </el-table-column>
                 <el-table-column label="所在城市" align="center" prop="updateBy">
+                    <template slot-scope="scope">{{ '贵阳市' }}</template>
+                </el-table-column>
+                <el-table-column label="设备所属方" align="center" prop="equipmentOwnerName"></el-table-column>
+                <el-table-column label="详细地址" align="center" prop="addr"></el-table-column>
+                <el-table-column label="场所类型" align="center">
+                    <!-- 站点类型（1公共，50个人，100公交专用，101环卫专用，102物流专用，103出租车专用，255其他） -->
+                    <template slot-scope="scope">
+                        <el-tag v-if="scope.row.stationType == 1">公共</el-tag>
+                        <el-tag type="success" v-if="scope.row.stationType == 50">个人</el-tag>
+                        <el-tag type="info" v-if="scope.row.stationType == 100">公交专用</el-tag>
+                        <el-tag type="warning" v-if="scope.row.stationType == 101">环卫专用</el-tag>
+                        <el-tag type="danger" v-if="scope.row.stationType == 102">物流专用</el-tag>
+                        <el-tag effect="plain" type="success" v-if="scope.row.stationType == 103">出租车专用</el-tag>
+                        <el-tag effect="plain" type="warning" v-if="scope.row.stationType == 255">其他</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="充电终端数量" align="center" prop="equipmentnum"></el-table-column>
+                <el-table-column label="站点状态" align="center" prop="createTime">
                     <template slot-scope="scope">
-                        <el-tag v-if="scope.row.type == 1 || scope.row.type == null" type="info">普通用户</el-tag>
-                        <el-tag v-else-if="scope.row.type == 2" type="success">一级分销</el-tag>
-                        <el-tag v-else-if="scope.row.type == 3" type="warning">二级分销</el-tag>
+                        {{ scope.row.stationStatus | stationStatusFilter }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="服务电话" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.serviceTel||'--' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="更新时间" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.updateTime||'--' }}
                     </template>
                 </el-table-column>
-                <el-table-column label="设备所属方" align="center" prop="createTime"></el-table-column>
-                <el-table-column label="详细地址" align="center" prop="createTime"></el-table-column>
-                <el-table-column label="场所类型" align="center" prop="createTime"></el-table-column>
-                <el-table-column label="充电终端数量" align="center" prop="createTime"></el-table-column>
-                <el-table-column label="站点状态" align="center" prop="createTime"></el-table-column>
-                <el-table-column label="服务电话" align="center" prop="createTime"></el-table-column>
-                <el-table-column label="更新时间" align="center" prop="createTime"></el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
-                        <el-button size="mini" v-if="isAdmin==0" type="warning" plain @click="get_settingType(scope.row)">
+                        <el-button size="mini" v-if="isAdmin == 0" type="success" plain
+                            @click="get_settingType(scope.row)">
                             设置分销佣金(平台)
                         </el-button>
-                        <el-button v-if="isAdmin==2" size="mini" type="warning" plain @click="settingsFirst(scope.row)">
+                        <el-button v-if="isAdmin == 2" size="mini" type="success" plain
+                            @click="settingsFirst(scope.row)">
                             设置分销佣金(一级)
                         </el-button>
-                        <el-button v-if="isAdmin==3" size="mini" type="warning" plain @click="settingsFirst(scope.row)  ">
+                        <el-button v-if="isAdmin == 3" size="mini" type="success" plain
+                            @click="settingsFirst(scope.row)">
                             查看分销佣金(二级)
                         </el-button>
                     </template>
@@ -120,29 +142,41 @@
     </div>
 </template>
 <script>
-import { userList, settingType } from "@/api/distribution";
+import { chargeList } from "@/api/distribution";
 const defaultListQuery = {
     pageNum: 1,
     pageSize: 10,
-    userId: null,
-    nickName: null,
-    phone: null,
+    adminUserId: null,
+    stationId: null,
+    stationName: null,
+    stationStatus: null,
 };
 export default {
     name: "setCommission",
     data() {
         return {
-            isAdmin:null,
+            noSetCount: null,
+            haveSetCount: null,
+            isAdmin: null,
             listQuery: Object.assign({}, defaultListQuery),
             list: null,
             listLoading: false,
             total: null,
             options: [{
-                value: 2,
-                label: '使用中'
+                value: 0,
+                label: '未知'
             }, {
-                value: 3,
-                label: '未使用'
+                value: 1,
+                label: '建设中'
+            },{
+                value: 5,
+                label: '关闭下线'
+            },{
+                value: 6,
+                label: '维护中'
+            },{
+                value: 50,
+                label: '正常使用'
             }],
         };
     },
@@ -150,25 +184,49 @@ export default {
 
     },
     created() {
-        this.isAdmin= localStorage.getItem("isAdmin");
+        this.isAdmin = localStorage.getItem("isAdmin");
+        this.listQuery.adminUserId = this.$route.query.adminUserId;
         this.getList();
     },
+    filters: {
+        stationStatusFilter(value) {
+            // 0未知，1建设中，5关闭下线，6维护中，50正常使用
+            switch (value) {
+                case 0:
+                    return "未知";
+                case 1:
+                    return "建设中";
+                case 5:
+                    return "关闭下线";
+                case 6:
+                    return "维护中";
+                case 50:
+                    return "正常使用";
+                default:
+                    return "未知";
+            }
+        }
+    },
     methods: {
         // 设置分销
-        get_settingType(idnex, row) {
+        get_settingType(row) {
             this.$router.push({
                 name: "settingsPrice",
-                // query: {
-                //     adminUserId: row.adminUserId,
-                // }
+                query: {
+                    adminUserId: this.listQuery.adminUserId,
+                    stationId: row.id,
+                    name: row.name,
+                }
             })
         },
-        settingsFirst(){
+        settingsFirst(row) {
             this.$router.push({
                 name: "firstSetPrice",
-                // query: {
-                //     adminUserId: row.adminUserId,
-                // }
+                query: {
+                    adminUserId: this.listQuery.adminUserId,
+                    stationId: row.id,
+                    name: row.name,
+                }
             })
         },
 
@@ -193,10 +251,12 @@ export default {
 
         getList() {
             this.listLoading = true;
-            userList(this.listQuery).then((response) => {
+            chargeList(this.listQuery).then((response) => {
                 this.listLoading = false;
-                this.list = response.data.list;
-                this.total = response.data.total;
+                this.list = response.data.page.records;
+                this.total = response.data.page.total;
+                this.noSetCount = response.data.noSetCount;
+                this.haveSetCount = response.data.haveSetCount;
             });
         },
     },

src/views/distribution/peopleManage/settingsPrice.vue

@@ -23,7 +23,7 @@
                         <el-descriptions class="margin-top" :column="3" size="medium" border>
                             <el-descriptions-item>
                                 <template slot="label"> 电站 </template>
-                                花果园立交南广场停车场
+                                {{ name }}
                             </el-descriptions-item>
                         </el-descriptions>
                     </div>
@@ -35,75 +35,91 @@
         </el-card>
         <div class="table-container">
             <el-table ref="adminTable" :data="dialogList" style="width: 100%" v-loading="dialogListLoading" border>
-                <el-table-column label="时间段" align="center"></el-table-column>
-                <el-table-column label="电费(元/度)" align="center" prop="name"></el-table-column>
-                <el-table-column label="结算服务费(元)" align="center"></el-table-column>
-                <el-table-column label="结算费合计(元)" align="center"></el-table-column>
-                <el-table-column label="运营服务费(元)" align="center"></el-table-column>
-                <el-table-column label="销售合计价(元)" align="center"></el-table-column>
-                <el-table-column label="一级代理价(元)" align="center"></el-table-column>
-                <el-table-column label="操作" width="350" align="center">
+                <el-table-column label="时间段" align="center" prop="time"></el-table-column>
+                <el-table-column label="电费(元/度)" align="center" prop="electrovalence"></el-table-column>
+                <el-table-column label="结算服务费(元)" align="center" prop="servicePrice"></el-table-column>
+                <el-table-column label="结算费合计(元)" align="center" prop="eprice"></el-table-column>
+                <el-table-column label="运营服务费(元)" align="center" prop="addServicePrice"></el-table-column>
+                <el-table-column label="销售合计价(元)" align="center" prop="platformPrice"></el-table-column>
+                <el-table-column label="一级代理价(元)" align="center" prop="">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="primary" plain
-                            @click="settingsPrice(scope.row)">设置代理价(元)</el-button>
+                            <el-input v-model="scope.row.firstLevelPrice" size="small" style="width: 80px;" @blur="saveEdit(scope.row)"></el-input>
                     </template>
                 </el-table-column>
             </el-table>
         </div>
-        <el-dialog title="代理价设置" :visible.sync="forbiddenDialogVisible" width="30%">
-            <el-form :model="forbiddenForm" label-width="120px">
-                <el-form-item label="一级代理价(元)">
-                    <el-input v-model="forbiddenForm.name" size="small" placeholder="请输入一级代理价"></el-input>
-                </el-form-item>
-            </el-form>
-
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="forbiddenDialogVisible = false" size="small">取 消</el-button>
-                <el-button type="primary" @click="confirmForbidden" size="small">确 定</el-button>
-            </span>
-        </el-dialog>
+        <el-divider></el-divider>
+        <el-card class="operate-container" shadow="hover">
+            <div style="text-align: center;">
+                <el-button type="primary" @click="confirmForbidden">提交</el-button>
+            </div>
+        </el-card>
     </div>
 </template>
 <script>
-import { userList, settingType } from "@/api/distribution";
+import { priceList, settingsPrice } from "@/api/distribution";
+import Big from 'big.js';
 const defaultListQuery = {
-    pageNum: 1,
-    pageSize: 10,
-    userId: null,
-    nickName: null,
-    phone: null,
+    adminUserId: null,
+    stationId: null,
 };
 export default {
     name: "settingsPrice",
     data() {
         return {
-            date: "",
+            isDisabled: true,
+            name: null,
             listQuery: Object.assign({}, defaultListQuery),
-            forbiddenForm:{},
+            forbiddenForm: {},
             dialogList: null,
             dialogListLoading: false,
             total: null,
-            forbiddenDialogVisible: false,
         };
     },
     watch: {},
     created() {
+        this.name = this.$route.query.name;
+        this.listQuery.adminUserId = this.$route.query.adminUserId;
+        this.listQuery.stationId = this.$route.query.stationId;
         this.getList();
     },
     methods: {
-        // 设置分销
-        settingsPrice(idnex, row) {
-            this.forbiddenDialogVisible = true;
+        priceEdit( row) {
+            row.isEdit = true;
+            console.log(row);
+        },
+        saveEdit(row) {
+            if(row.firstLevelPrice>=row.platformPrice){
+                row.firstLevelPrice=0
+                return this.$message.error('分销价格必须小于平台价格');
+            }
         },
-        confirmForbidden(){
-
+        confirmForbidden() {
+            const newArray=this.dialogList.map(item=>({
+                adminUserId:this.listQuery.adminUserId,
+                firstLevelPrice:item.firstLevelPrice,
+                id:item.id,
+                platformPrice:item.platformPrice,
+                secondLevelPrice:item.secondLevelPrice,
+                servicePrice:new Big(item.platformPrice).minus(new Big(item.firstLevelPrice)).toNumber(),
+                stationId:this.listQuery.stationId,
+                time:item.time
+            }))
+            settingsPrice(newArray).then((res) => {
+                if (res.code == 200) {
+                    this.$message.success('设置成功');
+                    this.getList();
+                }
+            })
         },
         getList() {
             this.dialogListLoading = true;
-            userList(this.dialogListQuery).then((response) => {
+            priceList(this.listQuery).then((response) => {
                 this.dialogListLoading = false;
-                this.dialogList = response.data.list;
-                this.dialogTotal = response.data.total;
+                this.dialogList = response.data;
+                this.dialogList.map(item => {
+                    item.isEdit=false
+                })
             });
         },
     },