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

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

src/utils/followup/followapis.js

+import axios from '../fetch';
+
+import utils from './followupUtils';
+
+/*计划管理API*/
+const  planManageApi = [
+  {
+    url: '/followup/planPatient',
+    method: 'GET',
+    params: 'params',
+    name: 'getApproveList',
+    description: '获取居民列表',
+  },
+]
+
+
+
+const api = {};
+const apis = [...planManageApi];
+
+apis.forEach(item => api[item.name] = (params = {}, extraConfig = {}) => {
+  const config = {
+    url: item.url,
+    method: item.method,
+  };
+  if (extraConfig.urlSuffix) { // 需要做URL拼接的情况(比如*.do/2),,,可以根据自己的实际情况进行扩展
+    config.url = `${config.url}${extraConfig.urlSuffix}`;
+    //something else
+  }
+  const filterParams = utils.DC.getParams(params, item.args);
+  if (item.params === 'data') {
+    config.data = filterParams;
+  } else {
+    config.params = filterParams;
+  }
+  /*utils.MSG.$emit('axios:begin', item.url);*/
+  return axios({
+    ...config,
+    ...extraConfig,
+  }).then(res => {
+    return Promise.resolve(res);
+  }).catch(err => {
+    return Promise.resolve({ // 请务必根据data判断
+      data: {
+        code: 222222, // exception 专用
+        msg: 'axios:error',
+        err,
+        message: err
+      },
+    });
+  });
+});
+
+export default api;

src/utils/followup/followupUtils/dataConverter.js

+// 只获取指定的参数(浅复制);
+function getParams(params, arr) {
+  const res = Object.create(null);
+  if (!params) return res;
+  if (Object.prototype.toString.call(params) === '[object FormData]') { // formData类型直接返回
+    return params;
+  }
+  if (arr && arr.length) { // 只对需要处理的处理下
+    arr.forEach(item => {
+      if (item) {
+        res[item] = params[item] || '';
+      }
+    });
+    return res;
+  } else {
+    return params;
+  }
+}
+
+export default {
+  getParams,
+};

src/utils/followup/followupUtils/index.js

+import dataConverter from './dataConverter';
+
+export default {
+  DC: dataConverter,
+};

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

@@ -113,6 +113,7 @@
 </template>
 
 <script>
+  import api from '../../../utils/followup/followapis';
   import BreadCrumb from '@/components/breadcrumb'
   export default {
     name: "residentList",
@@ -151,6 +152,9 @@
 
       }
     },
+    created() {
+      console.log('api',api)
+    },
     mounted() {},
     methods: {
       handleSizeChangePre() {

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

 <template>
-    <div>
-      <h1>预约管理-预约列表</h1>
+  <div class="resident-list">
+    <bread-crumb
+      :curmbFirst="curmbFirst"
+      :curmbSecond="curmbSecond">
+    </bread-crumb>
+    <div class="resident-content f-main-content screenSet">
+      <p class="page-title">预约管理</p>
+      <div class="search-div">
+        <div class="search-input">
+          <el-form :model="searchData" :inline="true" :label-width="labelWidth">
+            <el-form-item label="随访计划名称：">
+              <el-input v-model="searchData.residentName" placeholder="请输入随访计划名称"></el-input>
+            </el-form-item>
+            <el-form-item label="姓名：">
+              <el-input v-model="searchData.residentName" placeholder="请输入姓名"></el-input>
+            </el-form-item>
+            <el-form-item label="手机号：">
+              <el-input v-model="searchData.phoneNumber" placeholder="请输入手机号"></el-input>
+            </el-form-item>
+            <el-form-item label="随访计划时间：">
+              <el-select v-model="searchData.startTime">
+                <el-option
+                  v-for="item in groupOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="居民预约状态：">
+              <el-select v-model="searchData.startTime">
+                <el-option
+                  v-for="item in groupOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="search-btn">
+          <el-button class="button-green" type="primary">查询</el-button>
+          <el-button class="button-white" plain>重置</el-button>
+        </div>
+      </div>
+      <div class="reservation-table table-content">
+        <el-radio-group v-model="tableType">
+          <el-radio-button label="0">全部(200)</el-radio-button>
+          <el-radio-button label="1">未发送(200)</el-radio-button>
+          <el-radio-button label="2">待确认(100)</el-radio-button>
+          <el-radio-button label="1">已接受(200)</el-radio-button>
+          <el-radio-button label="2">已拒绝(100)</el-radio-button>
+        </el-radio-group>
+        <el-button class="button-green" type="primary">发送预约</el-button>
+        <el-table
+          :data="reservationData"
+          center
+          style="width: 100%;margin-top: 20px;">
+          <el-table-column
+            type="selection"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="patientName"
+            label="姓名"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="sexName"
+            label="手机"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="mobilePhone"
+            label="随访计划名称"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="time"
+            label="随访计划时间"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="time"
+            label="随访预约时间"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center">
+            <template slot-scope="scope">
+              <el-button class="btn-right-class" type="text" >发送预约</el-button>|
+              <el-button class="btn-right-class" type="text" >变更预约</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          background
+          v-if="reservationData.length"
+          @size-change="handleSizeChangePre"
+          @current-change="handleCurrentChangePre"
+          layout="total, sizes, prev, pager, next, jumper"
+          :current-page="pageNum"
+          :page-sizes="[100, 200, 300, 400]"
+          :page-size="pageSize"
+          :total="total">
+        </el-pagination>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-  export default {}
+  import api from '../../../utils/followup/followapis';
+  import BreadCrumb from '@/components/breadcrumb'
+  export default {
+    name: "reservation-list",
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        /*面包屑配置*/
+        curmbFirst: '随访管理',
+        curmbSecond: '预约管理',
+        /*面包屑配置*/
+        labelWidth: '96px',  //标题长度
+        searchData: {}, //查询数据
+        groupOption: [{ // 分组选项
+          value: '全部',
+          label: '全部'
+        }],
+        tableType: 0, //列表筛选条件
+        reservationData: [
+
+        ], //居民列表
+        pageNum: 1,
+        pageSize: 15,
+        total: 100,
+
+      }
+    },
+    created() {
+      console.log('api',api)
+    },
+    mounted() {},
+    methods: {
+      handleSizeChangePre() {
+
+      },
+      handleCurrentChangePre() {
+
+      },
+      goPatientDetail(patientId) { //居民详情页
+        alert(1+patientId)
+        this.$router.push('/followup/plan-manage/resident-detail')
+
+      }
+    }
+  }
 </script>
+<style lang="scss" scoped>
 
-<style scoped lang="scss">
+  @import '../../../style/followup/followup-common';
+  @import '../../../style/followup/element-reset.css';
 
+  .reservation-table {
+    .button-green {
+      float: right;
+    }
+  }
 </style>