增加双属地管理

.eslintrc.js

+module.exports = {
+  root: true,
+  'extends': [
+    'plugin:vue/essential',
+    '@vue/standard'
+  ],
+  rules: {
+    // allow async-await
+    'generator-star-spacing': 'off',
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'vue/no-parsing-error': [2, {
+      'x-invalid-end-tag': false
+    }],
+    'no-undef': 'off',
+    'camelcase': 'off'
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  }
+}

src/api/key-person.js

@@ -275,3 +275,108 @@ export const getRatingStatistics = (param) => {
     data: param
   })
 }
+
+// ===== 双属地管理 =====
+export const getDualPushList = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/selectPushList',
+    method: 'post',
+    data: param
+  })
+}
+
+export const getDualForwardList = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/selectForwardList',
+    method: 'post',
+    data: param
+  })
+}
+
+export const getDualPendingList = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/selectPendingList',
+    method: 'post',
+    data: param
+  })
+}
+
+export const getDualReceivingList = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/selectReceivingList',
+    method: 'post',
+    data: param
+  })
+}
+
+export const getDualReceivedList = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/selectBeReceivedList',
+    method: 'post',
+    data: param
+  })
+}
+
+export const getDualPersonOptions = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/selectBelongPersonList',
+    method: 'post',
+    data: param
+  })
+}
+
+export const saveDualPush = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/savePush',
+    method: 'post',
+    data: param
+  })
+}
+
+export const selectCurrentUserInfo = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/selectCurrentUserInfo',
+    method: 'post',
+    data: param
+  })
+}
+
+export const revokeDualPush = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/revokePush',
+    method: 'post',
+    data: param
+  })
+}
+
+export const acceptDualPush = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/acceptPush',
+    method: 'post',
+    data: param
+  })
+}
+
+export const rejectDualPush = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/rejectPush',
+    method: 'post',
+    data: param
+  })
+}
+
+export const returnDualPerson = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/returnPerson',
+    method: 'post',
+    data: param
+  })
+}
+
+export const getDualDetail = (param) => {
+  return axios.request({
+    url: '/api/ac/jilinsscgsdp/keyPersonRatingDual/getDualDetail',
+    method: 'post',
+    data: param
+  })
+}

src/router/group/key-person.js

@@ -8,6 +8,38 @@ export default [
     component: () => import('@/view/key-person/key-person-rating/index')
   },
   {
+    path: '/keyPerson/keyPersonDual',
+    name: 'keyPersonDual',
+    meta: {
+      title: '人员双属地管理'
+    },
+    component: () => import('@/view/key-person/key-person-dual/index')
+  },
+  {
+    path: '/keyPerson/keyPersonDualRucs',
+    name: 'keyPersonDualRucs',
+    meta: {
+      title: '人员双属地管理-刑满释放人员'
+    },
+    component: () => import('@/view/key-person/key-person-dual/index-rucs')
+  },
+  {
+    path: '/keyPerson/keyPersonDualPsmd',
+    name: 'keyPersonDualPsmd',
+    meta: {
+      title: '人员双属地管理-严重精神障碍患者'
+    },
+    component: () => import('@/view/key-person/key-person-dual/index-psmd')
+  },
+  {
+    path: '/keyPerson/keyPersonDualKm',
+    name: 'keyPersonDualKm',
+    meta: {
+      title: '人员双属地管理-重点未成年人'
+    },
+    component: () => import('@/view/key-person/key-person-dual/index-km')
+  },
+  {
     path: '/keyPerson/keyPersonRatingDay',
     name: 'keyPersonRatingDay',
     meta: {

src/view/contradiction/allHomePage.vue

@@ -216,10 +216,9 @@ export default {
     try {
       const info = this.$store.state.user.otherUserInfo || {}
       console.log(info, 'info')
-      const parentIds = info.parent_ids || ''
-      const companyId = info.company_id || ''
       const areaId = info.area_id || ''
-      if ((typeof parentIds === 'string' && parentIds.indexOf('220100000000') !== -1) || companyId === '220100000000' || areaId === '220100000000') {
+
+      if (areaId.startsWith('2201')) {
         this.isChangchun = true
       }
     } catch (e) {

src/view/contradiction/dataSourcesStatisticalTable.vue

@@ -66,7 +66,7 @@ export default {
       ],
       optionsDisabled: {
         disabledDate (date) {
-          return date && date.valueOf() > Date.now() || date && date.valueOf() < Date.now() - 31536000000
+          return (date && date.valueOf() > Date.now()) || (date && date.valueOf() < Date.now() - 31536000000)
         }
       },
       loading: false
@@ -90,7 +90,7 @@ export default {
   methods: {
     checkDate () {
       this.params.areaId = this.formInline.areaList.length === 0 ? this.company_id : this.formInline.areaList[this.formInline.areaList.length - 1]
-      this.params.createStartTime = this.formInline.date && this.formInline.date.length > 0 && this.formInline.date[0] ? formatDate(this.formInline.date[0], 'YYYY-MM-DD') : '',
+      this.params.createStartTime = this.formInline.date && this.formInline.date.length > 0 && this.formInline.date[0] ? formatDate(this.formInline.date[0], 'YYYY-MM-DD') : ''
       this.params.createEndTime = this.formInline.date && this.formInline.date.length > 0 && this.formInline.date[1] ? formatDate(this.formInline.date[1], 'YYYY-MM-DD') : ''
     },
     getTotalNum () {

src/view/contradiction/roleManager.vue

@@ -107,7 +107,7 @@ export default {
         { title: '用户备注', key: 'remarks', align: 'center' },
         { title: '操作', slot: 'action', align: 'center', width: '260' }
       ],
-      searchInfo:{},
+      searchInfo: {},
       dataList: [],
       dictList: [],
       form: {},

src/view/key-person/key-person-dual/index-km.vue

+<template>
+  <DualIndex category="6" />
+</template>
+
+<script>
+import DualIndex from './index.vue'
+
+export default {
+  name: 'key-person-dual-km',
+  components: { DualIndex }
+}
+</script>

src/view/key-person/key-person-dual/index-psmd.vue

+<template>
+  <DualIndex category="3" />
+</template>
+
+<script>
+import DualIndex from './index.vue'
+
+export default {
+  name: 'key-person-dual-psmd',
+  components: { DualIndex }
+}
+</script>

src/view/key-person/key-person-dual/index-rucs.vue

+<template>
+  <DualIndex category="2" />
+</template>
+
+<script>
+import DualIndex from './index.vue'
+
+export default {
+  name: 'key-person-dual-rucs',
+  components: { DualIndex }
+}
+</script>