From 061f8368c797519dffd7acdefd1de5d4b8a9b2f0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 8 Sep 2021 18:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B5=E9=9D=A2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 131 +++++++++---------
 src/views/modules/sys/dept-add-or-update.vue  |   5 +-
 src/views/modules/sys/partyorg.vue            |   2 +-
 src/views/modules/workbench/workbench.vue     |   2 +-
 4 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index cb1a1d3..43218d2 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -35,50 +35,68 @@
                     @keyup.native="btKeyUpMobile"
                     style="width:200px"></el-input>
         </el-form-item>
-        <el-form-item label="户籍地"
-                      label-width="90px">
-          <el-input v-model="dataForm.householdRegisterName"
-                    placeholder="户籍地"
-                    clearable
-                    maxlength="500"
-                    style="width:200px"></el-input>
-        </el-form-item>
-        <br/>
-        <el-form-item label="街道/乡镇名称"
-                      prop="street"
-                      label-width="120px">
-          <el-input v-model="dataForm.street"
-                    placeholder="街道/乡镇名称"
-                    clearable
-                    maxlength="20"
-                    style="width:200px"></el-input>
-        </el-form-item>
-        <el-form-item label="社区/村庄名称"
-                      prop="community"
-                      label-width="120px">
-          <el-input v-model="dataForm.community"
-                    placeholder="社区/村庄名称"
-                    clearable
-                    maxlength="20"
-                    style="width:200px"></el-input>
+        <el-form-item label="所属机构" label-width="90px">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
         </el-form-item>
-        <el-form-item label="网格名称"
-                      prop="gridName"
-                      label-width="90px">
-          <el-input v-model="dataForm.gridName"
-                    placeholder="网格名称"
-                    clearable
-                    maxlength="20"
-                    style="width:200px"></el-input>
-        </el-form-item>
-        <el-form-item label="现居住地名称"
-                      label-width="100px">
-          <el-input v-model="dataForm.outLiveAddressName"
-                    placeholder="现居住地名称"
-                    clearable
-                    maxlength="500"
-                    style="width:200px"></el-input>
+        <el-form-item label="特殊人群"
+                      prop="specialCrowd" label-width="90px">
+          <el-select v-model="dataForm.specialCrowd" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in specialCrowdOptions"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
         </el-form-item>
+<!--        <el-form-item label="户籍地"-->
+<!--                      label-width="90px">-->
+<!--          <el-input v-model="dataForm.householdRegisterName"-->
+<!--                    placeholder="户籍地"-->
+<!--                    clearable-->
+<!--                    maxlength="500"-->
+<!--                    style="width:200px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <br/>-->
+<!--        <el-form-item label="街道/乡镇名称"-->
+<!--                      prop="street"-->
+<!--                      label-width="120px">-->
+<!--          <el-input v-model="dataForm.street"-->
+<!--                    placeholder="街道/乡镇名称"-->
+<!--                    clearable-->
+<!--                    maxlength="20"-->
+<!--                    style="width:200px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="社区/村庄名称"-->
+<!--                      prop="community"-->
+<!--                      label-width="120px">-->
+<!--          <el-input v-model="dataForm.community"-->
+<!--                    placeholder="社区/村庄名称"-->
+<!--                    clearable-->
+<!--                    maxlength="20"-->
+<!--                    style="width:200px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="网格名称"-->
+<!--                      prop="gridName"-->
+<!--                      label-width="90px">-->
+<!--          <el-input v-model="dataForm.gridName"-->
+<!--                    placeholder="网格名称"-->
+<!--                    clearable-->
+<!--                    maxlength="20"-->
+<!--                    style="width:200px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="现居住地名称"-->
+<!--                      label-width="100px">-->
+<!--          <el-input v-model="dataForm.outLiveAddressName"-->
+<!--                    placeholder="现居住地名称"-->
+<!--                    clearable-->
+<!--                    maxlength="500"-->
+<!--                    style="width:200px"></el-input>-->
+<!--        </el-form-item>-->
         <el-form-item label="核酸检测状态" prop="checkState">
           <el-select v-model="dataForm.checkState" clearable placeholder="核酸检测状态">
             <el-option v-for="item in checkStateList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
@@ -104,17 +122,6 @@
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="特殊人群"
-                      prop="specialCrowd">
-          <el-select v-model="dataForm.specialCrowd" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in specialCrowdOptions"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="已接种" label-width="90px"
                       prop="isInoculate">
           <el-select v-model="dataForm.isInoculate" clearable
@@ -439,7 +446,7 @@ export default {
   },
   created: function () {
     // this.getcompantyOptions()
-    // this.getOptions()
+    this.getOptions()
     // 乡镇下拉框赋值
     // this.getDailyTypeArrInfo()
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicreportuserinfo/importManualScoreExcel?token=${Cookies.get('token')}`
@@ -506,14 +513,14 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/custom/select/getSysArea`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data
-        })
-        .catch(() => { })
+          .get(`/sys/user/deptOptions/getByLoginUser`)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.options = res.data.options
+          })
+          .catch(() => { })
     },
     btKeyUpUsername (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
diff --git a/src/views/modules/sys/dept-add-or-update.vue b/src/views/modules/sys/dept-add-or-update.vue
index 3f8227a..93ac821 100644
--- a/src/views/modules/sys/dept-add-or-update.vue
+++ b/src/views/modules/sys/dept-add-or-update.vue
@@ -90,7 +90,7 @@
       </el-form-item>
       <el-form-item prop="introduction"
                     label="组织信息">
-        <el-input class="input-width-jg" v-model="dataForm.introduction"   
+        <el-input class="input-width-jg" v-model="dataForm.introduction"
                   type="textarea"
                   :rows="3"
                   placeholder="概况介绍"></el-input>
@@ -383,7 +383,6 @@ export default {
       })
     },
     position (position) {
-      debugger
         this.dataForm.latitude = position.latitude
         this.dataForm.longitude = position.longitude
     },
@@ -461,4 +460,4 @@ export default {
   height: 178px;
   display: block;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/sys/partyorg.vue b/src/views/modules/sys/partyorg.vue
index bb67497..281b0f0 100644
--- a/src/views/modules/sys/partyorg.vue
+++ b/src/views/modules/sys/partyorg.vue
@@ -64,7 +64,7 @@ export default {
         getDataListIsPage: true,
         deleteURL: '/sys/partyorg',
         deleteIsBatch: true,
-        exportURL: '/sys/partyorg/export',
+        exportURL: '/sys/partyorg/export'
       },
       dataForm: {
         id: '',
diff --git a/src/views/modules/workbench/workbench.vue b/src/views/modules/workbench/workbench.vue
index 83e92fb..25c744b 100644
--- a/src/views/modules/workbench/workbench.vue
+++ b/src/views/modules/workbench/workbench.vue
@@ -137,7 +137,7 @@ export default {
       issueItemAnalysisDepts: [],
       issueItemAnalysisIssueNum: [],
       issueItemAnalysisItemNum: [],
-      issueItemAnalysisTopicNum: [],
+      issueItemAnalysisTopicNum: []
     }
   },
   mounted () {