diff --git a/src/views/modules/custom/enterprisereport-add-or-update.vue b/src/views/modules/custom/enterprisereport-add-or-update.vue
index 8572822..097daab 100644
--- a/src/views/modules/custom/enterprisereport-add-or-update.vue
+++ b/src/views/modules/custom/enterprisereport-add-or-update.vue
@@ -1,38 +1,33 @@
 <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="grid">
-          <el-input v-model="dataForm.grid" placeholder="企业所属网格"></el-input>
-      </el-form-item>
-          <el-form-item label="企业所属网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="企业所属网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="发布人所属网格" prop="dept">
-          <el-input v-model="dataForm.dept" placeholder="发布人所属网格"></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="发布人ID" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="发布人ID"></el-input>
-      </el-form-item>
-          <el-form-item label="发布人昵称" prop="nickname">
-          <el-input v-model="dataForm.nickname" placeholder="发布人昵称"></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="faceImg">
-          <el-input v-model="dataForm.faceImg" placeholder="发布人头像"></el-input>
-      </el-form-item>
-          <el-form-item label="发布人真实姓名" prop="realName">
-          <el-input v-model="dataForm.realName" placeholder="发布人真实姓名"></el-input>
-      </el-form-item>
-          <el-form-item label="所属年度" prop="year">
-          <el-input v-model="dataForm.year" placeholder="所属年度"></el-input>
-      </el-form-item>
-          <el-form-item label="所属季度" prop="quarter">
-          <el-input v-model="dataForm.quarter" placeholder="所属季度"></el-input>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '160px' : '120px'">
+          <el-form-item label="网格" prop="gridId">
+          <el-cascader v-model="dataForm.gridIdArray"
+                       :options="options"
+                       ref="org"
+                       :props="{ checkStrictly: true }"
+                       @change="allGridIdsChangeHandle"
+                       placeholder="企业所属网格"
+                       show-overflow-tooltip
+                       style="width: 100%;">
+          </el-cascader>
+      </el-form-item>
+          <el-form-item label="年度" prop="year">
+          <el-date-picker v-model="dataForm.year"
+                          value-format="yyyy"
+                          type="year"
+                          placeholder="所属年度">
+          </el-date-picker>
+      </el-form-item>
+          <el-form-item label="季度" prop="quarter">
+          <el-select v-model="dataForm.quarter" placeholder="请选择所属季度" style="width: 100%;">
+            <el-option
+              v-for="item in enterpriseQuarterList"
+              :key="item.dictValue"
+              :label="item.dictName"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
       </el-form-item>
           <el-form-item label="公司名称" prop="enterpriseName">
           <el-input v-model="dataForm.enterpriseName" placeholder="公司名称"></el-input>
@@ -44,46 +39,23 @@
           <el-input v-model="dataForm.concat" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="公司状态" prop="enterpriseStatus">
-          <el-input v-model="dataForm.enterpriseStatus" placeholder="公司状态"></el-input>
-      </el-form-item>
-          <el-form-item label="营业收入(单位：万元)" prop="enterpriseIncome">
-          <el-input v-model="dataForm.enterpriseIncome" placeholder="营业收入"></el-input>
+          <el-select v-model="dataForm.enterpriseStatus" placeholder="请选择公司状态" style="width: 100%;">
+            <el-option
+              v-for="item in enterpriseStatusList"
+              :key="item.dictValue"
+              :label="item.dictName"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+      </el-form-item>
+          <el-form-item label="营业收入(万元)" prop="enterpriseIncome">
+          <el-input-number v-model="dataForm.enterpriseIncome" :min="0" :max="999999999" style="width: 30%;"></el-input-number>
       </el-form-item>
           <el-form-item label="用工人数" prop="enterprisePeopleNum">
-          <el-input v-model="dataForm.enterprisePeopleNum" placeholder="用工人数"></el-input>
-      </el-form-item>
-          <el-form-item label="问题" prop="question">
-          <el-input v-model="dataForm.question" 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-item label="企业父所有部门" prop="parentDeptIds">
-          <el-input v-model="dataForm.parentDeptIds" placeholder="企业父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="企业父所有部门" prop="parentDeptNames">
-          <el-input v-model="dataForm.parentDeptNames" placeholder="企业父所有部门"></el-input>
+          <el-input-number v-model="dataForm.enterprisePeopleNum" :min="0" :max="999999999" style="width: 30%;"></el-input-number>
       </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-item label="企业所有部门名称" prop="allDeptNames">
-          <el-input v-model="dataForm.allDeptNames" placeholder="企业所有部门名称"></el-input>
+          <el-form-item label="问题">
+          <el-input v-model="dataForm.question" placeholder="问题描述"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -103,13 +75,10 @@ export default {
         id: '',
         grid: '',
         gridId: '',
-        dept: '',
-        deptId: '',
-        userId: '',
-        nickname: '',
-        mobile: '',
-        faceImg: '',
-        realName: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
         year: '',
         quarter: '',
         enterpriseName: '',
@@ -119,17 +88,11 @@ export default {
         enterpriseIncome: '',
         enterprisePeopleNum: '',
         question: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
-        parentDeptIds: '',
-        parentDeptNames: '',
-        allDeptIds: '',
-        allDeptNames: ''
-      }
+        gridIdArray: []
+      },
+      options: [],
+      enterpriseStatusList: [],
+      enterpriseQuarterList: []
     }
   },
   computed: {
@@ -141,27 +104,6 @@ export default {
         gridId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        dept: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        deptId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        userId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nickname: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        faceImg: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        realName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         year: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -185,39 +127,6 @@ export default {
         ],
         enterprisePeopleNum: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        question: [
-          { 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' }
-        ],
-        parentDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -225,6 +134,10 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.dataForm.gridIdArray = []
+      this.getEnterpriseStatusList()
+      this.getEnterpriseQuarterList()
+      this.getOrgList()
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -232,9 +145,57 @@ export default {
         }
       })
     },
+    getOrgList () {
+      this.$http
+        .get(`/sys/dept/party/getDeptTree`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
+    },
+    getEnterpriseStatusList () {
+      this.$http
+        .get(`/sys/dict/listSimple/enterprise_status`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.enterpriseStatusList = res.data
+        })
+        .catch(() => {})
+    },
+    getEnterpriseQuarterList () {
+      this.$http
+        .get(`/sys/dict/listSimple/enterprise_quarter`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.enterpriseQuarterList = res.data
+        })
+        .catch(() => {})
+    },
+    allGridIdsChangeHandle (value, selectedData) {
+      let len = 'value' + value
+      // len.length == 5 表示 未勾选任何所属机构
+      if (len.length > 5) {
+        this.dataForm.grid = this.$refs['org'].getCheckedNodes()[0].label
+        this.dataForm.gridId = this.$refs['org'].getCheckedNodes()[0].value
+
+        this.dataForm.allDeptIds = this.$refs['org'].getCheckedNodes()[0].path.join(',')
+        this.dataForm.allDeptNames = this.$refs['org'].getCheckedNodes()[0].pathLabels.join('-')
+
+        let arrLength = this.$refs['org'].getCheckedNodes()[0].path.length
+        this.dataForm.parentDeptIds = this.$refs['org'].getCheckedNodes()[0].path.slice(0, arrLength - 1).join(',')
+        this.dataForm.parentDeptNames = this.$refs['org'].getCheckedNodes()[0].pathLabels.slice(0, arrLength - 1).join('-')
+      }
+    },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/enterprisereport/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/custom/enterprisereport/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -250,14 +211,14 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/enterprisereport/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/custom/enterprisereport/', 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,
+            duration: 2000,
             onClose: () => {
               this.visible = false
               this.$emit('refreshDataList')
diff --git a/src/views/modules/custom/enterprisereport-detail.vue b/src/views/modules/custom/enterprisereport-detail.vue
index 82fc5e8..71e6662 100644
--- a/src/views/modules/custom/enterprisereport-detail.vue
+++ b/src/views/modules/custom/enterprisereport-detail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" ref="dataForm" label-width="150px">
+    <el-form :model="dataForm" ref="dataForm" label-width="180px">
           <el-form-item label="网格：" prop="grid">
           <div>{{ dataForm.grid }}</div>
       </el-form-item>
diff --git a/src/views/modules/custom/enterprisereport.vue b/src/views/modules/custom/enterprisereport.vue
index c458844..432bad4 100644
--- a/src/views/modules/custom/enterprisereport.vue
+++ b/src/views/modules/custom/enterprisereport.vue
@@ -69,7 +69,8 @@
         <el-table-column prop="enterprisePeopleNum" 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="mini" @click="detailHandle(scope.row.id)">查看</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>