Merge remote-tracking branch 'origin/feature_deptSelect_lpf'

6 years ago · 6172f8737d
6 changed files with 146 additions and 14 deletions
--- a/src/views/modules/events/issue-process-detail-view.vue
+++ b/src/views/modules/events/issue-process-detail-view.vue
@ -96,6 +96,17 @@
               style="width: 720px;"
               :model="dataForm"
               :rules="dataRule">
+        <el-form-item label="操作人部门" prop="handlerDeptIdRule">
+          <el-cascader
+            ref="name"
+            v-model="dataForm.handlerDeptIdRule"
+            :options="options"
+            :props="{ multiple: false, checkStrictly: true }"
+            @change="changeHandle"
+            clearable
+          >
+          </el-cascader>
+        </el-form-item>
        <el-form-item label="处理:"
                      prop="state">
          <el-select v-model="dataForm.state"
@ -146,6 +157,7 @@ export default {
        distributeTime: '',
        advice: '',
        state: '',
+        handlerDeptIdRule: '',
        issueProgressResultDTOS: [],
        images: []
      },
@ -161,11 +173,13 @@ export default {
        verifyFlag: '4',
        verifyTitle: '转为项目'
      }],
-      timeLineList: []
+      timeLineList: [],
+      options: []
    }
  },
  mounted () {
    this.dataForm.id = this.$route.query.id
+    this.getOptions()
    this.init()
  },
  filters: {
@ -194,6 +208,9 @@ export default {
        ],
        state: [
          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        handlerDeptIdRule: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
        ]
      }
    }
@ -202,6 +219,21 @@ export default {
    backToItemDeal () {
      this.$parent.selectComponent = 'IssueProcessList'
    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    changeHandle (value, selectedData) {
+      this.dataForm.handlerDept = this.$refs['name'].getCheckedNodes()[0].label
+      this.dataForm.handlerDeptId = this.$refs['name'].getCheckedNodes()[0].value
+    },
    initBmap (latitude, longitude) {
      this.map = new BMap.Map('map')
      const point = new BMap.Point(longitude, latitude)
--- a/src/views/modules/events/issue-review-detail-view.vue
+++ b/src/views/modules/events/issue-review-detail-view.vue
@ -40,6 +40,17 @@
            <div class="handle-operation">
              <div class="handle-operation-tip">处理操作</div>
              <el-form ref="dataForm" label-width="120px" label-position="right" style="width: 720px;" :model="dataForm" :rules="dataRule">
+                <el-form-item label="操作人部门" prop="handlerDeptIdRule">
+                  <el-cascader
+                    ref="name"
+                    v-model="dataForm.handlerDeptIdRule"
+                    :options="options"
+                    :props="{ multiple: false, checkStrictly: true }"
+                    @change="changeHandle"
+                    clearable
+                  >
+                  </el-cascader>
+                </el-form-item>
                <el-form-item label="审核:" prop="eventState">
                    <el-radio v-model="dataForm.eventState" label="4">审核通过</el-radio>
                    <el-radio v-model="dataForm.eventState" label="2">驳回</el-radio>
@ -78,6 +89,7 @@ export default {
        nickName: '',
        categoryId: '',
        advice: '',
+        handlerDeptIdRule: '',
        eventState: '4'
      },
      isAble: false,
@ -85,11 +97,13 @@ export default {
      previewImgList: [],
      categoryVisible: true,
      urls: [],
-      categoryOptions: []
+      categoryOptions: [],
+      options: []
    }
  },
  mounted () {
    this.dataForm.id = this.$route.query.id
+    this.getOptions()
    this.init()
  },
  computed: {
@ -103,6 +117,9 @@ export default {
        ],
        advice: [
          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        handlerDeptIdRule: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
        ]
      }
    }
@ -128,6 +145,21 @@ export default {
        }
      })
    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    changeHandle (value, selectedData) {
+      this.dataForm.handlerDept = this.$refs['name'].getCheckedNodes()[0].label
+      this.dataForm.handlerDeptId = this.$refs['name'].getCheckedNodes()[0].value
+    },
    getCategoryList () {
      return this.$http.get('/events/category/list').then(({ data: res }) => {
        if (res.code !== 0) {
@ -176,7 +208,7 @@ export default {
    // 表单提交
    dataFormSubmitHandle: debounce(function () {
      this.dataForm.categoryId = this.categoryIds[this.categoryIds.length - 1]
-      console.log(this.dataForm.categoryId)
+      console.log(this.dataForm)
      this.$refs['dataForm'].validate((valid) => {
        if (!valid) {
          return false
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@ -108,10 +108,20 @@
                 style="width: 720px;"
                 :model="dataForm"
                 :rules="dataRule">
+          <el-form-item label="操作人部门" prop="handlerDeptIdRule">
+            <el-cascader
+              ref="name"
+              v-model="dataForm.handlerDeptIdRule"
+              :options="options"
+              :props="{ multiple: false, checkStrictly: true }"
+              @change="changeHandle"
+            >
+            </el-cascader>
+          </el-form-item>
          <el-form-item label="处理:"
                        prop="handleCategory">
            <el-select v-model="postDataForm.handleCategory"
-                       placeholder="请选择">
+                       placeholder="请选择" @visible-change="visibleChange">
              <el-option v-for="handleResultDTO in dataForm.handleResultDTOS"
                         :key="handleResultDTO.processResult"
                         :label="handleResultDTO.processName"
@ -252,7 +262,8 @@ export default {
        outHandleAdvice: '',
        handleCategory: '',
        issueLatitude: '',
-        issueLongitude: ''
+        issueLongitude: '',
+        handlerDeptIdRule: ''
      },
      isAble: false,
      previewImgList: [],
@ -271,11 +282,13 @@ export default {
      },
      deptResultDTOSVisible: false,
      evaluateDeptDTOSVisible: false,
-      timeLineList: []
+      timeLineList: [],
+      options: []
    }
  },
  mounted () {
    this.dataForm.id = this.$route.query.id
+    this.getOptions()
    this.init()
  },
  filters: {
@ -342,6 +355,9 @@ export default {
        ],
        evaluateDeptDTOS: [
          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        handlerDeptIdRule: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
        ]
      }
    }
@ -379,6 +395,38 @@ export default {
    backToItemDeal () {
      this.$parent.selectComponent = 'ItemDeal'
    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    visibleChange (val) {
+      if (this.dataForm.handleResultDTOS.length === 0 && this.dataForm.handlerDeptIdRule === '' && val === true) {
+        return this.$message.error('请先选择操作人部门！')
+      }
+    },
+    changeHandle (value, selectedData) {
+      this.postDataForm.handlerDept = this.$refs['name'].getCheckedNodes()[0].label
+      this.postDataForm.handlerDeptId = this.$refs['name'].getCheckedNodes()[0].value
+      this.getHandleResultDTOS()
+    },
+    // 获取处理项
+    getHandleResultDTOS () {
+      this.$http.post(`/events/item/getHandleResultDTOS`, { itemId: this.dataForm.id, deptId: this.postDataForm.handlerDeptId }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm.handleResultDTOS = res.data.handleResultDTOS
+        this.dataForm.deptResultDTOS = res.data.deptResultDTOS
+        this.dataForm.evaluateDeptDTOS = res.data.evaluateDeptDTOS
+      }).catch(() => { })
+    },
    initBmap (latitude, longitude) {
      this.map = new BMap.Map('map')
      const point = new BMap.Point(longitude, latitude)
--- a/src/views/modules/master/masternotice.vue
+++ b/src/views/modules/master/masternotice.vue
@ -62,7 +62,7 @@
            <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:toTop') && scope.row.state == 1"   @click="openToTopDialog($event, scope.row)" >置顶</el-button>
            <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:toTop') && scope.row.state == 2"  @click="openCancelToTopDialog($event, scope.row)">取消置顶</el-button>
            <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:close')"  @click="openCloseTopicDialog($event, scope.row)" :disabled="scope.row.state == 0">关闭</el-button>
-            <el-button type="text" size="small" @click="manageHandle(scope.row.id)">查看</el-button>          </template>
+            <el-button type="text" size="small" @click="manageHandle(scope.row.id, scope.row.browseNum)">查看</el-button>          </template>
        </el-table-column>
      </el-table>
      <el-pagination
@ -241,9 +241,9 @@ export default {
      this.optionForm.id = row.id
      this.optionForm.state = 0
    },
-    manageHandle (noticeId) {
+    manageHandle (noticeId, browseNum) {
      this.$parent.selectComponent = 'Masternoticedetail'
-      this.$router.push({ path: '/master-masternoticeroute', query: { noticeId: noticeId } })
+      this.$router.push({ path: '/master-masternoticeroute', query: { noticeId: noticeId, browseNum: browseNum } })
    }
  }
 }
--- a/src/views/modules/master/masternoticedetail.vue
+++ b/src/views/modules/master/masternoticedetail.vue
@ -71,8 +71,9 @@ export default {
  mounted () {
    this.dataForm.id = this.$route.query.noticeId
    this.readForm.id = this.$route.query.noticeId
+    this.dataForm.browseNum = this.$route.query.browseNum
+    this.addBrowNum()
    this.getInfo()
-    this.getReadInfo(1)
  },
  methods: {
    // 获取信息
@ -88,6 +89,16 @@ export default {
        this.dataForm.tagIds = []
      }).catch(() => { })
    },
+    // 将当前登录人改为已读
+    addBrowNum () {
+      this.$http.post(`/cloudAnalysis/masternotice/addBrowNum`, this.dataForm).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        // 获取已读未读信息
+        this.getReadInfo(1)
+      }).catch(() => {})
+    },
    // 获取已读未读信息
    getReadInfo (readFlag) {
      this.readForm.readFlag = readFlag
--- a/src/views/modules/master/mastertopic.vue
+++ b/src/views/modules/master/mastertopic.vue
@ -77,7 +77,7 @@
            <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:mastertopic:toTop')  && scope.row.state == 1"  @click="openToTopDialog($event, scope.row)">置顶</el-button>
            <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:mastertopic:toTop')  && scope.row.state == 2" @click="openCancelToTopDialog($event, scope.row)">取消置顶</el-button>
            <el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:mastertopic:close')" @click="openCloseTopicDialog($event, scope.row)" :disabled="scope.row.state == 0">关闭</el-button>
-            <el-button type="text" size="small" @click="manageHandle(scope.row.id)">查看</el-button>
+            <el-button type="text" size="small" :disabled="btnAble" @click="manageHandle(scope.row.id, scope.row.browseNum)">查看</el-button>
          </template>
        </el-table-column>
      </el-table>
@ -152,6 +152,7 @@ export default {
      closeDialog: false,
      isTop: true,
      toGrey: false,
+      btnAble: false,
      orderByArr: [
        {
          label: '总参与度',
@ -221,9 +222,17 @@ export default {
        return '进行中'
      }
    },
-    manageHandle (topicId) {
-      this.$parent.selectComponent = 'Mastertopicdetail'
-      this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } })
+    manageHandle (topicId, browseNum) {
+      this.btnAble = true
+      // 将当前登录人改为已读
+      this.$http.post(`/cloudAnalysis/mastertopic/addBrowNum`, { id: topicId, browseNum: browseNum }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.btnAble = false
+        this.$parent.selectComponent = 'Mastertopicdetail'
+        this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } })
+      }).catch(() => {})
    },
    openToTopDialog (value, row) {
      this.toTopDialog = true