Merge remote-tracking branch 'origin/feature/style' into feature/style

5 years ago · 304396dc03
24 changed files with 37 additions and 33 deletions
--- a/src/views/modules/contentSecurity/violationsrecords.vue
+++ b/src/views/modules/contentSecurity/violationsrecords.vue
@ -49,7 +49,7 @@
        </el-form-item>

        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button v-if="$hasPermission('news:violationsrecords:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
--- a/src/views/modules/custom/enterpriseinfo.vue
+++ b/src/views/modules/custom/enterpriseinfo.vue
@ -22,10 +22,10 @@
                </el-form-item>

                <el-form-item>
-                    <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                    <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                </el-form-item>
                <el-form-item>
-                    <el-button v-if="$hasPermission('epdc:enterpriseinfo:export')" type="success"
+                    <el-button v-if="$hasPermission('epdc:enterpriseinfo:export')" type="primary"
                               @click="exportHandle()">{{ $t('export') }}
                    </el-button>
                </el-form-item>
--- a/src/views/modules/custom/evaluatedept.vue
+++ b/src/views/modules/custom/evaluatedept.vue
@ -9,7 +9,7 @@
          <el-input v-model="dataForm.deptName" @keyup.native="btKeyUpDeptName" placeholder="请输入" clearable></el-input>
        </el-form-item>
        <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button v-if="$hasPermission('custom:evaluatedept:deptUpdate')" type="danger" @click="deptUpdate()">同步</el-button>
@ -72,6 +72,7 @@ export default {
      },
      dataForm: {
        id: '',
+        deptName:''
      },
      evaluateofficerVisible: false,
    }
--- a/src/views/modules/custom/evaluateoption.vue
+++ b/src/views/modules/custom/evaluateoption.vue
@ -22,10 +22,10 @@

        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
-          <el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button v-if="$hasPermission('custom:evaluateoption:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
--- a/src/views/modules/custom/majorfunctionconf-add-or-update.vue
+++ b/src/views/modules/custom/majorfunctionconf-add-or-update.vue
@ -6,7 +6,6 @@
    <el-form :model="dataForm"
             :rules="dataRule"
             ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
      <el-form-item label="功能编码"
                    v-if="!dataForm.id"
--- a/src/views/modules/events/category-add-or-update.vue
+++ b/src/views/modules/events/category-add-or-update.vue
@ -1,6 +1,6 @@
 <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="120px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  label-width="120px">
      <el-form-item prop="categoryName" label="分类名称">
        <el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="500"></el-input>
      </el-form-item>
--- a/src/views/modules/events/issue-process-list.vue
+++ b/src/views/modules/events/issue-process-list.vue
@ -81,7 +81,7 @@
                        </el-date-picker>
                    </el-form-item>
                    <el-form-item>
-                        <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                    </el-form-item>
                </div>
            </el-form>
--- a/src/views/modules/group/group-detail.vue
+++ b/src/views/modules/group/group-detail.vue
@ -16,14 +16,14 @@
      </el-form-item>
    </el-form>
    <el-form :inline="true" :model="dataForm" ref="dataForm">
-      <el-form-item>
-        <el-input v-model="dataForm.nickname" placeholder="姓名" clearable></el-input>
+      <el-form-item label="姓名">
+        <el-input v-model="dataForm.nickname" placeholder="姓名" clearable @keyup.native="btKeyUpNickname"></el-input>
      </el-form-item>
-      <el-form-item>
-        <el-input v-model="dataForm.mobile" placeholder="电话" clearable></el-input>
+      <el-form-item label="电话">
+        <el-input v-model="dataForm.mobile" placeholder="电话" clearable @keyup.native="btKeyUpMobile"></el-input>
      </el-form-item>
      <el-form-item>
-        <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-button @click="getDataListSearch()" type='success'>{{ $t('query') }}</el-button>
      </el-form-item>
    </el-form>
    <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@ -102,6 +102,14 @@ export default {
      } else if (lordFlag === '1') {
        return '是'
      }
+    },
+    btKeyUpNickname(e){
+       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+       this.dataForm.nickname= e.target.value
+    },
+    btKeyUpMobile(e){
+       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
+       this.dataForm.mobile = e.target.value
    }
  }
 }
--- a/src/views/modules/kpi/manualscore-add-or-update-zlph.vue
+++ b/src/views/modules/kpi/manualscore-add-or-update-zlph.vue
@ -1,6 +1,6 @@
 <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' : '120px'">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
      <el-form-item>
        <el-form-item label="被打分部门" prop="deptId" v-if="!dataForm.id" style="margin-left: -120px; width: 400px;">
          <el-cascader
--- a/src/views/modules/message/mail-log.vue
+++ b/src/views/modules/message/mail-log.vue
@ -15,7 +15,7 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary"  @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success"  @click="getDataListSearch()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
--- a/src/views/modules/message/sms.vue
+++ b/src/views/modules/message/sms.vue
@ -12,13 +12,13 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary"  @click="getDataListSearch ()">{{ $t('query') }}</el-button>
+          <el-button type="success"  @click="getDataListSearch ()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button type="primary"  @click="configHandle()">{{ $t('sms.config') }}</el-button>
        </el-form-item>
        <el-form-item>
-          <el-button type="success" @click="sendHandle()">{{ $t('sms.send') }}</el-button>
+          <el-button type="primary" @click="sendHandle()">{{ $t('sms.send') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
--- a/src/views/modules/message/smslog.vue
+++ b/src/views/modules/message/smslog.vue
@ -24,7 +24,7 @@
        </el-select>
      </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <!-- <el-button v-if="$hasPermission('message:smslog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
--- a/src/views/modules/message/smstemplate-add-or-update.vue
+++ b/src/views/modules/message/smstemplate-add-or-update.vue
@ -1,6 +1,6 @@
 <template>
  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('smstemplate.add') : $t('smstemplate.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 :model="dataForm" :rules="dataRule" ref="dataForm"  :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
      <el-form-item label="模板类型" prop="templateType">
        <el-select v-model="dataForm.templateType" placeholder="模板类型" @change="selectModel($event)">
          <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
--- a/src/views/modules/news/newscategory-add-or-update.vue
+++ b/src/views/modules/news/newscategory-add-or-update.vue
@ -6,7 +6,6 @@
    <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="categoryName">
--- a/src/views/modules/sys/analysis-menu-add-or-update.vue
+++ b/src/views/modules/sys/analysis-menu-add-or-update.vue
@ -9,7 +9,6 @@
      :model="dataForm"
      :rules="dataRule"
      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
      label-width="120px"
    >
      <el-form-item prop="type" :label="$t('menu.type')" size="mini">
--- a/src/views/modules/sys/appmenutemplate-add-or-update.vue
+++ b/src/views/modules/sys/appmenutemplate-add-or-update.vue
@ -9,7 +9,6 @@
      :model="dataForm"
      :rules="dataRule"
      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
      :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
    >
      <el-form-item label="模板名称" prop="templateName" label-width="100px">
--- a/src/views/modules/sys/log-error.vue
+++ b/src/views/modules/sys/log-error.vue
@ -6,7 +6,7 @@
          <el-input v-model="dataForm.module" :placeholder="$t('logError.module')" clearable @keyup.native="btKeyUpModule"></el-input>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@ -14,7 +14,7 @@
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
        <el-table-column label="序号" type="index" align="center" width="50"  show-overflow-tooltip></el-table-column>
-        <el-table-column prop="module" :label="$t('logError.module')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="module" :label="$t('logError.module')" header-align="center" align="center" width="200" show-overflow-tooltip ></el-table-column>
        <el-table-column prop="requestUri" :label="$t('logError.requestUri')" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="requestMethod" :label="$t('logError.requestMethod')" header-align="center" align="center"></el-table-column>
        <el-table-column prop="requestParams" :label="$t('logError.requestParams')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
--- a/src/views/modules/sys/log-login.vue
+++ b/src/views/modules/sys/log-login.vue
@ -13,7 +13,7 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@ -25,7 +25,7 @@
                         show-overflow-tooltip
                         align="center"
                         width="50"></el-table-column>
-        <el-table-column prop="creatorName" :label="$t('logLogin.creatorName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="creatorName" :label="$t('logLogin.creatorName')" header-align="center" align="center" width="200" show-overflow-tooltip ></el-table-column>
        <el-table-column prop="operation" :label="$t('logLogin.operation')" header-align="center" align="center">
          <template slot-scope="scope">
            {{ scope.row.operation === 0 ? $t('logLogin.operation0') : $t('logLogin.operation1') }}
--- a/src/views/modules/sys/log-operation.vue
+++ b/src/views/modules/sys/log-operation.vue
@ -12,7 +12,7 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
        </el-form-item>
        <el-form-item>
          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
--- a/src/views/modules/sys/resource-add-or-update.vue
+++ b/src/views/modules/sys/resource-add-or-update.vue
@ -9,7 +9,6 @@
      :model="dataForm"
      :rules="dataRule"
      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
      label-width="120px"
    >
      <el-form-item prop="resourceLabel" label="资源标签">
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@ -6,7 +6,6 @@
    <el-form :model="dataForm"
             :rules="dataRule"
             ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
             label-width="120px">
      <el-form-item prop="name"
                    :label="$t('role.name')">
--- a/src/views/modules/user/fail-authentication.vue
+++ b/src/views/modules/user/fail-authentication.vue
@ -57,8 +57,9 @@
                    placeholder="请输入"
                    clearable></el-input>
        </el-form-item>
+        <br/>
        <div class="block">
-          <el-form-item label="注册时间" prop="startTime" label-width="90px">
+          <el-form-item label="注册时间" prop="startTime">
            <el-date-picker v-model="dataForm.startTime"
                            type="date"
                            :picker-options="pickerBeginDateBefore"
--- a/src/views/modules/user/user-detail.vue
+++ b/src/views/modules/user/user-detail.vue
@ -66,13 +66,14 @@
                           label="主键" v-if="false">
          </el-table-column>
          <el-table-column prop="allDeptNames"
-                           label="街道-社区-网格">
+                           label="街道-社区-网格" align="center" min-width="200">
          </el-table-column>
          <el-table-column prop="grid"
                           label="网格名称" v-if="false">
          </el-table-column>
          <el-table-column prop="leaderFlag"
                           label="是否为网格长"
+                           align="center"
                           :formatter="showLeaderFlagFormatter">
          </el-table-column>
        </el-table>
--- a/src/views/modules/user/usertag-add-or-update.vue
+++ b/src/views/modules/user/usertag-add-or-update.vue
@ -6,7 +6,6 @@
    <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="tagName">