Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/rehabilitation/css/health_control.css

@@ -30,7 +30,17 @@ ul,
li {
    margin: 0;
}
.all img{
    cursor: pointer;
}
.recoveryPlan{
    border: 1px solid #12b7f5;
     background-color: white;
     padding: 2px 4px;
     color: #12b7f5;
     font-size: 14px;
     margin: 2px;
}
.flex-box {
    display: -webkit-box;
    display: -ms-flexbox;

app/rehabilitation/css/moreplan.css

@@ -15,7 +15,9 @@ p {
body{
    font-family: 微软雅黑;
}
.dac img{
    cursor: pointer;
}
.flex-box {
    display: -webkit-box;
    display: -ms-flexbox;

app/rehabilitation/html/health_control.html

@@ -70,14 +70,14 @@
            </div>
            
            <div class="neironglef">
                <button @click="newRecover()">新康复安排</button>
                <button @click="newRecover()">新建计划</button>
                <button @click="modelControl()">模版管理</button>
            </div>
        </div>
        <div class="neirong2">
            <ul class="c-blocks-3 ul">
                <li>患者信息</li>
                <li>医生及计划信息</li>
                <li>计划信息</li>
                <li>操作</li>
            </ul>
            <!-- table -->
@@ -87,10 +87,10 @@
                        <div class="all flex-box">
                            <div class="dataa flex-box">
                                <div :class="{ quote: isActive}"></div>
                                <img :src="setImgSrc(data.photo)" width="40" height="40" class="c-images-cycle" />
                                <img :src="setImgSrc(data.photo)" @click="checkPatient(data)" width="40" height="40" class="c-images-cycle" />
                                <p class="xinxi">
                                    <span>{{data.patientName}}
                                    </span>&nbsp;&nbsp;(&nbsp;{{data.sex}}&nbsp;{{data.age}}岁&nbsp;)
                                    </span>&nbsp;&nbsp;(&nbsp;{{data.sex}}&nbsp;{{data.age}}岁&nbsp;) <button class="recoveryPlan" @click="recoveryPlan(data)">康复管理</button>
                                    <br><span :id="'hospitalName_'+data.id" style="font-size: 14px;color: #999999;">{{data.hospitalName}}</span></p>
                                <p class="biaoqian" :id="'quote_'+data.id">
                                    <span class="span"></span> <span>{{data.healthyCondition}}</span>
@@ -115,13 +115,14 @@
                                </p>
                            </div>
                            <div class="datad flex-box">
                                <button @click="morePlan(data)">
                                    <a href="javascript: void(0)">更多计划</a>
                                </button>
                               
                                <button>
                                    <a href="javascript: void(0)" @click="checkPlan(data)">查看计划</a>
                                </button>
                                <button class="stopBtn" @click="stop(data)" :data-id="data.id" :id="'stopBtn_'+data.id">中止计划</button>
                                <button @click="morePlan(data)">
                                    <a href="javascript: void(0)">更多计划</a>
                                </button>
                            </div>
                        </div>
                    </td>

app/rehabilitation/html/moreplan.html

@@ -37,7 +37,7 @@
                                    <div class="dataatop">
                                        <div class="dac flex-box">
                                            <p>
                                           <img :src="setImgSrc(dat.patientPhoto)" width="40" height="40" class="c-images-cycle" />
                                           <img :src="setImgSrc(dat.patientPhoto)" @click="checkPatient()" width="40" height="40" class="c-images-cycle" />
            
                                            </p>
                                            <div class="xinxi">
@@ -139,7 +139,7 @@
                                </p>
                            </div>
                            <div class="detaild">
                                <a href="javascript: void(0)" @click="checkPatient()">查看患者</a>
                                <!-- <a href="javascript: void(0)" @click="checkPatient()">查看患者</a> -->
                                <a href="javascript: void(0)" @click="checkPlan(data)">查看计划</a>
                                <a href="javascript: void(0)"  @click="stop(data)" :id="'stopBtn_'+data.planId">中止计划</a>
        

app/rehabilitation/js/health_control.js

@@ -348,6 +348,28 @@ layui.use('element', function () {
            modelControl: function () {
                location.href = "../../rehabilitation/html/management.html"
            },
            checkPatient: function (data) {
                var vm = this
                layer.open({
                    type: 2,
                    area: ['750px', '650px'],
                    shade: 0.5,
                    title: '居民服务项',
                    fixed: true, //不固定
                    maxmin: true,
                    closeBtn: 1,
                    shift: 5,
                    shadeClose: false, //点击遮罩关闭层
                    content: '../../temporary/html/userInfo.html?patient=' + data.patientCode
                })
               
                // location.href = "" + 
            },
            recoveryPlan:function (data){
                location.href = "../../recover/html/personal-manage.html?patientCode="+data.patientCode
                    
            }
        }

app/rehabilitation/js/moreplan.js

@@ -248,7 +248,7 @@ layui.use('element', function () {
                    type: 2,
                    area: ['750px', '650px'],
                    shade: 0.5,
                    title: '居民信息',
                    title: '居民服务项',
                    fixed: true, //不固定
                    maxmin: true,
                    closeBtn: 1,