Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/style/followup/element-reset.css

@@ -46,9 +46,9 @@
   border-color: #449284!important;
 }
 
-.el-form-item .el-form-item__label{
-  font-size: 14px;
-}
+/*.el-form-item .el-form-item__label{*/
+  /*font-size: 14px;*/
+/*}*/
 
 .el-message-box__content{
   padding: 20px 15px;

src/views/followup/plan-manage/dialog/select-cartoon.vue

@@ -7,7 +7,7 @@
     center>
     <div class="select-content">
       <div class="first-section">
-        <el-select placeholder="请选择疾病" v-model="diseaseId">
+        <el-select placeholder="请选择疾病" v-model="diseaseId" size="small">
           <el-option
             v-for="item in diseaseOptions"
             :key="item.value"
@@ -15,11 +15,11 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <el-select placeholder="请选择类目" v-model="typeId" style="margin-left:20px;">
+        <el-select placeholder="请选择类目" size="small" v-model="typeId" style="margin-left:20px;">
         </el-select>
       </div>
       <div class="scroll-section">
-        <el-radio-group v-model="sendObj.hasSelected">
+        <el-radio-group v-model="sendObj.hasSelected" size="small">
           <el-radio
             v-for="(item, index) in cartoonList"
             :key="index"
@@ -28,8 +28,8 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-        <el-button class="button-green" @click="clickClose" plain>取 消</el-button>
-        <el-button class="button-white" @click="sureSelect" type="primary">确 定</el-button>
+        <el-button class="button-green" size="small" @click="clickClose" plain>取 消</el-button>
+        <el-button class="button-white" size="small" @click="sureSelect" type="primary">确 定</el-button>
       </span>
   </el-dialog>
 </template>

src/views/followup/plan-manage/new-plan.vue

@@ -14,16 +14,16 @@
           <span :class="{ 'active-class' : activeTab === 'first' }">随访时间节点</span>
         </div>
         <div class="plan-btns-group" v-if="activeTab === 'first'">
-          <el-button class="button-white" plain @click="cancelEdit" >取 消</el-button>
-          <el-button type="primary"@click="nextClick('baseInfo')">下一步</el-button>
+          <el-button class="button-white" size="small" plain @click="cancelEdit" >取 消</el-button>
+          <el-button type="primary" size="small" @click="nextClick('baseInfo')">下一步</el-button>
         </div>
         <div class="plan-btns-group" v-if="activeTab === 'second'">
-          <el-button class="button-white" plain @click="preClick">上一步</el-button>
-          <el-button type="primary" @click="saveEdit">保 存</el-button>
+          <el-button class="button-white" size="small" plain @click="preClick">上一步</el-button>
+          <el-button type="primary" size="small" @click="saveEdit">保 存</el-button>
         </div>
       </div>
       <div class="edit-plan-content" v-if="activeTab === 'first'">
-        <el-form ref="baseInfo" :model="baseInfo" :rules="rules" label-suffix=":" label-width="140px" :inline-message="true">
+        <el-form ref="baseInfo" :model="baseInfo" :rules="rules" label-suffix=":" label-width="140px" :inline-message="true" size="small">
           <el-form-item label="随访计划名称" prop="name">
             <el-input v-model="baseInfo.name" maxlength="20" style="width: 30%" clearable></el-input>
           </el-form-item>

src/views/followup/plan-manage/plan-list.vue

@@ -5,7 +5,7 @@
       <div class="page-title">计划管理</div>
       <div class="search-div">
         <div class="search-input">
-          <el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px">
+          <el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px" size="small">
             <el-form-item label="随访计划名称">
               <el-input v-model="searchData.name" placeholder="请输入关键词" maxlength="20" style="width: 250px" clearable></el-input>
             </el-form-item>
@@ -23,12 +23,12 @@
           </el-form>
         </div>
         <div class="search-btn">
-          <el-button class="button-green" type="primary" @click="search(1)">查询</el-button>
-          <el-button class="button-white" plain @click="reseat">重置</el-button>
+          <el-button class="button-green" size="small" type="primary" @click="search(1)">查询</el-button>
+          <el-button class="button-white" size="small" plain @click="reseat">重置</el-button>
         </div>
       </div>
       <div class="table-content">
-        <div class="content-group-btn"><el-button type="primary" @click="addNewPlan">新建随访计划</el-button></div>
+        <div class="content-group-btn"><el-button type="primary" size="small" @click="addNewPlan">新建随访计划</el-button></div>
         <div>
           <el-table :data="planList.fPlanDtoList" style="width: 100%;margin-top: 20px;">
             <el-table-column prop="name" label="随访计划名称" min-width="100" align="center" :show-overflow-tooltip="true">

src/views/followup/record-manage/dialog/change-followup-status.vue

@@ -9,7 +9,7 @@
       :close-on-press-escape="false"
       :before-close="closeChange"
       width="800px">
-      <el-form ref="statusForm" :model="statusForm" :rules="rules" label-suffix=":" label-width="120px">
+      <el-form ref="statusForm" :model="statusForm" :rules="rules" label-suffix=":" label-width="120px" size="small">
         <el-form-item label="居民" style="margin-bottom:0;">
           <span>{{statusForm.nickname}}</span>
         </el-form-item>
@@ -21,8 +21,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button plain @click="closeChange">取 消</el-button>
-        <el-button type="primary" @click="saveReason('statusForm')">确 定</el-button>
+        <el-button size="small" plain @click="closeChange">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveReason('statusForm')">确 定</el-button>
       </div>
     </el-dialog>
   </div>

src/views/followup/record-manage/record-list.vue

@@ -5,7 +5,7 @@
         <div class="page-title">录入管理</div>
         <div class="search-div">
           <div class="search-input">
-            <el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px">
+            <el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px" size="small">
               <el-form-item label="随访计划名称">
                 <el-input v-model="searchData.planName" placeholder="请输入关键词" style="width: 250px" clearable></el-input>
               </el-form-item>
@@ -30,12 +30,12 @@
             </el-form>
           </div>
           <div class="search-btn">
-            <el-button class="button-green" type="primary" @click="search(1)">查询</el-button>
-            <el-button class="button-white" plain @click="reseat">重置</el-button>
+            <el-button class="button-green" size="small" type="primary" @click="search(1)">查询</el-button>
+            <el-button class="button-white" size="small" plain @click="reseat">重置</el-button>
           </div>
         </div>
         <div class="table-content">
-          <el-radio-group v-model="activeName" @change="handlerClick">
+          <el-radio-group v-model="activeName" @change="handlerClick" size="small">
             <el-radio-button label="0">全部（{{recordList.count}}）</el-radio-button>
             <el-radio-button label="1">已完成（{{recordList.acceptCount}}）</el-radio-button>
             <el-radio-button label="2">未完成（{{recordList.refuseCount}}）</el-radio-button>

src/views/followup/reservation-manage/dialog/send-reservation.vue

@@ -13,7 +13,8 @@
         :rules="rules"
         label-suffix=":"
         label-width="120px"
-        :label-position="'left'">
+        :label-position="'left'"
+        size="small">
         <el-form-item label="已选居民">
           <span>{{checkData.total}}人</span><span>（微信发送{{checkData.weChatNum}}人；短信发送{{checkData.messageNum}}人）</span>
         </el-form-item>