Merge branch 'dev_data' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_data

src/views/modules/organize/deptofficer-add-or-update.vue

@@ -0,0 +1,150 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="姓名" prop="name">
+          <el-input v-model="dataForm.name" placeholder="姓名" maxlength="10"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="dataForm.sex" placeholder="性别">
+          <el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+          <el-form-item label="职位" prop="position">
+          <el-input v-model="dataForm.position" placeholder="职位" maxlength="10"></el-input>
+      </el-form-item>
+          <el-form-item label="联系方式" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系方式"></el-input>
+      </el-form-item>
+          <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
+      </el-form-item>
+          <el-form-item label="主显标识" prop="masterFlag">
+          <el-input v-model="dataForm.masterFlag" placeholder="主显标识" maxlength="10" disabled></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        deptId: '',
+        name: '',
+        sex: '',
+        position: '',
+        mobile: '',
+        sort: '',
+        masterFlag: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+      sexFlagArr: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        position: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: '请输入正确号码格式', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        masterFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/cloudAnalysis/deptofficer/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/deptofficer/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

src/views/modules/organize/deptofficer-add.vue

@@ -0,0 +1,153 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="姓名" prop="name">
+          <el-input v-model="dataForm.name" placeholder="姓名" maxlength="10"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="dataForm.sex" placeholder="性别">
+          <el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+          <el-form-item label="职位" prop="position">
+          <el-input v-model="dataForm.position" placeholder="职位" maxlength="10"></el-input>
+      </el-form-item>
+          <el-form-item label="联系方式" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系方式"></el-input>
+      </el-form-item>
+          <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
+      </el-form-item>
+          <el-form-item label="主显标识" prop="masterFlag">
+          <el-input v-model="dataForm.masterFlag" placeholder="主显标识" maxlength="10" disabled></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        deptId: '',
+        name: '',
+        sex: '',
+        position: '',
+        mobile: '',
+        sort: '',
+        masterFlag: '1',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+      sexFlagArr: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        position: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: '请输入正确号码格式', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        masterFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/cloudAnalysis/deptofficer/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/deptofficer/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

src/views/modules/organize/deptofficer.vue

@@ -0,0 +1,134 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__deptofficer}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <div>
+        <el-form-item>
+          <el-button type="primary" @click="backToDeptList">返回</el-button>
+        </el-form-item>
+        </div>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="dataForm.name" placeholder="姓名" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <!-- <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
+          <el-button type="primary" @click="deptofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:deptofficer:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
+        <el-table-column prop="position" label="职位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系方式" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="masterFlag" label="主显标识" header-align="center" align="center"></el-table-column> -->
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <deptofficer-add v-if="deptofficerAddVisible" ref="deptofficerAdd" @refreshDataList="getDataList"></deptofficer-add>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './deptofficer-add-or-update'
+import deptofficerAdd from './deptofficer-add'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/cloudAnalysis/deptofficer/page',
+        getDataListIsPage: true,
+        deleteURL: '/cloudAnalysis/deptofficer',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      deptofficerAddVisible: false,
+      pidList: []
+    }
+  },
+  mounted () {
+    this.pidList = JSON.parse(this.$route.query.pidList)
+    console.log(this.$route.query.deptId)
+    this.dataForm.deptId = this.$route.query.deptId
+    this.getDataList()
+  },
+  components: {
+    AddOrUpdate,
+    deptofficerAdd
+  },
+  methods: {
+    showFlagFormat (row, column) {
+      if (row.sex === '0') {
+        return '女'
+      } else {
+        return '男'
+      }
+    },
+    backToDeptList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Metasysdept'
+      this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList) } })
+    },
+    deptofficerAddHandle (deptId) {
+      this.deptofficerAddVisible = true
+      this.$nextTick(() => {
+        this.$refs.deptofficerAdd.dataForm.deptId = deptId
+        this.$refs.deptofficerAdd.init()
+      })
+    }
+  }
+}
+</script>

src/views/modules/organize/metaSysDeptManagement-add-or-update.vue

@@ -0,0 +1,211 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             label-width="120px">
+      <el-form-item prop="name"
+                    :label="$t('dept.name')">
+        <el-input v-model="dataForm.name"
+                  :placeholder="$t('dept.name')"></el-input>
+      </el-form-item>
+      <el-form-item prop="partyCode"
+                    :label="$t('dept.partyCode')">
+        <el-input v-model="dataForm.partyCode"
+                  :placeholder="$t('dept.partyCode')" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item prop="parentName"
+                    :label="$t('dept.parentName')"
+                    class="dept-list">
+        <el-popover v-model="deptListVisible"
+                    ref="deptListPopover"
+                    placement="bottom-start"
+                    trigger="click" :disabled="true">
+          <el-tree :data="deptList"
+                   :props="{ label: 'name', children: 'children' }"
+                   node-key="id"
+                   ref="deptListTree"
+                   :highlight-current="true"
+                   :expand-on-click-node="false"
+                   accordion
+                   @current-change="deptListTreeCurrentChangeHandle">
+          </el-tree>
+        </el-popover>
+        <el-input v-model="dataForm.parentName"
+                  v-popover:deptListPopover
+                  :readonly="true"
+                  :placeholder="$t('dept.parentName')" :disabled="true">
+          <i v-if="$store.state.user.superAdmin === 1 && dataForm.pid !== '0'"
+             slot="suffix"
+             @click.stop="deptListTreeSetDefaultHandle()"
+             class="el-icon-circle-close el-input__icon">
+          </i>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="机构类型"
+                    prop="typeKey">
+        <el-select v-model="dataForm.typeKey"
+                   @change="changeOrgType"
+                   placeholder="机构类型" :disabled="true">
+          <el-option v-for="item in secondOrgDictList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="sort"
+                    :label="$t('dept.sort')">
+        <el-input-number v-model="dataForm.sort"
+                         controls-position="right"
+                         :min="0"
+                         :label="$t('dept.sort')"></el-input-number>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      deptList: [],
+      deptListVisible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        pid: '',
+        parentName: '',
+        sort: 0,
+        typeKey: '',
+        typeName: '',
+        partyCode: ''
+      },
+      secondOrgDictList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        this.getDeptList().then(() => {
+          if (this.dataForm.id) {
+            this.getInfo()
+          } else if (this.$store.state.user.superAdmin === 1) {
+            this.deptListTreeSetDefaultHandle()
+          }
+          if (this.dataForm.id) {
+          } else {
+            this.dataForm.partyCode = ''
+            this.dataForm.typeKey = ''
+          }
+        })
+      })
+      this.getSecondOrgDicList()
+    },
+    // 改变机构类型
+    changeOrgType (item) {
+      this.typeKey = item
+    },
+    // 获取部门列表
+    getDeptList () {
+      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptList = res.data
+      }).catch(() => { })
+    },
+    // 获取二级党委字典列表
+    getSecondOrgDicList () {
+      this.$http.get(`/sys/dict/listSimple/org_type`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.secondOrgDictList = res.data
+      }).catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/cloudAnalysis/metaSysdeptManager/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        if (this.dataForm.pid === '0') {
+          return this.deptListTreeSetDefaultHandle()
+        }
+        this.$refs.deptListTree.setCurrentKey(this.dataForm.pid)
+      }).catch(() => { })
+    },
+    // 上级部门树, 设置默认值
+    deptListTreeSetDefaultHandle () {
+      this.dataForm.pid = '0'
+      this.dataForm.parentName = this.$t('dept.parentNameDefault')
+    },
+    // 上级部门树, 选中
+    deptListTreeCurrentChangeHandle (data) {
+      this.dataForm.pid = data.id
+      this.dataForm.parentName = data.name
+      this.deptListVisible = false
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/metaSysdeptManager', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+
+<style lang="scss">
+.mod-sys__dept {
+  .dept-list {
+    .el-input__inner,
+    .el-input__suffix {
+      cursor: pointer;
+    }
+  }
+}
+</style>

src/views/modules/organize/metasysdept-add-or-update.vue

@@ -0,0 +1,159 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="上级ID" prop="pid">
+          <el-input v-model="dataForm.pid" placeholder="上级ID"></el-input>
+      </el-form-item>
+          <el-form-item label="所有上级ID，用逗号分开" prop="pids">
+          <el-input v-model="dataForm.pids" placeholder="所有上级ID，用逗号分开"></el-input>
+      </el-form-item>
+          <el-form-item label="部门名称" prop="name">
+          <el-input v-model="dataForm.name" placeholder="部门名称"></el-input>
+      </el-form-item>
+          <el-form-item label="排序" prop="sort">
+          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识  0：未删除    1：删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识  0：未删除    1：删除"></el-input>
+      </el-form-item>
+          <el-form-item label="创建者" prop="creator">
+          <el-input v-model="dataForm.creator" placeholder="创建者"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新者" prop="updater">
+          <el-input v-model="dataForm.updater" placeholder="更新者"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="机构类型键值" prop="typeKey">
+          <el-input v-model="dataForm.typeKey" placeholder="机构类型键值"></el-input>
+      </el-form-item>
+          <el-form-item label="部门编码" prop="partyCode">
+          <el-input v-model="dataForm.partyCode" placeholder="部门编码"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门id" prop="allDeptIds">
+          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门id"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        pid: '',
+        pids: '',
+        name: '',
+        sort: '',
+        delFlag: '',
+        creator: '',
+        createDate: '',
+        updater: '',
+        updateDate: '',
+        typeKey: '',
+        partyCode: '',
+        allDeptIds: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        pid: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pids: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        creator: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updater: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updateDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        typeKey: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        partyCode: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/cloudAnalysis/metasysdept/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/metasysdept/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

src/views/modules/organize/metasysdept.vue

@@ -0,0 +1,122 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__metasysdept}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <div v-if="dataForm.pid != 0">
+        <el-form-item>
+          <el-button type="primary" @click="backToDeptList">返回</el-button>
+        </el-form-item>
+        </div>
+        <el-form-item label="组织架构名称" prop="name">
+          <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:metasysdept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:metasysdept:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column prop="name" label="名称" header-align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('sys:metasysdept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:metasysdept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="lookHandle(scope.row.id,scope.row.pid)" :disabled="scope.row.typeKey == 'grid_party'">查看</el-button>
+            <el-button type="text" size="small" @click="manageHandle(scope.row.id,scope.row.pid)">管理</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import TableTreeColumn from '@/components/table-tree-column'
+import AddOrUpdate from './metasysdept-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/cloudAnalysis/metasysdept/page',
+        getDataListIsPage: true,
+        deleteURL: '/cloudAnalysis/metasysdept',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        pid: '',
+        name: ''
+      },
+      pidList: [0]
+    }
+  },
+  mounted () {
+    if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
+      this.pidList = JSON.parse(this.$route.query.pidList)
+      this.dataForm.pid = this.pidList[this.pidList.length - 1]
+    } else {
+      this.dataForm.pid = 0
+    }
+    this.getDataList()
+  },
+  created: function () {
+  },
+  components: {
+    TableTreeColumn,
+    AddOrUpdate
+  },
+  methods: {
+    manageHandle (deptId, pid) {
+      this.$parent.selectComponent = 'Deptofficer'
+      this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList), deptId: deptId } })
+    },
+    lookHandle (id, pid) {
+      this.page = 1
+      this.pidList.push(id)
+      this.$parent.selectComponent = 'Metasysdept'
+      this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList) } })
+      if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
+        this.pidList = JSON.parse(this.$route.query.pidList)
+        this.dataForm.pid = this.pidList[this.pidList.length - 1]
+      } else {
+        this.dataForm.pid = 0
+      }
+      this.getDataList()
+    },
+    backToDeptList () {
+      this.page = 1
+      var m = this.pidList.splice(this.pidList.length - 1, 1)
+      m.pop()
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Metasysdept'
+      this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList) } })
+      if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
+        this.pidList = JSON.parse(this.$route.query.pidList)
+        this.dataForm.pid = this.pidList[this.pidList.length - 1]
+      } else {
+        this.dataForm.pid = 0
+      }
+      this.getDataList()
+    }
+  }
+}
+</script>

src/views/modules/organize/metasysdeptManagement.vue

@@ -0,0 +1,117 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__metasysdept}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <div v-if="dataForm.pid != 0">
+        <el-form-item>
+          <el-button type="primary" @click="backToDeptList">返回</el-button>
+        </el-form-item>
+        </div>
+        <el-form-item label="组织架构名称" prop="name">
+          <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:metasysdept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:metasysdept:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column prop="name" label="名称" header-align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('sys:metasysdeptManagement:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:metasysdeptManagement:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="lookHandle(scope.row.id,scope.row.pid)" :disabled="scope.row.typeKey == 'grid_party'">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import TableTreeColumn from '@/components/table-tree-column'
+import AddOrUpdate from './metaSysDeptManagement-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/cloudAnalysis/metaSysdeptManager/page',
+        getDataListIsPage: true,
+        deleteURL: '/cloudAnalysis/metaSysdeptManager',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        pid: '',
+        name: ''
+      },
+      pidList: [0]
+    }
+  },
+  mounted () {
+    if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
+      this.pidList = JSON.parse(this.$route.query.pidList)
+      this.dataForm.pid = this.pidList[this.pidList.length - 1]
+    } else {
+      this.dataForm.pid = 0
+    }
+    this.getDataList()
+  },
+  created: function () {
+  },
+  components: {
+    TableTreeColumn,
+    AddOrUpdate
+  },
+  methods: {
+    lookHandle (id, pid) {
+      this.page = 1
+      this.pidList.push(id)
+      this.$parent.selectComponent = 'Metasysdept'
+      this.$router.push({ path: '/organize-organizedeptManagementroute', query: { pidList: JSON.stringify(this.pidList) } })
+      if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
+        this.pidList = JSON.parse(this.$route.query.pidList)
+        this.dataForm.pid = this.pidList[this.pidList.length - 1]
+      } else {
+        this.dataForm.pid = 0
+      }
+      this.getDataList()
+    },
+    backToDeptList () {
+      this.page = 1
+      var m = this.pidList.splice(this.pidList.length - 1, 1)
+      m.pop()
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Metasysdept'
+      this.$router.push({ path: '/organize-organizedeptManagementroute', query: { pidList: JSON.stringify(this.pidList) } })
+      if (this.$route.query.pidList !== null && this.$route.query.pidList !== undefined) {
+        this.pidList = JSON.parse(this.$route.query.pidList)
+        this.dataForm.pid = this.pidList[this.pidList.length - 1]
+      } else {
+        this.dataForm.pid = 0
+      }
+      this.getDataList()
+    }
+  }
+}
+</script>

src/views/modules/organize/organizedeptManagementroute.vue

@@ -0,0 +1,27 @@
+<template>
+    <keep-alive include="metasysdept">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Metasysdept from './metaSysDeptManagement'
+export default {
+  data () {
+    return {
+      selectComponent: Metasysdept
+    }
+  },
+  components: {
+    Metasysdept
+  },
+  methods: {
+    init () {
+      this.selectComponent = Metasysdept
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/modules/organize/organizedeptroute.vue

@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="metasysdept">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Metasysdept from './metasysdept'
+import Deptofficer from './deptofficer'
+export default {
+  data () {
+    return {
+      selectComponent: Metasysdept
+    }
+  },
+  components: {
+    Metasysdept,
+    Deptofficer
+  },
+  methods: {
+    init () {
+      this.selectComponent = Metasysdept
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>