Merge branch 'dev-detail-adjust0919'

src/views/modules/base/epidemic/antiInfo.vue

@@ -556,7 +556,7 @@ export default {
       return subYear + '-' + nowMonth + '-' + nowDay
     },
     handleCnalceForm () {
-      this.$refs.detail_form.resetFields()
+
       this.vaccineList = []
       this.natList = []
       this.tripList = []

src/views/modules/base/epidemic/natInfo/noNatDetail.vue

@@ -25,7 +25,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-2">检测结果：</span>
-            <span>{{ formData.natResult==='0'?'阴性':'阳性' }}</span>
+            <span>{{ formData.natResult==='0'?'阴性':formData.natResult==='1'?'阳性':'--' }}</span>
           </div>
 
         </div>

src/views/modules/base/epidemic/vaccin.vue

@@ -100,7 +100,8 @@
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
                    :multiple="false"
                    :show-file-list="false"
                    :before-upload="beforeUpload"
@@ -243,8 +244,7 @@
                class="dialog-h"
                @closed="diaClose">
       <vaccinForm ref="ref_form"
-                  @dialogCancle="diaClose"
+                  @dialogCancle="diaClose"></vaccinForm>
-                  @dialogOk="addFormOk"></vaccinForm>
     </el-dialog>
     <el-dialog :visible.sync="addFormShow"
                :close-on-click-modal="false"
@@ -409,7 +409,7 @@ export default {
       this.formShow = true;
       const row1 = { ...row }
       let row2 = await this.getInfo(row1);
-      this.$refs.ref_form.initForm("detail", row2);
+      this.$refs.ref_form.initForm(row2);
     },
 
     handleAdd () {

src/views/modules/base/epidemic/vaccinForm.vue

@@ -1,99 +1,47 @@
 <template>
-  <div class="epidemic-form">
+  <div>
     <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">姓名：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
 
-      <el-form ref="ref_form"
+          <div class="info-prop">
-               :inline="true"
+            <span class="info-title-2">手机号：</span>
-               :model="formData"
+            <span>{{ formData.mobile||'--' }}</span>
-               :rules="dataRule"
+          </div>
-               :disabled="formType==='detail'"
+
-               class="form">
+          <div class="info-prop">
-
+            <span class="info-title-2">证件号：</span>
-        <el-form-item label="姓名"
+            <span>{{ formData.idCard||'--' }}</span>
-                      prop="name"
+          </div>
-                      label-width="150px"
+
-                      style="display: block">
+          <div class="info-prop">
-          <el-input class="item_width_2"
+            <span class="info-title-2">接种时间：</span>
-                    placeholder="请输入姓名"
+            <span>{{ formData.inoculateTime||'--'  }}</span>
-                    clearable
+          </div>
-                    :disabled="isFromResi"
+          <div class="info-prop">
-                    v-model="formData.name">
+            <span class="info-title-2">接种地点：</span>
-          </el-input>
+            <span>{{ formData.inoculateAddress||'--'  }}</span>
-
+          </div>
-        </el-form-item>
+          <div class="info-prop">
-
+            <span class="info-title-2">疫苗厂家：</span>
-        <el-form-item label="手机号"
+            <span>{{ formData.manufacturer||'--'  }}</span>
-                      prop="mobile"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入手机号"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.mobile">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="证件号"
-                      prop="idCard"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入身份证号或护照号"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.idCard">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="接种时间"
-                      style="display: block"
-                      prop="inoculateTime"
-                      label-width="150px">
-          <el-date-picker class="item_width_2"
-                          v-model="formData.inoculateTime"
-                          format="yyyy-MM-dd HH:mm"
-                          value-format="yyyy-MM-dd HH:mm"
-                          type="datetime"
-                          :picker-options="pickerOptions"
-                          clearable
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item label="接种地点"
-                      prop="inoculateAddress"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入检测地点"
-                    clearable
-                    v-model="formData.inoculateAddress">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="疫苗厂家"
-                      prop="manufacturer"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入检测地点"
-                    clearable
-                    v-model="formData.manufacturer" />
-        </el-form-item>
-
-      </el-form>
           </div>
 
-    <div class="form_div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
         </div>
+      </div>
+
+    </div>
+
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
 
   </div>
 </template>
@@ -108,23 +56,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      initLoading: false,
-      hideUploadEdit: false, // 隐藏'上传按钮'
-      limitNum: 1,
-      enterType: '1',//录入方式1 手动输入  2  选择居民
-      isFromResi: false,//是否从已有居民信息中选择
-
-      gridList: [],
-      personList: [],
-      pickerOptions: { //控制时间范围
-        disabledDate (time) {
-          return time.getTime() > (Date.now())
-        }
-      },
-
-      btnDisable: false,
-
-      icNatId: '',
       formData: {
         agencyId: '',//当前网格所属组织Id
         userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
@@ -137,11 +69,7 @@ export default {
         manufacturer: ''
       },
 
-      fileList: [],
+
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-      dialogImageUrl: '',
-      dialogVisible: false,
-      imgLoading: false,
 
     }
   },
@@ -149,8 +77,7 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    //获取网格下拉框数据
+
-    // await this.loadGrid()
   },
 
   methods: {
@@ -158,79 +85,16 @@ export default {
       this.formData.content = ''
     },
 
-    async initForm (type, row) {
+    async initForm (row) {
-      // this.startLoading()
-      this.formData.agencyId = this.agencyId
 
-      // this.$refs['ref_form'].resetFields();
-      this.isFromResi = false
-      this.enterType = '1'
-      this.formType = type
 
       this.formData = { ...row }
       // this.endLoading()
       console.log('formData----', this.formData)
-
+      this.initLoading = true
     },
 
-    handleChangeEnterType (value) {
-      this.formData.name = ''
-      this.formData.mobile = ''
-      this.formData.idCard = ''
-      this.formData.gridId = ''
-      this.formData.userId = ''
-
-      this.$refs['ref_form'].resetFields();
-      if (value === '2') {
-        this.isFromResi = true
-      } else {
-        this.isFromResi = false
-      }
 
-    },
-
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
-
-      let params = {
-        agencyId: this.agencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.gridList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async handleSelGrid (value) {
-
-      const url = "/epmetuser/icresiuser/demandusers"
-
-      let params = {
-        agencyId: this.agencyId,
-        gridId: value
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.personList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async handleSelPerson (personItem) {
-      this.formData.userId = personItem.demandUserId
-      this.formData.name = personItem.demandUserName
-      this.formData.mobile = personItem.demandUserMobile
-      this.formData.idCard = personItem.idCard
-    },
 
     async loadFormData () {
 
@@ -284,164 +148,15 @@ export default {
       }
     },
 
-    handleComfirm () {
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-
-        } else {
-          this.addNat()
-        }
-
-      })
-    },
-
-    async addNat () {
-      // if (this.imgLoading) {
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '正在上传图片，请稍候重试'
-      //   })
-      //   return false;
-      // }
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.formData.mobile) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z0-9]{8,9}$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-      if (regCard.test(this.formData.idCard) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的证件号码'
-        })
-        return false;
-      }
-
-      if (this.formData.isSelChannel) {
-        if (!this.formData.content) {
-          this.$message({
-            type: 'warning',
-            message: '请填写通知内容'
-          })
-          return false;
-        } else {
-          this.formData.channel = ['0']
-        }
-
-      } else {
-        this.formData.channel = []
-        this.formData.content = ''
-      }
-
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 5000)
-
-      let url = ''
-      if (this.formType === 'add') {
-        url = '/epmetuser/icNat/add'
-        // url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add"
-        this.formData.icNatId = ''
-
-      } else {
-        url = '/epmetuser/icNat/edit'
-        // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit"
-      }
-
-
-      const { data, code, msg } = await requestPost(url, this.formData)
-
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-
-      } else {
-        this.btnDisable = false
-        this.$message.error(msg)
-      }
-
-    },
 
     handleCancle () {
-      this.resetData()
+      // this.resetData()
       this.$emit('dialogCancle')
 
     },
 
-    handleRemove (file, fileList) {
-      this.hideUploadEdit = fileList.length >= this.limitNum;
-      this.formData.fileName = ''
-      this.formData.attachmentUrl = ''
-      this.formData.attachmentType = ''
-      this.fileList = []
-
-    },
-    handlePictureCardPreview (file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-
-    handleEditChange (file, fileList) {
-      this.hideUploadEdit = fileList.length >= this.limitNum;
-
-    },
-
-    beforeUpload (file) {
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
-      // const isLt1M = (file.size / 1024 / 1024) < 5
-      if (extension !== 'jpg'
-        && extension !== 'png'
-        && extension !== 'gif'
-      ) {
-        this.$message.error('只能上传jpg、png、gif文件！')
-        return false
-      } else {
-        this.btnDisable = true
-      }
-      // if (!isLt1M) {
-      //   this.$message.error('上传文件大小不能超过 5MB!')
-      // }
-      // return isLt1M
-
-    },
-
-    handleFileSuccess (res, file) {
-
-      if (res.code === 0 && res.msg === 'success') {
-        const array = file.name.split('.')
-        const fileType = array[array.length - 1]
-
-        this.formData.fileName = file.name
-        this.formData.attachmentUrl = res.data.url
-        this.formData.attachmentType = 'image'
-
-        file.attachmentFormat = fileType
-        file.attachmentSize = file.size
-
-
-      } else {
-        this.$message.error(res.msg)
-      }
-      this.btnDisable = false
-    },
 
     resetData () {
-      this.icNatId = ''
-      this.fileList = []
-      this.hideUploadEdit = false
 
       this.formData = {
         icNatId: '',
@@ -481,40 +196,6 @@ export default {
     }
   },
   computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
-        idCard: [
-          { required: true, message: '证件号不能为空', trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: '手机号不能为空', trigger: 'blur' },
-        ],
-        natTime: [
-          { required: true, message: '检测时间不能为空', trigger: 'blur' },
-        ],
-
-        natAddress: [
-          { required: false },
-        ],
-        natResult: [
-          { required: true, message: '检测结果不能为空', trigger: 'blur' },
-        ],
-
-        isSelChannel: [
-          { required: false },
-        ],
-        channel: [
-          { required: false },
-        ],
-        content: [
-          { required: false },
-        ],
-
-      }
-    },
 
   },
   props: {
@@ -530,19 +211,8 @@ export default {
 </script>
 
 
-<style lang="scss" scoped >
+<style lang="scss" scoped>
-@import "@/assets/scss/modules/management/epidemic.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
-</style>
-
-<style lang='scss'>
-// 隐藏上传按钮
-.hide .el-upload--picture-card {
-  display: none;
-}
-// 添加/删除文件时去掉动画过渡
-.el-upload-list__item {
-  transition: none !important;
-}
 </style>
 
 

src/views/modules/communityService/ninePlaces/places/placesDetail.vue

@@ -134,11 +134,7 @@ export default {
       }
     },
 
-
-
     handleCancle () {
-
-
       this.$emit('diaDetailClose')
 
     },

src/views/modules/communityService/worklog/workLog.vue

@@ -10,6 +10,7 @@
                         prop="gridId">
             <el-select v-model="workLog.gridId"
                        filterable
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in optionsG"
@@ -23,6 +24,7 @@
                         prop="serviceType">
             <el-select v-model="workLog.serviceType"
                        filterable
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in serviceTypeList"
@@ -153,35 +155,35 @@
                          align="center"
                          label="申请人"
                          show-overflow-tooltip
-                         max-width="100">
+                         width="100">
         </el-table-column>
         <el-table-column prop="applicantAddress"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
                          label="住址"
-                         width="80">
+                         min-width="130">
         </el-table-column>
         <el-table-column prop="serviceContent"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="服务内容"
-                         mix-width="230">
+                         min-width="150">
         </el-table-column>
         <el-table-column prop="applicantMobile"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="联系电话"
-                         width="100">
+                         width="110">
         </el-table-column>
         <el-table-column prop="principalName"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="责任人"
-                         width="130">
+                         width="100">
         </el-table-column>
         <el-table-column prop="serviceTime"
                          header-align="center"

src/views/modules/worklog/icworklog.vue

@@ -1,11 +1,17 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-__icWorkLog} resi-container">
-      <el-card ref="searchCard" class="search-card">
+      <el-card ref="searchCard"
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+               class="search-card">
-        <el-form-item prop="gridId" label="所属组织">
+        <el-form :inline="true"
+                 :model="dataForm"
+                 @keyup.enter.native="getDataList()">
+          <el-form-item prop="gridId"
+                        label="所属组织">
             <div class="resi-cell-value">
               <el-cascader class="customer_cascader"
+                           size="small"
                            ref="myCascader"
                            clearable
                            v-model="agencyIdArray"
@@ -44,9 +50,11 @@
                       placeholder="请输入联系电话">
             </el-input>
           </el-form-item>
-        <el-form-item label="日志时间" prop="startTime">
+          <el-form-item label="日志时间"
+                        prop="startTime">
             <el-date-picker v-model="dataForm.startTime"
                             type="date"
+                            size="small"
                             :picker-options="pickerBeginDateBefore"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
@@ -54,9 +62,11 @@
                             style="width:200px">
             </el-date-picker>
           </el-form-item>
-        <el-form-item label="至" prop="endTime">
+          <el-form-item label="至"
+                        prop="endTime">
             <el-date-picker v-model="dataForm.endTime"
                             type="date"
+                            size="small"
                             :picker-options="pickerBeginDateAfter"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
@@ -65,7 +75,10 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-          <el-button type="primary" size="small" class="diy-button--search" @click="getDataList()">{{ $t('query') }}</el-button>
+            <el-button type="primary"
+                       size="small"
+                       class="diy-button--search"
+                       @click="getDataList()">{{ $t('query') }}</el-button>
 
             <el-button style="margin-left:10px"
                        size="small"
@@ -78,9 +91,9 @@
                    type="primary"
                    class="diy-button--reset"
                    @click="resetSearch">重置</el-button> -->
-<!--        <el-form-item>-->
+          <!--        <el-form-item>-->
-<!--          <el-button type="primary" size="small"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+          <!--          <el-button type="primary" size="small"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
-<!--        </el-form-item>-->
+          <!--        </el-form-item>-->
           <!-- <el-form-item>
          <el-button size="small" style="margin-left:10px" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
        </el-form-item> -->
@@ -88,33 +101,64 @@
       </el-card>
       <el-card class="resi-card-table">
         <div class="resi-row-btn">
-          <el-button
+          <el-button class="diy-button--add"
-                  class="diy-button--add"
                      size="small"
-                  @click="addOrUpdateHandle()"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-          >{{ $t('add') }}</el-button
+          <el-button @click="exportHandle()"
-          >
+                     class="diy-button--reset"
-          <el-button @click="exportHandle()" class="diy-button--reset" size="small"
+                     size="small">导出</el-button>
-          >导出</el-button
+          <el-button size="small"
-          >
+                     type="danger"
-          <el-button size="small" type="danger" @click="deleteHandle()">批量删除</el-button>
+                     @click="deleteHandle()">批量删除</el-button>
         </div>
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+        <el-table class="resi-table"
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+                  v-loading="dataListLoading"
-        <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
+                  :data="dataList"
-        <el-table-column prop="logType" label="日志类型" :formatter="categoryCodeFormatter" header-align="center" align="center"></el-table-column>
+                  border
-        <el-table-column prop="logDate" label="日志时间" header-align="center" align="center"></el-table-column>
+                  @selection-change="dataListSelectionChangeHandle"
-        <el-table-column prop="createdUser" label="网格员" header-align="center" align="center"></el-table-column>
+                  style="width: 100%">
-        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
+          <el-table-column type="selection"
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+                           header-align="center"
+                           align="center"
+                           width="50"></el-table-column>
+          <el-table-column prop="title"
+                           label="标题"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="logType"
+                           label="日志类型"
+                           :formatter="categoryCodeFormatter"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="logDate"
+                           label="日志时间"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="createdUser"
+                           label="网格员"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="mobile"
+                           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="small" @click="addOrUpdateHandle(scope.row.id)"> {{ userId == scope.row.createdBy ? $t('update') : '查看' }}</el-button>
+              <el-button type="text"
-            <el-button type="text" v-if="userId == scope.row.createdBy" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+                         size="small"
+                         @click="addOrUpdateHandle(scope.row.id)"> {{ userId == scope.row.createdBy ? $t('update') : '查看' }}</el-button>
+              <el-button type="text"
+                         v-if="userId == scope.row.createdBy"
+                         size="small"
+                         @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
-      <el-pagination
+        <el-pagination :current-page="page"
-        :current-page="page"
                        :page-sizes="[10, 20, 50, 100]"
                        :page-size="limit"
                        :total="total"
@@ -124,7 +168,9 @@
         </el-pagination>
       </el-card>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
     </div>
   </el-card>
 </template>
@@ -145,10 +191,10 @@ export default {
         exportURL: '/gov/org/icWorkLog/export'
       },
       userId: this.$store.state.user.id,
-      agencyIdArray:[],
+      agencyIdArray: [],
       orgOptions: [],
       logTypeArr: [],
-      orgOptionProps:{
+      orgOptionProps: {
         multiple: false,
         value: 'agencyId',
         label: 'agencyName',
@@ -168,7 +214,7 @@ export default {
     this.getCategrayList()
   },
   methods: {
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customeragency/agencygridtree', {})
@@ -177,8 +223,8 @@ export default {
             return this.$message.error(res.msg)
           } else {
             console.log('获取组织树成功', res.data)
-                  this.orgOptions=[]
+            this.orgOptions = []
-                  this.orgOptions .push( res.data)
+            this.orgOptions.push(res.data)
           }
         })
         .catch(() => {
@@ -254,20 +300,20 @@ export default {
       })
       return ca
     },
-    handleChangeAgency(val) {
+    handleChangeAgency (val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
 
       if (obj) {
-        if(obj.level === 'grid'){
+        if (obj.level === 'grid') {
           this.dataForm.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.dataForm.agencyId=''
+          this.dataForm.agencyId = ''
-        }else{
+        } else {
           this.dataForm.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
           this.dataForm.gridId = ''
         }
 
-      }else{
+      } else {
-        this.dataForm.agencyId=''
+        this.dataForm.agencyId = ''
         this.dataForm.gridId = ''
       }
     },
@@ -291,16 +337,16 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/buttonstyle.scss";
 
-  .resi-container .resi-card-table {
+.resi-container .resi-card-table {
   ::v-deep .el-table th {
     color: #fff;
     background-color: rgba(33, 149, 254, 1);
     // border-right: 1px solid rgba(33, 149, 254, 1);
   }
-  }
+}
-  .resi-table {
+.resi-table {
   ::v-deep .el-button--text {
     text-decoration: underline;
   }
@@ -311,20 +357,19 @@ export default {
   ::v-deep .btn-color-edit {
     color: rgba(0, 167, 169, 1);
   }
-  }
+}
 
-  .resi-row-btn {
+.resi-row-btn {
   margin-bottom: 13px;
   .upload-btn {
     display: inline-block;
     margin: 0 10px;
   }
-  }
+}
 
-  .form-wr {
+.form-wr {
   .input-width {
     width: 260px;
-
   }
   .input-width-textarea {
     width: 500px;
@@ -346,17 +391,17 @@ export default {
       }
     }
   }
-  }
+}
-  .div-content {
+.div-content {
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  }
+}
 </style>
 
 <style>
-  .el-table .warning-row {
+.el-table .warning-row {
   background: #ffe168;
-  }
+}
 </style>