技术人员抵扣相关

src/api/modules/gisUser.js

@@ -0,0 +1,23 @@
+import request from '@/utils/request'
+import md5 from 'js-md5'
+/*
+* GIS用户
+*/
+export default {
+  list(params) {
+    return request.get(`gisUser`, { params: params })
+  },
+  simpleAll() {
+    return request.get(`gisUser/simpleAll`)
+  },
+  add(params) {
+    return request.post(`gisUser`, params)
+  },
+  edit(params) {
+    return request.put(`gisUser`, params)
+  },
+   delete(params) {
+     return request.delete(`gisUser/${params}`)
+   },
+  
+}

src/api/modules/gisVisited.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import md5 from 'js-md5'
+/*
+* GIS平台访问记录
+*/
+export default {
+  list(params) {
+    return request.get(`gisVisited`, { params: params })
+  },
+}

src/api/modules/itemBrokerageTechnicist.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+/*
+* 技术人员项目的抵扣记录
+*/
+export default {
+  list(params) {
+    return request.get(`itemBrokerageTechnicist`, { params: params })
+  },
+
+  onceList(params){
+    return request.get(`itemBrokerageTechnicist/once`, { params: params })
+  }
+}

src/api/modules/itemBrokerageTechnicistDeduction.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+/*
+* 技术人员提成抵扣记录
+*/
+export default {
+  list(params) {
+    return request.get(`itemBrokerageTechnicistDeduction`, { params: params })
+  },
+  stat() {
+    return request.get(`itemBrokerageTechnicistDeduction/stat`)
+  },
+}

src/router/urlMap.js

@@ -59,6 +59,9 @@ import _views_brokerage_settle_detail from '@/views/brokerage/sequenceDetail'
 import _views_brokerage_deduction from '@/views/brokerage/deduction'
 import _views_market_team from '@/views/market/team/list'
 import _views_item_transfer from '@/views/item/transfer'
+import _views_gis_user from '@/views/gis/user'
+import _views_gis_visited from '@/views/gis/visited'
+import _views_brokerage_tech_deduction from '@/views/brokerage/deductionTech'
 export default {
   _views_set_menu,
   _view_department,
@@ -105,5 +108,8 @@ export default {
   _views_brokerage_settle_detail,
   _views_brokerage_deduction,
   _views_market_team,
-  _views_item_transfer
+  _views_item_transfer,
+  _views_gis_user,
+  _views_gis_visited,
+  _views_brokerage_tech_deduction
 }

src/views/brokerage/deduction.vue

@@ -22,6 +22,8 @@
         >
           <el-option label="项目结算" value="ITEM_SETTLE"/>
           <el-option label="默认预提" value="DEFAULT_AHEAD"/>
+          <el-option label="转入个人奖金池" value="POOL_SETTLE"/>
+          <el-option label="一次性结算" value="ONCE_SETTLE"/>
         </el-select>
         <el-button
           class="filter-item"
@@ -198,6 +200,12 @@
         if (val === 'ITEM_SETTLE'){
           return '项目结算';
         }
+        if (val === 'POOL_SETTLE'){
+          return '转入个人奖金池';
+        }
+        if (val === 'ONCE_SETTLE'){
+          return '一次性结算';
+        }
       },
       getList() {
         const that = this;

src/views/brokerage/deductionTech.vue

@@ -0,0 +1,420 @@
+<template>
+    <div class="app-container">
+        <y-data-view-page-layout>
+            <y-data-view-module>
+                <div>
+                    <el-divider content-position="center">
+                        <y-d-v-over-view style="width: 220px" title="提成奖金池" :typeId="1"
+                            :data="[{ text: stat.poolResidueAmount, value: '元' }]"></y-d-v-over-view>
+                        <y-d-v-over-view style="width: 220px" title="每月默认预提" :typeId="5"
+                            :data="[{ text: stat.defaultBrokerageAmount === null ? 0.00 : stat.defaultBrokerageAmount, value: '元' }]"></y-d-v-over-view>
+                    </el-divider>
+                </div>
+            </y-data-view-module>
+        </y-data-view-page-layout>
+        <el-tabs v-model="activeName" type="border-card" style="margin-top: 30px;">
+            <el-tab-pane label="默认预提抵扣详情" name="first">
+                <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+                    <template slot="left">
+                        <el-select v-model="listQuery.year" placeholder="结算年份" clearable filterable
+                            style="margin-left: 20px;width: 100px;float: left;" class="filter-item">
+                            <el-option label="2022" value="2022" />
+                            <el-option label="2023" value="2023" />
+                            <el-option label="2024" value="2024" />
+                            <el-option label="2025" value="2025" />
+                            <el-option label="2026" value="2026" />
+                            <el-option label="2027" value="2027" />
+                            <el-option label="2028" value="2028" />
+                            <el-option label="2029" value="2029" />
+                            <el-option label="2030" value="2030" />
+                        </el-select>
+                        <el-select v-model="listQuery.month" placeholder="结算月份" clearable filterable
+                            style="margin-left: 20px;width: 100px;float: left;" class="filter-item">
+                            <el-option label="1" value="1" />
+                            <el-option label="2" value="2" />
+                            <el-option label="3" value="3" />
+                            <el-option label="4" value="4" />
+                            <el-option label="5" value="5" />
+                            <el-option label="6" value="6" />
+                            <el-option label="7" value="7" />
+                            <el-option label="8" value="8" />
+                            <el-option label="9" value="9" />
+                            <el-option label="10" value="10" />
+                            <el-option label="11" value="11" />
+                            <el-option label="12" value="12" />
+                        </el-select>
+                        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary"
+                            @click="getList" round>搜索
+                        </el-button>
+                        <el-button class="filter-item" style="float: left;" round type="warning" @click="resetSearch()">重置
+                        </el-button>
+                    </template>
+                    <parentTable v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
+                        <el-table-column type="expand">
+                            <template slot-scope="{row}">
+                                <parentTable style="font-size: 5px;color: #8c939d" v-loading="listLoading" inline
+                                    :data="row.deductionRecords" v-if="row.deductionRecords.length > 0">
+                                    <el-table-column align="center" width=285>
+                                        <el-tag style="margin-left: 100px;">抵扣项目</el-tag>
+                                    </el-table-column>
+                                    <el-table-column label="项目名称" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.itemName }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="转入年份" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.year }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="转入月份" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.month }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="转入金额" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.settleAmount }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="结算类型" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ settleCate(row.settleCate) }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="转入时间" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.created }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="已抵扣金额(元)" align="center">
+                                        <template slot-scope="{row}">
+                                            <el-tag type="success">{{ row.deductionAmount }}</el-tag>
+                                        </template>
+                                    </el-table-column>
+                                </parentTable>
+                                <parentTable style="font-size: 5px;color: #8c939d" v-loading="listLoading" inline
+                                    :data="row.deductionRecords" v-else>
+                                </parentTable>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="人员名称" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.userName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="结算年份" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.year }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="结算月份" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.month }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="结算类型" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ settleCate(row.cate) }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="已发金额(元)" align="center">
+                            <template slot-scope="{row}">
+                                <el-tag type="success">{{ row.brokerageAmount }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="结算时间" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.created }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="未抵扣金额" align="center">
+                            <template slot-scope="{row}">
+                                <el-tag type="error" style="color:red">{{ row.notDeductionAmount }}</el-tag>
+                            </template>
+                        </el-table-column>
+                    </parentTable>
+                </y-page-list-layout>
+            </el-tab-pane>
+            <el-tab-pane label="转入奖金池的项目提成抵扣详情">
+                <y-page-list-layout :page-list="pageData1" :page-para="listQuery1" :get-page-list="getItemDeductionList">
+                    <template slot="left">
+                        <el-input v-model="listQuery1.itemName" placeholder="项目名称" clearable
+                            style="margin-left: 20px;width: 320px;float: left;">
+                        </el-input>
+                        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary"
+                            @click="getItemDeductionList" round>搜索
+                        </el-button>
+                        <el-button class="filter-item" style="float: left;" round type="warning" @click="resetSearch1()">重置
+                        </el-button>
+                    </template>
+                    <parentTable v-loading="listLoading1" :data="pageData1.records" slot="table" style="width: 100%;">
+                        <el-table-column type="expand">
+                            <template slot-scope="{row}">
+                                <parentTable style="font-size: 5px;color: #8c939d" v-loading="listLoading1" inline
+                                    :data="row.defaultDeductions" v-if="row.defaultDeductions.length > 0">
+                                    <el-table-column align="center" width="285">
+                                        <template slot-scope="{row}">
+                                            <el-tag style="margin-left: 100px;">{{row.cate ==='DEFAULT_AHEAD'?'抵扣预提':'一次性结算'}}</el-tag>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="结算年份" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.year }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="结算月份" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.month }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="结算金额" align="center">
+                                        <template slot-scope="{row}">
+                                            <el-tag type="error">{{ row.brokerageAmount }}</el-tag>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="结算类型" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ settleCate(row.cate) }}</span>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="结算时间" align="center">
+                                        <template slot-scope="{row}">
+                                            <span>{{ row.created }}</span>
+                                        </template>
+                                    </el-table-column>
+                                </parentTable>
+                                <parentTable style="font-size: 5px;color: #8c939d" v-loading="listLoading1" inline
+                                    :data="row.deductionRecords" v-else>
+                                </parentTable>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="人员名称" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.userName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="项目名称" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.itemName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="转入奖金池金额" align="center">
+                            <template slot-scope="{row}">
+                                <el-tag>{{ row.brokerageAmount }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="项目剩余金额" align="center">
+                            <template slot-scope="{row}">
+                                <el-tag type="success">{{ row.residueAmount }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="项目剩余比重" align="center">
+                            <template slot-scope="{row}">
+                                <el-progress type="circle"
+                                    :percentage="Math.floor((row.residueAmount / row.brokerageAmount) * 100) / 100 * 100"
+                                    width=50 stroke-width=3 :color="colors"></el-progress>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="转入奖金池时间" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.created }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="备注" align="center">
+                            <template slot-scope="{row}">
+                                <el-tag type="success">{{ row.embody }}</el-tag>
+                            </template>
+                        </el-table-column>
+                    </parentTable>
+                </y-page-list-layout>
+            </el-tab-pane>
+            <el-tab-pane label="(全额回款）一次性发放项目">
+                <y-page-list-layout :page-list="pageData2" :page-para="listQuery2" :get-page-list="getOnceSettle">
+                    <template slot="left">
+                        <el-input v-model="listQuery2.itemName" placeholder="项目名称" clearable
+                            style="margin-left: 20px;width: 320px;float: left;">
+                        </el-input>
+                        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary"
+                            @click="getOnceSettle" round>搜索
+                        </el-button>
+                        <el-button class="filter-item" style="float: left;" round type="warning" @click="resetSearch2()">重置
+                        </el-button>
+                    </template>
+                    <parentTable v-loading="listLoading2" :data="pageData2.records" slot="table" style="width: 100%;">
+                        <el-table-column label="人员名称" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.userName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="项目名称" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.itemName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="已发放金额" align="center">
+                            <template slot-scope="{row}">
+                                <el-tag>{{ row.onceAmount }}</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="剩余金额" align="center">
+                            <el-tag type="success">0</el-tag>
+                        </el-table-column>
+                        <el-table-column label="发放时间" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.created }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="备注" align="center">
+                            <template slot-scope="{row}">
+                               <span>此项目提成金额已从奖金池一次性发放</span>
+                            </template>
+                        </el-table-column>
+                    </parentTable>
+                </y-page-list-layout>
+            </el-tab-pane>
+
+
+        </el-tabs>
+
+
+    </div>
+</template>
+
+<script>
+import YDVOverView from '@/components/YDataViewPageLayout/YDVOverView'
+import YDataViewModule from '@/components/YDataViewPageLayout/YDataViewModule'
+import YDataViewPageLayout from '@/components/YDataViewPageLayout'
+import YPageListLayout from '@/components/YPageListLayout'
+export default {
+    name: 'deductionTech',
+    components: {
+        YDVOverView,
+        YDataViewModule,
+        YDataViewPageLayout,
+        YPageListLayout,
+    },
+    data() {
+        return {
+            activeName: 'first',
+            listQuery: {
+                page: 1,
+                size: 10,
+                descs: 'id',
+            },
+            listQuery1: {
+                page: 1,
+                size: 10,
+                descs: 'id',
+                itemName: null
+            },
+            listQuery2: {
+                page: 1,
+                size: 10,
+                descs: 'id',
+                itemName: null
+            },
+            pageData: { records: [] },
+            pageData1: { records: [] },
+            pageData2: { records: [] },
+            total: 10,
+            listLoading: true,
+            listLoading1: true,
+            listLoading2: true,
+            colors: [
+                { color: '#f56c6c', percentage: 20 },
+                { color: '#e6a23c', percentage: 40 },
+                { color: '#5cb87a', percentage: 60 },
+                { color: '#1989fa', percentage: 80 },
+                { color: '#008B00', percentage: 100 }
+            ],
+            stat: {
+                poolResidueAmount: null,
+                defaultBrokerageAmount: null
+            }
+        }
+    },
+    created() {
+        this.getStat();
+        this.getList();
+        this.getItemDeductionList();
+        this.getOnceSettle();
+    },
+
+    methods: {
+        settleCate(val) {
+            if (val === 'DEFAULT_AHEAD') {
+                return '默认预提';
+            }
+            if (val === 'ONCE_SETTLE') {
+                return '一次性结算';
+            }
+            if (val === 'POOL_SETTLE') {
+                return '转入个人奖金池';
+            }
+        },
+        getList() {
+            const that = this;
+            this.listLoading = true;
+            this.$api.itemBrokerageTechnicistDeduction.list(Object.assign({}, that.listQuery)).then((res) => {
+                that.pageData = res.data;
+                setTimeout(() => {
+                    that.listLoading = false
+                }, 200)
+            })
+                .catch(() => {
+                    that.listLoading = false
+                })
+        },
+        getItemDeductionList() {
+            const that = this;
+            this.listLoading1 = true;
+            this.$api.itemBrokerageTechnicist.list(Object.assign({}, that.listQuery1)).then((res) => {
+                that.pageData1 = res.data;
+                setTimeout(() => {
+                    that.listLoading1 = false
+                }, 200)
+            })
+                .catch(() => {
+                    that.listLoading1 = false
+                })
+        },
+        resetSearch1() {
+            this.listQuery1 = {
+                page: 1,
+                size: 10,
+                descs: 'id',
+                itemName: null
+            },
+                this.getItemDeductionList();
+        },
+        resetSearch() {
+            this.listQuery = {
+                page: 1,
+                size: 10,
+                descs: 'id',
+            },
+                this.getList();
+        },
+        getStat() {
+            this.$api.itemBrokerageTechnicistDeduction.stat().then(res => {
+                this.stat = res.data;
+            })
+        },
+        getOnceSettle(){
+            const that = this;
+            this.listLoading2 = true;
+            this.$api.itemBrokerageTechnicist.onceList(Object.assign({}, that.listQuery2)).then((res) => {
+                that.pageData2 = res.data;
+                setTimeout(() => {
+                    that.listLoading2 = false
+                }, 200)
+            })
+                .catch(() => {
+                    that.listLoading2 = false
+                })
+        }
+    }
+}
+</script>
+        

src/views/brokerage/sequence.vue

@@ -310,7 +310,13 @@
         }
         if (val === 'ITEM_SETTLE'){
           return '项目结算';
+        } 
+        if (val === 'POOL_SETTLE') {
+          return '转入个人奖金池';
         }
+        if (val === 'ONCE_SETTLE') {
+                return '一次性结算';
+            }
       },
       getList() {
         const that = this;

src/views/gis/user.vue

@@ -0,0 +1,240 @@
+<template>
+    <div class="app-container">
+      <div class="title-container">
+        <breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
+      </div>
+  
+      <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+        <template slot="left">
+          <PermissionButton
+            menu-code="_views_gis_user_add"
+            class-name="filter-item"
+            type="primary"
+            name
+            size="mini"
+            round
+            style="float: left"
+          />
+          <el-input
+            v-model="listQuery.description"
+            placeholder="请输入内容"
+            clearable
+            style="margin-left: 20px;width: 320px;float: left;"
+          >
+            <el-select slot="prepend" v-model="listQueryKey" style="width: 90px;" placeholder="请选择">
+              <el-option label="全部" value="keyword"/>
+              <el-option label="用户名称" value="name"/>
+              <el-option label="账号" value="account"/>
+              <el-option label="市州" value="cityName"/>
+              <el-option label="区县" value="countryName"/>
+              <el-option label="联系人" value="linkman"/>
+            </el-select>
+          </el-input>
+          <el-button
+            class="filter-item"
+            style="margin-left: 10px;float: left;"
+            type="primary"
+            @click="searchList"
+            round
+          >搜索
+          </el-button>
+          <el-button
+            class="filter-item"
+            style="float: left;"
+            round
+            type="warning"
+            @click="resetSearch()"
+          >重置
+          </el-button>
+        </template>
+        <parentTable
+          v-loading="listLoading"
+          :data="pageData.records"
+          slot="table"
+          style="width: 100%;"
+        >
+          <el-table-column label="用户名称" align="center" width="300">
+            <template slot-scope="{row}">
+              <span>{{ row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="市州" align="center" width="150">
+            <template slot-scope="{row}">
+              <span>{{ row.cityName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="区县" align="center" width="150">
+            <template slot-scope="{row}">
+              <span>{{ row.countryName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="账号" align="center" width="100">
+            <template slot-scope="{row}">
+              <span>{{ row.account}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="联系人" align="center" width="100">
+            <template slot-scope="{row}">
+              <span>{{ row.linkman}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="联系电话" align="center" width="150">
+            <template slot-scope="{row}">
+              <span>{{ row.mobile}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="邮箱" align="center" width="150">
+            <template slot-scope="{row}">
+              <span>{{ row.email}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="账号有效期" align="center" width="100">
+            <template slot-scope="{row}">
+              <span>{{ row.expiryDate}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="激活状态" align="center" width="100">
+            <template slot-scope="{row}">
+              <span>{{ row.enable?'激活':'未激活'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" width="180">
+            <template slot-scope="{row}">
+              <span>{{ row.created}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="150" fixed="right">
+            <template slot-scope="{row}">
+              <PermissionButton
+                menu-code="_views_gis_user_edit"
+                class-name="filter-item"
+                name=""
+                type="primary"
+                round
+                size="mini"
+              />
+            </template>
+          </el-table-column>
+        </parentTable>
+      </y-page-list-layout>
+    </div>
+  </template>
+  <script>
+    import YPageListLayout from '@/components/YPageListLayout'
+    import Breadcrumb from '@/components/Breadcrumb'
+    import PermissionButton from '@/components/PermissionButton/PermissionButton'
+  
+    export default {
+      name: 'ViewsUserList',
+      components: {
+        Breadcrumb,
+        YPageListLayout,
+        PermissionButton,
+      },
+      filters: {
+        statusFilter(status) {
+          const statusMap = {
+            published: 'success',
+            draft: 'info',
+            deleted: 'danger',
+          }
+          return statusMap[status]
+        },
+      },
+      data() {
+        return {
+          pageData: { records: [] },
+          total: 10,
+          listLoading: true,
+          listQuery: {
+            page: 1,
+            size: 10,
+            descs: 'id',
+          },
+          listQueryKey: 'keyword',
+        }
+      },
+      created() {
+        const that = this;
+        if (that.$route.query.current && !isNaN(that.$route.query.current)) {
+          that.listQuery.current = parseInt(that.$route.query.current);
+        }
+        that.getList()
+      },
+      methods: {
+        resetSearch() {
+          this.$router.push({ query: {} });
+          this.listQuery = {
+            current: 1,
+            size: 10,
+            descs: 'id',
+          }
+          this.getList()
+        },
+        searchList() {
+          // 重置分页
+          this.listQuery.page = 1
+          this.listQuery.size = 10
+          this.getList()
+        },
+        getList() {
+          const that = this
+          this.listLoading = true
+          // console.log(that.listQuery)
+          const key = {}
+          key[this.listQueryKey] = this.listQuery.description
+          this.$api.gisUser
+            .list(Object.assign({}, that.listQuery, key))
+            .then((res) => {
+              that.pageData = res.data
+              setTimeout(() => {
+                that.listLoading = false
+              }, 200)
+            })
+            .catch(() => {
+              that.listLoading = false
+            })
+        },
+      },
+    }
+  </script>
+  <style lang="scss" scoped>
+    .right {
+      flex: 1;
+  
+      .title {
+        font-size: 16px;
+        font-weight: 500;
+        color: rgba(51, 51, 51, 1);
+        line-height: 35px;
+        margin-bottom: 8px;
+      }
+  
+      .menu-2-box {
+        display: flex;
+        flex-wrap: wrap;
+        width: 100%;
+      }
+  
+      .menu-2-item {
+        display: flex;
+        align-items: center;
+        color: #656565;
+        font-size: 12px;
+        width: 230px;
+        height: 101px;
+        background: rgb(255, 185, 129);
+        border-radius: 3px;
+        padding-left: 20px;
+        margin-right: 10px;
+        margin-bottom: 10px;
+        cursor: pointer;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+  
+        .text {
+          margin-left: 16px;
+        }
+      }
+    }
+  </style>
+  

src/views/gis/visited.vue

@@ -0,0 +1,168 @@
+<template>
+    <div class="app-container">
+      <div class="title-container">
+        <breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
+      </div>
+  
+      <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+        <template slot="left">
+          <el-input
+            v-model="listQuery.remoteAddr"
+            placeholder="远程地址"
+            clearable
+            style="margin-left: 20px;width: 320px;float: left;"
+          >
+          </el-input>
+          <el-button
+            class="filter-item"
+            style="margin-left: 10px;float: left;"
+            type="primary"
+            @click="searchList"
+            round
+          >搜索
+          </el-button>
+          <el-button
+            class="filter-item"
+            style="float: left;"
+            round
+            type="warning"
+            @click="resetSearch()"
+          >重置
+          </el-button>
+        </template>
+        <parentTable
+          v-loading="listLoading"
+          :data="pageData.records"
+          slot="table"
+          style="width: 100%;"
+        >
+          <el-table-column label="访问IP地址" align="center" >
+            <template slot-scope="{row}">
+              <span>{{ row.remoteIp }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="远程主机" align="center" >
+            <template slot-scope="{row}">
+              <span>{{ row.remoteHost }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="远程地址" align="center" >
+            <template slot-scope="{row}">
+              <span>{{ row.remoteAddr }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="访问时间" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.created}}</span>
+            </template>
+          </el-table-column>
+        </parentTable>
+      </y-page-list-layout>
+    </div>
+  </template>
+  <script>
+    import YPageListLayout from '@/components/YPageListLayout'
+    import Breadcrumb from '@/components/Breadcrumb'
+  
+    export default {
+      name: 'ViewsVisitedList',
+      components: {
+        Breadcrumb,
+        YPageListLayout,
+      },
+      data() {
+        return {
+          pageData: { records: [] },
+          total: 10,
+          listLoading: true,
+          listQuery: {
+            page: 1,
+            size: 50,
+            descs: 'id',
+          },
+        }
+      },
+      created() {
+        const that = this;
+        if (that.$route.query.current && !isNaN(that.$route.query.current)) {
+          that.listQuery.current = parseInt(that.$route.query.current);
+        }
+        that.getList()
+      },
+      methods: {
+        resetSearch() {
+          this.$router.push({ query: {} });
+          this.listQuery = {
+            current: 1,
+            size: 50,
+            descs: 'id',
+          }
+          this.getList()
+        },
+        searchList() {
+          // 重置分页
+          this.listQuery.page = 1
+          this.listQuery.size = 50
+          this.getList()
+        },
+        getList() {
+          const that = this
+          this.listLoading = true
+          // console.log(that.listQuery)
+          const key = {}
+          key[this.listQueryKey] = this.listQuery.description
+          this.$api.gisVisited
+            .list(Object.assign({}, that.listQuery, key))
+            .then((res) => {
+              that.pageData = res.data
+              setTimeout(() => {
+                that.listLoading = false
+              }, 200)
+            })
+            .catch(() => {
+              that.listLoading = false
+            })
+        },
+      },
+    }
+  </script>
+  <style lang="scss" scoped>
+    .right {
+      flex: 1;
+  
+      .title {
+        font-size: 16px;
+        font-weight: 500;
+        color: rgba(51, 51, 51, 1);
+        line-height: 35px;
+        margin-bottom: 8px;
+      }
+  
+      .menu-2-box {
+        display: flex;
+        flex-wrap: wrap;
+        width: 100%;
+      }
+  
+      .menu-2-item {
+        display: flex;
+        align-items: center;
+        color: #656565;
+        font-size: 12px;
+        width: 230px;
+        height: 101px;
+        background: rgb(255, 185, 129);
+        border-radius: 3px;
+        padding-left: 20px;
+        margin-right: 10px;
+        margin-bottom: 10px;
+        cursor: pointer;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+  
+        .text {
+          margin-left: 16px;
+        }
+      }
+    }
+  </style>
+  

src/views/item/list.vue

@@ -21,10 +21,13 @@
           style="margin-left: 20px;width: 320px;float: left;">
         </el-input>
         <el-input v-model="listQuery.businessNo" placeholder="流水号" clearable
-          style="margin-left: 20px;width: 320px;float: left;">
+          style="margin-left: 20px;width: 200px;float: left;">
         </el-input>
         <el-input v-model="listQuery.clientManager" placeholder="客户经理" clearable
-          style="margin-left: 20px;width: 320px;float: left;">
+          style="margin-left: 20px;width: 200px;float: left;">
+        </el-input>
+        <el-input v-model="listQuery.skiller" placeholder="项目负责人" clearable
+          style="margin-left: 20px;width: 200px;float: left;">
         </el-input>
         <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList" round>搜索
         </el-button>
@@ -90,6 +93,11 @@
             <span>{{ row.clientManager }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="项目负责人" align="center" width="100">
+          <template slot-scope="{row}">
+            <span>{{ row.skiller }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="状态" align="center" width="100">
           <template slot-scope="{row}">
             <el-tag>{{ row.itemStatus }}</el-tag>

src/views/item/plan.vue

@@ -33,12 +33,12 @@
                           placeholder=""
                           clearable
                           filterable
-                          class="filter-item"
+                          class="filter-item" :readonly="postForm.id" :disabled="postForm.id"
                         >
                           <el-option v-for="item in stages"
                                      :key="item.footerId"
                                      :label="item.name"
-                                     :value="item.footerId"/>
+                                     :value="item.footerId"  />
                         </el-select>
                       </el-form-item>
                     </el-col>
@@ -428,7 +428,8 @@
               }).catch(() => {
                 this.vLoading = false
               })
-            } else {
+            } 
+            else {
               this.$api.itemStage.edit(Object.assign({}, this.postForm, {
               })).then(res => {
                 if (res.code === 200) {
@@ -446,6 +447,9 @@
                 this.vLoading = false
               })
             }
+            //清空表单
+            this.clean();
+
           }
         })
       },

src/views/log/logIndex.vue

@@ -84,7 +84,6 @@
             this.legend.data = data.itemNames;
             this.xAxis = data.xasis;
             this.series = data.items;
-            console.log(this.series);
             this.initChart();
           }
         });

src/views/login/index.vue

@@ -6,8 +6,7 @@
     </div>
     <div class="login-form-box">
       <div class="title-container">
-        <h3 class="title">土地规划项目管理系统
-        </h3>
+        <h3 class="title">土地规划项目管理系统</h3>
       </div>
       <el-form
         v-show="showboj"
@@ -65,10 +64,9 @@
             </el-button>
           </div>
         </el-form-item>
-      </el-form>
-
-      <div v-show="!showboj" class="login-form" id="login_container" style="margin-top: -10%" />
+      </el-form>    
     </div>
+    <div class="tag">v2.0.0613</div>
   </div>
 </template>
 
@@ -346,6 +344,7 @@
       }
     }
   }
+
 </style>
 <style scoped>
   .login-form >>> .el-input input {
@@ -360,4 +359,15 @@
   .login-form >>> .el-input__icon {
     font-size: 18px;
   }
+  .tag {
+    width: 100%;
+    background-color: #6C74F7;
+    position: fixed;
+    bottom: 0;
+    height: 20px;
+    font-size: 10px;
+    vertical-align: middle;
+    padding-left: 5px;
+    color: #fff;
+}
 </style>

src/views/market/payment/list.vue

@@ -3,7 +3,7 @@
     <div class="title-container">
       <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" style="margin-top: 30px;">
+    <el-tabs v-model="activeName"  type="border-card" style="margin-top: 30px;">
       <el-tab-pane label="项目回款" name="first">
         <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
           <template slot="left">