完善页面信息

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="户籍地"
+        <el-form-item label="所属机构" label-width="90px">
-                      label-width="90px">
+          <el-cascader v-model="deptIdList"
-          <el-input v-model="dataForm.householdRegisterName"
+                       :options="options"
-                    placeholder="户籍地"
+                       :props="{ checkStrictly: true }"
-                    clearable
+                       clearable>
-                    maxlength="500"
+          </el-cascader>
-                    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="网格名称"
+        <el-form-item label="特殊人群"
-                      prop="gridName"
+                      prop="specialCrowd" label-width="90px">
-                      label-width="90px">
+          <el-select v-model="dataForm.specialCrowd" clearable
-          <el-input v-model="dataForm.gridName"
+                     placeholder="请选择">
-                    placeholder="网格名称"
+            <el-option v-for="item in specialCrowdOptions"
-                    clearable
+                       :key="item.dictValue"
-                    maxlength="20"
+                       :label="item.dictName"
-                    style="width:200px"></el-input>
+                       :value="item.dictValue">
-        </el-form-item>
+            </el-option>
-        <el-form-item label="现居住地名称"
+          </el-select>
-                      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="户籍地"-->
+<!--                      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,12 +513,12 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/custom/select/getSysArea`)
+          .get(`/sys/user/deptOptions/getByLoginUser`)
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg)
             }
-          this.options = res.data
+            this.options = res.data.options
           })
           .catch(() => { })
     },

src/views/modules/sys/dept-add-or-update.vue

@@ -383,7 +383,6 @@ export default {
       })
     },
     position (position) {
-      debugger
         this.dataForm.latitude = position.latitude
         this.dataForm.longitude = position.longitude
     },

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: '',

src/views/modules/workbench/workbench.vue

@@ -137,7 +137,7 @@ export default {
       issueItemAnalysisDepts: [],
       issueItemAnalysisIssueNum: [],
       issueItemAnalysisItemNum: [],
-      issueItemAnalysisTopicNum: [],
+      issueItemAnalysisTopicNum: []
     }
   },
   mounted () {