From bcf136bbff15ad0d1755f864bf45ca0834b059a6 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 27 Aug 2021 14:07:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9D=A3=E5=8A=9E=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN.js                             |   1 +
 .../analysis/item/difficult-Item-list.vue     |  35 +++-
 .../analysis/item/difficult-item-oversee.vue  | 147 ++++++++++++++
 .../difficultitemoversee-add-or-update.vue    | 180 ++++++++++++++++++
 .../analysis/item/difficultitemoversee.vue    |  80 ++++++++
 .../item/roledifficultdept-add-or-update.vue  | 131 +++++++++++++
 .../analysis/item/roledifficultdept.vue       |  73 +++++++
 src/views/modules/sys/role-add-or-update.vue  |  19 ++
 8 files changed, 656 insertions(+), 10 deletions(-)
 create mode 100644 src/views/modules/analysis/item/difficult-item-oversee.vue
 create mode 100644 src/views/modules/analysis/item/difficultitemoversee-add-or-update.vue
 create mode 100644 src/views/modules/analysis/item/difficultitemoversee.vue
 create mode 100644 src/views/modules/analysis/item/roledifficultdept-add-or-update.vue
 create mode 100644 src/views/modules/analysis/item/roledifficultdept.vue

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index a7eae72..d8c8f4b 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -373,6 +373,7 @@ t.role.appMenuList = '工作端菜单授权'
 t.role.categoryList = '项目处理类型授权'
 t.role.whistleDeptList = '吹哨部门授权'
 t.role.moduleList = '内容栏目授权'
+t.role.overseeDeptList = '督办部门授权'
 
 t.user = {}
 t.user.username = '用户名'
diff --git a/src/views/modules/analysis/item/difficult-Item-list.vue b/src/views/modules/analysis/item/difficult-Item-list.vue
index f426371..cc7b02e 100644
--- a/src/views/modules/analysis/item/difficult-Item-list.vue
+++ b/src/views/modules/analysis/item/difficult-Item-list.vue
@@ -94,19 +94,22 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="itemContent" 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="operatNum" label="处理次数" header-align="center" align="center"  ></el-table-column>
-        <el-table-column prop="reportFlag" label="是否流转网格化平台" header-align="center" align="center" :formatter="showReportFlagFormatter"></el-table-column>
-        <el-table-column prop="deptNum" label="涉及部门数量" header-align="center" align="center" ></el-table-column>
-        <el-table-column prop="itemState" label="项目状态" header-align="center" align="center" :formatter="showItemStateNameFormatter"></el-table-column>
-        <el-table-column prop="processedTime" label="处理完毕时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="takeTime" label="处理时长(h)" header-align="center" align="center" ></el-table-column>
-        <el-table-column prop="allDeptNames" label="项目来源网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="evaluationScore" label="居民满意度评价" header-align="center" align="center" :formatter="showEvaluationScoreNameFormatter"></el-table-column>
+          <el-table-column prop="allDeptNames" label="所属组织" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="itemContent" label="事件标题" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="overseeName" label="督办" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="reportFlag" label="是否流转网格化平台" header-align="center" align="center" :formatter="showReportFlagFormatter"></el-table-column>-->
+        <el-table-column prop="itemState" label="事件状态" header-align="center" align="center" :formatter="showItemStateNameFormatter"></el-table-column>
+          <el-table-column prop="createdTime" label="提交日期" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="processedTime" label="处理完毕时间" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="takeTime" label="耗时（h）" header-align="center" align="center" ></el-table-column>
+          <el-table-column prop="operatNum" label="处理次数" header-align="center" align="center"  ></el-table-column>
+          <el-table-column prop="deptNum" label="涉及部门" header-align="center" align="center" ></el-table-column>
+
+<!--        <el-table-column prop="evaluationScore" label="居民满意度评价" header-align="center" align="center" :formatter="showEvaluationScoreNameFormatter"></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="look(scope.row.id)">{{ $t('look') }}</el-button>
+              <el-button type="text" size="small" @click="openOversee(scope.row.id)">{{ $t('督办') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -119,12 +122,15 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
+
+        <difficult-item-oversee v-if="overseeVisible" ref="difficultItemOversee" @refreshDataList="getDataList"></difficult-item-oversee>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
+import DifficultItemOversee from './difficult-item-oversee'
 export default {
   mixins: [mixinViewModule],
   name: 'difficultItemList',
@@ -176,6 +182,7 @@ export default {
         label: '是'
       }],
       closeVisible: false,
+      overseeVisible: false,
       dataForm: {
         id: '',
         streetId: '',
@@ -227,6 +234,7 @@ export default {
     }
   },
   components: {
+      DifficultItemOversee
   },
   created: function () {
     this.getOptions()
@@ -256,6 +264,13 @@ export default {
     }
   },
   methods: {
+      openOversee (id) {
+          this.overseeVisible = true
+          this.$nextTick(() => {
+              this.$refs.difficultItemOversee.dataForm.id = id
+              this.$refs.difficultItemOversee.init()
+          })
+      },
     showReportFlagFormatter: function (row, column) {
       if (row.reportFlag) {
         let dict = this.reportFlagOptions.filter(item => item.value === row.reportFlag)[0]
diff --git a/src/views/modules/analysis/item/difficult-item-oversee.vue b/src/views/modules/analysis/item/difficult-item-oversee.vue
new file mode 100644
index 0000000..812d7fc
--- /dev/null
+++ b/src/views/modules/analysis/item/difficult-item-oversee.vue
@@ -0,0 +1,147 @@
+<template>
+    <el-dialog :visible.sync="visible" title="督办" :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="allDeptNames" label-width="120px">
+                {{dataForm.itemContent}}
+            </el-form-item>
+            <el-form-item label="所属组织：" prop="allDeptNames" label-width="120px">
+                {{dataForm.allDeptNames}}
+            </el-form-item>
+            <el-form-item label="处理次数：" prop="operatNum" label-width="120px">
+                {{dataForm.operatNum}}
+            </el-form-item>
+            <el-form-item label="涉及部门：" prop="deptNum" label-width="120px">
+                {{dataForm.deptNum}}
+            </el-form-item>
+            <el-form-item label="处理时长：" prop="takeTime" label-width="120px">
+                {{dataForm.takeTime}}
+            </el-form-item>
+            <el-form-item label="提交日期：" prop="createdTime" label-width="120px">
+                {{dataForm.createdTime}}
+            </el-form-item>
+            <el-form-item label="督办备注：" prop="overseeContent" label-width="120px">
+                <el-input v-model="dataForm.overseeContent" type="textarea"  maxlength="500" placeholder="请输入督办备注，最多500字"></el-input>
+            </el-form-item>
+            <el-form-item label="督办记录：" label-width="120px">
+                <ul>
+                    <li v-for="item in this.dataForm.overseeList">
+                        {{ item.overseeTime }} &nbsp;&nbsp;
+                        {{ item.overseeDeptName }}&nbsp;&nbsp;
+                        {{ item.overseeUserName }}&nbsp;&nbsp;
+                        督办：
+                        <br>
+                        {{ item.overseeContent }}
+<!--                        <hr>-->
+                    </li>
+                </ul>
+            </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: '',
+                    name: '',
+                    sex: '',
+                    nation: '',
+                    birthday: '',
+                    address: '',
+                    idcard: '',
+                    organ: '',
+                    imgCode: '',
+                    imgUrl: '',
+                    testingResult: '',
+                    testingTime: '',
+                    revision: '',
+                    createdBy: '',
+                    createdTime: '',
+                    updatedBy: '',
+                    updatedTime: '',
+                    delFlag: '',
+                    mobile:'',
+                    overseeContent:''
+                },
+                uploadUrl: '',
+                loading: false,
+            }
+        },
+        computed: {
+            dataRule() {
+                return {
+                    name: [
+                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                    ],
+                    sex: [
+                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                    ],
+                }
+            }
+        },
+        created() {
+            this.$nextTick(() => {
+            })
+        },
+        methods: {
+            init() {
+                this.visible = true
+                this.$nextTick(() => {
+                    this.$refs['dataForm'].resetFields()
+                    if (this.dataForm.id) {
+                        this.getInfo()
+                    }
+                })
+            },
+            // 获取信息
+            getInfo() {
+                this.$http.get(`/analysis/item/difficultItemOversee/${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['post']('/analysis/item/saveOversee', 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>
diff --git a/src/views/modules/analysis/item/difficultitemoversee-add-or-update.vue b/src/views/modules/analysis/item/difficultitemoversee-add-or-update.vue
new file mode 100644
index 0000000..8e8d87b
--- /dev/null
+++ b/src/views/modules/analysis/item/difficultitemoversee-add-or-update.vue
@@ -0,0 +1,180 @@
+<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="difficultId">
+          <el-input v-model="dataForm.difficultId" placeholder="难点堵点ID"></el-input>
+      </el-form-item>
+          <el-form-item label="督办人ID" prop="overseeUserId">
+          <el-input v-model="dataForm.overseeUserId" placeholder="督办人ID"></el-input>
+      </el-form-item>
+          <el-form-item label="督办人姓名" prop="overseeUserName">
+          <el-input v-model="dataForm.overseeUserName" placeholder="督办人姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="督办人部门ID" prop="overseeDeptId">
+          <el-input v-model="dataForm.overseeDeptId" placeholder="督办人部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="督办人部门名称" prop="overseeDeptName">
+          <el-input v-model="dataForm.overseeDeptName" placeholder="督办人部门名称"></el-input>
+      </el-form-item>
+          <el-form-item label="督办时间" prop="overseeTime">
+          <el-input v-model="dataForm.overseeTime" placeholder="督办时间"></el-input>
+      </el-form-item>
+          <el-form-item label="督办描述" prop="overseeContent">
+          <el-input v-model="dataForm.overseeContent" placeholder="督办描述"></el-input>
+      </el-form-item>
+          <el-form-item label="被督办人部门ID" prop="beOverseeDept">
+          <el-input v-model="dataForm.beOverseeDept" placeholder="被督办人部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="被督办人部门名称" prop="beOverseeDeptName">
+          <el-input v-model="dataForm.beOverseeDeptName" 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="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></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: '',
+        difficultId: '',
+        overseeUserId: '',
+        overseeUserName: '',
+        overseeDeptId: '',
+        overseeDeptName: '',
+        overseeTime: '',
+        overseeContent: '',
+        beOverseeDept: '',
+        beOverseeDeptName: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        difficultId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        overseeUserId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        overseeUserName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        overseeDeptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        overseeDeptName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        overseeTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        overseeContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        beOverseeDept: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        beOverseeDeptName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { 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(`/analysis/difficultitemoversee/${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']('/analysis/difficultitemoversee/', 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>
diff --git a/src/views/modules/analysis/item/difficultitemoversee.vue b/src/views/modules/analysis/item/difficultitemoversee.vue
new file mode 100644
index 0000000..1067b47
--- /dev/null
+++ b/src/views/modules/analysis/item/difficultitemoversee.vue
@@ -0,0 +1,80 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-analysis__difficultitemoversee}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" 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('analysis:difficultitemoversee:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('analysis:difficultitemoversee: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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="difficultId" label="难点堵点ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="overseeUserId" label="督办人ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="overseeUserName" label="督办人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="overseeDeptId" label="督办人部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="overseeDeptName" label="督办人部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="overseeTime" label="督办时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="overseeContent" label="督办描述" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="beOverseeDept" label="被督办人部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="beOverseeDeptName" label="被督办人部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识 0-否，1-是" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('analysis:difficultitemoversee:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('analysis:difficultitemoversee:delete')" 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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './difficultitemoversee-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/difficultitemoversee/page',
+        getDataListIsPage: true,
+        deleteURL: '/analysis/difficultitemoversee',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/analysis/item/roledifficultdept-add-or-update.vue b/src/views/modules/analysis/item/roledifficultdept-add-or-update.vue
new file mode 100644
index 0000000..ce34262
--- /dev/null
+++ b/src/views/modules/analysis/item/roledifficultdept-add-or-update.vue
@@ -0,0 +1,131 @@
+<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="roleId">
+          <el-input v-model="dataForm.roleId" placeholder="角色ID"></el-input>
+      </el-form-item>
+          <el-form-item label="部门ID" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="部门ID"></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="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></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: '',
+        roleId: '',
+        deptId: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        roleId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { 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(`/analysis/roledifficultdept/${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']('/analysis/roledifficultdept/', 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>
diff --git a/src/views/modules/analysis/item/roledifficultdept.vue b/src/views/modules/analysis/item/roledifficultdept.vue
new file mode 100644
index 0000000..0e956e3
--- /dev/null
+++ b/src/views/modules/analysis/item/roledifficultdept.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-analysis__roledifficultdept}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" 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('analysis:roledifficultdept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('analysis:roledifficultdept: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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="标识号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="roleId" label="角色ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识 0-否，1-是" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('analysis:roledifficultdept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('analysis:roledifficultdept:delete')" 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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './roledifficultdept-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/roledifficultdept/page',
+        getDataListIsPage: true,
+        deleteURL: '/analysis/roledifficultdept',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 2578ada..730623a 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -114,6 +114,18 @@
                   </el-tree>
               </el-form-item>
           </el-col>
+        <el-col :span="5">
+          <el-form-item size="mini"
+                        :label="$t('role.overseeDeptList')">
+            <el-tree :data="deptList"
+                     :props="{ label: 'name', children: 'children' }"
+                     node-key="id"
+                     ref="overseeListTree"
+                     accordion
+                     show-checkbox>
+            </el-tree>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template slot="footer">
@@ -148,6 +160,7 @@ export default {
         whistleDeptIdList: [],
         analysisMenuIdList: [],
         moduleMenuIdList: [],
+        overseeMenuIdList: [],
         remark: '',
         typeKey: ''
       }
@@ -177,6 +190,7 @@ export default {
         this.$refs.whistleDeptListTree.setCheckedKeys([])
         this.$refs.analysisMenuListTree.setCheckedKeys([])
         this.$refs.moduleListTree.setCheckedKeys([])
+        this.$refs.overseeListTree.setCheckedKeys([])
         Promise.all([
           this.getMenuList(),
           this.getDeptList(),
@@ -273,6 +287,7 @@ export default {
         this.dataForm.categoryIdList.forEach(item => this.$refs.categoryListTree.setChecked(item, true))
         this.dataForm.analysisMenuIdList.forEach(item => this.$refs.analysisMenuListTree.setChecked(item, true))
         this.dataForm.moduleMenuIdList.forEach(item => this.$refs.moduleListTree.setChecked(item, true))
+        this.dataForm.overseeMenuIdList.forEach(item => this.$refs.overseeListTree.setChecked(item, true))
 
         this.$refs.whistleDeptListTree.setCheckedKeys(this.dataForm.whistleDeptIdList)
       }).catch(() => { })
@@ -304,6 +319,10 @@ export default {
           ...this.$refs.moduleListTree.getCheckedKeys(),
           ...this.$refs.moduleListTree.getHalfCheckedKeys()
         ]
+        this.dataForm.overseeMenuIdList = [
+          ...this.$refs.overseeListTree.getCheckedKeys(),
+          ...this.$refs.overseeListTree.getHalfCheckedKeys()
+        ]
         this.dataForm.whistleDeptIdList = this.$refs.whistleDeptListTree.getCheckedKeys()
         this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role/v2', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {

From 311643126495ef397b113cf2862fcd5debb53a84 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 27 Aug 2021 16:50:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/item/difficult-Item-list.vue     | 142 ++++++++++--------
 .../analysis/item/difficult-item-oversee.vue  |   2 +-
 2 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/src/views/modules/analysis/item/difficult-Item-list.vue b/src/views/modules/analysis/item/difficult-Item-list.vue
index cc7b02e..2ab7b2e 100644
--- a/src/views/modules/analysis/item/difficult-Item-list.vue
+++ b/src/views/modules/analysis/item/difficult-Item-list.vue
@@ -2,21 +2,38 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="所属机构">
+        <el-form-item label="所属组织">
           <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
-       <el-form-item label="排序规则">
-          <el-select v-model="dataForm.orderType" placeholder="请选择">
-            <el-option
-              v-for="item in sortOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="转项目时间"
+<!--       <el-form-item label="排序规则">-->
+<!--          <el-select v-model="dataForm.orderType" placeholder="请选择">-->
+<!--            <el-option-->
+<!--              v-for="item in sortOptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+          <el-form-item label="事件状态">
+              <el-select v-model="dataForm.itemState" placeholder="全部" clearable >
+                  <el-option
+                          v-for="item in itemStateOptions"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="是否督办" prop="overseeName">
+              <el-select v-model="dataForm.overseeName" clearable placeholder="是否督办">
+                  <el-option v-for="item in overseeNameList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                  </el-option>
+              </el-select>
+          </el-form-item>
+          <br>
+        <el-form-item label="日期(起)"
                       prop="changeItemStartTime">
           <el-date-picker v-model="dataForm.changeItemStartTime"
                           type="date"
@@ -26,8 +43,8 @@
                           placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至"
-                      label-width="25px"
+        <el-form-item label="日期(止)"
+                      label-width="70px"
                       prop="changeItemEndTime">
           <el-date-picker v-model="dataForm.changeItemEndTime"
                           type="date"
@@ -37,57 +54,48 @@
                           placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="项目状态">
-          <el-select v-model="dataForm.itemState" placeholder="全部" clearable >
-            <el-option
-              v-for="item in itemStateOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="处理完毕时间"
-                      prop="processedStartTime">
-          <el-date-picker v-model="dataForm.processedStartTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore1"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至"
-                      label-width="25px"
-                      prop="processedEndTime">
-          <el-date-picker v-model="dataForm.processedEndTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter1"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="满意度">
-          <el-select v-model="dataForm.evaluationScore" placeholder="全部" clearable >
-            <el-option
-              v-for="item in evaluationScoreOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否流转网格化平台">
-          <el-select v-model="dataForm.reportFlag" placeholder="全部" clearable >
-            <el-option
-              v-for="item in reportFlagOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
+
+<!--        <el-form-item label="处理完毕时间"-->
+<!--                      prop="processedStartTime">-->
+<!--          <el-date-picker v-model="dataForm.processedStartTime"-->
+<!--                          type="date"-->
+<!--                          :picker-options="pickerBeginDateBefore1"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          placeholder="选择日期时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="至"-->
+<!--                      label-width="25px"-->
+<!--                      prop="processedEndTime">-->
+<!--          <el-date-picker v-model="dataForm.processedEndTime"-->
+<!--                          type="date"-->
+<!--                          :picker-options="pickerBeginDateAfter1"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          placeholder="选择日期时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="满意度">-->
+<!--          <el-select v-model="dataForm.evaluationScore" placeholder="全部" clearable >-->
+<!--            <el-option-->
+<!--              v-for="item in evaluationScoreOptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否流转网格化平台">-->
+<!--          <el-select v-model="dataForm.reportFlag" placeholder="全部" clearable >-->
+<!--            <el-option-->
+<!--              v-for="item in reportFlagOptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -181,6 +189,10 @@ export default {
         value: '1',
         label: '是'
       }],
+        overseeNameList: [
+            {dictValue: '0', dictName: '已督办'},
+            {dictValue: '1', dictName: '未督办'},
+        ],
       closeVisible: false,
       overseeVisible: false,
       dataForm: {
diff --git a/src/views/modules/analysis/item/difficult-item-oversee.vue b/src/views/modules/analysis/item/difficult-item-oversee.vue
index 812d7fc..59ab76b 100644
--- a/src/views/modules/analysis/item/difficult-item-oversee.vue
+++ b/src/views/modules/analysis/item/difficult-item-oversee.vue
@@ -86,7 +86,7 @@
                     name: [
                         {required: true, message: this.$t('validate.required'), trigger: 'blur'}
                     ],
-                    sex: [
+                    overseeContent: [
                         {required: true, message: this.$t('validate.required'), trigger: 'blur'}
                     ],
                 }