Merge branch 'dev' of zhanghaoyu/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/desizenMan/service_project_management.jsp

@@ -170,7 +170,7 @@
                    <a href="">模板下载</a>
                    <p>请核对导入数据，若导入项目信息已存在，将会更新项目表中的数据。</p>
                    <div class="lay-button">
                        <button onclick="submitFile()">确认</button>
                        <button onclick="submitFile(this)">确认</button>
                        <button class="closePage">取消</button>
                    </div>
                </div>
@@ -795,8 +795,8 @@
                $('.fileName').val(file)
            }
            // 上传文件
            function submitFile(){
                var file = document.getElementById("uploadfile").files[0];
            function submitFile(_this){
                var file = $(_this).parents('.lay').find('.uploadfile')[0].files[0];
                var _formData = new FormData()
                _formData.append('file', file)
                var index = layer.load(2);

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

@@ -229,13 +229,13 @@
                <div class="file flex flex-sp-b flex-cz-c">
                    <span>导入文件：</span>
                    <input type="text" class="fileName" disabled>
                    <input id="uploadfile" type="file" value="选择" onchange="auploadFile(event)">
                    <input class="uploadfile" type="file" value="选择" onchange="auploadFile(event)">
                    <button>选择</button>
                </div>
                <a href="">模板下载</a>
                <p>请核对导入数据，若导入项目信息已存在，将会更新项目表中的数据。</p>
                <div class="lay-button">
                    <button onclick="submitFile()">确认</button>
                    <button onclick="submitFile(this)">确认</button>
                    <button class="closePage">取消</button>
                </div>
            </div>
@@ -740,17 +740,17 @@
                    {
                        name: 'title',
                        display: '项目名称',
                        width: 80
                        width: 162
                    },
                    {
                        name:"diseaseItem",
                        display:"病案项目",
                        width:80
                        width:81
                    },
                    {
                        name:'itemType',
                        display:"项目类型",
                        width:80,
                        width:81,
                        render:function (row) {
                            row.itemType == '0'? row.itemType = "康复服务":row.itemType = "健康管理";
                            return row.itemType;
@@ -759,7 +759,7 @@
                    {
                        name:'hospitalGrade',
                        display:"医院等级",
                        width:80,
                        width:81,
                        render:function (row) {
                            if (row.hospitalGrade == '3'){
                                row.hospitalGrade = '三级医院'
@@ -776,17 +776,17 @@
                    {
                        name:"content",
                        display:"项目内涵",
                        width:290
                        width:243
                    },
                    {
                        name:"excludeContent",
                        display:"除外内容",
                        width:200
                        width:162
                    },
                    {
                        name:'unit',
                        display:"计价单位",
                        width:80
                        width:81
                    },
                    {
                        name:'biaozhun',
@@ -795,34 +795,34 @@
                            {
                                name:'threeHospitals',
                                display:'三级医院',
                                width:75
                                width:81
                            },
                            {
                                name:'twoHospitals',
                                display:"二级医院",
                                width:75
                                width:81
                            },
                            {
                                name:'oneHospitals',
                                display:"一级及一级以</br>下医疗机构",
                                width:75
                                width:81
                            }
                        ],
                    },
                    {
                        name:'addItem',
                        display:'加收项目',
                        width:130
                        width:121.5
                    },
                    {
                        name:'description',
                        display:"说明",
                        width:100
                        width:121.5
                    },
                    {
                        name:"imediate",
                        display:"是否生效",
                        width:60,
                        width:81,
                        render:function (row) {
                            row.imediate == '0'? row.imediate = "否":row.imediate = "是";
                            return row.imediate;
@@ -831,7 +831,7 @@
                    {
                        name:"caozuo",
                        display:"操作",
                        width:160,
                        width:162,
                        render: function (record, rowindex, value, column) {
                            return '<input type="button" onclick="invalid('+rowindex+')" value="失效"/><input type="button" onclick="modify('+rowindex+')" value="修改"/><input type="button" class="delete" onclick="deleteRow('+rowindex+')" value="删除"/><input type="button" onclick="history('+rowindex+')" value="查看历史"/>';
                        }
@@ -846,6 +846,8 @@
                    var arr2 =  $(table2).find('tr');
                    arr2.each(function(index,item){
                        $(arr[index]).height($(this).height())
                        $(arr[index]).width(40)
                        console.log($(arr[index]).width())
                    })
                }
            });
@@ -926,11 +928,11 @@
            $('.fileName').val(file)
        }
        // 上传文件
        function submitFile(){
            var file = document.getElementById("uploadfile").files[0];
        function submitFile(_this){
            var file = $(_this).parents('.lay').find('.uploadfile')[0].files[0];
            var _formData = new FormData()
			_formData.append('file', file)
            console.log(_formData);
            console.log(_formData.get('file'));
            var index = layer.load(2);
            $.ajax({
                url: ctx + "/admin/specialist/serviceItem/importData",