Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

config/dev.env.js

@@ -6,8 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
   // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

package-lock.json

@@ -4740,7 +4740,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4763,13 +4764,15 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4785,19 +4788,22 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4927,7 +4933,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4941,6 +4948,7 @@
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4957,6 +4965,7 @@
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4964,13 +4973,15 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": false,
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4991,6 +5002,7 @@
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5078,7 +5090,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5092,6 +5105,7 @@
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5186,7 +5200,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5228,6 +5243,7 @@
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5249,6 +5265,7 @@
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5296,13 +5313,15 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": false,
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/api/project/project.js

@@ -0,0 +1,163 @@
+import request from "@/utils/request";
+
+export function saveProject(params){
+
+    return request({
+        url:"/api/his/saveproject",
+        methods:"get",
+        params:params,
+    })
+}
+
+
+export function getProjectList(params){
+   
+    return request({
+       url:"/api/his/getprojectlist",
+       methods:"get",
+       params:params
+    })
+}
+
+export function getProjectDetail(id,params){
+  
+    return request({
+       url:"/api/his/getprojectdetail?id="+id,
+       methods:"get",
+       params:params
+    })
+}
+
+export function updatedProject(params){
+   
+   return request({
+      url:"/api/his/updatedproject",
+      methods:"get",
+      params:params
+   })
+}
+
+export function deleteHisProject(id,params){
+   
+    return request({
+      url:"/api/his/deletehisproject?id="+id,
+      methods:"get",
+      params:params
+    })
+}
+
+export function saveProjectTeam(params){
+  
+   return request({
+     url:"/api/his/saveprojectteam",
+     methods:"Get",
+     params:params
+   })
+}
+
+export function getProjectTeamList(params){
+  
+    return request({
+       url:"/api/his/getprojectteamlist",
+       methods:"get",
+       params:params
+    })
+}
+
+export function getProjectTeamDetail(id,params){
+   
+    return request({
+       url:"/api/his/getprojectteamdetail?id="+id,
+       methods:"get",
+       params:params
+    })
+}
+
+export function updatedProjectTeam(params){
+  
+    return request({
+       url:"/api/his/updateprojectteam",
+       methods:"get",
+       params:params
+    })
+}
+
+export function DeleteProjectTeam(id,params){
+   
+  return request({
+      url:"/api/his/deleteprojectteam?id="+id,
+      methods:"get",
+      params:params
+  })
+}
+
+export function SaveDepartment(params){
+  
+    return request({
+       url:"/api/his/savedepartment",
+       methods:"get",
+       params:params
+    })
+}
+
+export function getDePartmentList(params){
+  
+    return request({
+       url:"/api/his/getdepartmentlist",
+       methods:"Get",
+       params:params
+    })
+}
+
+export function getDepartMentDetail(id,params){
+  
+    return request({
+        url:"/api/his/getdepartmentdetail?id="+id,
+        methods:"get",
+        params:params
+    })
+}
+
+export function UpdatedDepartment(params){
+   
+    return request({
+        url:"/api/his/updagtedepartment",
+        methods:"get",
+        params:params
+    })
+}
+
+export function DeleteDepartment(id,params){
+    return request({
+       url:"/api/his/deletedeparment?id="+id,
+       methods:"get",
+       params:params
+    })
+}
+
+
+export function getPatientList(params){
+   return request({
+       url:"/api/his/getbloodpatient",
+       methods:"get",
+       params:params
+   })
+}
+
+export function getHisPrescription(id,params){
+   
+    return request({
+       url:"/api/his/gethisprescription?id="+id,
+       methods:"get",
+       params:params
+    })
+}
+
+export function saveCharges(data){
+    
+    return request({
+       url:"/api/his/additionalcharge",
+       method:"post",
+       data:data
+    })
+}

src/lang/zh.js

@@ -230,6 +230,7 @@ export default {
     dictionaryManagement:'字典管理',
     templateManagement:'模板管理',
     drugStockUserDetail:"出库人明细",
+    DepartManage:"部门管理"
 
   },
   navbar: {

src/router/index.js

@@ -42,6 +42,7 @@ import dataPrint from './modules/dataPrint'
 import bedManagement from './modules/bedManagement'
 import dictionaryManagement from './modules/dictionaryManagement'
 import templateManagement from './modules/templateManagement'
+import DepartManage from './modules/DepartManage'
 
 Vue.use(Router)
 
@@ -151,6 +152,7 @@ var _asy_router_map = [
   shop,
   
   systems,
+  DepartManage,
   roleManage,
   bedManagement,
   dictionaryManagement,

src/router/modules/DepartManage.js

@@ -0,0 +1,18 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+    path: '/depart/manage',
+    component: Layout,
+    name:'DepartManage',
+    redirct: '/depart/manage',
+    children: [{
+        path: '/depart/manage',
+        component: () => import('@/xt_pages/role/departManage'),
+        name: 'DepartManage',
+        meta: {
+          title: 'DepartManage',
+          noCache: true,
+    
+        }
+    },]
+}

src/router/modules/outpatientCharges.js

@@ -42,5 +42,13 @@ export default {
         name: 'summary',
         meta: { title: 'summary', noCache: true }
     },
+    {
+        path: '/outpatientCharges/summaryDetail',
+        component: () => import('@/xt_pages/outpatientCharges/summaryDetail'),
+        hidden: true,
+        is_menu: false,
+        name: 'summaryDetail',
+        meta: { title: 'summaryDetail', noCache: true }
+    },
   ]
 }

src/router/modules/outpatientDoctorStation.js

@@ -30,5 +30,13 @@ export default {
         name: 'outpatientDoctorStationTemplateManagement',
         meta: { title: 'outpatientDoctorStationTemplateManagement', noCache: true }
     },
+    {
+        path: '/outpatientDoctorStation/print',
+        component: () => import('@/xt_pages/outpatientDoctorStation/print'),
+        hidden: true,
+        is_menu: false,
+        name: 'outpatientDoctorStationPrint',
+        meta: { title: 'outpatientDoctorStationPrint', noCache: true }
+    },
   ]
 }

src/views/layout/Layout.vue

@@ -127,7 +127,7 @@ export default {
     let bingli = ['User','createPatient']
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement']
-    let peizhi = ['system','roleManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config']
+    let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config']
     let kuyishopping = ['kuyiShopping']
     let menzhenArr = []
     let bingliArr = []

src/views/layout/components/Sidebar/index.vue

@@ -138,7 +138,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '配置管理'){
-          let nameArr = ['system','roleManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config']
+          let nameArr = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {

src/xt_pages/data/components/addConfigure.vue

@@ -6,7 +6,7 @@
         :before-close="_close"
     >
         <div>
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form :model="form" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                 <el-form-item label="名称:" prop="name" style="width:50%">
                     <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
@@ -20,7 +20,7 @@
         </div>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+            <el-button type="primary"  @click="submitAction()">保 存</el-button>
         </div>
     </el-dialog>         
 </template>
@@ -33,6 +33,7 @@ export default {
             form:{
                 name:''
             },
+            remark:"",
             submitLoading:false,
             parentid:0,
             

src/xt_pages/data/components/addDrugs.vue

@@ -339,7 +339,7 @@
         visible: false,
         formTitle: '',
         activeName: 'first',
-        manufacturers:[],
+        // manufacturers:[],
         sign: [
           { id: 1, name: '透析模式' },
           { id: 2, name: '特殊护理' },
@@ -522,7 +522,8 @@
       hide() {
         // this.clear()
         this.visible = false
-      },getValue: function() {
+      },
+      getValue: function() {
         const form = {}
         form['id'] = this.form.id
         form['drug_name'] = this.form.drug_name

src/xt_pages/data/components/addInspection.vue

@@ -7,31 +7,31 @@
     >
         <div>
             <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                <el-form-item label="组套名称 : " prop="name" style="width:100%">
-                    <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                <el-form-item label="组套名称 : " prop="project_team" style="width:100%">
+                    <el-input v-model="form.project_team" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
-                <el-form-item label="组套价格 : " prop="name" style="width:100%">
-                    <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                <el-form-item label="组套价格 : " prop="price" style="width:100%">
+                    <el-input v-model="form.price" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
-                <el-form-item label="拼音 : " prop="name" style="width:50%">
-                    <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
+                    <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
-                <el-form-item label="五笔 : " prop="name" style="width:50%">
-                    <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                <el-form-item label="五笔 : " prop="wubi" style="width:50%">
+                    <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
                 
-                <el-form-item label="试管颜色 : " prop="name" style="width:50%">
-                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
+                <el-form-item label="试管颜色 : " prop="tube_color" style="width:50%">
+                    <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                         v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                         :key="index"
+                         :label="item.name"
+                         :value="item.id">
                         </el-option>
-                    </el-select>
+                  </el-select>
                 </el-form-item>
-                <el-form-item label="组套类型 : " prop="name" style="width:50%">
-                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
+                <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
+                    <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
                         <el-option
                         v-for="item in options"
                         :key="item.value"
@@ -41,7 +41,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
-                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
+                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
             </el-form>
         </div>
@@ -49,12 +49,14 @@
 
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+            <el-button type="primary"  @click="submitAction('form')">保 存</el-button>
         </div>
   </el-dialog>
 </template>
 
 <script>
+import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
+import { saveProjectTeam } from "@/api/project/project"
 export default {
     data(){
         return{
@@ -62,31 +64,37 @@ export default {
             formTitle:'',
             activeName:'first',
             form:{
-                name:''
+              project_team:'',
+              price:"",
+              pinyin:"",
+              wubi:"",
+              tube_color:"",
+              team_type:"",
+              remark:""
             },
-            options: [{
-            value: '选项1',
-            label: '黄金糕'
-            }, {
-            value: '选项2',
-            label: '双皮奶'
-            }, {
-            value: '选项3',
-            label: '蚵仔煎'
-            }, {
-            value: '选项4',
-            label: '龙须面'
-            }, {
-            value: '选项5',
-            label: '北京烤鸭'
-            }],
+            options: [
+            {value: 1,label: '是'},
+            {value: 2,label: '否'}
+            ],
             value: '',
-            radio:'1'
+            radio:'1',
+            rules: {
+              project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
+              pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+              wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+              price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+              team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
+           }
         }
     },
     methods:{
+        getDataConfig(module, filed_name){
+            return getDataConfig(module, filed_name)
+        },
+            getDictionaryDataConfig(module, filed_name) {
+            return getDictionaryDataConfig(module, filed_name)
+        },
         _close: function(done) {
-            // this.clear()
             done()
         },
         clear: function() {
@@ -95,18 +103,43 @@ export default {
             this.form.intro = "";
         },
         show(id) {
-            // this.clear()
             this.visible = true
-            if(id == 0){
-                this.formTitle = '新增'
-            }else{
-                this.formTitle = '编辑'
-            }
-        },
+            this.formTitle = '新增' 
+         },
         hide() {
-            // this.clear()
-            this.visible = false
+         this.visible = false
         },
+        submitAction(formName){
+           this.$refs[formName].validate((valid)=>{
+               var params = {
+                 project_team:this.form.project_team,
+                 price:this.form.price,
+                 pinyin:this.form.pinyin,
+                 wubi:this.form.wubi,
+                 tube_color:this.form.tube_color,
+                 team_type:this.form.team_type,
+                 remark:this.form.remark
+               }
+               console.log("params",params)
+              saveProjectTeam(params).then(response=>{
+                 if(response.data.state == 1){
+                   var projectTeam = response.data.data.projectTeam
+                   console.log("projectTeam",projectTeam)
+                   this.$message.success("保存成功")
+                  
+                   this.visible = false
+                   this.form.project_team = "",
+                   this.form.price = "",
+                   this.form.pinyin = "",
+                   this.form.wubi = "",
+                   this.form.tube_color = "",
+                   this.form.team_type = "",
+                   this.form.remark = ""
+                   this.$parent.getlist()
+                 }
+              }) 
+           })
+        }
     }
 }
 </script>

src/xt_pages/data/components/addProject.vue

@@ -5,74 +5,74 @@
         :visible.sync="visible"
         :before-close="_close"
     >
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model="activeName">
             <el-tab-pane label="基础数据" name="first">
                 <div>
                     <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                        <el-form-item label="耗材名称 : " prop="name" style="width:100%">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                        <el-form-item label="项目名称 : "  prop="project_name" style="width:100%" >
+                            <el-input v-model="form.project_name" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="拼音 : " prop="name" style="width:100%">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                        <el-form-item label="拼音 : " prop="pinyin" style="width:100%">
+                            <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="五笔 : " prop="name" style="width:100%">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                        <el-form-item label="五笔 : " prop="wubi" style="width:100%">
+                            <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="价格(元) : " prop="name">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                        <el-form-item label="价格(元) : " prop="price">
+                            <el-input v-model="form.price" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="单位 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
+                        <el-form-item label="单位 : " prop="unit">
+                            <el-select v-model="form.unit" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                             </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="费用类别 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-form-item label="费用类别 : " prop="cost_classify">
+                            <el-select v-model="form.cost_classify" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                                v-for="(item,index) in getDictionaryDataConfig('system','cost_classify')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="执行科室 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-form-item label="执行科室 : " prop="executive_section">
+                            <el-select v-model="form.executive_section" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                                v-for="(item,index) in getDictionaryDataConfig('system','executive_section')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="医保等级 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
+                        <el-form-item label="医保等级 : " prop="medical_coverage">
+                            <el-select v-model="form.medical_coverage" style="width:160px;" placeholder="请选择">
+                               <el-option
+                                 v-for="(item,index) in getDictionaryDataConfig('system','medical_insurance_level')"
+                                 :key="index"
+                                 :label="item.name"
+                                 :value="item.id">
+                               </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="统计分类 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-form-item label="统计分类 : " prop="statistical_classification">
+                            <el-select v-model="form.statistical_classification" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                                v-for="(item,index) in getDictionaryDataConfig('system','statistics_category')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="是否特病目录:" prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-form-item label="是否特病目录:" prop="disease_directory">
+                            <el-select v-model="form.disease_directory" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -81,8 +81,8 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="是否备案 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-form-item label="是否备案 : " prop="is_record">
+                            <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -91,48 +91,48 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="医保编码 : " prop="name">
-                            <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        <el-form-item label="医保编码 : " prop="medical_code">
+                            <el-input v-model="form.medical_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="试管颜色 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                        <el-form-item label="试管颜色 : " prop="tube_color">
+                            <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="状态 : " prop="name" style="width:100%;">
-                            <el-radio-group v-model="radio">
+                        <el-form-item label="状态 : " prop="medical_status" style="width:100%;">
+                            <el-radio-group v-model="form.medical_status">
                                 <el-radio :label="1">停用</el-radio>
                                 <el-radio :label="2">收费</el-radio>
                             </el-radio-group>
                         </el-form-item>
-                        <el-form-item label="备注 : " prop="name" style="width:100%;">
-                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
+                        <el-form-item label="备注 : " prop="remark" style="width:100%;">
+                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                         </el-form-item>
                     </el-form>
                 </div>
             </el-tab-pane>
             <el-tab-pane label="扩展数据" name="second">
-                <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                    <el-form-item label="标签 : " prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                <el-form :model="form"  label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+                    <el-form-item label="标签 : " prop="sign">
+                        <el-select v-model="form.sign" style="width:160px;" placeholder="请选择">
                             <el-option
-                            v-for="item in options"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                            v-for="(item,index) in getDictionaryDataConfig('system','sign')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="默认使用数量:" prop="name">
-                        <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    <el-form-item label="默认使用数量:" prop="default_number">
+                        <el-input v-model="form.default_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
-                    <el-form-item label="是否默认:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                    <el-form-item label="是否默认:" prop="is_default">
+                        <el-select v-model="form.is_default" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -141,8 +141,8 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="是否收费常用项:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                    <el-form-item label="是否收费常用项:" prop="is_charge">
+                        <el-select v-model="form.is_charge" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -151,8 +151,8 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="是否收费预估项:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                    <el-form-item label="是否收费预估项:" prop="is_estimate">
+                        <el-select v-model="form.is_estimate" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -161,8 +161,8 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="是否统计工作量:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                    <el-form-item label="是否统计工作量:" prop="is_workload">
+                        <el-select v-model="form.is_workload" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -171,11 +171,11 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="收费项目排序:" prop="name">
-                        <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    <el-form-item label="收费项目排序:" prop="sort">
+                        <el-input v-model="form.sort" style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
-                    <el-form-item label="是否常用医嘱:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                    <el-form-item label="是否常用医嘱:" prop="is_advice">
+                        <el-select v-model="form.is_advice" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -183,51 +183,67 @@
                             :value="item.value">
                             </el-option>
                         </el-select>
-                    </el-form-item>
-                    <el-form-item label="收费项目排序:" prop="name" style="visibility: hidden;">
-                        <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
-                    </el-form-item>
-                        
+                    </el-form-item>       
                 </el-form>
             </el-tab-pane>
         </el-tabs>
-
-
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+            <el-button type="primary" @click="submitAction('form')">保 存</el-button>
         </div>
   </el-dialog>
 </template>
 
 <script>
+import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
+import { saveProject } from "@/api/project/project"
 export default {
     data(){
         return{
             visible:false,
             formTitle:'',
             activeName:'first',
+            options: [
+             {value: 1,label: '是'},
+             {value: 2,label: '否'}
+             ],
+            value: '',
+            radio:'1',
             form:{
-                name:''
+              project_name:"",
+              pinyin:"",
+              wubi:"", 
+              price:"", 
+              unit:"",
+              cost_classify:"",
+              executive_section:"",
+              medical_coverage:"",
+              statistical_classification:"",
+              disease_directory:"",
+              is_record:"",
+              medical_code:"",
+              tube_color:"",
+              medical_status:"",
+              remark:"",
+              sign:"",
+              default_number:"",
+              is_default:"",
+              is_charge:"",
+              is_estimate:"",
+              is_workload:"",
+              sort:"",
+              is_advice:"",
             },
-            options: [{
-            value: '选项1',
-            label: '黄金糕'
-            }, {
-            value: '选项2',
-            label: '双皮奶'
-            }, {
-            value: '选项3',
-            label: '蚵仔煎'
-            }, {
-            value: '选项4',
-            label: '龙须面'
-            }, {
-            value: '选项5',
-            label: '北京烤鸭'
-            }],
-            value: '',
-            radio:'1'
+            rules: {
+                project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
+                pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+                wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+                price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+                unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
+                cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
+                executive_section: [{ required: true, message: '请填写执行科室',trigger: 'blur'  }],
+                medical_coverage: [{ required: true, message: '请填写医保等级',trigger: 'blur' }],
+           }
         }
     },
     methods:{
@@ -250,9 +266,77 @@ export default {
             }
         },
         hide() {
-            // this.clear()
-            this.visible = false
+         this.visible = false
         },
+       getDataConfig(module, filed_name){
+         return getDataConfig(module, filed_name)
+       },
+        getDictionaryDataConfig(module, filed_name) {
+          return getDictionaryDataConfig(module, filed_name)
+       },
+       submitAction(formName){
+          this.$refs[formName].validate((valid)=>{
+            if(valid){
+                 var params = {
+                    project_name:this.form.project_name,
+                    pinyin:this.form.pinyin,
+                    wubi:this.form.wubi,
+                    price:this.form.price,
+                    unit:this.form.unit,
+                    cost_classify:this.form.cost_classify,
+                    executive_section:this.form.executive_section,
+                    medical_coverage:this.form.medical_coverage,
+                    statistical_classification:this.form.statistical_classification,
+                    disease_directory:this.form.disease_directory,
+                    is_record:this.form.is_record,
+                    medical_code:this.form.medical_code,
+                    tube_color:this.form.tube_color,
+                    medical_status:this.form.medical_status,
+                    remark:this.form.remark,
+                    sign:this.form.sign,
+                    default_number:this.form.default_number,
+                    is_charge:this.form.is_charge,
+                    is_estimate:this.form.is_estimate,
+                    is_workload:this.form.is_workload,
+                    sort:this.form.sort,
+                    is_advice:this.form.is_advice,
+                    is_default:this.form.is_default
+               }
+           
+              saveProject(params).then(response=>{
+                 if(response.data.state == 1){
+                   var hisProject = response.data.data.hisProject
+                   this.$parent.getlist()
+                   this.$message.success('保存成功')
+                   this.visible = false
+                   this.form.project_name = ""
+                   this.form.pinyin = ""
+                   this.form.wubi = ""
+                   this.form.price = ""
+                   this.form.unit = ""
+                   this.form.cost_classify = ""
+                   this.form.executive_section = ""
+                   this.form.medical_coverage = ""
+                   this.form.statistical_classification = ""
+                   this.form.disease_directory = ""
+                   this.form.is_record = ""
+                   this.form.medical_code = ""
+                   this.form.tube_color = ""
+                   this.form.medical_status = ""
+                   this.form.remark = ""
+                   this.form.sign = ""
+                   this.form.default_number = ""
+                   this.form.is_charge = ""
+                   this.form.is_estimate = ""
+                   this.form.is_workload = ""
+                   this.form.sort = ""
+                   this.form.is_advice = ""
+                   this.form.is_default = ""
+                 }
+              })
+            }
+          })
+       }
     }
 }
 </script>

src/xt_pages/data/components/drugs.vue

@@ -243,6 +243,7 @@
         current_id: 0,
 
         search_input: '',
+        total:0,
         options: [
           {
             value: '0',

src/xt_pages/data/components/editInspection.vue

@@ -0,0 +1,161 @@
+<template>
+    <el-dialog
+        :title="formTitle"
+        width="900px"
+        :visible.sync="visible"
+        :before-close="_close"
+    >
+        <div>
+            <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+                <el-form-item label="组套名称 : " prop="project_team" style="width:100%">
+                    <el-input v-model="form.project_team" placeholder="" maxlength="30"></el-input>
+                </el-form-item>
+                <el-form-item label="组套价格 : " prop="price" style="width:100%">
+                    <el-input v-model="form.price" placeholder="" maxlength="30"></el-input>
+                </el-form-item>
+                <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
+                    <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
+                </el-form-item>
+                <el-form-item label="五笔 : " prop="wubi" style="width:50%">
+                    <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
+                </el-form-item>
+                
+                <el-form-item label="试管颜色 : " prop="name" style="width:50%">
+                     <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
+                        <el-option
+                         v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                         :key="index"
+                         :label="item.name"
+                         :value="item.id">
+                        </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="组套类型 : " prop="name" style="width:50%">
+                    <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="备注 : " prop="name" style="width:100%;">
+                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+                </el-form-item>
+            </el-form>
+        </div>
+
+
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary"  @click="submitAction('form')">保 存</el-button>
+        </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getProjectTeamDetail,updatedProjectTeam } from "@/api/project/project"
+import { getDictionaryDataConfig,getDataConfig} from "@/utils/data";
+export default {
+    data(){
+        return{
+            visible:false,
+            formTitle:'',
+            activeName:'first',
+            form:{
+              id:"",
+              project_team:'',
+              price:"",
+              pinyin:"",
+              wubi:"",
+              tube_color:"",
+              team_type:"",
+              remark:""
+            },
+            options: [{
+            value: 1,
+            label: '是'
+            }, {
+            value: 2,
+            label: '否'
+            },],
+            value: '',
+            radio:'1',
+            rules: {
+              project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
+              pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+              wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+              price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+              team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
+           }
+        }
+    },
+    methods:{
+         getDataConfig(module, filed_name){
+            return getDataConfig(module, filed_name)
+        },
+            getDictionaryDataConfig(module, filed_name) {
+            return getDictionaryDataConfig(module, filed_name)
+        },
+        _close: function(done) {
+            done()
+        },
+        clear: function() {
+            this.form.id = 0;
+            this.form.name = "";
+            this.form.intro = "";
+        },
+        show(id) {
+         this.visible = true
+         this.formTitle = '编辑'
+         this.getProjectTeamDetail(id) 
+        },
+        hide() {
+    
+            this.visible = false
+        },
+        getProjectTeamDetail(id){
+           getProjectTeamDetail(id).then(response=>{
+              if(response.data.state == 1){
+                 var projectTeamDetail =  response.data.data.projectTeamDetail
+                 this.form.id = projectTeamDetail.id
+                 this.form.project_team = projectTeamDetail.project_team
+                 this.form.price = projectTeamDetail.price
+                 this.form.pinyin = projectTeamDetail.pinyin
+                 this.form.wubi  = projectTeamDetail.wubi
+                 this.form.tube_color = projectTeamDetail.tube_color
+                 this.form.team_type = projectTeamDetail.team_type
+                 this.form.remark = projectTeamDetail.remark
+                 console.log("project",projectTeamDetail)
+              }
+           }) 
+        },
+        submitAction(formName){
+           this.$refs[formName].validate((valid)=>{
+              if(valid){
+                var params = {
+                    id:this.form.id,
+                    project_team:this.form.project_team,
+                    price:this.form.price,
+                    pinyin:this.form.pinyin,
+                    wubi:this.form.wubi,
+                    tube_color:this.form.tube_color,
+                    team_type:this.form.team_type,
+                    remark:this.form.remark
+                }
+                 updatedProjectTeam(params).then(response=>{
+                   if(response.data.state == 1){
+                     var projectTeam = response.data.data.projectTeam
+                     this.$message.success("保存成功")
+                     this.visible = false
+                     this.$parent.getlist()
+                   }
+                 })
+              }
+           })  
+        
+        }
+    }
+}
+</script>

src/xt_pages/data/components/editProject.vue

@@ -0,0 +1,354 @@
+<template>
+    <el-dialog
+        :title="formTitle"
+        width="900px"
+        :visible.sync="visible"
+        :before-close="_close"
+    >
+        <el-tabs v-model="activeName">
+            <el-tab-pane label="基础数据" name="first">
+                <div>
+                    <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+                        <el-form-item label="项目名称 : "  prop="project_name" style="width:100%" >
+                            <el-input v-model="form.project_name" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                        <el-form-item label="拼音 : " prop="pinyin" style="width:100%">
+                            <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                        <el-form-item label="五笔 : " prop="wubi" style="width:100%">
+                            <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                        <el-form-item label="价格(元) : " prop="price">
+                            <el-input v-model="form.price" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                        <el-form-item label="单位 : " prop="unit">
+                            <el-select v-model="form.unit" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                             </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="费用类别 : " prop="cost_classify">
+                            <el-select v-model="form.cost_classify" style="width:160px;" placeholder="请选择">
+                                <el-option
+                                v-for="(item,index) in getDictionaryDataConfig('system','cost_classify')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="执行科室 : " prop="executive_section">
+                            <el-select v-model="form.executive_section" style="width:160px;" placeholder="请选择">
+                                <el-option
+                                v-for="(item,index) in getDictionaryDataConfig('system','executive_section')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="医保等级 : " prop="medical_coverage">
+                            <el-select v-model="form.medical_coverage" style="width:160px;" placeholder="请选择">
+                               <el-option
+                                 v-for="(item,index) in getDictionaryDataConfig('system','medical_insurance_level')"
+                                 :key="index"
+                                 :label="item.name"
+                                 :value="item.id">
+                               </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="统计分类 : " prop="statistical_classification">
+                            <el-select v-model="form.statistical_classification" style="width:160px;" placeholder="请选择">
+                                <el-option
+                                v-for="(item,index) in getDictionaryDataConfig('system','statistics_category')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="是否特病目录:" prop="disease_directory">
+                            <el-select v-model="form.disease_directory" style="width:160px;" placeholder="请选择">
+                                <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="是否备案 : " prop="is_record">
+                            <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
+                                <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="医保编码 : " prop="medical_code">
+                            <el-input v-model="form.medical_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                        <el-form-item label="试管颜色 : " prop="tube_color">
+                            <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
+                              <el-option
+                                v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="状态 : " prop="medical_status" style="width:100%;">
+                            <el-radio-group v-model="form.medical_status">
+                                <el-radio :label="1">停用</el-radio>
+                                <el-radio :label="2">收费</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="备注 : " prop="remark" style="width:100%;">
+                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="扩展数据" name="second">
+                <el-form :model="form"  label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+                    <el-form-item label="标签 : " prop="sign">
+                        <el-select v-model="form.sign" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="(item,index) in getDictionaryDataConfig('system','sign')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="默认使用数量:" prop="default_number">
+                        <el-input v-model="form.default_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    </el-form-item>
+                    <el-form-item label="是否默认:" prop="is_default">
+                        <el-select v-model="form.is_default" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否收费常用项:" prop="is_charge">
+                        <el-select v-model="form.is_charge" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否收费预估项:" prop="is_estimate">
+                        <el-select v-model="form.is_estimate" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="是否统计工作量:" prop="is_workload">
+                        <el-select v-model="form.is_workload" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="收费项目排序:" prop="sort">
+                        <el-input v-model="form.sort" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    </el-form-item>
+                    <el-form-item label="是否常用医嘱:" prop="is_advice">
+                        <el-select v-model="form.is_advice" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>       
+                </el-form>
+            </el-tab-pane>
+        </el-tabs>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+        </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
+import { getProjectDetail,updatedProject } from "@/api/project/project"
+export default {
+    data(){
+        return{
+            visible:false,
+            formTitle:'',
+            activeName:'first',
+            options: [
+             {value: 1,label: '是'},
+             {value: 2,label: '否'}
+             ],
+            value: '',
+            radio:'1',
+          
+            form:{
+              id:0,
+              project_name:"",
+              pinyin:"",
+              wubi:"", 
+              price:"", 
+              unit:"",
+              cost_classify:"",
+              executive_section:"",
+              medical_coverage:"",
+              statistical_classification:"",
+              disease_directory:"",
+              is_record:"",
+              medical_code:"",
+              tube_color:"",
+              medical_status:"",
+              remark:"",
+              sign:"",
+              default_number:"",
+              is_default:"",
+              is_charge:"",
+              is_estimate:"",
+              is_workload:"",
+              sort:"",
+              is_advice:"",
+            },
+            rules: {
+                project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
+                pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+                wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+                price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+                unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
+                cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
+                executive_section: [{ required: true, message: '请填写执行科室',trigger: 'blur'  }],
+                medical_coverage: [{ required: true, message: '请填写医保等级',trigger: 'blur' }],
+           }
+        }
+    },
+    methods:{
+        _close: function(done) {
+            done()
+        },
+        clear: function() {
+            this.form.id = 0;
+            this.form.name = "";
+            this.form.intro = "";
+        },
+        show(id) {
+          
+           this.visible = true
+           this.formTitle = '编辑'
+           this.getProjectDetail(id)
+        },
+        hide() {
+         this.visible = false
+        },
+       getDataConfig(module, filed_name){
+         return getDataConfig(module, filed_name)
+       },
+        getDictionaryDataConfig(module, filed_name) {
+          return getDictionaryDataConfig(module, filed_name)
+       },
+       getProjectDetail(id){
+           console.log("id",id)
+         getProjectDetail(id).then(response=>{
+            if(response.data.state == 1){
+              var projecDetail =  response.data.data.projecDetail
+              console.log("projectdatail",projecDetail)
+              this.form.id = projecDetail.id
+              this.form.project_name = projecDetail.project_name
+              this.form.pinyin = projecDetail.pinyin
+              this.form.wubi = projecDetail.wubi
+              this.form.price = projecDetail.price
+              this.form.unit = projecDetail.unit
+              this.form.cost_classify = projecDetail.cost_classify
+              this.form.executive_section = projecDetail.executive_section
+              this.form.medical_coverage = projecDetail.medical_coverage
+              this.form.statistical_classification =projecDetail.statistical_classification
+              this.form.disease_directory = projecDetail.disease_directory
+              this.form.is_record = projecDetail.is_record
+              this.form.medical_code = projecDetail.medical_code
+              this.form.tube_color = projecDetail.tube_color
+              this.form.medical_status = projecDetail.medical_status
+              this.form.remark = projecDetail.remark
+              this.form.sign = projecDetail.sign
+              this.form.default_number = projecDetail.default_number
+              this.form.is_default = projecDetail.is_default
+              this.form.is_charge = projecDetail.is_charge
+              this.form.is_estimate = projecDetail.is_estimate
+              this.form.is_workload = projecDetail.is_workload
+              this.form.sort = projecDetail.sort
+              this.form.is_advice = projecDetail.doctor_advice
+            }
+         })
+       },
+     
+       
+       submitAction(formName){
+          this.$refs[formName].validate((valid)=>{
+            if(valid){
+                 var params = {
+                    id:this.form.id,
+                    project_name:this.form.project_name,
+                    pinyin:this.form.pinyin,
+                    wubi:this.form.wubi,
+                    price:this.form.price,
+                    unit:this.form.unit,
+                    cost_classify:this.form.cost_classify,
+                    executive_section:this.form.executive_section,
+                    medical_coverage:this.form.medical_coverage,
+                    statistical_classification:this.form.statistical_classification,
+                    disease_directory:this.form.disease_directory,
+                    is_record:this.form.is_record,
+                    medical_code:this.form.medical_code,
+                    tube_color:this.form.tube_color,
+                    medical_status:this.form.medical_status,
+                    remark:this.form.remark,
+                    sign:this.form.sign,
+                    default_number:this.form.default_number,
+                    is_charge:this.form.is_charge,
+                    is_estimate:this.form.is_estimate,
+                    is_workload:this.form.is_workload,
+                    sort:this.form.sort,
+                    is_advice:this.form.is_advice,
+                    is_default:this.form.is_default
+               }
+              
+              updatedProject(params).then(response=>{
+                 if(response.data.state == 1){
+                   var hisProject = response.data.data.hisProject
+                   this.$message.success('保存成功')
+                   this.$parent.getlist()
+                   this.visible = false
+                   
+                 }
+              })
+            }
+          })
+       }
+    }
+}
+</script>

src/xt_pages/data/components/inspection.vue

@@ -17,29 +17,69 @@
             <el-button type="primary" @click="openForm(0)">新增</el-button>
         </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-            <el-table-column prop="date" label="自编码" width="80" align="center"></el-table-column>
-            <el-table-column prop="date" label="名称" align="center"></el-table-column>
-            <el-table-column prop="date" label="拼音助记符" width="140" align="center"></el-table-column>
-            <el-table-column prop="date" label="五笔助记符" width="140" align="center"></el-table-column>
-            <el-table-column label="价格" width="60" align="center"></el-table-column>
-            <el-table-column prop="date" label="备注" align="center"></el-table-column>
+            <el-table-column prop="date" label="序号" width="80" align="center">
+                <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="名称" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.project_team}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="拼音助记符" width="140" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.pinyin}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="五笔助记符" width="140" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.wubi}}
+                </template>
+            </el-table-column>
+            <el-table-column label="价格" width="60" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.price}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="备注" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.remark}}
+                </template>
+            </el-table-column>
             <el-table-column prop="date" label="操作" width="300" align="center">
                 <template slot-scope="scope">
-                    <el-button @click="openForm(scope.row)" type="primary" size="small">编辑</el-button>
-                    <el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>
-                    <el-button type="danger" size="small">删除</el-button>
+                    <el-button @click="editProjectTeam(scope.row.id)" type="primary" size="small">编辑</el-button>
+                    <el-button type="danger" size="small" @click="DeleteProjectTeam(scope.row.id,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+         >
+        </el-pagination>
+
         <add-inspection ref="addInspection"></add-inspection>
+        <edit-inspection ref="editInspection"></edit-inspection>
     </div>
 </template>
 
 <script>
 import addInspection from './addInspection'
+import editInspection from './editInspection'
+import { getProjectTeamList,DeleteProjectTeam } from "@/api/project/project"
 export default {
     components:{
-        addInspection
+        addInspection,
+        editInspection
     },
     data(){
         return{
@@ -52,27 +92,22 @@ export default {
             label: '否'
             },],
             value: '',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            tableData: [],
+            limit:20,
+            page:1,
+            total:0
             
         }
     },
     methods:{
+      handleSizeChange(val) {
+        this.limit = val
+        this.getlist()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getlist()
+      },
         searchAction(){},
         clickSelfPayment(){
             this.$refs.selfPayment.show();
@@ -82,7 +117,44 @@ export default {
         },
         openForm(id){
             this.$refs.addInspection.show(id);
+        },
+        editProjectTeam(id){
+           this.$refs.editInspection.show(id)
+        },
+        getlist(){
+            const params = {
+               limit:this.limit,
+               page:this.page,
+            }
+          getProjectTeamList(params).then(response=>{
+             if(response.data.state == 1){
+               var projectTeamList =  response.data.data.projectTeamList
+               console.log("projectteamlist",projectTeamList)
+               this.tableData = projectTeamList
+               var total  =  response.data.data.total
+               this.total = total
+             }
+          })
+        },
+        DeleteProjectTeam(id,index){
+          this.$confirm("确认删除此项目组套吗?", "删除", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning"
+           }).then(() => {
+            DeleteProjectTeam(id,index).then(response => {
+               if (response.data.state == 1) {
+                 var msg = response.data.data.msg
+                 this.$message.success("删除成功")
+                this.tableData.splice(index, 1);
+                }
+            });
+            })
+            .catch(() => {});   
         }
+    },
+    created(){
+       this.getlist()  
     }
 }
 </script>

src/xt_pages/data/components/project.vue

@@ -26,29 +26,72 @@
             <el-button type="primary" @click="openForm(0)">新增</el-button>
         </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-            <el-table-column prop="date" label="自编码" width="80" align="center"></el-table-column>
-            <el-table-column prop="date" label="名称" align="center"></el-table-column>
-            <el-table-column prop="date" label="费用类型" align="center"></el-table-column>
-            <el-table-column prop="date" label="医计科室" width="140" align="center"></el-table-column>
-            <el-table-column label="医保编码" width="140" align="center"></el-table-column>
-            <el-table-column label="状态" width="60" align="center"></el-table-column>
+            <el-table-column prop="date" label="序号" width="80" align="center">
+                 <template  slot-scope="scope">
+                      {{scope.$index+1}}
+                 </template>
+            </el-table-column>
+            <el-table-column prop="date" label="名称" align="center">
+                <template  slot-scope="scope">
+                    {{scope.row.project_name}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="费用类别" align="center">
+                  <template  slot-scope="scope">
+                     {{getCostClassify(scope.row.cost_classify)}}
+                  </template>
+            </el-table-column>
+            <el-table-column prop="date" label="执行科室" width="140" align="center">
+                <template  slot-scope="scope">
+                    {{getExecutiveSection(scope.row.executive_section)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="医保编码" width="140" align="center">
+                <template  slot-scope="scope">
+                   {{scope.row.medical_code}}
+                </template>
+            </el-table-column>
+            <el-table-column label="状态" width="60" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.medical_status ==0"></span>
+                  <span v-if="scope.row.medical_status ==1">停用</span>
+                  <span v-if="scope.row.medical_status ==2">收费</span>
+                </template>
+            </el-table-column>
             <el-table-column prop="date" label="操作" width="300" align="center">
                 <template slot-scope="scope">
-                    <el-button @click="openForm(scope.row)" type="primary" size="small">编辑</el-button>
-                    <el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>
-                    <el-button type="danger" size="small">删除</el-button>
+                    <el-button @click="editHisProject(scope.row.id)" type="primary" size="small">编辑</el-button>
+                    <el-button type="danger" size="small" @click="deleteProject(scope.row.id,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
+         <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+         >
+        </el-pagination>
+
         <add-project ref="addProject"></add-project>
+        <editProject ref="editProject"></editProject>
     </div>
 </template>
 
 <script>
 import addProject from './addProject'
+import editProject from './editProject'
+import { getProjectList,deleteHisProject } from "@/api/project/project"
+import { getDictionaryDataConfig } from "@/utils/data";
 export default {
     components:{
-        addProject
+        addProject,
+        editProject
     },
     data(){
         return{
@@ -61,37 +104,90 @@ export default {
             label: '否'
             },],
             value: '',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }]
-            
+            limit:20,
+            page:1,
+            total:0,
+            tableData: []
         }
     },
     methods:{
+        handleSizeChange(val) {
+            this.limit = val
+            this.getlist()
+        },
+        handleCurrentChange(val) {
+            this.page = val
+            this.getlist()
+        },
         searchAction(){},
         clickSelfPayment(){
             this.$refs.selfPayment.show();
         },
         clickMainTain(){
-            // this.$refs.maintain.show();
         },
         openForm(id){
-            this.$refs.addProject.show(id);
+           this.$refs.addProject.show(id);
+        },
+        editHisProject(id){
+           this.$refs.editProject.show(id)
+        },
+        getCostClassify(id){
+          var costClassify = getDictionaryDataConfig('system','cost_classify')
+          var name = ""
+          for(let i=0;i<costClassify.length;i++){
+             if(id == costClassify[i].id){
+               name = costClassify[i].name
+             }
+          }
+          return name
+        },
+        getExecutiveSection(id){
+          var executiveSection =  getDictionaryDataConfig('system','executive_section')
+          var name = ""
+          for(let i=0;i<executiveSection.length;i++){
+            if(id == executiveSection[i].id){
+               name = executiveSection[i].name
+            }
+          }
+          return name
+        },
+      
+        getlist(){
+            var params = {
+               limit:this.limit,
+               page:this.page,
+            }
+          getProjectList(params).then(response=>{
+             if(response.data.state == 1){
+               var projecList = response.data.data.projecList
+               console.log('projectlist',projecList)
+               this.tableData = projecList
+               var total = response.data.data.total
+               this.total = total
+             }
+          })  
+        },
+        deleteProject(id,index){
+            this.$confirm("确认删除此项目吗?", "删除", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning"
+           }).then(() => {
+            deleteHisProject(id).then(response => {
+               if (response.data.state == 1) {
+                 var msg = response.data.data.msg
+                 this.$message.success("删除成功")
+                this.tableData.splice(index, 1);
+                }
+             });
+            })
+            .catch(() => {});
         }
+        
+    },
+    created(){
+      this.getlist()
+     
     }
 }
 </script>

src/xt_pages/data/components/selfPayment.vue

@@ -17,7 +17,7 @@
 
     <div slot="footer" class="dialog-footer">
       <el-button @click="hide">取 消</el-button>
-      <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+      <el-button type="primary"  @click="submitAction()">保 存</el-button>
     </div>
   </el-dialog>
 </template>

src/xt_pages/data/specialDictionary.vue

@@ -4,19 +4,19 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName">
         <el-tab-pane label="药品" name="1">
           <drugs></drugs>
         </el-tab-pane>
         <el-tab-pane label="耗材" name="2">
           <consumables></consumables>
         </el-tab-pane>
-        <!--<el-tab-pane label="项目" name="3">-->
-        <!--<project></project>-->
-        <!--</el-tab-pane>-->
-        <!--<el-tab-pane label="检验检查项目" name="4">-->
-        <!--<inspection></inspection>-->
-        <!--</el-tab-pane>-->
+        <el-tab-pane label="项目" name="3">
+        <project></project>
+        </el-tab-pane>
+        <el-tab-pane label="项目组套" name="4">
+        <inspection></inspection>
+        </el-tab-pane>
         <el-tab-pane label="生产厂商" name="5">
           <!--<manufacturer></manufacturer>-->
           <manufacturer></manufacturer>

src/xt_pages/dialysis/details/index.vue

@@ -1300,6 +1300,7 @@ export default {
       })
     },
     changePatient(schedual) {
+      console.log("schedual",schedual)
       this.patient_id = schedual.patient_id
       this.date = schedual.schedule_date
       // this.getScheduleDetail();
@@ -1312,7 +1313,8 @@ export default {
         query: {
           patient_id: patient_id,
           date: date,
-          patient_name: schedual.patient.name
+          patient_name: schedual.patient.name,
+          mode_id:schedual.mode_id
         }
       })
     },

src/xt_pages/outpatientCharges/components/additionalCharges.vue

@@ -0,0 +1,88 @@
+<template>
+    <el-dialog
+        title="附加收费"
+        width="300px"
+        :visible.sync="visible"
+        :before-close="_close"
+    >
+        <el-table :data="tableData" border style="width: 100%;" height="300" 
+         :row-style="{ color: '#303133' }" 
+         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+          highlight-current-row
+          @selection-change="handleSelectionChange"
+          >
+            <el-table-column align="center" type="selection" width="40"></el-table-column>
+            <el-table-column align="center" prop="name" label="名称" width="100">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="金额(元)">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.money"></el-input>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary"  @click="submitAction()">保 存</el-button>
+        </div>
+    </el-dialog>         
+</template>
+
+<script>
+import { saveCharges } from "@/api/project/project"
+export default {
+ 
+    data(){
+        return{
+            visible:false,
+            form:{
+                name:''
+            },
+            tableData:[
+              {id:1,name:"zs",money:50},
+              {id:2,name:"ls",money:60}  
+            ],
+            patient_id:0,
+            chargeTable:[]
+        }
+    },
+    methods:{
+        _close: function(done) {
+            done()
+        },
+        clear: function() {
+            this.form.id = 0;
+            this.form.name = "";
+            this.form.intro = "";
+        },
+        show(id) {
+           this.patient_id = id
+           this.visible = true
+        },
+        hide() {
+           this.visible = false
+        },
+        handleSelectionChange(val){
+          console.log("val",val)
+          this.chargeTable = val
+        },
+        submitAction(){
+           var params = {
+             patient_id:this.patient_id,
+             medicineData:this.chargeTable
+           }
+           console.log("params",params)
+          saveCharges(params).then(response=>{
+             if(response.data.state == 1){
+               var additionalCharge =  response.data.data.additionalCharge
+               console.log("additionalchar",additionalCharge)
+               this.visible = false
+               this.$message.success("保存成功")
+             }
+          })  
+        }
+    },
+   
+}
+</script>
+

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -0,0 +1,148 @@
+<template>
+    <div class="prescriptionTable">
+        <el-table :data="preTableData" border style="width: 98%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+            <el-table-column align="center" type="selection" width="40"></el-table-column>
+            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" prop="name" label="名称">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="组套">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+                <template slot-scope="scope">
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="用法">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="频率">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="天数">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="100" label="总量">
+                <template slot-scope="scope">
+                    <div style="display:flex;">
+                        <el-input v-model="input" style="width:50%" placeholder=""></el-input>
+                        <!-- <el-select v-model="value" style="width:50%" placeholder="">
+                            <el-option
+                            v-for="item in newoptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select> -->
+                        <el-input v-model="input" style="width:50%" placeholder=""></el-input>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="单价">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.unitPrice" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="备注">
+                <template slot-scope="scope">
+                    <!-- <el-autocomplete
+                    class="inline-input"
+                    v-model="state1"
+                    :fetch-suggestions="querySearch"
+                    placeholder=""
+                    @select="handleSelect"
+                    ></el-autocomplete> -->
+                </template>
+            </el-table-column>
+            <el-table-column align="center" width="40" prop="name" label="操作">
+                <template slot-scope="scope">
+                    <i class="el-icon-delete"></i>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+</template>
+
+<script>
+export default {
+    props:{
+        preTableData:Array
+    },
+    data(){
+        return{
+            tableData: [],
+            newoptions: [{
+            value: '1',
+            label: '1'
+            }, {
+            value: '2',
+            label: '2'
+            }, {
+            value: '3',
+            label: '3'
+            }, {
+            value: '4',
+            label: '4'
+            }, {
+            value: '5',
+            label: '5'
+            }],
+            value:'1',
+            input:1
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.prescriptionTable{
+    .el-table th .cell, .el-table td .cell{
+        padding: 0 2px;
+        white-space: pre-line;
+    }
+    .el-icon-delete{
+        color:red;
+    }
+}
+</style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3,22 +3,99 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div class="app-container">
-            <div class="dateBox">
-                <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+        <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
+            <div class="mainLeft">
+                <div class="mainCell" style="justify-content: space-between;">
+                    <p>未就诊：<span>1</span>人</p>
+                    <p>已就诊：<span>0</span>人</p>
+                </div>
+                <div class="mainCell">
+                    <el-radio-group v-model="radio">
+                        <el-radio :label="1">未就诊</el-radio>
+                        <el-radio :label="2">已就诊</el-radio>
+                        <el-radio :label="3">全部</el-radio>
+                    </el-radio-group>
+                </div>
+                <div class="mainCell" style="margin-bottom:10px;">
+                    <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                </div>
+                <div style="flex:1;overflow-y:auto;">
+                    <el-table :data="patientTableData" border @row-click='choosePatient' style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                        <el-table-column align="center" prop="name" label="患者姓名">
+                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="就诊号" width="90">
+                            <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+            <div class="mainRight">
+                <div class="mainCell" style="margin-bottom:10px;flex-direction: row-reverse;">
+                    <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
+                    <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
+                    <el-button size="small" @click="open(3)" type="primary">打印</el-button>
+                    <el-button size="small" @click="open(4)" type="primary">收费</el-button>
+                    <el-button size="small" v-if="state == '已收费'" @click="open(5)" type="primary">退费</el-button>
+                </div>
+                <div class="mainCenter">
+                    <div class="centerLeft">
+                        <div class="tabsBox">
+                            <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+                            <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" :before-leave="moreState">
+                                <el-tab-pane
+                                    v-for="(item, index) in editableTabs"
+                                    :key="index"
+                                    :label="item.title"
+                                    :name="item.name"
+                                >
+                                    <div class="RP">Rp</div>
+                                    <prescription-table :preTableData='preTableData'></prescription-table>
+                                </el-tab-pane>
+                                <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span></el-tab-pane>
+                            </el-tabs>
+                            
+                        </div>
+                        <div class="costBox">
+                            <span>处方编号：2134348971237883</span>
+                            <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
+                            <span>{{ state }}</span>
+                        </div>
+                    </div>
+                    <div class="centerRight">
+                        <p class="centerRightTitle">人员信息</p>
+                        <div style="display:flex;justify-content: space-between;line-height:30px;">
+                            <span style="font-size:14px;">人员编码:{{ patientInfo.psn_no }}</span>
+                            <span style="font-size:14px;">日期:2020-11-13</span>
+                        </div>
+                        <ul class="basicUl">
+                            <li style="width:50%;">姓名：{{ patientInfo.psn_name }}</li>
+                            <li style="width:50%;">性别：{{ patientInfo && patientInfo.gend == 1 ? '男' : "女" }}</li>
+                            <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
+                            <li style="width:50%;">身高：</li>
+                            <li style="width:50%;">体重：</li>
+                            <li style="width:50%;">电话：</li>
+                            <li style="width:100%;">地址：</li>
+                            <li style="width:100%;">过敏史：</li>
+                        </ul>
+                        <p class="centerRightTitle">诊断信息</p>
+                        <div style="display:flex;justify-content: space-between;line-height:30px;">
+                            <span style="font-size:14px;">门诊编号:676273816287361</span>
+                        </div>
+                        <ul class="basicUl">
+                            <li style="width:50%;">医生：{{ doctor.name }}</li>
+                            <li style="width:50%;">科室：{{ doctor.department }}</li>
+                            <li style="width:100%;">费用：{{ doctor.total }}元</li>
+                            <li style="width:100%;">判断结果：</li>
+                            <li style="width:100%;">是否有传染病：</li>
+                            <li style="width:100%;">血压：</li>
+                        </ul>
+                    </div>
+                </div>
             </div>
-            <el-tabs v-model="activeName">
-                <el-tab-pane label="未收费" name="first">
-                    <no-charge></no-charge>
-                </el-tab-pane>
-                <el-tab-pane label="已收费" name="second">
-                    <charged></charged>
-                </el-tab-pane>
-                <el-tab-pane label="医保退处方" name="third">
-                    <medical-insurance-refund></medical-insurance-refund>
-                </el-tab-pane>
-            </el-tabs>
         </div>
+        <additionalCharges ref='additionalCharges'></additionalCharges>
     </div>
 </template>
 
@@ -28,12 +105,16 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import noCharge from './components/noCharge'
 import charged from './components/charged'
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
+import prescriptionTable from './components/prescriptionTable'
+import additionalCharges from './components/additionalCharges'
 export default {
     components:{
         BreadCrumb,
         noCharge,
         charged,
-        medicalInsuranceRefund
+        medicalInsuranceRefund,
+        prescriptionTable,
+        additionalCharges
     },
     data(){
         return{
@@ -41,31 +122,268 @@ export default {
                 { path: false, name: '门诊收费' },
                 { path: false, name: '门诊收费管理' }
             ],
-            activeName:'first'
+            tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            },{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            },{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            editableTabsValue: '1',
+            editableTabs: [{
+            title: '处方1',
+            name: '1',
+            }],
+            tabIndex: 1,
+
+            patientTableData:[{
+                name:'杨美英',
+                mdtrt_id:"1709946",
+            }],
+            patientInfo:{},
+            doctor:{},
+            total:0,
+            state:'未收费'
+        }
+    },
+    created(){
+        
+    },
+    methods:{
+        moreState(tab, event){
+          if(tab == 'more'){
+            return false;
+          }
+        },
+        open(index){
+            if(index == 1){
+            }else if(index == 2){
+                
+            }else if(index == 4){
+                this.state = '已收费'
+                this.$message({message: '收费成功',type: 'success'});
+            }else if(index == 5){
+                this.$message({message: '退费成功',type: 'success'});
+            }
+            
+        },
+        addTab(targetName) {
+            let newTabName = ++this.tabIndex + '';
+            this.editableTabs.push({
+                title: '处方' + this.tabIndex,
+                name: newTabName,
+            });
+            this.editableTabsValue = newTabName;
+        },
+        removeTab(targetName) {
+            let tabs = this.editableTabs;
+            let activeName = this.editableTabsValue;
+            if (activeName === targetName) {
+            tabs.forEach((tab, index) => {
+                if (tab.name === targetName) {
+                let nextTab = tabs[index + 1] || tabs[index - 1];
+                if (nextTab) {
+                    activeName = nextTab.name;
+                }
+                }
+            });
+            }
+            
+            this.editableTabsValue = activeName;
+            this.editableTabs = tabs.filter(tab => tab.name !== targetName);
+        },
+        addCharges(){
+            this.$refs.additionalCharges.show()
+        },
+        choosePatient(){
+            let a = JSON.parse(localStorage.getItem("drugs"))
+            this.preTableData = a
+            this.preTableData.map(item => {
+                this.total += item.unitPrice
+            })
+            this.patientInfo = {
+                certno:"440221195903290027",
+                psn_no:"0221201972",
+                gend:"2",
+                brdy:"1960-03-29",
+                naty:"01",
+                psn_cert_type:"01",
+                psn_name:"杨美英",
+                age:60.7
+            }
+            this.doctor = {
+                name:'刘志刚',
+                department:'血透中心',
+                total:20,
+            }
         }
     }
 }
 </script>
 
 <style lang="scss" scoped>
+.app-container{
+    height:100%;
+}
 .outpatientChargesManagement{
-    .el-tabs{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    .mainLeft{
+        width:200px;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        .el-radio{
+            margin-right:5px;
+        }
+        
+    }
+    .mainCell{
+        height:36px;
+        display: flex;
+        align-items: center;
+    }
+    .mainRight{
+        margin-left:20px;
+        flex:1;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        overflow-y: auto;
+        .cellSpan{
+            min-width: 80px;
+            display: inline-block;
+            margin-right: 10px;
+        }
+    }
+    .tabsBox{
         position: relative;
+        height: 90%;
+        overflow-y: auto;
+        margin-bottom: 60px;
+        .el-tabs__item{
+            padding: 0 10px;
+        }
     }
-    .el-tabs__nav-wrap{
-        padding-left:200px;
+    .addTab{
+        position: absolute;
+        right: 0;
+        top: 6px;
+        z-index: 20;
+    }
+    .mainCenter{
+        display: flex;
+        flex:1;
     }
-    .dateBox{
+    .costBox{
+        width:100%;
+        height:60px;
+        background:#fff;
         position: absolute;
-        z-index:99;
+        bottom:0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+    .centerLeft{
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+    }
+    .centerRight{
+        width: 300px;
+        margin-left: 5px;
+        display: flex;
+        flex-direction: column;
+    }
+    .RP{
+        color:#409EFF;
+        font-size: 20px;
+        margin-bottom: 5px;
+    }
+    .centerRightTitle{
+        color:#409EFF;
+        padding-top: 10px;;
+    }
+    .basicUl{
+        border-top: 1px solid #e5e5e5;
+        border-left: 1px solid #e5e5e5;
+        display: flex;
+        flex-wrap: wrap;
+        li{
+            border-bottom: 1px solid #e5e5e5;
+            border-right: 1px solid #e5e5e5;
+            width: 100%;
+            height: 38px;
+            line-height: 38px;
+            text-indent: 5px;
+            font-size: 14px;
+        }
     }
 }
 </style>
 
 <style lang="scss">
-.outpatientChargesManagement{
-    .el-tabs__nav-wrap{
-        padding-left:220px;
+#tab-more{
+    .el-icon-close{
+        display: none;
     }
 }
 </style>
+

src/xt_pages/outpatientCharges/summary.vue

@@ -44,7 +44,7 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="primary">打印</el-button>
+                        <el-button size="mini" type="primary" @click="toDetail">详情</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -83,6 +83,11 @@ export default {
             address: '上海市普陀区金沙江路 1516 弄'
             }]
         }
+    },
+    methods:{
+        toDetail(){
+            this.$router.push('/outpatientCharges/summaryDetail')
+        }
     }
 }
 </script>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -0,0 +1,230 @@
+<template>
+    <div class="main-contain summaryDetail">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
+            <div class="mainCenter">
+                <div class="centerLeft">
+                    <div class="tabsBox">
+                        <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+                        <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" :before-leave="moreState">
+                            <el-tab-pane
+                                v-for="(item, index) in editableTabs"
+                                :key="index"
+                                :label="item.title"
+                                :name="item.name"
+                            >
+                                <div class="RP">Rp</div>
+                                <el-table :data="tableData" border style="width: 99%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                                    <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+                                    <el-table-column align="center" prop="name" label="名称">
+                                        <template slot-scope="scope">{{ scope.row.date }}</template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="50" label="组套">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="50" label="用法">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="50" label="频率">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="50" label="天数">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="100" label="总量">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="50" label="单价">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column align="center" prop="name" width="50" label="备注">
+                                        <template slot-scope="scope">
+                                            
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                        </el-tabs>
+                        
+                    </div>
+                    <div class="costBox">
+                        <span>处方编号：2134348971237883</span>
+                        <span>当前处方总费用：<span style="color:red;">0.00元</span></span>
+                        <span>已收费</span>
+                    </div>
+                </div>
+                <div class="centerRight">
+                    <p class="centerRightTitle">人员信息</p>
+                    <ul class="basicUl">
+                        <li style="width:50%;">姓名：张三</li>
+                        <li style="width:50%;">性别：男</li>
+                        <li style="width:50%;">年龄：12</li>
+                        <li style="width:50%;">身高：123</li>
+                        <li style="width:50%;">体重：44kg</li>
+                        <li style="width:50%;">电话：348971237883</li>
+                    </ul>
+                    <p class="centerRightTitle">收费信息</p>
+                    <ul class="basicUl">
+                        <li style="width:50%;">应收金额：0.00元</li>
+                        <li style="width:50%;">实收金额：0.00元</li>
+                        <li style="width:50%;">舍入金额：0.00元</li>
+                        <li style="width:50%;">优惠金额：0.00元</li>
+                        <li style="width:50%;">总金额</li>
+                        <li style="width:50%;">0.00元</li>
+                    </ul>
+                    <p class="centerRightTitle">发票费用</p>
+                    <ul class="basicUl">
+                        <li style="width:100%;">西药费：0.00元</li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+export default {
+    components:{
+        BreadCrumb,
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: '门诊收费' },
+                { path: false, name: '项目消费明细汇总详情' }
+            ],
+            tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            editableTabsValue: '1',
+            editableTabs: [{
+            title: '处方1',
+            name: '1',
+            }],
+            tabIndex: 1,
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.summaryDetail{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    .tabsBox{
+        position: relative;
+        height: 90%;
+        overflow-y: auto;
+        margin-bottom: 60px;
+        .el-tabs__item{
+            padding: 0 10px;
+        }
+    }
+    .addTab{
+        position: absolute;
+        right: 0;
+        top: 6px;
+        z-index: 20;
+    }
+    .mainCenter{
+        display: flex;
+        flex:1;
+    }
+    .costBox{
+        width:100%;
+        height:60px;
+        background:#fff;
+        position: absolute;
+        bottom:0;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .centerLeft{
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+    }
+    .centerRight{
+        width: 300px;
+        margin-left: 5px;
+        display: flex;
+        flex-direction: column;
+    }
+    .RP{
+        color:#409EFF;
+        font-size: 20px;
+        margin-bottom: 5px;
+    }
+    .centerRightTitle{
+        color:#409EFF;
+        padding: 10px 0;
+    }
+    .basicUl{
+        border-top: 1px solid #e5e5e5;
+        border-left: 1px solid #e5e5e5;
+        display: flex;
+        flex-wrap: wrap;
+        li{
+            border-bottom: 1px solid #e5e5e5;
+            border-right: 1px solid #e5e5e5;
+            width: 100%;
+            height: 38px;
+            line-height: 38px;
+            text-indent: 5px;
+            font-size: 14px;
+        }
+    }
+}
+</style>
+
+<style lang="scss">
+.summaryDetail{
+    .el-table th .cell, .el-table td .cell{
+        padding: 0 2px;
+        white-space: pre-line;
+    }
+    .el-icon-delete{
+        color:red;
+    }
+}
+
+</style>
+

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -0,0 +1,57 @@
+<template>
+    <el-dialog
+        title="附加收费"
+        width="300px"
+        :visible.sync="visible"
+        :before-close="_close"
+    >
+        <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+            <el-table-column align="center" type="selection" width="40"></el-table-column>
+            <el-table-column align="center" prop="name" label="名称" width="100">
+                <template slot-scope="scope">{{ scope.row.date }}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="金额(元)">
+                <template slot-scope="scope">
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+        </div>
+    </el-dialog>         
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            visible:false,
+            form:{
+                name:''
+            },
+        }
+    },
+    methods:{
+        _close: function(done) {
+            // this.clear()
+            done()
+        },
+        clear: function() {
+            this.form.id = 0;
+            this.form.name = "";
+            this.form.intro = "";
+        },
+        show() {
+            // this.clear()
+            this.visible = true
+        },
+        hide() {
+            // this.clear()
+            this.visible = false
+        },
+    }
+}
+</script>
+

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -0,0 +1,572 @@
+<template>
+    <div style="height: calc(100% - 36px);display: flex;flex-direction: column;">
+        <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
+            <div class="mainCell" style="margin-bottom:10px;float:right">
+                <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+                <el-button size="small" @click="open(2)" type="primary">打印</el-button>
+                <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
+                <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
+            </div>
+        </div>
+        <div class="backColor"></div>
+        <div class="mainCenter">
+            <div class="centerLeft">
+                <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+                    <el-form-item label="姓名:" prop="name">
+                        <el-input v-model="patientInfo.psn_name" placeholder=""></el-input>
+                    </el-form-item>
+                    <el-form-item label="证件号: " prop="name">
+                        <el-input v-model="patientInfo.certno" placeholder=""></el-input>
+                    </el-form-item>
+                    <el-form-item label="挂号类型: " prop="name">
+                        <el-input v-model="form.name" placeholder=""></el-input>
+                    </el-form-item>
+                    <el-form-item label="诊断:" prop="name">
+                        <el-autocomplete
+                        style="width:100%;"
+                        class="inline-input"
+                        v-model="state1"
+                        :fetch-suggestions="querySearch"
+                        placeholder="请输入内容"
+                        @select="handleSelect"
+                        ></el-autocomplete>
+                    </el-form-item>
+                    <el-form-item label="大病类别: " prop="name">
+                        <el-input v-model="form.name" placeholder=""></el-input>
+                    </el-form-item>
+                    <el-form-item label="处方类型: " prop="name">
+                        <el-select v-model="value" placeholder="请选择" style="width:100%;">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <div class="tabsBox">
+                    
+                    <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" :before-leave="moreState">
+                        <el-tab-pane
+                            v-for="(item, index) in editableTabs"
+                            :key="index"
+                            :label="item.title"
+                            :name="item.name"
+                        >
+                            <div class="RP">Rp</div>
+                            <prescription-table :preDrugs="preDrugs"></prescription-table>
+                        </el-tab-pane>
+                        <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span></el-tab-pane>
+                    </el-tabs>
+                </div>
+                <div class="costBox">
+                    <span>医生：</span>
+                    <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="">
+                        <el-option
+                        v-for="item in doctorOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                    <span>科室：</span>
+                    <el-select style="margin-right:5px;" v-model="departmentValue" placeholder="">
+                        <el-option
+                        v-for="item in departmentOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                    <span>总计：</span>
+                    <span style="color:red;">{{ total }}</span>元
+                </div>
+            </div>
+            <div class='centerRight'>
+                <div class="rightTab">
+                    <p :class="rightTab == 1 ? 'activeP' : ''" @click="clickTab(1)">药品</p>
+                    <p :class="rightTab == 2 ? 'activeP' : ''" @click="clickTab(2)">项目</p>
+                </div>
+                <template>
+                    <div style="margin-top:5px;">
+                        <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                        <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div style="height:84%;overflow-y: auto;margin-bottom: 60px;">
+                        <el-tabs class="rightTabs" v-model="activeName">
+                            <el-tab-pane label="药品列表" name="1">
+                                <el-table :data="drugTableData" border @select='selectDrugs' style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                                    <el-table-column align="center" type="selection" width="40"></el-table-column>
+                                    <el-table-column align="center" prop="name" label="名称">
+                                        <template slot-scope="scope">{{ scope.row.name }}</template>
+                                    </el-table-column>
+                                    <el-table-column align="center" label="规格" width="60">
+                                        <template slot-scope="scope">{{ scope.row.specifications }}</template>
+                                    </el-table-column>
+                                    <el-table-column align="center" label="库存" width="60">
+                                        <template slot-scope="scope">{{ scope.row.stock }}</template>
+                                    </el-table-column>
+                                    <el-table-column align="center" label="单价" width="40">
+                                        <template slot-scope="scope">{{ scope.row.unitPrice }}</template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                            <el-tab-pane label="医嘱模板" name="2">
+                                <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                                    <el-table-column align="center" type="selection" width="40"></el-table-column>
+                                    <el-table-column align="center" prop="name" label="名称">
+                                        <template slot-scope="scope">{{ scope.row.date }}</template>
+                                    </el-table-column>
+                                    <el-table-column align="center" label="规格" width="60">
+                                        <template slot-scope="scope">33</template>
+                                    </el-table-column>
+                                    <el-table-column align="center" label="库存" width="60">
+                                        <template slot-scope="scope">22</template>
+                                    </el-table-column>
+                                    <el-table-column align="center" label="单价" width="40">
+                                        <template slot-scope="scope">12</template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </div>
+                    <div class="comfirmBox">
+                        <div>
+                            <span>药品类型：</span>
+                            <el-select style="margin-right:5px;width:100px;" v-model="value" placeholder="">
+                                <el-option
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </div>
+                        <el-button type="primary" size="small" @click="comfirm">确定添加</el-button>
+                    </div>
+                </template>
+            </div>
+        </div>
+        <additionalCharges ref='additionalCharges'></additionalCharges>
+        <select-template ref='selectTemplate'></select-template>
+        <save-template ref='saveTemplate'></save-template>
+    </div>
+</template>
+
+
+<script>
+import prescriptionTable from './prescriptionTable'
+import selectTemplate from './selectTemplate'
+import saveTemplate from './saveTemplate'
+import additionalCharges from './additionalCharges'
+export default {
+    props:{
+        patientInfo:Object
+    },
+    components:{
+        selectTemplate,
+        saveTemplate,
+        prescriptionTable,
+        additionalCharges
+    },
+    data(){
+        return{
+            form:{
+                name:''
+            },
+            tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            },{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            },{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            editableTabsValue: '1',
+            editableTabs: [{
+            title: '处方1',
+            name: '1',
+            }],
+            tabIndex: 1,
+
+            rightTab:1,
+            activeName:'1',
+
+            drugTableData:[
+                {
+                    name:'头孢氨苄甲氧苄啶',
+                    specifications:'1',
+                    stock:10,
+                    unitPrice:10
+                },
+                {
+                    name:'注射用甲磺酸齐拉西酮',
+                    specifications:'1',
+                    stock:10,
+                    unitPrice:10
+                },
+                {
+                    name:'九味羌活片',
+                    specifications:'1',
+                    stock:10,
+                    unitPrice:10
+                },
+                {
+                    name:'氟哌啶醇注射液',
+                    specifications:'1',
+                    stock:10,
+                    unitPrice:10
+                },
+                {
+                    name:'奥氮平口崩片',
+                    specifications:'1',
+                    stock:10,
+                    unitPrice:10
+                },
+                {
+                    name:'利培酮口崩片',
+                    specifications:'1',
+                    stock:10,
+                    unitPrice:10
+                },
+            ],
+            preDrugs:[],
+            curDrugs:[],
+            doctorOptions:[
+                {
+                    value: '1',
+                    label: '刘志刚'
+                },
+                {
+                    value: '2',
+                    label: '李悦'
+                },
+                {
+                    value: '3',
+                    label: '董校含'
+                },
+            ],
+            doctorValue:'',
+            departmentOptions:[
+                {
+                    value: '1',
+                    label: '血透中心'
+                },
+                {
+                    value: '2',
+                    label: '心内科'
+                },
+            ],
+            departmentValue:'',
+            total:0
+        }
+    },
+    methods:{
+        moreState(tab, event){
+          if(tab == 'more'){
+            return false;
+          }
+        },
+        open(index){
+            if(index == 1){
+                localStorage.setItem("drugs",JSON.stringify(this.preDrugs));
+                this.$message({message: '保存成功',type: 'success'});
+            }else if(index == 2){
+                this.$router.push('/outpatientDoctorStation/print')
+            }else if(index == 4){
+                this.$refs.selectTemplate.show()
+            }else if(index == 5){
+                this.$refs.saveTemplate.show()
+            }
+            
+        },
+        addTab(targetName) {
+            let newTabName = ++this.tabIndex + '';
+            this.editableTabs.push({
+                title: '处方' + this.tabIndex,
+                name: newTabName,
+            });
+            this.editableTabsValue = newTabName;
+        },
+        removeTab(targetName) {
+            let tabs = this.editableTabs;
+            let activeName = this.editableTabsValue;
+            if (activeName === targetName) {
+            tabs.forEach((tab, index) => {
+                if (tab.name === targetName) {
+                let nextTab = tabs[index + 1] || tabs[index - 1];
+                if (nextTab) {
+                    activeName = nextTab.name;
+                }
+                }
+            });
+            }
+            
+            this.editableTabsValue = activeName;
+            this.editableTabs = tabs.filter(tab => tab.name !== targetName);
+        },
+        clickTab(index){
+            this.rightTab = index
+        },
+        addCharges(){
+            this.$refs.additionalCharges.show()
+        },
+        selectDrugs(selection, row){
+            this.curDrugs = selection
+        },
+        comfirm(){
+            this.preDrugs = this.curDrugs
+            this.preDrugs.map(item => {
+                this.total += item.unitPrice
+            })
+            
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.new-main-contain{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+.app-container{
+    height:100%;
+}
+.mainCell{
+    height:36px;
+    display: flex;
+    align-items: center;
+}
+.mainLeft{
+    width:200px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    .el-radio{
+        margin-right:5px;
+    }
+    
+}
+.mainRight{
+    margin-left:20px;
+    flex:1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    .cellSpan{
+        min-width: 80px;
+        display: inline-block;
+        margin-right: 10px;
+    }
+}
+.mainCenter{
+    display: flex;
+    flex:1;
+}
+.centerLeft{
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    .el-form-item{
+        width:32%;
+        margin-right: 1%;
+        float: left;
+    }
+    .el-form-item__label{
+        text-align: left;
+    }
+}
+.backColor{
+    background: #f6f8f9;
+    height: 5px;
+    margin-bottom: 5px;
+}
+.RP{
+    color:#409EFF;
+    font-size: 20px;
+    margin-bottom: 5px;
+}
+.tabsBox{
+    position: relative;
+    height: 76%;
+    overflow-y: auto;
+    margin-bottom: 60px;
+    .el-tabs__item{
+        padding: 0 10px;
+    }
+}
+.preTabs{
+    height:100%;
+}
+.costBox{
+    width:100%;
+    height:60px;
+    background:#fff;
+    position: absolute;
+    bottom:0;
+    display: flex;
+    align-items: center;
+}
+.addTab{
+    position: absolute;
+    right: 0;
+    top: 6px;
+    z-index: 20;
+}
+.centerRight{
+    width: 300px;
+    margin-left: 5px;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+}
+.rightTab{
+    height: 40px;
+    width: 100%;
+    border: 1px solid #d2d2d2;
+    box-sizing: border-box;
+    
+    p{
+        width: 50%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background: #eee;
+        float: left;
+    }
+    >p:last-child{
+      border-left: 1px solid #d2d2d2;  
+      float: right;
+    }
+    .activeP{
+        background: #409EFF;
+        color:#fff;
+    }
+}
+.comfirmBox{
+    width:100%;
+    height:60px;
+    background:#fff;
+    position: absolute;
+    bottom:0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+</style>
+
+<style lang="scss">
+.centerLeft{
+    .el-form-item__label{
+        text-align: left;
+    }
+}
+.tabsBox{
+    .el-tabs__item{
+        padding: 0 10px;
+    }
+    .el-tabs--bottom .el-tabs--left>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2){
+        padding: 0 10px;
+    }
+    .el-tabs--bottom .el-tabs--left>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:last-child{
+        padding: 0 10px;
+    }
+    .el-tabs--card>.el-tabs__header .el-tabs__item.is-active.is-closable{
+        padding: 0 10px;
+    }
+}
+.centerRight{
+    .el-tabs__nav-scroll{
+        display: flex;
+    }
+    .el-tabs__nav{
+        margin: 0 auto;
+    }
+    .el-table th .cell, .el-table td .cell{
+        padding: 0 2px;
+    }
+}
+.preTabs{
+    // .el-tabs__content{
+    //     height:69%;
+    //     overflow-y: auto;
+    // }
+}
+.rightTabs{
+    height: 100%;
+    // .el-tabs__content{
+    //     height:72%;
+    //     overflow-y: auto;
+    // }
+}
+#tab-more{
+    .el-icon-close{
+        display: none;
+    }
+}
+</style>

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -0,0 +1,245 @@
+<template>
+    <div class="deskRecord">
+        <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
+            <div class="mainCell" style="margin-bottom:10px;float:right">
+                <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+                <el-button size="small" @click="open(2)" type="primary">打印</el-button>
+                <el-button size="small" @click="open(3)" type="primary">病历调用</el-button>
+                <el-button size="small" @click="open(4)" type="primary">存模板</el-button>
+            </div>
+        </div>
+        <div class="backColor"></div>
+        <div class="mainTitle">基本信息：</div>
+        <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="120px">
+            <el-form-item label="姓名:" prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="性别: " prop="name">
+                <el-select style="width:100%;" v-model="value" placeholder="">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="年龄: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="证件号:" prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="出生日期: " prop="name">
+                <el-date-picker
+                style="width:100%;"
+                v-model="value1"
+                type="date"
+                placeholder="选择日期">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="联系电话: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="关系联系人: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="关系联系人电话: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="家庭住址: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+        </el-form>
+        <div class="mainTitle">体格信息：</div>
+        <el-form class="physiqueForm" :model="form" :rules="rules" ref="form" label-width="80px">
+            <el-form-item label="体温:" prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input><span>℃</span>
+            </el-form-item>
+            <el-form-item label="血糖: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>mmol/L
+            </el-form-item>
+            <el-form-item label="脉搏: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>(次/分)
+            </el-form-item>
+            <el-form-item label="血压:" prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>/
+                <el-input v-model="form.name" placeholder=""></el-input>mmHg
+            </el-form-item>
+            <el-form-item label="身高: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>cm
+            </el-form-item>
+            <el-form-item label="血脂: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>mmol/L
+            </el-form-item>
+            <el-form-item label="脉搏: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>(次/分)
+            </el-form-item>
+            <el-form-item label="体重: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>kg
+            </el-form-item>
+        </el-form>
+        <div class="mainTitle">病历信息：</div>
+        <el-form class="recordForm" :model="form" :rules="rules" ref="form" label-width="80px">
+            <el-form-item label="病历分类:" prop="name">
+                <el-select style="width:100%;" v-model="value" placeholder="">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="症状: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="发病日期: " prop="name">
+                <el-date-picker
+                style="width:100%;"
+                v-model="value1"
+                type="date"
+                placeholder="选择日期">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="" prop="name">
+                <el-checkbox v-model="checked">是否传染</el-checkbox>
+            </el-form-item>
+            <el-form-item label="主诉:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="现病史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="既往史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="个人史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="家族史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="诊断信息:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+        </el-form>
+        <medicalRecord ref='medicalRecord'></medicalRecord>
+        <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+    </div>
+</template>
+
+<script>
+import medicalRecord from './medicalRecord'
+import saveRecordTemplate from './saveRecordTemplate'
+export default {
+    components:{
+       medicalRecord,
+       saveRecordTemplate 
+    },
+    data(){
+        return{
+            form:{
+                name:''
+            },
+        }
+    },
+    methods:{
+        open(index){
+            if(index == 1){
+                
+            }else if(index == 2){
+                
+            }else if(index == 3){
+                this.$refs.medicalRecord.show()
+            }else if(index == 4){
+                this.$refs.saveRecordTemplate.show()
+            }
+            
+        },
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.mainTitle{
+    font-size:18px;
+    font-weight:bold;
+    margin-bottom: 10px;
+}
+.backColor{
+    background: #f6f8f9;
+    height: 5px;
+    margin-bottom: 5px;
+}
+.deskRecord{
+    .basicForm{
+        display: flex;
+        flex-wrap: wrap;
+        .el-form-item{
+            width:32%;
+            margin-right: 1%;
+        }
+    }
+    .physiqueForm{
+        display: flex;
+        flex-wrap: wrap;
+        .el-form-item{
+            width:24%;
+            margin-right: 1%;
+        }
+    }
+    .recordForm{
+        display: flex;
+        flex-wrap: wrap;
+        .el-form-item{
+            width:24%;
+            margin-right: 1%;
+        }
+    }
+    
+}
+</style>
+
+<style lang="scss">
+.physiqueForm{
+    .el-form-item__content{
+        display: flex;
+    }
+    .el-input{
+        width:80px;
+        margin-right:5px;
+    }
+}
+</style>

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -45,41 +45,71 @@
                 </el-table> 
             </el-tab-pane>
             <el-tab-pane label="病历详情" name="second">
-                <el-table :data="tableData" border height="350" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                    <el-table-column align="center" prop="name" label="类型">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="医嘱名称">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="组">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="每次量">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="单位">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="用法">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="频率">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="天数">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="总量">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="单位">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="限制说明">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                </el-table> 
+                <div class="detailMain">
+                    <span style="width:240px;">处方号：344431222222222</span>
+                    <span style="width:200px;">医生：医生</span>
+                    <span style="width:200px;">科室：儿科</span>
+                    <span style="width:200px;">创建时间：2020-10-10 01:12:20</span>
+                </div>
+                <div class="commonCell">
+                    <p>基本信息</p>
+                    <div class="detailMain">
+                        <span style="width:240px;">疾病名称：无</span>
+                        <span style="width:200px;">症状：医生</span>
+                        <span style="width:200px;">发病日期：2020-10-10 01:12:20</span>
+                        <span style="width:200px;">是否传染：否</span>
+                    </div>
+                </div>
+                <div class="commonCell">
+                    <p>体格信息</p>
+                    <div class="detailMain">
+                        <span style="width:140px;">体温：℃</span>
+                        <span style="width:140px;">呼吸：0 次/分</span>
+                        <span style="width:140px;">脉搏：0 次/分</span>
+                        <span style="width:200px;">血压：0。00~0.00 mmHg</span>
+                    </div>
+                </div>
+                <div class="commonCell">
+                    <p></p>
+                    <div class="detailMain">
+                        <span style="width:140px;">血糖：0 mmol/L</span>
+                        <span style="width:140px;">血脂：0 mmol/L</span>
+                        <span style="width:140px;">身高：0 cm</span>
+                        <span style="width:200px;">体重：0 kg</span>
+                    </div>
+                </div>
+                <div class="commonCell">
+                    <p>主诉</p>
+                    <div>无</div>
+                </div>
+                <div class="commonCell">
+                    <p>现病史</p>
+                    <div>无</div>
+                </div>
+                <div class="commonCell">
+                    <p>门诊诊断</p>
+                    <div>无</div>
+                </div>
+                <div class="commonCell">
+                    <p>门诊医嘱</p>
+                    <div>无</div>
+                </div>
+                <div class="commonCell">
+                    <p>过敏史</p>
+                    <div>无</div>
+                </div>
+                <div class="commonCell">
+                    <p>既往史</p>
+                    <div>无</div>
+                </div>
+                <div class="commonCell">
+                    <p>个人史</p>
+                    <div>无</div>
+                </div>
+                <div class="commonCell">
+                    <p>家族史</p>
+                    <div>无</div>
+                </div>
             </el-tab-pane>
         </el-tabs>
         <div slot="footer" class="dialog-footer">
@@ -141,6 +171,21 @@ export default {
     .el-dialog__body{
         padding: 0 20px 30px;
     }
+    .detailMain{
+        // padding:5px;
+        span{
+            display: inline-block;
+        }
+    }
+    .commonCell{
+        display: flex;
+        line-height: 40px;
+        >p{
+            font-weight: bold;
+            color:#000;
+            width: 80px;
+        }
+    }
 }
 </style>
 

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -1,95 +1,101 @@
 <template>
     <el-dialog
-        title="病历"
+        title="病历调用"
         width="1000px"
         :visible.sync="visible"
         :before-close="_close"
+        class="recordDialog"
     >
         <div>
-            <el-form :model="form" :rules="rules" class="medicalRecordForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                <el-form-item class="width33" label="传染病:" prop="name">
-                    <el-radio v-model="radio" label="1">阴性</el-radio>
-                    <el-radio v-model="radio" label="2">阳性</el-radio>
-                </el-form-item>
-                <el-form-item class="width33" label="患病类型:" prop="name">
-                    <el-radio v-model="radio" label="1">慢性病</el-radio>
-                    <el-radio v-model="radio" label="2">神经病</el-radio>
-                    <el-radio v-model="radio" label="3">抑郁症</el-radio>
-                </el-form-item>
-                <el-form-item class="width33" label="透析之前情况:" prop="name">
-                    <el-radio v-model="radio" label="1">腹膜透析</el-radio>
-                    <el-radio v-model="radio" label="2">肾移植</el-radio>
-                </el-form-item>
-                <el-form-item class="width100" label="主诉 : " prop="name">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item class="width100" label="现病史 : " prop="name">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item class="width100" label="既往史 : " prop="name">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item class="width50" label="药品规格 : " prop="name">
-                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
-                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item class="width50" label="总量 : " prop="name">
-                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
-                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item class="width50" label="每次量 : " prop="name">
-                    <el-input v-model="form.name" placeholder="" style="width:180px;"></el-input>
-                    <el-select v-model="value" style="width:180px;margin-left:9px;" placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item class="width50" label="用法 : " prop="name">
-                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item class="width50" label="执行频率 : " prop="name">
-                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item class="width50" label="天数 : " prop="name">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="限制说明 : " prop="name" style="width:100%;">
-                    <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
-                </el-form-item>
-            </el-form>
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tab-pane label="历史病历" name="first">
+                    <div style="display:flex;align-items: center;margin-bottom:10px;">
+                        <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item" style="width:140px;"/>
+                        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                        <span>日期：</span>
+                        <el-date-picker
+                        size="small"
+                        style="width:140px;margin:0 10px;"
+                        v-model="value1"
+                        type="date"
+                        placeholder="选择日期">
+                        </el-date-picker>
+                        <el-date-picker
+                        style="width:140px;"
+                        size="small"
+                        v-model="value1"
+                        type="date"
+                        placeholder="选择日期">
+                        </el-date-picker>
+                    </div>
+                    <el-table :data="tableData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                        <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+                        <el-table-column align="center" prop="name" label="病历编号">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="诊断信息">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="医生">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="创建日期">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="操作">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini">调用</el-button>
+                                <el-button type="primary" size="mini" @click="toHistoryDetail">详情</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table> 
+                </el-tab-pane>
+                <el-tab-pane label="病历模板" name="second">
+                    <div style="display:flex;align-items: center;margin-bottom:10px;">
+                        <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item" style="width:140px;"/>
+                        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                        <span>日期：</span>
+                        <el-date-picker
+                        size="small"
+                        style="width:140px;margin:0 10px;"
+                        v-model="value1"
+                        type="date"
+                        placeholder="选择日期">
+                        </el-date-picker>
+                        <el-date-picker
+                        style="width:140px;"
+                        size="small"
+                        v-model="value1"
+                        type="date"
+                        placeholder="选择日期">
+                        </el-date-picker>
+                    </div>
+                    <el-table :data="tableData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                        <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+                        <el-table-column align="center" prop="name" label="病历编号">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="诊断信息">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="医生">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="创建日期">
+                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="操作">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini">调用</el-button>
+                                <el-button type="primary" size="mini" @click="totemplateDetail">详情</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table> 
+                </el-tab-pane>
+            </el-tabs>
         </div>
+        <record-history-detail ref="recordHistoryDetail"></record-history-detail>
+        <record-template-detail ref="recordTemplateDetail"></record-template-detail>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
@@ -98,13 +104,37 @@
 </template>
 
 <script>
+import recordHistoryDetail from './recordHistoryDetail'
+import recordTemplateDetail from './recordTemplateDetail'
 export default {
+    components:{
+        recordHistoryDetail,
+        recordTemplateDetail
+    },
     data(){
         return{
             visible:false,
+            activeName:'first',
             form:{
                 name:''
             },
+            tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }],
         }
     },
     methods:{
@@ -125,23 +155,20 @@ export default {
             // this.clear()
             this.visible = false
         },
+        toHistoryDetail(){
+            this.$refs.recordHistoryDetail.show()
+        },
+        totemplateDetail(){
+            this.$refs.recordTemplateDetail.show()
+        }
     }
 }
 </script>
 
-<style lang="scss" scoped>
-.medicalRecordForm{
-    .width33{
-        width:33%;
-    }
-    .width50{
-        width:50%;
-    }
-    .width100{
-        width:100%;
-    }
-    .el-radio{
-        margin-right:2px;
+<style lang="scss">
+.recordDialog{
+    .el-dialog__body{
+        padding-top:0;
     }
 }
 </style>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -0,0 +1,148 @@
+<template>
+    <div class="prescriptionTable">
+        <el-table :data="preDrugs" border style="width: 98%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+            <el-table-column align="center" type="selection" width="40"></el-table-column>
+            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" prop="name" label="名称">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="组套">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+                <template slot-scope="scope">
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="用法">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="频率">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="天数">
+                <template slot-scope="scope">
+                    <!-- <el-select v-model="value" placeholder="">
+                        <el-option
+                        v-for="item in newoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select> -->
+                    <el-input v-model="input" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="100" label="总量">
+                <template slot-scope="scope">
+                    <div style="display:flex;">
+                        <el-input v-model="input" style="width:50%" placeholder=""></el-input>
+                        <!-- <el-select v-model="value" style="width:50%" placeholder="">
+                            <el-option
+                            v-for="item in newoptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select> -->
+                        <el-input v-model="input" style="width:50%" placeholder=""></el-input>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="单价">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.unitPrice" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="备注">
+                <template slot-scope="scope">
+                    <!-- <el-autocomplete
+                    class="inline-input"
+                    v-model="state1"
+                    :fetch-suggestions="querySearch"
+                    placeholder=""
+                    @select="handleSelect"
+                    ></el-autocomplete> -->
+                </template>
+            </el-table-column>
+            <el-table-column align="center" width="40" prop="name" label="操作">
+                <template slot-scope="scope">
+                    <i class="el-icon-delete"></i>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+</template>
+
+<script>
+export default {
+    props:{
+        preDrugs:Array,
+    },
+    data(){
+        return{
+            tableData: [],
+            newoptions: [{
+            value: '1',
+            label: '1'
+            }, {
+            value: '2',
+            label: '2'
+            }, {
+            value: '3',
+            label: '3'
+            }, {
+            value: '4',
+            label: '4'
+            }, {
+            value: '5',
+            label: '5'
+            }],
+            value:'1',
+            input:1
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.prescriptionTable{
+    .el-table th .cell, .el-table td .cell{
+        padding: 0 2px;
+        white-space: pre-line;
+    }
+    .el-icon-delete{
+        color:red;
+    }
+}
+</style>

src/xt_pages/outpatientDoctorStation/components/recordHistoryDetail.vue

@@ -0,0 +1,105 @@
+<template>
+    <el-dialog
+        title="病历历史详情"
+        width="1000px"
+        :visible.sync="visible"
+        :before-close="_close"
+        class="recordDialog"
+        append-to-body
+    >
+        <div class="detailMain">
+            <span style="width:240px;">病历编号：11111111111111111</span>
+            <span style="width:240px;">医生：</span>
+            <span style="width:240px;">创建日期：11111111111111111</span>
+        </div>
+        <div class="detailMain">
+            <span style="width:240px;">关系联系人：无</span>
+            <span style="width:240px;">关系联系方式：无</span>
+        </div>
+        <p>体格检查</p>
+        <div class="detailMain">
+            <span style="margin: 0 0 0 40px;width:140px;">体温：℃</span>
+            <span style="width:140px;">呼吸：0 次/分</span>
+            <span style="width:140px;">脉搏：0 次/分</span>
+            <span style="width:200px;">血压：0。00~0.00 mmHg</span>
+        </div>
+        <div class="detailMain">
+            <span style="margin: 0 0 0 40px;width:140px;">血糖：0 mmol/L</span>
+            <span style="width:140px;">血脂：0 mmol/L</span>
+            <span style="width:140px;">身高：0 cm</span>
+            <span style="width:200px;">体重：0 kg</span>
+        </div>
+        <div class="detailMain">
+            <span style="width:220px;">疾病名称：无</span>
+            <span style="width:220px;">症状：无</span>
+            <span style="width:220px;">发病日期：</span>
+            <span style="width:220px;">是否传染：否</span>
+        </div>
+        <div class="detailMain">
+            <span>主诉：</span>
+        </div>
+        <div class="detailMain">
+            <span>现病史：</span>
+        </div>
+        <div class="detailMain">
+            <span>诊断信息：</span>
+        </div>
+        <div class="detailMain">
+            <span>医嘱：</span>
+        </div>
+        <div class="detailMain">
+            <span>过敏史：</span>
+        </div>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+        </div>
+    </el-dialog>         
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            visible:false,
+            form:{
+                name:''
+            },
+        }
+    },
+    methods:{
+        _close: function(done) {
+            // this.clear()
+            done()
+        },
+        clear: function() {
+            this.form.id = 0;
+            this.form.name = "";
+            this.form.intro = "";
+        },
+        show() {
+            // this.clear()
+            this.visible = true
+        },
+        hide() {
+            // this.clear()
+            this.visible = false
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+.recordDialog{
+    .el-dialog__body{
+        padding-top:0;
+    }
+}
+.detailMain{
+    padding:5px;
+    span{
+        display: inline-block;
+    }
+}
+</style>
+

src/xt_pages/outpatientDoctorStation/components/recordTemplateDetail.vue

@@ -0,0 +1,143 @@
+<template>
+    <el-dialog
+        title="病历模板详情"
+        width="1000px"
+        :visible.sync="visible"
+        :before-close="_close"
+        class="recordDialog"
+        append-to-body
+    >
+        <el-form class="recordForm" :model="form" :rules="rules" ref="form" label-width="80px">
+            <el-form-item label="模板名称: " prop="name" style="width:49%;">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="" prop="name" style="width:49%;">
+                <el-radio v-model="radio" label="1">私人模板</el-radio>
+                <el-radio v-model="radio" label="2">公共模板</el-radio>
+            </el-form-item>
+            <el-form-item label="模板说明: " prop="name" style="width:100%;">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="病历分类:" prop="name">
+                <el-select style="width:100%;" v-model="value" placeholder="">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="症状: " prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="发病日期: " prop="name">
+                <el-date-picker
+                style="width:100%;"
+                v-model="value1"
+                type="date"
+                placeholder="选择日期">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="" prop="name">
+                <el-checkbox v-model="checked">是否传染</el-checkbox>
+            </el-form-item>
+            <el-form-item label="主诉:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="现病史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="既往史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="个人史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="家族史:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="诊断信息:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+        </div>
+    </el-dialog>         
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            visible:false,
+            form:{
+                name:''
+            },
+        }
+    },
+    methods:{
+        _close: function(done) {
+            // this.clear()
+            done()
+        },
+        clear: function() {
+            this.form.id = 0;
+            this.form.name = "";
+            this.form.intro = "";
+        },
+        show() {
+            // this.clear()
+            this.visible = true
+        },
+        hide() {
+            // this.clear()
+            this.visible = false
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.recordForm{
+    display: flex;
+    flex-wrap: wrap;
+    .el-form-item{
+        width:24%;
+        margin-right: 1%;
+    }
+}
+</style>
+

src/xt_pages/outpatientDoctorStation/components/saveRecordTemplate.vue

@@ -0,0 +1,77 @@
+<template>
+    <el-dialog
+        title="保存病历模板"
+        width="600px"
+        :visible.sync="visible"
+        :before-close="_close"
+        class="recordDialog"
+    >
+        <el-form class="recordForm" :model="form" :rules="rules" ref="form" label-width="80px">
+            <el-form-item label="模板类别:" prop="name" style="width:100%;">
+                <el-radio v-model="radio" label="1">私人模板</el-radio>
+                <el-radio v-model="radio" label="2">公共模板</el-radio>
+            </el-form-item>
+            <el-form-item label="模板名称: " prop="name" style="width:100%;">
+                <el-input v-model="form.name" placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="模板说明:" prop="name" style="width:100%;">
+                <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="textarea">
+                </el-input>
+            </el-form-item>
+            <el-form-item label="创建人:" prop="name" style="width:100%;">
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+        </div>
+    </el-dialog>         
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            visible:false,
+            form:{
+                name:''
+            },
+        }
+    },
+    methods:{
+        _close: function(done) {
+            // this.clear()
+            done()
+        },
+        clear: function() {
+            this.form.id = 0;
+            this.form.name = "";
+            this.form.intro = "";
+        },
+        show() {
+            // this.clear()
+            this.visible = true
+        },
+        hide() {
+            // this.clear()
+            this.visible = false
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.recordForm{
+    display: flex;
+    flex-wrap: wrap;
+    .el-form-item{
+        width:24%;
+        margin-right: 1%;
+    }
+}
+</style>
+

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -1,16 +1,23 @@
 <template>
     <el-dialog
-        title="新增医嘱"
+        title="模板信息"
         width="600px"
         :visible.sync="visible"
         :before-close="_close"
     >
         <div>
             <el-form :model="form" :rules="rules" class="adviceForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                <el-form-item label="模板名称 : " prop="name" style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
+                <el-form-item label="创建人 : " style="width: 100%;margin-bottom:0;">
+                    医生
+                </el-form-item>
+                <el-form-item label="处方类型 : " style="width: 100%;margin-bottom:0;">
+                    药品模板
+                </el-form-item>
+                <el-form-item label="模板类型 : " style="width: 100%;margin-bottom:0;">
+                    <el-radio v-model="radio" label="1">临时</el-radio>
+                    <el-radio v-model="radio" label="2">长期</el-radio>
                 </el-form-item>
-                <el-form-item label="模板类型 : " prop="name" style="width: 100%;">
+                <el-form-item label="科室 : " style="width: 100%;">
                     <el-select v-model="value" style="width:100%;" placeholder="请选择">
                         <el-option
                         v-for="item in options"
@@ -20,10 +27,19 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="模板等级 : " prop="name" style="width: 100%;">
+                <el-form-item label="模板名称 : " style="width: 100%;">
+                    <el-input v-model="form.name" placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item label="模板说明 : " style="width: 100%;">
+                    <el-input v-model="form.name" placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item label="诊断信息 : " style="width: 100%;">
+                    <el-input v-model="form.name" placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item label="医嘱说明 : " style="width: 100%;">
                     <el-input v-model="form.name" placeholder=""></el-input>
                 </el-form-item>
-                <el-form-item label="创建时间 : " prop="name" style="width: 100%;">
+                <el-form-item label="备注说明 : " style="width: 100%;">
                     <el-input v-model="form.name" placeholder=""></el-input>
                 </el-form-item>
             </el-form>

src/xt_pages/outpatientDoctorStation/components/selectTemplate.vue

@@ -6,36 +6,39 @@
         :before-close="_close"
     >
         <div style="display:flex;">
-            <div style="width: 121px;">
+            <div style="width: 201px;">
                 <el-table :data="tableData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                    <el-table-column align="center" prop="name" label="模板名称" width="120">
+                    <el-table-column align="center" prop="name" label="处方类型" width="100">
+                        <template slot-scope="scope">{{ scope.row.date }}</template>
+                    </el-table-column>
+                    <el-table-column align="center" prop="name" label="模板名称" width="100">
                         <template slot-scope="scope">{{ scope.row.date }}</template>
                     </el-table-column>
                 </el-table> 
             </div>
             <el-table :data="tableData" border height="300" style="flex:1;margin-left:20px;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                 <el-table-column type="selection" width="55" align="center"></el-table-column>
-                <el-table-column align="center" prop="name" label="医嘱内容">
+                <el-table-column align="center" prop="name" label="药品名称">
                     <template slot-scope="scope">{{ scope.row.date }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="药品规格">
                     <template slot-scope="scope">{{ scope.row.date }}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="开药数量">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
                 <el-table-column align="center" prop="name" label="单次用量">
                     <template slot-scope="scope">{{ scope.row.date }}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="给药途径">
+                <el-table-column align="center" prop="name" label="用法">
                     <template slot-scope="scope">{{ scope.row.date }}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="执行频率">
+                <el-table-column align="center" prop="name" label="频率">
                     <template slot-scope="scope">{{ scope.row.date }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="天数">
                     <template slot-scope="scope">{{ scope.row.date }}</template>
                 </el-table-column>
+                <el-table-column align="center" prop="name" label="总量">
+                    <template slot-scope="scope">{{ scope.row.date }}</template>
+                </el-table-column>
             </el-table> 
         </div>
         <div slot="footer" class="dialog-footer">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="main-contain">
+    <div class="main-contain new-main-contain">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div class="app-container" style="display:flex">
+        <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
             <div class="mainLeft">
                 <div class="mainCell" style="justify-content: space-between;">
-                    <p>未就诊：<span>0</span>人</p>
+                    <p>未就诊：<span>1</span>人</p>
                     <p>已就诊：<span>0</span>人</p>
                 </div>
                 <div class="mainCell">
@@ -20,112 +20,41 @@
                     <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
                 </div>
-                <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                    <el-table-column align="center" width="40">
-                        <template slot-scope="scope">
-                            <el-popover placement="top-start" width="200" trigger="hover">
-                                <i slot="reference" class="el-icon-caret-bottom"></i>
-                            </el-popover>
-                        </template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="姓名" width="100">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="姓名" width="110">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                </el-table>
+                <div style="flex:1;overflow-y:auto;">
+                    <el-table :data="patientTableData" @row-click='choosePatient' border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                        <el-table-column align="center" prop="name" label="患者姓名">
+                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="就诊号" width="90">
+                            <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
+                        </el-table-column>
+                    </el-table>
+                </div>
             </div> 
             <div class="mainRight">
-                <div style="display:flex;justify-content: space-between;">
-                    <div>
-                        <div class="mainCell">
-                            <p>姓名：<span class="cellSpan"></span></p>
-                            <p>证件号：<span class="cellSpan"></span></p>
-                            <p>挂号类型：<span class="cellSpan"></span></p>
-                            <p>患者保险类型：<span class="cellSpan"></span></p>
-                        </div>
-                        <div class="mainCell">
-                            <label class="title"><span class="name">诊断</span> : </label>
-                            <el-input size="small" style="width:150px;margin:0 10px;" v-model="input" placeholder="请输入内容"></el-input>
-                            <label class="title"><span class="name">处方类型</span> : </label>
-                            <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </div>
-                    </div>
-                    <div class="cost">
-                        <p>当用费用总额：</p>
-                        <p>药品费用总额：</p>
-                    </div>
-                </div>
-                <div style="display:flex;justify-content: space-between;">
-                    <div class="mainCell" style="margin-bottom:10px;">
-                        <label class="title"><span class="name">新增</span> : </label>
-                        <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">智慧医保</el-button>
-                        <el-button size="small" @click="open(2)" type="primary">病历</el-button>
-                        <el-button size="small" @click="open(3)" type="primary">新医嘱</el-button>
-                        <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
-                        <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
-                        <el-button size="small" @click="open(6)" type="primary">开检验</el-button>
-                    </div>
-                    <div><el-button size="small" type="primary">保存打印</el-button></div>
+                <div class="mainHeader">
+                    <el-radio-group v-model="titleType">
+                        <el-radio-button label="处方"></el-radio-button>
+                        <el-radio-button label="病历"></el-radio-button>
+                    </el-radio-group>
                 </div>
-                <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                    <el-table-column align="center" prop="name" label="类型">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="名称">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="规格">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="数量">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="单次用量">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="操作">
-                        <template slot-scope="scope">
-                            <el-button size="mini" type="danger">删除</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
+                <desk-prescription :patientInfo="patientInfo" v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
+                <desk-record v-if="titleType == '病历'"></desk-record>
             </div>
+            
         </div>
-        <prescription ref='prescription'></prescription>
-        <medicalRecord ref='medicalRecord'></medicalRecord>
-        <advice ref='advice'></advice>
-        <select-template ref='selectTemplate'></select-template>
-        <save-template ref='saveTemplate'></save-template>
-        <inspection ref='inspection'></inspection>
     </div>
 </template>
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import prescription from './components/prescription'
-import medicalRecord from './components/medicalRecord'
-import advice from './components/advice'
-import selectTemplate from './components/selectTemplate'
-import saveTemplate from './components/saveTemplate'
-import inspection from './components/inspection'
+import deskPrescription from './components/deskPrescription'
+import deskRecord from './components/deskRecord'
 export default {
     components:{
         BreadCrumb,
-        prescription,
-        medicalRecord,
-        advice,
-        selectTemplate,
-        saveTemplate,
-        inspection
+        deskPrescription,
+        deskRecord
     },
     data(){
         return{
@@ -133,6 +62,11 @@ export default {
                 { path: false, name: '门诊医生站' },
                 { path: false, name: '医生工作台' }
             ],
+            titleType:'处方',
+            patientTableData:[{
+                name:'杨美英',
+                mdtrt_id:"1709946",
+            }],
             tableData: [{
             date: '2016-05-02',
             name: '王小虎',
@@ -149,59 +83,242 @@ export default {
             date: '2016-05-03',
             name: '王小虎',
             address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            },{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            },{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            patientInfo:{}
         }
     },
     methods:{
-        open(index){
-            if(index == 1){
-                this.$refs.prescription.show()
-            }else if(index == 2){
-                this.$refs.medicalRecord.show()
-            }else if(index == 3){
-                this.$refs.advice.show()
-            }else if(index == 4){
-                this.$refs.selectTemplate.show()
-            }else if(index == 5){
-                this.$refs.saveTemplate.show()
-            }else if(index == 6){
-                this.$refs.inspection.show()
+        choosePatient(){
+            this.patientInfo = {
+                certno:"440221195903290027",
+                psn_no:"0221201972",
+                gend:"2",
+                brdy:"1960-03-29",
+                naty:"01",
+                psn_cert_type:"01",
+                psn_name:"杨美英",
+                age:60.7
             }
-            
         }
     }
 }
 </script>
 
 <style lang="scss" scoped>
+.new-main-contain{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+.app-container{
+    height:100%;
+}
 .mainCell{
     height:36px;
     display: flex;
     align-items: center;
 }
 .mainLeft{
-    width:250px;
+    width:200px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
     .el-radio{
-        margin-right:20px;
+        margin-right:5px;
     }
     
 }
 .mainRight{
     margin-left:20px;
     flex:1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
     .cellSpan{
         min-width: 80px;
         display: inline-block;
         margin-right: 10px;
     }
-    .cost{
-        border: 1px solid #ccc;
-        height: 60px;
-        display: flex;
-        width: 200px;
-        flex-direction: column;
-        justify-content: space-around;
+}
+.mainCenter{
+    display: flex;
+    flex:1;
+}
+.centerLeft{
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    .el-form-item{
+        width:32%;
+        margin-right: 1%;
+        float: left;
+    }
+    .el-form-item__label{
+        text-align: left;
+    }
+}
+.backColor{
+    background: #f6f8f9;
+    height: 5px;
+    margin-bottom: 5px;
+}
+.tabsBox{
+    position: relative;
+    height: 76%;
+    overflow-y: auto;
+    margin-bottom: 60px;
+    .el-tabs__item{
+        padding: 0 10px;
+    }
+}
+.preTabs{
+    height:100%;
+}
+.costBox{
+    width:100%;
+    height:60px;
+    background:#fff;
+    position: absolute;
+    bottom:0;
+    display: flex;
+    align-items: center;
+}
+.addTab{
+    position: absolute;
+    right: 0;
+    top: 14px;
+    z-index: 20;
+}
+.centerRight{
+    width: 300px;
+    margin-left: 5px;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+}
+.rightTab{
+    height: 40px;
+    width: 100%;
+    border: 1px solid #d2d2d2;
+    box-sizing: border-box;
+    
+    p{
+        width: 50%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background: #eee;
+        float: left;
+    }
+    >p:last-child{
+      border-left: 1px solid #d2d2d2;  
+      float: right;
+    }
+    .activeP{
+        background: #409EFF;
+        color:#fff;
+    }
+}
+.comfirmBox{
+    width:100%;
+    height:60px;
+    background:#fff;
+    position: absolute;
+    bottom:0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+</style>
+
+<style lang="scss">
+.centerLeft{
+    .el-form-item__label{
+        text-align: left;
+    }
+}
+.tabsBox{
+    .el-tabs__item{
+        padding: 0 10px;
+    }
+    .el-tabs--bottom .el-tabs--left>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2){
+        padding: 0 10px;
+    }
+    .el-tabs--bottom .el-tabs--left>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:last-child{
         padding: 0 10px;
     }
+    .el-tabs--card>.el-tabs__header .el-tabs__item.is-active.is-closable{
+        padding: 0 10px;
+    }
+}
+.centerRight{
+    .el-tabs__nav-scroll{
+        display: flex;
+    }
+    .el-tabs__nav{
+        margin: 0 auto;
+    }
+    .el-table th .cell, .el-table td .cell{
+        padding: 0 2px;
+    }
+}
+.preTabs{
+    // .el-tabs__content{
+    //     height:69%;
+    //     overflow-y: auto;
+    // }
+}
+.rightTabs{
+    height: 100%;
+    // .el-tabs__content{
+    //     height:72%;
+    //     overflow-y: auto;
+    // }
 }
 </style>

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -38,7 +38,7 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="100">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="danger" @click="handerDelete">删除</el-button>
+                        <el-button size="mini" type="primary" @click="handerDelete">详情</el-button>
                     </template>
                 </el-table-column>
             </el-table>

src/xt_pages/outpatientRegistration/index.vue

@@ -19,7 +19,7 @@
                     </el-form-item>
                     <el-form-item class="specialFormItem" label="医保卡号">
                         <el-input v-model="form.medicalInsuranceCard"></el-input>
-                        <el-button type="primary">读卡</el-button>
+                        <el-button type="primary" @click="reading">读卡</el-button>
                     </el-form-item>
                     <el-form-item label="患者姓名">
                         <el-input v-model="form.name"></el-input>
@@ -126,6 +126,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { basename } from 'path'
 const moment = require('moment')
 export default {
     components:{
@@ -192,27 +193,27 @@ export default {
                 label: "港澳地区身份证"
             }],
             medicalCare: [{
-                value: 1,
-                label: '普通门诊'
+                value: 310,
+                label: '职工基本医疗保险'
                 }, {
-                value: 2,
-                label: "门诊大病"
+                value: 320,
+                label: "公务员医疗补助"
                 },{
-                value: 3,
-                label: "重疾特药"
+                value: 330,
+                label: "大额医疗费用补助"
                 },{
-                value: 4,
-                label: "门诊特检"
+                value: 340,
+                label: "离休人员医疗"
                 },{
-                value: 5,
-                label: "健康接种"
+                value: 390,
+                label: "城乡居民基本医疗保险"
                 },{
-                value: 6,
-                label: "预防接种"
+                value: 392,
+                label: "城乡居民大病医疗保险"
                 },
                 {
-                value: 7,
-                label: "门诊输液"
+                value: 510,
+                label: "生育保险"
             }],
             register: [{
                 value: 1,
@@ -230,6 +231,16 @@ export default {
                 value: 5,
                 label: "专家"
             }],
+            baseinfo:{
+                certno:"440221195903290027",
+                psn_no:"0221201972",
+                gend:"2",
+                brdy:"1960-03-29",
+                naty:"01",
+                psn_cert_type:"01",
+                psn_name:"杨美英",
+                age:60.7
+            },
         }
     },
     computed:{
@@ -240,6 +251,15 @@ export default {
         }
     },
     methods:{
+        reading(medicalInsuranceCard){
+            this.form.name = this.baseinfo.psn_name
+            this.form.sex = parseInt(this.baseinfo.gend)
+            this.form.psn_cert_type = this.baseinfo.certificates
+            this.form.birthday = this.baseinfo.brdy
+            this.form.age = parseInt(this.baseinfo.age)
+            this.form.idCard = this.baseinfo.certno
+            this.form.certificates = 1
+        },
         getBirthday(date){
             console.log(date)
             let curTime = moment(new Date(date)).format('YYYY-MM-DD')
@@ -311,7 +331,8 @@ export default {
                 })
                 this.$message({message: '添加成功',type: 'success'});
             }
-        }   
+        },
+        
     }
 }
 </script>

src/xt_pages/role/departManage.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        type="primary"
+        size="small"
+        icon="el-icon-circle-plus-outline"
+        style="float:right;"
+        @click="openForm"
+        >新增</el-button
+      >
+    </div>
+    <div class="app-container">
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        style="width:100%;"
+        ref="table"
+        border
+        :data="tableData"
+      >
+        <el-table-column label="序号" prop="name" min-width="60" align="center">
+           <template slot-scope="scope">
+                {{scope.$index + 1}}
+           </template>
+        </el-table-column>
+        <el-table-column label="科室名称" prop="name" min-width="150" align="center">
+            <template slot-scope="scope">
+                {{scope.row.name}}
+            </template>
+        </el-table-column>
+         <el-table-column label="科室编号"  prop="ip" min-width="150" align="center">
+             <template slot-scope="scope">
+                 {{scope.row.number}}
+             </template>
+         </el-table-column>
+        <el-table-column label="操作" width="160" align="center">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+            <el-button
+                type="primary"
+                icon="el-icon-edit-outline"
+                size="small"
+                @click="editOpenForm(scope.row.id)">
+            </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                type="danger"
+                size="small"
+                icon="el-icon-delete"
+                @click="DeleteDepartment(scope.row.id,scope.$index)"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+         >
+        </el-pagination>
+
+     
+       
+      
+      <el-dialog
+        title="添加科室"
+        :visible.sync="dialogVisible"
+        width="50%">
+        <span>
+          <el-form :model="form" ref="form" label-width="120px">
+             <el-row :span="24">
+                 <el-col :span="10">
+                   <el-form-item label="科室名称:">
+                      <el-input v-model="form.name" style="width:200px"></el-input>
+                  </el-form-item> 
+                 </el-col>
+             </el-row >
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="医保科室编号:">
+                      <el-input v-model="form.number"  style="width:200px"></el-input>
+                  </el-form-item> 
+                 </el-col>
+             </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="SaveDepartment('form')">确 定</el-button>
+        </span>
+    </el-dialog>
+
+     
+      <el-dialog
+        title="编辑科室"
+        :visible.sync="editDialogVisible"
+        width="50%">
+        <span>
+          <el-form :model="form" ref="form" label-width="120px">
+             <el-row :span="24">
+                 <el-col :span="10">
+                   <el-form-item label="科室名称:">
+                      <el-input v-model="form.name" style="width:200px"></el-input>
+                  </el-form-item> 
+                 </el-col>
+             </el-row >
+             <el-row :span="24" >
+                 <el-col :span="12">
+                   <el-form-item label="医保科室编号:">
+                      <el-input v-model="form.number"  style="width:200px"></el-input>
+                  </el-form-item> 
+                 </el-col>
+             </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="UpdatedDepartment('form')">确 定</el-button>
+        </span>
+    </el-dialog>
+
+
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import AdminInfoForm from "./components/AdminInfoForm";
+import { SaveDepartment,getDePartmentList,getDepartMentDetail,UpdatedDepartment,DeleteDepartment } from "@/api/project/project"
+export default {
+  name: "adminManage",
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "管理中心" },
+        { path: false, name: "部门管理" }
+      ],
+      tableData:[],
+      dialogVisible:false,
+      editDialogVisible:false,
+      form:{
+        id:0,
+        name:"",
+        number:"",
+      },
+      limit:20,
+      page:1,
+      total:10,
+    };
+  },
+  components: {
+    BreadCrumb,
+    AdminInfoForm
+  },
+  created() {
+    this.getlist()
+  },
+
+  methods: {
+
+    openForm(){
+      this.dialogVisible = true
+    },
+
+    handleSizeChange(val) {
+       this.limit = val
+       this.getlist()
+    },
+    handleCurrentChange(val) {
+       this.page = val
+       this.getlist()
+    },
+    SaveDepartment(formName){
+         var params = {
+            name:this.form.name,
+            number:this.form.number, 
+         }
+       this.$refs[formName].validate((valid)=>{
+          SaveDepartment(params).then(response=>{
+             if(response.data.state == 1){
+                var department =  response.data.data.department
+                console.log("department",department)
+                this.$message.success("保存成功")
+                this.dialogVisible = false
+                this.getlist()
+                this.form.name = ""
+                this.form.number = ""
+             }
+          })
+       })
+    },
+    getlist(){
+       var params = {
+           limit:this.limit,
+           page:this.page,
+       }
+      getDePartmentList(params).then(response=>{
+         if(response.data.state == 1){
+           var department =   response.data.data.departMentList
+           console.log("department",department)
+           this.tableData = department
+           var total = response.data.data.total
+           console.log("total",total)
+           this.total = total
+         }
+      })
+    },
+
+    editOpenForm(id){
+      this.editDialogVisible = true
+      getDepartMentDetail(id).then(response=>{
+         if(response.data.state == 1){
+           var departDetail =  response.data.data.departDetail
+           console.log("departdetail",departDetail)
+           this.form.id = departDetail.id
+           this.form.name = departDetail.name
+           this.form.number = departDetail.number
+         }
+      })
+    },
+    
+    UpdatedDepartment(formName){
+         var params = {
+            id:this.form.id,
+            name:this.form.name,
+            number:this.form.number, 
+         }
+       this.$refs[formName].validate((valid)=>{
+          UpdatedDepartment(params).then(response=>{
+             if(response.data.state == 1){
+                var department =  response.data.data.department
+                console.log("department",department)
+                this.$message.success("保存成功")
+                this.editDialogVisible = false
+                this.getlist()
+             }
+          })
+       })
+    },
+    
+   DeleteDepartment(id,index){
+      this.$confirm("确认删除此部门吗?", "删除", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+       }).then(() => {
+
+       DeleteDepartment(id).then(response => {
+          if (response.data.state == 1) {
+             var msg = response.data.data.msg
+             this.$message.success("删除成功")
+             this.tableData.splice(index, 1);
+          }
+       });
+     }).catch(() => {});
+    }
+  
+    
+  },
+    
+  
+ 
+ 
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-button + .el-button {
+  margin-left: 0 !important;
+}
+</style>
+<style>
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>