askin пре 2 година
родитељ
комит
2ab176fa1f
50 измењених фајлова са 14 додато и 981 уклоњено
  1. 14 0
      sources/client/vrv-platform/.gitignore
  2. 0 0
      sources/client/vrv-platform/static/.gitkeep
  3. 0 29
      sources/client/vrv11/README.md
  4. BIN
      sources/client/vrv11/src/assets/login_bg.png
  5. BIN
      sources/client/vrv11/src/assets/logo_banner.jpg
  6. 0 214
      sources/client/vrv11/src/config/routes.js
  7. 0 404
      sources/client/vrv11/src/views/home/TaskDetail.vue
  8. 0 334
      sources/client/vrv11/src/views/home/TaskList.vue
  9. 0 0
      sources/server/vrv/vrv-core-api/src/main/resources/.gitignore
  10. 0 0
      sources/server/vrv/vrv-core-api/src/test/java/com/kuyuntech/vrv/coreapi/.gitignore
  11. 0 0
      sources/server/vrv/vrv-core-api/src/test/resources/.gitignore
  12. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/bean/core/.gitignore
  13. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/constant/core/.gitignore
  14. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/controller/core/.gitignore
  15. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/dao/core/.gitignore
  16. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/domain/core/.gitignore
  17. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/filter/core/.gitignore
  18. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/interceptor/core/.gitignore
  19. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/mapper/core/.gitignore
  20. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/repository/core/.gitignore
  21. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/service/core/.gitignore
  22. 0 0
      sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/util/core/.gitignore
  23. 0 0
      sources/server/vrv/vrv-core-restful/src/test/java/com/kuyuntech/vrv/corerestful/.gitignore
  24. 0 0
      sources/server/vrv/vrv-core-restful/src/test/resources/.gitignore
  25. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/bean/core/.gitignore
  26. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/constant/core/.gitignore
  27. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/controller/core/.gitignore
  28. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/.gitignore
  29. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/domain/core/.gitignore
  30. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/filter/core/.gitignore
  31. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/interceptor/core/.gitignore
  32. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/mapper/core/.gitignore
  33. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/repository/core/.gitignore
  34. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/.gitignore
  35. 0 0
      sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/util/core/.gitignore
  36. 0 0
      sources/server/vrv/vrv-core-service/src/test/java/com/kuyuntech/vrv/coreservice/.gitignore
  37. 0 0
      sources/server/vrv/vrv-core-service/src/test/resources/.gitignore
  38. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/bean/core/.gitignore
  39. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/constant/core/.gitignore
  40. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/.gitignore
  41. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/dao/core/.gitignore
  42. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/domain/core/.gitignore
  43. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/filter/core/.gitignore
  44. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/interceptor/core/.gitignore
  45. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/mapper/core/.gitignore
  46. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/repository/core/.gitignore
  47. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/service/core/.gitignore
  48. 0 0
      sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/util/core/.gitignore
  49. 0 0
      sources/server/vrv/vrv-platform/src/test/java/com/kuyuntech/vrv/platform/.gitignore
  50. 0 0
      sources/server/vrv/vrv-platform/src/test/resources/.gitignore

+ 14 - 0
sources/client/vrv-platform/.gitignore

@@ -0,0 +1,14 @@
+.DS_Store
+node_modules/
+/dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

+ 0 - 0
sources/client/vrv-platform/static/.gitkeep


+ 0 - 29
sources/client/vrv11/README.md

@@ -1,29 +0,0 @@
-# gov-scafe-platform
-
-## Project setup
-```
-yarn install
-```
-
-### Compiles and hot-reloads for development
-```
-yarn run serve
-```
-
-### Compiles and minifies for production
-```
-yarn run build
-```
-
-### Run your tests
-```
-yarn run test
-```
-
-### Lints and fixes files
-```
-yarn run lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).

BIN
sources/client/vrv11/src/assets/login_bg.png


BIN
sources/client/vrv11/src/assets/logo_banner.jpg


+ 0 - 214
sources/client/vrv11/src/config/routes.js

@@ -1,214 +0,0 @@
-import Index from 'fastboot-admin/src/views/common/Index.vue'
-
-export default [
-    {
-
-        path: '/epssys',
-        name: 'index',
-        meta: {tab: false},
-        component: Index,
-        // eslint-disable-next-line no-sparse-arrays
-        children: [
-            {
-                path: '/home',
-                name: 'home',
-                component: () => import(/* webpackChunkName: "views" */ '../views/home/Home'),
-            }, {
-                path: '/home/task-list',
-                name: 'task-list',
-                meta: {title: '楼栋派送任务', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/home/TaskList'),
-            } ,{
-                path: '/home/task-detail',
-                name: 'task-detail',
-                meta: {title: '楼栋派送任务详情', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/home/TaskDetail'),
-            },
-            {
-
-                path: '/building-manager/list',
-                name: 'building-manager-list',
-                meta: {title: '区域楼栋列表', tab: true,keepAlive:true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/building-manager/List'),
-            }, {
-
-                path: '/building-manager/add',
-                name: 'building-manager-add',
-                meta: {title: '区域楼栋新增', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/building-manager/Add'),
-            }, {
-
-                path: '/building-manager/edit',
-                name: 'building-manager-edit',
-                meta: {title: '区域楼栋编辑', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/building-manager/Edit'),
-            }, {
-                path: '/exception-template-manager/list',
-                name: 'exception-template-manager-list',
-                meta: {title: '异常原因模板列表', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/exception-template-manager/List'),
-            }, {
-
-                path: '/exception-template-manager/add',
-                name: 'exception-template-manager-add',
-                meta: {title: '异常原因模板新增', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/exception-template-manager/Add'),
-            }, {
-
-                path: '/exception-template-manager/edit',
-                name: 'exception-template-manager-edit',
-                meta: {title: '异常原因模板编辑', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/exception-template-manager/Edit'),
-            }, {
-                path: '/delivery-time-manager/list',
-                name: 'delivery-time-manager-list',
-                meta: {title: '配送时间段列表', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/delivery-time-manager/List'),
-            }, {
-
-                path: '/delivery-time-manager/add',
-                name: 'delivery-time-manager-add',
-                meta: {title: '配送时间段新增', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/delivery-time-manager/Add'),
-            }, {
-
-                path: '/delivery-time-manager/edit',
-                name: 'delivery-time-manager-edit',
-                meta: {title: '配送时间段编辑', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/delivery-time-manager/Edit'),
-            }, {
-                path: '/eps-employee-manager/list',
-                name: 'eps-employee-manager-list',
-                meta: {title: '员工列表', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/eps-employee-manager/List'),
-            }, {
-
-                path: '/eps-employee-manager/add',
-                name: 'eps-employee-manager-add',
-                meta: {title: '员工新增', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/eps-employee-manager/Add'),
-            }, {
-
-                path: '/eps-employee-manager/edit',
-                name: 'eps-employee-manager-edit',
-                meta: {title: '员工编辑', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/eps-employee-manager/Edit'),
-            }, {
-                path: '/coupon-manager/list',
-                name: 'coupon-manager-list',
-                meta: {title: '优惠卷列表', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/coupon-manager/List'),
-            }, {
-                path: '/coupon-manager/receive-list',
-                name: 'coupon-manager-receive-list',
-                meta: {title: '优惠劵领取记录', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/coupon-manager/ReceiveList'),
-            }, {
-
-                path: '/coupon-manager/add',
-                name: 'coupon-manager-add',
-                meta: {title: '优惠卷新增', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/coupon-manager/Add'),
-            }, {
-
-                path: '/coupon-manager/edit',
-                name: 'coupon-manager-edit',
-                meta: {title: '优惠卷编辑', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/coupon-manager/Edit'),
-            }, {
-                path: '/member-manager/list',
-                name: 'member-manager-list',
-                meta: {title: '会员列表', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/List'),
-            }, {
-
-                path: '/member-manager/receiving-list',
-                name: 'member-manager-receiving-list',
-                meta: {title: '会员寄件记录', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/ReceivingList'),
-            }, {
-
-                path: '/member-manager/refuse-list',
-                name: 'member-manager-refuse-list',
-                meta: {title: '会员预拒收记录', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/RefuseList'),
-            }, {
-
-                path: '/member-manager/receiving-detail',
-                name: 'member-manager-receiving-detail',
-                meta: {title: '会员寄件详情', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/ReceivingDetail'),
-            }, {
-
-                path: '/member-manager/delivery-list',
-                name: 'member-manager-delivery-list',
-                meta: {title: '会员收件记录', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/DeliveryList'),
-            }, {
-
-                path: '/member-manager/delivery-detail',
-                name: 'member-manager-delivery-detail',
-                meta: {title: '会员收件记录详情', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/DeliveryDetail'),
-            }, {
-
-                path: '/member-manager/detail',
-                name: 'member-manager-detail',
-                meta: {title: '会员详情', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/Detail'),
-            }, {
-
-                path: '/member-manager/delivery-verify',
-                name: 'member-manager-delivery-verify',
-                meta: {title: '会员快件核销', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/member-manager/DeliveryVerify'),
-            }
-            , {
-
-                path: '/receiving-record-manager/list',
-                name: 'receiving-record-manager-list',
-                meta: {title: '揽件列表', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/receiving-record-manager/List'),
-            }, {
-
-                path: '/receiving-record-manager/detail',
-                name: 'receiving-record-manager-detail',
-                meta: {title: '揽件详情', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/receiving-record-manager/Detail'),
-            }, {
-
-                path: '/receiving-record-manager/edit',
-                name: 'receiving-record-manager-edit',
-                meta: {title: '揽件编辑', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/receiving-record-manager/Edit'),
-            }
-            , {
-                path: '/delivery-record-manager/list',
-                name: 'delivery-record-manager-list',
-                meta: {title: '配送件列表', tab: true,keepAlive:true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/delivery-record-manager/List'),
-            },
-            , {
-
-                path: '/delivery-record-manager/verify',
-                name: 'delivery-record-manager-verify',
-                meta: {title: '配送件核销', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/delivery-record-manager/Verify'),
-            }, {
-
-                path: '/delivery-record-manager/detail',
-                name: 'delivery-record-manager-detail',
-                meta: {title: '配送件详情', tab: true},
-                component: () => import(/* webpackChunkName: "views" */ '../views/delivery-record-manager/Detail'),
-            }
-
-        ]
-    },
-    {
-
-        path: '/login',
-        name: 'login',
-        component: () => import(/* webpackChunkName: "views" */ '../views/Login'),
-    }
-]
-;

+ 0 - 404
sources/client/vrv11/src/views/home/TaskDetail.vue

@@ -1,404 +0,0 @@
-<template>
-    <fb-form-body>
-        <el-form :model="formData" ref="form" label-width="150px" class="fb-form">
-
-
-            <el-form-item label="快递单号:">
-                {{formData.trackingNumber}}
-            </el-form-item>
-            <el-form-item label="收件人:">
-                {{formData.addressee}}
-            </el-form-item>
-            <el-form-item label="手机号码:">
-                {{formData.addresseeMobileNumber}}
-            </el-form-item>
-            <el-form-item label="楼栋名称:">
-                {{formData.buildingName ? formData.buildingName : '-'}}
-            </el-form-item>
-            <el-form-item label="户号:">
-                {{formData.houseNumber ? formData.houseNumber : '-'}}
-            </el-form-item>
-            <el-form-item label="派送方式:">
-                {{formData.deliveryMethod ? getDeliveryMethodName(formData.deliveryMethod) : '-'}}
-            </el-form-item>
-            <el-form-item label="派送员:">
-                {{formData.deliveryman ? formData.deliveryman : '-'}}
-            </el-form-item>
-            <el-form-item label="派送员手机:">
-                {{formData.deliverymanMobileNumber ? formData.deliverymanMobileNumber : '-'}}
-            </el-form-item>
-            <el-form-item label="通知情况:">
-                {{formData.noticeState ? getNoticeStateName(formData.noticeState) : '-'}}
-            </el-form-item>
-            <el-form-item label="状态:">
-                {{formData.state ? getStateName(formData.state) : '-'}}
-            </el-form-item>
-            <el-form-item label="派件异常次数:">
-                {{formData.exceptionCount}}
-            </el-form-item>
-
-        </el-form>
-        <hr style="margin-bottom: 20px;">
-        <div>
-            <el-button type="primary" @click="showUpdateState=true">用户签收</el-button>
-            <el-button type="danger" @click="showAddException()">配送异常</el-button>
-            <el-button @click="showDeliveryTimes()">修改配送方式/时间</el-button>
-            <el-button @click="showHistory=true">查看配送历史</el-button>
-        </div>
-
-        <el-dialog
-                title="配送历史"
-                :visible.sync="showHistory"
-                width="30%">
-            <div style="margin-bottom: 20px;" v-bind:key="index" v-for="(item,index) in formData.deliveryHistory">
-                <span>{{item.time}}</span>
-                <span style="margin-left: 40px;">{{item.desc}}</span>
-            </div>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="showHistory = false">取 消</el-button>
-            <el-button type="primary" @click="showHistory = false">确 定</el-button>
-          </span>
-        </el-dialog>
-
-        <el-dialog
-                title="用户签收"
-                :visible.sync="showUpdateState"
-                width="30%">
-            <el-form :inline="true">
-                <el-row>
-                    <el-form-item label="签收结果">
-                        <el-select v-model="updateStateForm.state" placeholder="请选择揽件方式">
-                            <el-option label="正常签收" value="SIGNED"></el-option>
-                            <el-option label="拒收" value="REFUSE"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-row>
-                <el-row>
-                    <el-form-item label="签收描述">
-                        <el-input
-                                style="width: 500px"
-                                type="textarea"
-                                :rows="3"
-                                placeholder="请输入内容"
-                                v-model="updateStateForm.remarks">
-                        </el-input>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="showUpdateState = false">取 消</el-button>
-            <el-button type="primary" @click="updateState">确 定</el-button>
-          </span>
-        </el-dialog>
-
-        <el-dialog
-                title="添加异常"
-                :visible.sync="showExceptionList"
-                width="30%">
-            <el-table
-                    highlight-current-row
-                    @current-change="handleCurrentChange"
-                    :data="exceptionList">
-                <el-table-column
-                        prop="number"
-                        label="原因码"
-                >
-                    <template scope="scope">
-                        {{scope.row.number ? scope.row.number :'(无)' }}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="description"
-                        label="文字描述"
-                >
-                    <template scope="scope">
-                        {{scope.row.description ? scope.row.description :'(无)' }}
-                    </template>
-                </el-table-column>
-
-            </el-table>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="showExceptionList = false">取 消</el-button>
-            <el-button type="primary" @click="addException">确 定</el-button>
-          </span>
-        </el-dialog>
-
-        <el-dialog
-                title="修改派送方式与时间"
-                :visible.sync="showUpdateDeliveryMethodTime"
-                width="30%">
-            <el-form :inline="true">
-                <el-row>
-                    <el-form-item label="派送方式">
-                        <el-select @change="showTime" v-model="updateDeliveryMethodTimeForm.deliveryMethod" placeholder="请选择揽件方式">
-                            <el-option label="送货上门" value="DELIVERY"></el-option>
-                            <el-option label="自取" value="SELF"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-row>
-                <el-row v-if="showDeliveryTime">
-                    <el-form-item label="派送时间">
-                        <el-select v-model="updateDeliveryMethodTimeForm.deliveryTimeCode" placeholder="请选择揽件时段">
-                            <el-option v-bind:key="time.code" v-for="time in deliveryTimes"
-                                       :label="$moment(time.startTime).format('HH:mm:ss') + ' - ' + $moment(time.endTime).format('HH:mm:ss')"
-                                       :value="time.code"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="showUpdateDeliveryMethodTime = false">取 消</el-button>
-            <el-button type="primary" @click="updateDeliveryMethodTime">确 定</el-button>
-          </span>
-        </el-dialog>
-
-    </fb-form-body>
-</template>
-
-<script>
-    export default {
-        name: "ExceptionTemplateEdit",
-        data() {
-            return {
-                api: {
-                    detail: this.$api.deliveryRecord.detail,
-                    updateState: this.$api.deliveryRecord.updateState,
-                    timeList: this.$api.deliveryTime.list,
-                    updateDeliveryMethodTime: this.$api.deliveryRecord.updateDeliveryMethodTime,
-                },
-                deliveryTimes: [],
-                exceptionList: [],
-                showExceptionList: false,
-                showUpdateDeliveryMethodTime: false,
-                showHistory: false,
-                showUpdateState: false,
-                updateDeliveryMethodTimeForm: {
-                    deliveryMethod: '',
-                    deliveryTimeCode: ''
-                },
-                formData: {},
-                updateStateForm: {},
-                states: [
-                    {
-                        name: "已签收",
-                        value: "SIGNED",
-                    }, {
-                        name: "派送中",
-                        value: "DELIVERING",
-                    }, {
-                        name: "待派送",
-                        value: "WAIT",
-                    }, {
-                        name: "待取货",
-                        value: "WAIT_SIGNED",
-                    }, {
-                        name: "异常",
-                        value: "EXCEPTION",
-                    }, {
-                        name: "拒收",
-                        value: "REFUSE",
-                    }
-                ],
-                verifyStates: [
-                    {
-                        name: "已核销",
-                        value: "VERIFIED",
-                    },
-                    {
-                        name: "未核销",
-                        value: "NOT_VERIFIED",
-                    }, {
-                        name: "未签收",
-                        value: "NOT_SIGNED",
-                    },
-                ], deliveryMethods: [
-                    {
-                        name: "送货上门",
-                        value: "DELIVERY",
-                    },
-                    {
-                        name: "自取",
-                        value: "SELF",
-                    }
-                ]
-                , noticeStates: [
-                    {
-                        name: "已发送",
-                        value: "SUCCESS",
-                    },
-                    {
-                        name: "未发送",
-                        value: "NOT_SENT",
-                    }
-                    ,
-                    {
-                        name: "发送失败",
-                        value: "FAIL",
-                    }
-                ],
-                showDeliveryTime: false,
-                currentExceptionCode: ''
-
-            }
-
-        },
-        methods: {
-            updateDeliveryMethodTime() {
-                let vm = this;
-                vm.showUpdateDeliveryMethodTime = true;
-                this.$http.post(this.api.updateDeliveryMethodTime, vm.$qs.stringify({
-                    code: vm.formData.code,
-                    deliveryMethod: vm.updateDeliveryMethodTimeForm.deliveryMethod,
-                    deliveryTimeCode: vm.updateDeliveryMethodTimeForm.deliveryTimeCode,
-                })).then((resp) => {
-                    vm.showUpdateDeliveryMethodTime = false;
-                    if (resp.data.status === 200) {
-                        vm.$message({
-                            type: 'success',
-                            message: resp.data.desc
-                        });
-                    } else {
-                        vm.$message({
-                            type: 'error',
-                            message: resp.data.desc
-                        });
-                    }
-                    vm.loadDetail();
-                })
-            },
-            showTime() {
-                let vm = this;
-                if (vm.updateDeliveryMethodTimeForm.deliveryMethod === 'DELIVERY') {
-                    vm.showDeliveryTime = true;
-                    vm.showDeliveryTimes();
-                } else {
-                    vm.showDeliveryTime = false;
-                }
-            },
-            showDeliveryTimes() {
-                let vm = this;
-                vm.showUpdateDeliveryMethodTime = true;
-                this.$http.post(this.api.timeList, vm.$qs.stringify({onPage: false})).then((resp) => {
-                    vm.deliveryTimes = resp.data.data.deliveryTimes;
-                })
-            },
-            addException() {
-                let vm = this
-                this.$http.post(vm.$api.deliveryRecord.addDeliveryException, vm.$qs.stringify({
-                    code: vm.formData.code,
-                    exceptionTemplateCode: vm.currentExceptionCode,
-                })).then(function (resp) {
-                    vm.exceptionList = resp.data.data.exceptionTemplates;
-                    if (resp.data.status === 200) {
-                        vm.$message({
-                            type: 'success',
-                            message: resp.data.desc
-                        });
-                    } else {
-                        vm.$message({
-                            type: 'error',
-                            message: resp.data.desc
-                        });
-                    }
-                    vm.loadDetail();
-                });
-                vm.showExceptionList = false;
-            },
-            handleCurrentChange(val) {
-                let vm = this;
-                if (val && val.code) {
-                    vm.currentExceptionCode = val.code
-                }
-
-            },
-            showAddException() {
-                let vm = this;
-                vm.showExceptionList = true;
-                vm.currentExceptionCode = ''
-                vm.loadExceptionList();
-            },
-            loadExceptionList() {
-                let vm = this;
-                this.$http.post(vm.$api.exceptionTemplate.list, vm.$qs.stringify({
-                    onPage: false
-                })).then(function (resp) {
-                    vm.exceptionList = resp.data.data.exceptionTemplates;
-                });
-            },
-            updateState() {
-                let vm = this;
-                this.$http.post(this.api.updateState, vm.$qs.stringify({
-                    code: vm.formData.code,
-                    state: vm.updateStateForm.state,
-                    remarks: vm.updateStateForm.remarks
-                })).then(function (resp) {
-                    vm.showUpdateState = false
-
-                    if (resp.data.status === 200) {
-                        vm.$message({
-                            type: 'success',
-                            message: resp.data.desc
-                        });
-                    } else {
-                        vm.$message({
-                            type: 'error',
-                            message: resp.data.desc
-                        });
-                    }
-
-                    vm.loadDetail();
-
-                });
-            },
-            getNoticeStateName(value) {
-                for (let i = 0; i < this.noticeStates.length; i++) {
-                    if (this.noticeStates[i].value === value) {
-                        return this.noticeStates[i].name
-                    }
-                }
-            },
-            getDeliveryMethodName(value) {
-                for (let i = 0; i < this.deliveryMethods.length; i++) {
-                    if (this.deliveryMethods[i].value === value) {
-                        return this.deliveryMethods[i].name
-                    }
-                }
-            },
-            getStateName(value) {
-                for (let i = 0; i < this.states.length; i++) {
-                    if (this.states[i].value === value) {
-                        return this.states[i].name
-                    }
-                }
-            },
-            getVerifyStateName(value) {
-                for (let i = 0; i < this.verifyStates.length; i++) {
-                    if (this.verifyStates[i].value === value) {
-                        return this.verifyStates[i].name
-                    }
-                }
-            },
-            loadDetail() {
-                let vm = this;
-                this.$http.post(this.api.detail, this.$qs.stringify(this.$route.query)).then(function (resp) {
-                    // 赋值
-                    vm.formData = resp.data.data.deliveryRecord
-                    vm.updateDeliveryMethodTimeForm.deliveryMethod = vm.formData.deliveryMethod;
-                    vm.updateDeliveryMethodTimeForm.deliveryTimeCode = vm.formData.deliveryTimeCode;
-                });
-            }
-        },
-
-        created() {
-            let vm = this;
-            vm.loadDetail();
-        },
-    }
-</script>
-
-<style lang="scss" scoped>
-    .fb-form {
-        max-width: 500px;
-    }
-
-</style>

+ 0 - 334
sources/client/vrv11/src/views/home/TaskList.vue

@@ -1,334 +0,0 @@
-<template>
-    <fb-list-body :pager="pager"
-                  @handlePagerSizeChange="handlePagerSizeChange"
-                  @handlePagerIndexChange="handlePagerIndexChange"
-    >
-
-        <template slot="btn-group">
-            <el-button icon="el-icon-search" @click.stop="handleSearch">查询</el-button>
-        </template>
-
-        <template slot="search-form">
-
-            <el-form-item class="search-form-item" label="频次">
-                <el-select v-model="searchForm.deliveryTimeType" placeholder="请选择频次">
-                    <el-option label="全部" value=""></el-option>
-                    <el-option label="上午" value="MORNING"></el-option>
-                    <el-option label="下午" value="AFTERNOON"></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item class="search-form-item" label="户号">
-                <el-input v-model="searchForm.houseNumber" placeholder="请输入户号"></el-input>
-            </el-form-item>
-
-            <el-form-item class="search-form-item" label="收件人">
-                <el-input v-model="searchForm.addressee" placeholder="请输入姓名"></el-input>
-            </el-form-item>
-
-            <el-form-item class="search-form-item" label="手机号码">
-                <el-input v-model="searchForm.addresseeMobileNumber" placeholder="请输入手机号码"></el-input>
-            </el-form-item>
-
-        </template>
-
-        <template slot="table">
-
-
-            <el-table :data="tableData" @selection-change="handleSelectionChange" @row-dblclick="handleEdit">
-
-                <el-table-column
-                        label="派送楼栋"
-                >
-                    <template scope="scope">
-                        {{scope.row.buildingName ? scope.row.buildingName :'-' }}
-                    </template>
-                </el-table-column>
-
-                <el-table-column
-                        label="户号"
-                >
-                    <template scope="scope">
-                        {{scope.row.houseNumber ? scope.row.houseNumber :'-' }}
-                    </template>
-                </el-table-column>
-
-                <el-table-column
-                        label="收件人">
-                    <template scope="scope">
-                        {{scope.row.addressee ? scope.row.addressee :'-' }}
-                    </template>
-                </el-table-column>
-
-                <el-table-column
-                        label="收件人手机号"
-                >
-                    <template scope="scope">
-                        {{scope.row.addresseeMobileNumber ? scope.row.addresseeMobileNumber :'-' }}
-                    </template>
-                </el-table-column>
-
-
-                <el-table-column
-                        label="快递单号"
-                >
-                    <template scope="scope">
-                        {{scope.row.trackingNumber ? scope.row.trackingNumber :'-' }}
-                    </template>
-                </el-table-column>
-
-                <el-table-column
-                        label="派送时间段"
-                >
-                    <template scope="scope">
-                        {{scope.row.type ? getTypeName(scope.row.type) :'' }}
-                        {{' '}}
-                        {{scope.row.deliveryStartTime | dateFormat("hh:mm:ss")}}
-                        {{' - '}}
-                        {{scope.row.deliveryEndTime | dateFormat("hh:mm:ss")}}
-                    </template>
-                </el-table-column>
-
-
-                <el-table-column
-                        label="状态"
-                >
-                    <template scope="scope">
-                        {{scope.row.state ? getStateName(scope.row.state) :'-' }}
-                    </template>
-                </el-table-column>
-
-
-                <el-table-column
-                        fixed="right"
-                        label="操作">
-                    <template slot-scope="scope">
-                        <el-link style="margin-left: 10px;" type="primary" @click="handleDetail(scope.row)" :underline="false">详情</el-link>
-                    </template>
-                </el-table-column>
-
-            </el-table>
-        </template>
-
-
-    </fb-list-body>
-</template>
-
-<script>
-
-    export default {
-        name: "ExceptionTemplateList",
-        components: {},
-        props:{
-          timestamp:{type:Number,default:function () {
-                  return new Date().getTime()
-              }},
-        },
-        data() {
-            return {
-                api:{
-                    list:this.$api.deliveryRecord.list,
-                },
-                deliveryTimes: [],
-                businesses: [],
-                searchForm: {
-                    addressee: '',
-                    buildingCode: '',
-                    addresseeMobileNumber: '',
-                    houseNumber: '',
-                    deliveryTimeType:''
-                },
-                types: [
-                    {
-                        name: "上午",
-                        key: "MORNING"
-                    },
-                    {
-                        name: "下午",
-                        key: "AFTERNOON"
-                    }
-                ],
-                states: [
-                    {
-                        name: "已签收",
-                        value: "SIGNED",
-                    },{
-                        name: "派送中",
-                        value: "DELIVERING",
-                    },{
-                        name: "待派送",
-                        value: "WAIT",
-                    },{
-                        name: "待取货",
-                        value: "WAIT_SIGNED",
-                    },{
-                        name: "异常",
-                        value: "EXCEPTION",
-                    },{
-                        name: "拒收",
-                        value: "REFUSE",
-                    }
-                ],
-
-                tableData:[],
-                tree:[],
-                selection:[],
-                pager: {
-                    pageSize: 10
-                    , pageIndex: 1,
-                    itemCount: 0
-                }
-            }
-        },
-        computed: {
-            searchParams() {
-                return Object.assign({}, this.$route.query,this.searchForm,this.pager);
-            }
-        },
-        watch:{
-            timestamp(){
-              this.handleSearch();
-            },
-            "pager.pageIndex":{
-                handler() {
-                    this.$router.updateQuery({path: this.$route.path, query: this.searchParams});
-                    this.handleSearch();
-
-                },
-                deep:true,
-                immediate:true
-            },
-            "pager.pageSize":{
-                handler() {
-
-                    this.$router.updateQuery({path: this.$route.path, query: this.searchParams});
-                    this.handleSearch();
-
-                },
-                deep:true
-            }
-
-        },
-        methods: {
-            getTypeName(key) {
-                for (let i = 0; i < this.types.length; i++) {
-                    if (this.types[i].key === key) {
-                        return this.types[i].name;
-                    }
-                }
-            },
-
-
-            getStateName(value) {
-                for (let i = 0; i < this.states.length; i++) {
-                    if (this.states[i].value === value) {
-                        return this.states[i].name
-                    }
-                }
-            },
-            handleEdit(e) {
-
-                if(e && e.code){
-                    this.$router.push({path:'edit',query:{code:e.code}});
-                    return;
-                }
-
-                if(!this.selection.length){
-                    this.$message({type:'warning',message:'未选择记录'});
-                    return ;
-                }
-
-                if(this.selection.length > 1){
-                    this.$message({type:'warning',message:'一次只能编辑一条数据'});
-                    return ;
-                }
-
-                this.$router.push({path:'edit',query:{code:this.selection[0].code}});
-            },
-            handleDetail(e) {
-                if(e && e.code){
-                    this.$router.push({path:'task-detail',query:{code:e.code}});
-                    return;
-                }
-
-                this.$router.push({path:'task-detail',query:{code:this.selection[0].code}});
-            },
-            handleDelete(row){
-
-
-                let vm = this;
-
-                vm.$confirm('您现在正在进行删除操作, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-
-                    vm.$http.post(vm.api.delete,vm.$qs.stringify({code:row.code})).then((resp)=>{
-                        if(resp.data.status === 200){
-                            vm.$message({type:'success',message:resp.data.desc});
-                            vm.handleSearch();
-                        }else{
-                            vm.$message({type:'error',message:resp.data.desc});
-
-                        }
-                    })
-
-
-
-                }).catch(() => {
-                    // this.$message({
-                    //     type: 'info',
-                    //     message: '已取消删除'
-                    // });
-                });
-
-            },
-            handleSelectionChange(selection){
-                console.log(selection);
-                this.selection = selection;
-            },
-            handlePagerSizeChange(e){
-                this.pager.pageSize = e;
-            },
-            handlePagerIndexChange(e){
-                this.pager.pageIndex = e;
-            },
-            handleSearch() {
-                let vm = this;
-                let buildingCode = this.$route.query['buildingCode'];
-                this.$http.post(this.api.list,this.$qs.stringify({
-                    addressee: vm.searchForm.addressee,
-                    houseNumber: vm.searchForm.houseNumber,
-                    addresseeMobileNumber: vm.searchForm.addresseeMobileNumber,
-                    buildingCode: buildingCode,
-                    pageIndex: vm.pager.pageIndex,
-                    pageSize: vm.pager.pageSize,
-                    deliveryTimeType: vm.searchForm.deliveryTimeType
-                })).then((resp)=>{
-                    console.log(resp.data.data.deliveryRecords)
-                    vm.tableData = resp.data.data.deliveryRecords;
-
-                    //处理分页
-                    vm.pager.pageIndex = resp.data.data.pager.pageIndex;
-                    vm.pager.pageSize = resp.data.data.pager.pageSize;
-                    vm.pager.itemCount = resp.data.data.pager.itemCount;
-
-                })
-            }
-        },
-        created() {
-            let vm = this;
-            for (let key in this.searchForm){
-                 if(this.$route.query[key]){
-                     this.searchForm[key]= this.$route.query[key];
-                 }
-            }
-
-        }
-    }
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 0
sources/server/vrv/vrv-core-api/src/main/resources/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-api/src/test/java/com/kuyuntech/vrv/coreapi/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-api/src/test/resources/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/bean/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/constant/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/controller/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/dao/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/domain/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/filter/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/interceptor/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/mapper/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/repository/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/service/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/util/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/test/java/com/kuyuntech/vrv/corerestful/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-restful/src/test/resources/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/bean/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/constant/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/controller/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/domain/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/filter/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/interceptor/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/mapper/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/repository/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/util/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/test/java/com/kuyuntech/vrv/coreservice/.gitignore


+ 0 - 0
sources/server/vrv/vrv-core-service/src/test/resources/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/bean/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/constant/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/dao/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/domain/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/filter/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/interceptor/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/mapper/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/repository/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/service/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/util/core/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/test/java/com/kuyuntech/vrv/platform/.gitignore


+ 0 - 0
sources/server/vrv/vrv-platform/src/test/resources/.gitignore