From 6ec48a8a65bfc55d6086f52523041bf865a455a0 Mon Sep 17 00:00:00 2001
From: FightingN <18300240052@163.com>
Date: Mon, 27 Jul 2020 18:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E4=BC=98=E5=8C=96=E3=80=91-?=
 =?UTF-8?q?=E5=BC=A0=E6=99=93=E5=AE=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/api/scanswitch-add-or-update.vue       | 9 ++++-----
 .../custom/gridoperatordutycategory-add-or-update.vue    | 2 +-
 src/views/modules/events/category.vue                    | 6 +++---
 src/views/modules/events/item-close-list.vue             | 8 ++++----
 src/views/modules/events/item-deal-list.vue              | 8 ++++----
 src/views/modules/events/item-end-list.vue               | 8 ++++----
 src/views/modules/events/item-timeout-list.vue           | 4 ++--
 src/views/modules/user/alluser.vue                       | 4 ++--
 src/views/modules/user/volunteerinfo.vue                 | 8 ++++----
 9 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/api/scanswitch-add-or-update.vue b/src/views/modules/api/scanswitch-add-or-update.vue
index d23859b8..69204a40 100644
--- a/src/views/modules/api/scanswitch-add-or-update.vue
+++ b/src/views/modules/api/scanswitch-add-or-update.vue
@@ -6,22 +6,21 @@
     <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="versionNum">
         <el-input v-model="dataForm.versionNum"
                   placeholder="版本号"
-                  maxlength="20"></el-input>
+                  maxlength="20" style="width:50%"></el-input>
       </el-form-item>
       <el-form-item label="扫码开关" prop="scanFlag">
-        <el-select v-model="dataForm.scanFlag" placeholder="扫码开关">
+        <el-select v-model="dataForm.scanFlag" placeholder="扫码开关" style="width:50%">
           <el-option v-for="item in scanFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="维护状态" prop="maintainFlag">
-        <el-select v-model="dataForm.maintainFlag" placeholder="维护状态">
+      <el-form-item label="维护状态" prop="maintainFlag" >
+        <el-select v-model="dataForm.maintainFlag" placeholder="维护状态" style="width:50%">
           <el-option v-for="item in maintainFlagArr" :key="item.maintainValue" :label="item.maintainName" :value="item.maintainValue">
           </el-option>
         </el-select>
diff --git a/src/views/modules/custom/gridoperatordutycategory-add-or-update.vue b/src/views/modules/custom/gridoperatordutycategory-add-or-update.vue
index c87f90f7..e43cd068 100644
--- a/src/views/modules/custom/gridoperatordutycategory-add-or-update.vue
+++ b/src/views/modules/custom/gridoperatordutycategory-add-or-update.vue
@@ -11,7 +11,7 @@
       <el-form-item label="网格员职责类别名称" label-width="150px"
                     prop="dutyCategoryName">
         <el-input v-model="dataForm.dutyCategoryName"
-                  placeholder="网格员职责类别名称"></el-input>
+                  placeholder="网格员职责类别名称" maxlength="50"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/events/category.vue b/src/views/modules/events/category.vue
index 77237511..00ebad09 100644
--- a/src/views/modules/events/category.vue
+++ b/src/views/modules/events/category.vue
@@ -23,9 +23,9 @@
         <el-table-column type="index"
                          width="50"
                          label="序号" align="center"></el-table-column> 
-        <table-tree-column prop="categoryName" :label="$t('dept.name')" header-align="center"></table-tree-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
+        <table-tree-column prop="categoryName" :label="$t('dept.name')" header-align="center" min-width="180"></table-tree-column>
+        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center" show-overflow-tooltip ></el-table-column>
+        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80" show-overflow-tooltip ></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('events:category:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/events/item-close-list.vue b/src/views/modules/events/item-close-list.vue
index ed64599a..abd4ef78 100644
--- a/src/views/modules/events/item-close-list.vue
+++ b/src/views/modules/events/item-close-list.vue
@@ -6,7 +6,7 @@
                     :model="dataForm"
                     @keyup.enter.native="getDataListSearch()"
             >
-                <el-form-item label="所属机构">
+                <el-form-item label="所属机构" label-width="100px">
                     <el-cascader
                             v-model="ids"
                             :options="options"
@@ -31,11 +31,11 @@
                             placeholder="请输入项目内容"
                             clearable
                             @keyup.native="btKeyUpItemContent"
-                            style="width:250px;"
+                            style="width:200px;"
                     ></el-input>
                 </el-form-item>
                 <br>
-                <el-form-item label="提交人" prop="itemCode" label-width="70px">
+                <el-form-item label="提交人" prop="itemCode" label-width="100px">
                     <el-input
                             v-model="dataForm.nickName"
                             placeholder="请输入提交人"
@@ -55,7 +55,7 @@
                 </el-form-item>
                 <br>
                 <div>
-                    <el-form-item label="时间" prop="startTime" label-width="70px">
+                    <el-form-item label="转成项目时间" prop="startTime" label-width="100px">
                         <el-date-picker
                                 v-model="dataForm.startTime"
                                 type="date"
diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue
index 9dbde901..d5f8b6ce 100644
--- a/src/views/modules/events/item-deal-list.vue
+++ b/src/views/modules/events/item-deal-list.vue
@@ -6,7 +6,7 @@
                     :model="dataForm"
                     @keyup.enter.native="getDataListSearch()"
             >
-                <el-form-item label="所属机构">
+                <el-form-item label="所属机构" label-width="100px">
                     <el-cascader
                             v-model="ids"
                             :options="options"
@@ -31,11 +31,11 @@
                             placeholder="请输入项目内容"
                             clearable
                             @keyup.native="btKeyUpItemContent"
-                            style="width:250px;"
+                            style="width:200px;"
                     ></el-input>
                 </el-form-item>
                 <br>
-                <el-form-item label="提交人" prop="itemCode" label-width="70px">
+                <el-form-item label="提交人" prop="itemCode" label-width="100px">
                     <el-input
                             v-model="dataForm.nickName"
                             placeholder="请输入提交人"
@@ -55,7 +55,7 @@
                 </el-form-item>
                 <br>
                 <div>
-                    <el-form-item label="时间" prop="startTime" label-width="70px">
+                    <el-form-item label="转成项目时间" prop="startTime" label-width="100px">
                         <el-date-picker
                                 v-model="dataForm.startTime"
                                 type="date"
diff --git a/src/views/modules/events/item-end-list.vue b/src/views/modules/events/item-end-list.vue
index d424cc05..6b07ecbd 100644
--- a/src/views/modules/events/item-end-list.vue
+++ b/src/views/modules/events/item-end-list.vue
@@ -6,7 +6,7 @@
                     :model="dataForm"
                     @keyup.enter.native="getDataListSearch()"
             >
-                <el-form-item label="所属机构">
+                <el-form-item label="所属机构" label-width="100px">
                     <el-cascader
                             v-model="ids"
                             :options="options"
@@ -31,11 +31,11 @@
                             placeholder="请输入项目内容"
                             clearable
                             @keyup.native="btKeyUpItemContent"
-                            style="width:250px;"
+                            style="width:200px;"
                     ></el-input>
                 </el-form-item>
                 <br>
-                <el-form-item label="提交人" prop="itemCode" label-width="70px">
+                <el-form-item label="提交人" prop="itemCode" label-width="100px">
                     <el-input
                             v-model="dataForm.nickName"
                             placeholder="请输入提交人"
@@ -55,7 +55,7 @@
                 </el-form-item>
                 <br>
                 <div>
-                    <el-form-item label="时间" prop="startTime" label-width="70px">
+                    <el-form-item label="转成项目时间" prop="startTime" label-width="100px">
                         <el-date-picker
                                 v-model="dataForm.startTime"
                                 type="date"
diff --git a/src/views/modules/events/item-timeout-list.vue b/src/views/modules/events/item-timeout-list.vue
index 2e15eb02..2940d0e5 100644
--- a/src/views/modules/events/item-timeout-list.vue
+++ b/src/views/modules/events/item-timeout-list.vue
@@ -64,7 +64,7 @@
           </el-form-item>
           <br>
           <div>
-          <el-form-item label="项目创建时间" prop="startTime" label-width="105px">
+          <el-form-item label="转成项目时间" prop="startTime" label-width="105px">
             <el-date-picker
                     v-model="dataForm.startTime"
                     type="date"
@@ -90,7 +90,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>
           </div>
       </el-form>
diff --git a/src/views/modules/user/alluser.vue b/src/views/modules/user/alluser.vue
index 4312b07e..ee0c7368 100644
--- a/src/views/modules/user/alluser.vue
+++ b/src/views/modules/user/alluser.vue
@@ -45,10 +45,10 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                          header-align="center"
                          align="center"
-                         width="50"></el-table-column>
+                         width="50"></el-table-column> -->
         <el-table-column type="index"
                          width="50"
                          label="序号" align="center"></el-table-column> 
diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 0f85dce2..e2839a50 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -13,18 +13,18 @@
         </el-form-item>
         <el-form-item label="姓名">
           <el-input v-model="dataForm.realName"
-                    placeholder="姓名"
+                    placeholder="请输入姓名"
                     @keyup.native="btKeyUpUsername"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="联系电话">
           <el-input v-model="dataForm.mobile"
-                    placeholder="手机号"
+                    placeholder="请输入联系电话"
                     @keyup.native="btKeyUpMobile"
                     clearable></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>
       <el-table v-loading="dataListLoading"