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

src/api/project/project.js

@@ -470,4 +470,49 @@ export function changePatient(id,params){
        method:"Get",
        params:params
      })
+  }
+
+  export function saveMainTemplate(params){
+    
+    return request({
+      url:"/api/hispatient/savemaintemplate",
+      method:"Get",
+      params:params
+    })
+  }
+
+  export function getMedicalTemplateList(params){
+    
+    return request({
+      url:"/api/hispatient/getmedicaltemplatelist",
+      method:"Get",
+      params:params
+    })
+  }
+
+  export function getMainTemplateById(id,params){
+    
+    return request({
+      url:"/api/hispatient/getmaintemplatebyid?id="+id,
+      method:"get",
+      params:params
+    })
+  }
+
+  export function UpdateMainTemplate(params){
+   
+    return request({
+      url:"/api/hispatient/updatemaintemplate",
+      method:"get",
+      params:params
+    })
+  }
+
+  export function deleteMainTemplate(id,params){
+  
+     return request({
+       url:"/api/hispatient/deletemaintemplate?id="+id,
+       method:"Get",
+       params:params
+     })
   }

src/xt_pages/data/medicalTemplate.vue

@@ -0,0 +1,914 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+
+    <div class="app-container">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="主诉">
+          <div>
+            <div class="filter-container">
+              <el-button
+                class="filter-item"
+                style="margin-left: 10px;margin-right: 10px"
+                @click="handleCreateTemplate"
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+              >新 增
+              </el-button>
+            </div>
+            <el-table
+              :data="tabledata"
+              border
+              fit
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+              @cell-mouse-leave="cellMouseLeave"
+              @cell-mouse-enter="cellMouseEnter"
+              :row-class-name="tableRowClassNames"
+              :span-method="merge"
+              style="width: 100%;min-height:500px;"
+            >
+              <el-table-column
+                prop="id"
+                label="标题"
+                align="center"
+               >
+                <template slot-scope="scope">
+                   {{scope.row.title}}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="内容"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.content}}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="备注"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                width="180"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                    <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-edit-outline"
+                      @click="edit(scope.row.id)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="deleteMainTemplate(scope.row.id,scope.$index)" 
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          
+          </div>
+        </el-tab-pane>
+         <el-tab-pane label="现病史">
+          <div>
+            <div class="filter-container">
+              <el-button
+                class="filter-item"
+                style="margin-left: 10px;margin-right: 10px"
+                @click="handleCreateTemplate"
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+              >新 增
+              </el-button>
+            </div>
+             <el-table
+              :data="tabledataOne"
+              border
+              fit
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+              @cell-mouse-leave="cellMouseLeave"
+              @cell-mouse-enter="cellMouseEnter"
+              :row-class-name="tableRowClassNames"
+              :span-method="merge"
+              style="width: 100%;min-height:500px;"
+            >
+              <el-table-column
+                prop="id"
+                label="标题"
+                align="center"
+               >
+                <template slot-scope="scope">
+                   {{scope.row.title}}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="内容"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.content}}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="备注"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                width="180"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                    <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-edit-outline"
+                      @click="edit(scope.row.id)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="deleteMainTemplate(scope.row.id,scope.$index)" 
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          
+          </div>
+        </el-tab-pane>
+         <el-tab-pane label="既往史">
+          <div>
+            <div class="filter-container">
+              <el-button
+                class="filter-item"
+                style="margin-left: 10px;margin-right: 10px"
+                @click="handleCreateTemplate"
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+              >新 增
+              </el-button>
+            </div>
+            <el-table
+              :data="tabledataTwo"
+              border
+              fit
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+              @cell-mouse-leave="cellMouseLeave"
+              @cell-mouse-enter="cellMouseEnter"
+              :row-class-name="tableRowClassNames"
+              :span-method="merge"
+              style="width: 100%;min-height:500px;"
+            >
+              <el-table-column
+                prop="id"
+                label="标题"
+                align="center"
+               >
+                <template slot-scope="scope">
+                   {{scope.row.title}}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="内容"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.content}}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="备注"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                width="180"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                    <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-edit-outline"
+                      @click="edit(scope.row.id)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="deleteMainTemplate(scope.row.id,scope.$index)" 
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="个人史">
+          <div>
+            <div class="filter-container">
+              <el-button
+                class="filter-item"
+                style="margin-left: 10px;margin-right: 10px"
+                @click="handleCreateTemplate"
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+              >新 增
+              </el-button>
+            </div>
+            <el-table
+              :data="tabledataThree"
+              border
+              fit
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+              @cell-mouse-leave="cellMouseLeave"
+              @cell-mouse-enter="cellMouseEnter"
+              :row-class-name="tableRowClassNames"
+              :span-method="merge"
+              style="width: 100%;min-height:500px;"
+            >
+              <el-table-column
+                prop="id"
+                label="标题"
+                align="center"
+               >
+                <template slot-scope="scope">
+                   {{scope.row.title}}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="内容"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.content}}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="备注"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                width="180"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                    <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-edit-outline"
+                      @click="edit(scope.row.id)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="deleteMainTemplate(scope.row.id,scope.$index)" 
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          
+          </div>
+        </el-tab-pane>
+       
+        <el-tab-pane label="家族史">
+          <div>
+            <div class="filter-container">
+              <el-button
+                class="filter-item"
+                style="margin-left: 10px;margin-right: 10px"
+                @click="handleCreateTemplate"
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+              >新 增
+              </el-button>
+            </div>
+            <el-table
+              :data="tabledataFour"
+              border
+              fit
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+              @cell-mouse-leave="cellMouseLeave"
+              @cell-mouse-enter="cellMouseEnter"
+              :row-class-name="tableRowClassNames"
+              :span-method="merge"
+              style="width: 100%;min-height:500px;"
+            >
+              <el-table-column
+                prop="id"
+                label="标题"
+                align="center"
+               >
+                <template slot-scope="scope">
+                   {{scope.row.title}}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="内容"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.content}}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="备注"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                width="180"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                    <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-edit-outline"
+                      @click="edit(scope.row.id)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="deleteMainTemplate(scope.row.id,scope.$index)" 
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          
+          </div>
+        </el-tab-pane>
+         <el-tab-pane label="诊断信息">
+          <div>
+            <div class="filter-container">
+              <el-button
+                class="filter-item"
+                style="margin-left: 10px;margin-right: 10px"
+                @click="handleCreateTemplate"
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+              >新 增
+              </el-button>
+            </div>
+            <el-table
+              :data="tabledataFive"
+              border
+              fit
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+              @cell-mouse-leave="cellMouseLeave"
+              @cell-mouse-enter="cellMouseEnter"
+              :row-class-name="tableRowClassNames"
+              :span-method="merge"
+              style="width: 100%;min-height:500px;"
+            >
+              <el-table-column
+                prop="id"
+                label="标题"
+                align="center"
+               >
+                <template slot-scope="scope">
+                   {{scope.row.title}}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="内容"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.content}}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="备注"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                width="180"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                    <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-edit-outline"
+                      @click="edit(scope.row.id)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="deleteMainTemplate(scope.row.id,scope.$index)" 
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          
+          </div>
+        </el-tab-pane>
+          <el-tab-pane label="医嘱">
+          <div>
+            <div class="filter-container">
+              <el-button
+                class="filter-item"
+                style="margin-left: 10px;margin-right: 10px"
+                @click="handleCreateTemplate"
+                type="primary"
+                size="small"
+                icon="el-icon-circle-plus-outline"
+              >新 增
+              </el-button>
+            </div>
+             <el-table
+              :data="tabledataSix"
+              border
+              fit
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+              @cell-mouse-leave="cellMouseLeave"
+              @cell-mouse-enter="cellMouseEnter"
+              :row-class-name="tableRowClassNames"
+              :span-method="merge"
+              style="width: 100%;min-height:500px;"
+            >
+              <el-table-column
+                prop="id"
+                label="标题"
+                align="center"
+               >
+                <template slot-scope="scope">
+                   {{scope.row.title}}
+                </template>
+              </el-table-column>
+
+
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="内容"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.content}}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="amount1"
+                align="center"
+                label="备注"
+               >
+                <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                width="180"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                    <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-edit-outline"
+                      @click="edit(scope.row.id)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="deleteMainTemplate(scope.row.id,scope.$index)" 
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          
+          </div>
+        </el-tab-pane>
+     
+      </el-tabs>
+
+       <el-dialog
+        title="新增"
+        width="50%"
+        :visible.sync="dialogVisible"
+       >
+        <div>
+            <el-form :model="form" ref="form" label-width="100px" label-position="right" :rules="rules">
+                <el-form-item label="标题:" prop="title" required>
+                    <el-input v-model="form.title" placeholder="" maxlength="30"></el-input>
+                </el-form-item>
+                <el-form-item label="内容 : " prop="content" required>
+                    <el-input  type="textarea" v-model="form.content" placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item label="备注 : " prop="remark">
+                    <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="dialogVisible = false">取 消</el-button>
+            <el-button type="primary"  @click="submitAction('form')">保 存</el-button>
+        </div>
+    </el-dialog>   
+
+
+    <el-dialog
+        title="编辑"
+        width="50%"
+        :visible.sync="editDialogVisible"
+       >
+        <div>
+            <el-form :model="form" ref="form" label-width="100px" label-position="right" :rules="rules">
+                <el-form-item label="标题:" prop="title" required>
+                    <el-input v-model="form.title" placeholder="" maxlength="30"></el-input>
+                </el-form-item>
+                <el-form-item label="内容 : " prop="content" required>
+                    <el-input  type="textarea" v-model="form.content" placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item label="备注 : " prop="remark">
+                    <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="editDialogVisible = false">取 消</el-button>
+            <el-button type="primary"  @click="UpdateMainTemplate('form')">保 存</el-button>
+        </div>
+    </el-dialog>          
+    </div>
+  </div>
+
+</template>
+
+
+<style>
+  @import "../../../static/css/table_row.css";
+
+  .filter-item {
+    float: right;
+  }
+</style>
+
+<script>
+ 
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { saveMainTemplate,getMedicalTemplateList,getMainTemplateById,UpdateMainTemplate,deleteMainTemplate} from "@/api/project/project"
+  export default {
+    name: 'hisTemplate',
+    components: { BreadCrumb },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '模版管理' },
+          { path: '', name: '医嘱模版' }
+        ],
+        rowIndex: -1,
+        current_template_id: 0,
+        currentObject: {},
+        tempArr: [],
+        sameRowArr: [],
+        dialogVisible:false,
+        form:{
+          id:0,
+          title:"",
+          content:"",
+          remark:""  
+        },
+        rules: {
+            title: [{ required: true, message: "请输入标题"}],
+            content: [{ required: true, message: "请输入内容"}]
+        },
+        tabledata:[],
+        tabledataOne:[],
+        tabledataTwo:[],
+        tabledataThree:[],
+        tabledataFour:[],
+        tabledataFive:[],
+        tabledataSix:[],
+        tabledataSeven:[],
+        editDialogVisible:false,
+        activeName:0
+      }
+    },
+    created() {
+       this.getlist()
+    },
+    methods:{
+        handleCreateTemplate(){
+       
+        this.dialogVisible = true
+      },
+      submitAction(formName){
+
+            var template_id = 1
+                if(this.activeName == 0){
+                   template_id = 1
+                }
+                if(this.activeName == 1){
+                   template_id = 2
+                }
+                if(this.activeName == 2){
+                   template_id = 3
+                }
+
+                if(this.activeName == 3){
+                   template_id = 4
+                }
+
+                if(this.activeName == 4){
+                   template_id = 5
+                }
+
+                if(this.activeName == 5){
+                   template_id = 6
+                }
+
+                if(this.activeName == 6){
+                   template_id = 7
+                }
+
+                if(this.activeName == 7){
+                   template_id = 8
+                }
+
+                const params = {
+                   title:this.form.title,
+                   content:this.form.content,
+                   remark:this.form.remark,
+                   template_id:template_id,
+                }
+               console.log("params",params)
+         this.$refs[formName].validate(valid=>{
+            if(valid){
+             saveMainTemplate(params).then(response=>{
+                  if(response.data.state == 1){
+                     var template =  response.data.data.template
+                     this.$message.success("保存成功")
+                     this.dialogVisible = false
+                     this.getlist()
+                     this.form.title = ""
+                     this.form.content = ""
+                     this.form.remark = ""
+                  }
+               }) 
+            }
+         })
+      },
+
+      getlist(){
+        getMedicalTemplateList().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list",list)
+             this.tabledata = list
+             this.tabledataOne =  response.data.data.listOne
+             this.tabledataTwo = response.data.data.listTwo
+             this.tabledataThree = response.data.data.listThree
+             this.tabledataFour =  response.data.data.listFour
+             this.tabledataFive = response.data.data.listFive
+             this.tabledataSix = response.data.data.listSix
+             this.tabledataSeven =  response.data.data.listSeven
+           }
+        })   
+      },
+
+      edit(id){
+        this.editDialogVisible = true
+        getMainTemplateById(id).then(response=>{
+           if(response.data.state == 1){
+             var template =  response.data.data.template
+             this.form.title = template.title 
+             this.form.content =  template.content
+             this.form.remark = template.remark
+             this.form.id = template.id
+           }
+        })
+      },
+
+      UpdateMainTemplate(formName){
+          const params = {
+                  title:this.form.title,
+                  content:this.form.content,
+                  remark:this.form.remark,
+                  id:this.form.id,  
+           }
+         this.$refs[formName].validate(valid=>{
+             if(valid){   
+             
+              UpdateMainTemplate(params).then(response=>{
+                 if(response.data.state == 1){
+                   var template =  response.data.data.template
+                   this.$message.success("保存成功")
+                   this.editDialogVisible = false
+                   this.getlist()
+                 }
+              })
+             }
+         })
+      },
+
+      deleteMainTemplate(id,index){
+          this.$confirm('确认删除吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+         }).then(() => {
+             
+            deleteMainTemplate(id).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.tabledata.splice(index, 1);
+                  this.$message.success("删除成功")
+              } else {
+                  this.$message.error("药品已经出库不能删除")
+              }
+            })
+          })
+          .catch(() => {
+          }) 
+      }
+    }
+  }
+</script>
+<style>
+  .center th .cell {
+    text-align: center !important;
+  }
+
+  .templateadvicenamedisplay .cell {
+    float: left;
+    text-align: left;
+  }
+  .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>
+

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -214,6 +214,13 @@
 
    <register-dialog></register-dialog>
 
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="treatVisible">
+      <treatPrint :paramsObj='paramsObj'></treatPrint>
+    </el-dialog>
   </div>
 </template>
 
@@ -228,6 +235,7 @@
   import { getPatientInformation, getPatientList } from '@/api/project/project'
   import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
   import RegisterDialog from "./components/registerDialog";
+  import treatPrint from './treatPrint'
 
   const moment = require('moment')
   export default {
@@ -238,7 +246,9 @@
       charged,
       medicalInsuranceRefund,
       prescriptionTable,
-      additionalCharges
+      additionalCharges,
+      treatPrint,
+
     },
     data() {
       return {
@@ -284,6 +294,8 @@
         all_table_data:[],
         order:{},
         addtions_charge:[],
+        treatVisible:false,
+        paramsObj:{}
       }
     },
     created() {
@@ -486,7 +498,14 @@
           this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
 
         } else if (index == 3) {
-          this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
+          let obj = {
+            record_date:this.record_date,
+            patient_id:this.patient_id,
+            prescription_id:this.prescription_id
+          }
+          this.paramsObj = obj
+          this.treatVisible = true
+          // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
 
           if(this.hisPatientInfo.id == 0){

src/xt_pages/outpatientCharges/treatPrint.vue

@@ -1,21 +1,19 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-       <template>
-        <el-button
-          :loading="loading"
-          size="small"
-          icon="el-icon-printer"
-          @click="printThisPage"
-          type="primary"
-          >打印</el-button
-        >
-      </template>
-    </div>
-    <div class="app-container" style="min-height:0;">
-        <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-            <printOne v-bind:childResponse="childResponse"></printOne>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+        >打印</el-button
+      >
+    </template>
+    <div class="app-container" style="padding-top:40px;">
+        <div class='dialysisPage'>
+            <printOne v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
         </div>
     </div>
   </div>
@@ -41,6 +39,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    paramsObj:Object
+  },
   data() {
     return {
       crumbs: [
@@ -48,6 +49,7 @@ export default {
         { path: false, name: "打印单" }
       ],
       childResponse: {},
+      paramsObj:{}
       
 
     };
@@ -100,6 +102,15 @@ export default {
   },
   created() {
   },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObj = val
+        
+      },
+      deep:true
+    }
+  }
 };
 </script>
 

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -6,7 +6,7 @@
             <p class="infoP">名称：血液透析中心</p>
             <p class="infoP">医生工号：</p>
             <p class="infoP">门诊流水号：</p>
-            <p class="infoP">科别：{{list.p_info.departments}}</p>
+            <p class="infoP">科别：{{list.p_info.departments?list.p_info.departments:""}}</p>
             <p class="infoP">处方单据号：</p>
             <p class="infoP">姓名：{{patient.name}}</p>
             <p class="infoP">医疗账号：</p>
@@ -34,7 +34,7 @@
                     </div>
                     <div class="chargeUl" style="border-top:1px solid #000;"> 
                         <p style="width:50%;">费用合计</p>
-                        <p style="width:50%;"></p>
+                        <p style="width:50%;">{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:""}}</p>
                     </div>
                     <div class="chargeUl" style="border-top:1px solid #000;">
                         <p style="width:50%;">记账支付</p>
@@ -71,8 +71,8 @@
             
         </div>
         <div class="moneyBox">
-            <p>实收金：{{list.order_info.medfee_sumamt}}</p>
-            <p>记账前金额：{{list.order_info.preselfpay_amt}}</p>
+            <p>实收金：{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:''}}</p>
+            <p>记账前金额：{{list.order_info.preselfpay_amt?list.order_info.preselfpay_amt:""}}</p>
             <p>扣款金额：</p>
             <p>记账后金额：</p>
             <p>找赎金：</p>
@@ -94,6 +94,9 @@ export default {
           orgname:""
       } 
     },
+    props:{
+        paramsObj:Object
+    },
     methods:{
        getChargePrint(record_date,patient_id,prescription_id){
            var params = {
@@ -113,26 +116,49 @@ export default {
                var patient = response.data.data.patient
                console.log("patient",patient)
                this.patient  = patient
+               var histpatient =   response.data.data.hisPatient
+               console.log("hispatient",histpatient)
             }
          })
        }
     },
     created(){
-       var record_date =  this.$route.query.record_date
+       var record_date =  this.paramsObj.record_date
        console.log("record_date",record_date)
-       var patient_id = this.$route.query.patient_id
+       var patient_id = this.paramsObj.patient_id
        console.log("patient_id",patient_id)
-       var prescription_id = this.$route.query.prescription_id
+       var prescription_id = this.paramsObj.prescription_id
        this.getChargePrint(record_date,patient_id,prescription_id)
        var xtuser = this.$store.getters.xt_user
        this.orgname = xtuser.org.org_name
 
+    },
+    watch:{
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+        handler(val, oldVal){
+            this.paramsObj = val
+            this.patient_id = this.paramsObj.patient_id
+            var record_date = this.paramsObj.record
+            this.record_date = record_date
+            var prescription_id = this.paramsObj.prescription_id
+            this.prescription_id = prescription_id
+            
+        },
+        deep:true
+        }
     }
 }
 </script>
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
 .printTitle{
     font-size: 22px;
     text-align: center;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -575,10 +575,9 @@
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
             this.sick = response.data.data.sick
-
-            this.sick = response.data.data.sick
-
             this.diagnoses = response.data.data.diagnose
+            this.additions = response.data.data.additions
+
             // var info = response.data.data.info
             // if (info.user_type == 2 || info.user_type == 1) {
             //   this.doctorValue = info.admin_user_id
@@ -713,7 +712,14 @@
               this.doctorValue = admin_info.admin_user_id
               if (admin_info.department_id == 0) {
                 if (this.department.length > 0) {
-                  this.departmentValue = department[0].id
+                  if(department && department.length > 0){
+                    this.departmentValue = department[0].id
+
+                  }else{
+
+                    this.departmentValue = ''
+
+                  }
                 } else {
                   this.departmentValue = ''
                 }

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -85,70 +85,189 @@
       <el-form-item label="" prop="name">
         <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
       </el-form-item>
-      <el-form-item label="主诉:" prop="name" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.chief_conplaint">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="现病史:" prop="name" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.history_of_present_illness">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="既往史:" prop="name" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.past_history">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="个人史:" prop="name" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.personal_history">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="家族史:" prop="name" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.family_history">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="诊断信息:" prop="name" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.diagnostic">
-        </el-input>
-      </el-form-item>
-       <el-form-item label="医嘱:" prop="doctor_advice" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.doctor_advice">
-        </el-input>
-      </el-form-item>
-       <el-form-item label="备注:" prop="name" style="width:100%;">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="请输入内容"
-          v-model="case_history.remark">
-        </el-input>
+      <el-row :gutter = "20">
+        <el-col :span="24">
+          <el-form-item label="主诉:">
+              <el-select @change="changeMainTemplate" v-model="value" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledata"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+              </el-select>
+          </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item  prop="name" style="width:100%;">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="case_history.chief_conplaint">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+           <el-form-item label="现病史:">
+              <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataOne"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+              </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item  prop="name" style="width:100%;">
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="case_history.history_of_present_illness">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+         <el-col :span="24">
+           <el-form-item label="既往史:">
+            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataTwo"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+             </el-select>
+            </el-form-item>
+         </el-col>
+         <el-col :span="24">
+            <el-form-item  prop="name" style="width:100%;">
+              <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="case_history.past_history">
+              </el-input>
+           </el-form-item>
+         </el-col>
+      </el-row>
+     <el-row :gutter="24">
+       <el-col :span="20">
+          <el-form-item label="个人史:">
+            <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataThree"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+             </el-select>
+            </el-form-item>
+       </el-col>
+       <el-col :span="20">
+        <el-form-item  prop="name" style="width:100%;">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="case_history.personal_history">
+          </el-input>
+        </el-form-item>
+      </el-col>
+     </el-row>
+     <el-row :gutter="24">
+       <el-col :span="20">
+          <el-form-item  label="家族史:">
+            <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataFour"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+             </el-select>
+         </el-form-item>
+       </el-col>
+        <el-col :span="20">
+          <el-form-item prop="name" style="width:100%;">
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="case_history.family_history">
+            </el-input>
+          </el-form-item>
+       </el-col>
+     </el-row>
+     <el-row :gutter="24">
+       <el-col :span="20">
+          <el-form-item label="诊断信息:">
+            <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataFive"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+             </el-select>
+         </el-form-item>
+       </el-col>
+       <el-col :span="20">
+        <el-form-item  prop="name" style="width:100%;">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="case_history.diagnostic">
+          </el-input>
       </el-form-item>
+       </el-col>
+     </el-row>
+
+     <el-row :gutter="24">
+       <el-col :span="20">
+         <el-form-item label="医嘱:">
+            <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataSix"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+             </el-select>
+         </el-form-item>
+       </el-col>
+       <el-col :span="20">
+        <el-form-item  prop="doctor_advice" style="width:100%;">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="case_history.doctor_advice">
+          </el-input>
+        </el-form-item>
+       </el-col>
+     </el-row>
+
+        <el-form-item label ="备注"  prop="name" style="width:100%;">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="case_history.remark">
+          </el-input>
+        </el-form-item>
+    
+    
+     
+    
+    
     </el-form>
 
   </div>
@@ -161,7 +280,7 @@
   import { getDictionaryDataConfig } from "@/utils/data";
   import {  createCaseHistory } from '@/api/his/his'
   import { getDataConfig } from "@/utils/data";
-  import { getTemplateDetail } from "@/api/project/project"
+  import { getTemplateDetail,getMedicalTemplateList } from "@/api/project/project"
   export default {
     props: {
       case_history: Object,
@@ -206,7 +325,23 @@
         wayOptions:[],
         start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
         doctor_advice:"",
-        remark:""
+        remark:"",
+        tabledata:[],
+        tabledataOne:[],
+        tabledataTwo:[],
+        tabledataThree:[],
+        tabledataFour:[],
+        tabledataFive:[],
+        tabledataSix:[],
+        tabledataSeven:[],
+        value:'',
+        valueOne:'',
+        valueTwo:'',
+        valueThree:'',
+        valueFour:'',
+        valueFive:'',
+        valueSix:'',
+        valueSeven:''
       }
     },
     methods: {
@@ -288,12 +423,125 @@
                 this.case_history.personal_history =    templatedetail.personal_history
                 this.case_history.family_history = templatedetail.family_history
                 this.case_history.diagnostic = templatedetail.diagnostic
-
+                this.case_history.doctor_advice = templatedetail.doctor_advice
+                this.case_history.remark = templatedetail.remark
               }
           })
         },
+
+        getlist(){
+           getMedicalTemplateList().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list",list)
+             this.tabledata = list
+             this.tabledataOne =  response.data.data.listOne
+             this.tabledataTwo = response.data.data.listTwo
+             this.tabledataThree = response.data.data.listThree
+             this.tabledataFour =  response.data.data.listFour
+             this.tabledataFive = response.data.data.listFive
+             this.tabledataSix = response.data.data.listSix
+             this.tabledataSeven =  response.data.data.listSeven
+           }
+        })   
+       },
+
+       changeMainTemplate(values){
+         if(this.case_history.chief_conplaint == ''){
+           this.case_history.chief_conplaint = values
+         } else {
+          if (this.case_history.chief_conplaint.indexOf(values) == -1) {
+            if (this.case_history.chief_conplaint.charAt(this.case_history.chief_conplaint.length - 1).indexOf('。') == -1) {
+              this.case_history.chief_conplaint = this.case_history.chief_conplaint + ',' + values
+            } else {
+              this.case_history.chief_conplaint = this.case_history.chief_conplaint + values
+            }
+          }
+        }
+       },
+       changeMainTemplateOne(values){
+          if(this.case_history.history_of_present_illness == ''){
+           this.case_history.history_of_present_illness = values
+         } else {
+          if (this.case_history.history_of_present_illness.indexOf(values) == -1) {
+            if (this.case_history.history_of_present_illness.charAt(this.case_history.history_of_present_illness.length - 1).indexOf('。') == -1) {
+              this.case_history.history_of_present_illness = this.case_history.history_of_present_illness + ',' + values
+            } else {
+              this.case_history.history_of_present_illness = this.case_history.history_of_present_illness + values
+            }
+          }
+        }
+      },
+      changeMainTemplateTwo(values){
+         if(this.case_history.past_history == ''){
+           this.case_history.past_history = values
+         } else {
+          if (this.case_history.past_history.indexOf(values) == -1) {
+            if (this.case_history.past_history.charAt(this.case_history.past_history.length - 1).indexOf('。') == -1) {
+              this.case_history.past_history = this.case_history.past_history + ',' + values
+            } else {
+              this.case_history.past_history = this.case_history.past_history + values
+            }
+          }
+        }
+      },
+      changeMainTemplateThree(values){
+         if(this.case_history.personal_history == ''){
+           this.case_history.personal_history = values
+         } else {
+          if (this.case_history.personal_history.indexOf(values) == -1) {
+            if (this.case_history.personal_history.charAt(this.case_history.personal_history.length - 1).indexOf('。') == -1) {
+              this.case_history.personal_history = this.case_history.personal_history + ',' + values
+            } else {
+              this.case_history.personal_history = this.case_history.personal_history + values
+            }
+          }
+        }
+      },
+      changeMainTemplateFour(values){
+          if(this.case_history.family_history == ''){
+           this.case_history.family_history = values
+         } else {
+          if (this.case_history.family_history.indexOf(values) == -1) {
+            if (this.case_history.family_history.charAt(this.case_history.family_history.length - 1).indexOf('。') == -1) {
+              this.case_history.family_history = this.case_history.family_history + ',' + values
+            } else {
+              this.case_history.family_history = this.case_history.family_history + values
+            }
+          }
+        }
+      },
+
+      changeMainTemplateFive(values){
+          if(this.case_history.diagnostic == ''){
+           this.case_history.diagnostic = values
+         } else {
+          if (this.case_history.diagnostic.indexOf(values) == -1) {
+            if (this.case_history.diagnostic.charAt(this.case_history.diagnostic.length - 1).indexOf('。') == -1) {
+              this.case_history.diagnostic = this.case_history.diagnostic + ',' + values
+            } else {
+              this.case_history.diagnostic = this.case_history.diagnostic + values
+            }
+          }
+        }
+      },
+      changeMainTemplateSix(values){
+          if(this.case_history.doctor_advice == ''){
+           this.case_history.doctor_advice = values
+         } else {
+          if (this.case_history.doctor_advice.indexOf(values) == -1) {
+            if (this.case_history.doctor_advice.charAt(this.case_history.doctor_advice.length - 1).indexOf('。') == -1) {
+              this.case_history.doctor_advice = this.case_history.doctor_advice + ',' + values
+            } else {
+              this.case_history.doctor_advice = this.case_history.doctor_advice + values
+            }
+          }
+        }
+      },
+     
     },
     created(){
+       this.getlist()
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
        console.log("232322323",this)
        if(this.patientInfo.gender = 1){
@@ -301,7 +549,7 @@
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-
+     
     },
     watch:{
       detalid:function(val){

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -6,10 +6,10 @@
     :before-close="_close"
     class="detailDialog"
   >
-    <div style="position: absolute;right:20px;z-index:99">
+    <!-- <div style="position: absolute;right:20px;z-index:99">
       <el-button v-if="activeName == 'first'" @click="open(1)" type="primary">打印</el-button>
       <el-button v-if="activeName == 'second'" @click="open(2)" type="primary">打印</el-button>
-    </div>
+    </div> -->
     <el-tabs v-model="activeName">
 
       <el-tab-pane label="处方详情" name="first">

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -123,13 +123,13 @@ export default {
         },
         //获取历史数据历史模板
         getlist(){
-            console.log("触发了吗")
+            
             const params = {
                keyword:this.search_input,
                start_time:this.start_time,
                end_time:this.end_time
             }
-           console.log("params-----",params)
+         
           getHistoryTemplate(params).then(response=>{
             if(response.data.state == 1){
               var template =  response.data.data.template

src/xt_pages/outpatientDoctorStation/components/recordTemplateDetail.vue

@@ -14,53 +14,183 @@
             <el-form-item label="模板说明: " prop="name" style="width:100%;">
                 <el-input v-model="form.template_remark" placeholder=""></el-input>
             </el-form-item>
-            <el-form-item label="主诉:" prop="name" style="width:100%;">
-                <el-input
+           <el-row :gutter = "20">
+        <el-col :span="24">
+          <el-form-item label="主诉:">
+              <el-select @change="changeMainTemplate" v-model="value" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledata"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+              </el-select>
+          </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item  prop="name" style="width:100%;">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="form.chief_conplaint">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+           <el-form-item label="现病史:">
+              <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataOne"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+              </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item  prop="name" style="width:100%;">
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.history_of_present_illness">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+         <el-col :span="24">
+           <el-form-item label="既往史:">
+            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:200px">
+                  <el-option
+                    v-for="(item, index) in tabledataTwo"
+                    :label="item.title"
+                    :value="item.content"
+                    :key="index"
+                  ></el-option>
+             </el-select>
+            </el-form-item>
+         </el-col>
+         <el-col :span="24">
+            <el-form-item  prop="name" style="width:100%;">
+              <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="form.chief_conplaint">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="现病史:" prop="name" style="width:100%;">
-                <el-input
+                v-model="form.past_history">
+              </el-input>
+           </el-form-item>
+         </el-col>
+      </el-row>
+        <el-row :gutter="24">
+        <el-col :span="20">
+            <el-form-item label="个人史:">
+                <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:200px">
+                    <el-option
+                        v-for="(item, index) in tabledataThree"
+                        :label="item.title"
+                        :value="item.content"
+                        :key="index"
+                    ></el-option>
+                </el-select>
+                </el-form-item>
+        </el-col>
+        <el-col :span="20">
+            <el-form-item  prop="name" style="width:100%;">
+            <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="form.history_of_present_illness">
-                </el-input>
+                v-model="form.personal_history">
+            </el-input>
+            </el-form-item>
+        </el-col>
+        </el-row>
+        <el-row :gutter="24">
+        <el-col :span="20">
+            <el-form-item  label="家族史:">
+                <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:200px">
+                    <el-option
+                        v-for="(item, index) in tabledataFour"
+                        :label="item.title"
+                        :value="item.content"
+                        :key="index"
+                    ></el-option>
+                </el-select>
             </el-form-item>
-            <el-form-item label="既往史:" prop="name" style="width:100%;">
+        </el-col>
+            <el-col :span="20">
+            <el-form-item prop="name" style="width:100%;">
                 <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="form.past_history">
+                v-model="form.family_history">
                 </el-input>
             </el-form-item>
-            <el-form-item label="个人史:" prop="name" style="width:100%;">
-                <el-input
+        </el-col>
+        </el-row>
+        <el-row :gutter="24">
+        <el-col :span="20">
+            <el-form-item label="诊断信息:">
+                <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:200px">
+                    <el-option
+                        v-for="(item, index) in tabledataFive"
+                        :label="item.title"
+                        :value="item.content"
+                        :key="index"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="20">
+            <el-form-item  prop="name" style="width:100%;">
+            <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="form.personal_history">
-                </el-input>
+                v-model="form.diagnostic">
+            </el-input>
+        </el-form-item>
+        </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+        <el-col :span="20">
+            <el-form-item label="医嘱:">
+                <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:200px">
+                    <el-option
+                        v-for="(item, index) in tabledataSix"
+                        :label="item.title"
+                        :value="item.content"
+                        :key="index"
+                    ></el-option>
+                </el-select>
             </el-form-item>
-            <el-form-item label="家族史:" prop="name" style="width:100%;">
-                <el-input
+        </el-col>
+        <el-col :span="20">
+            <el-form-item  prop="doctor_advice" style="width:100%;">
+            <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="form.family_history">
-                </el-input>
+                v-model="form.doctor_advice">
+            </el-input>
             </el-form-item>
-            <el-form-item label="诊断信息:" prop="name" style="width:100%;">
-                <el-input
+        </el-col>
+        </el-row>
+
+            <el-form-item label ="备注"  prop="name" style="width:100%;">
+            <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="form.diagnostic">
-                </el-input>
+                v-model="form.remark">
+            </el-input>
             </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -71,7 +201,7 @@
 </template>
 
 <script>
-import { getTemplateDetail,updateRecordTemplate } from "@/api/project/project"
+import { getTemplateDetail,updateRecordTemplate,getMedicalTemplateList } from "@/api/project/project"
 export default {
     data(){
         return{
@@ -85,10 +215,29 @@ export default {
               past_history:"",
               personal_history:"",
               family_history:"",
-              diagnostic:""
+              diagnostic:"",
+              remark:'',
+              doctor_advice:'',
+            
             },
             textarea:"",
-            templatedetail:{}
+            templatedetail:{},
+            tabledata:[],
+            tabledataOne:[],
+            tabledataTwo:[],
+            tabledataThree:[],
+            tabledataFour:[],
+            tabledataFive:[],
+            tabledataSix:[],
+            tabledataSeven:[],
+            value:'',
+            valueOne:'',
+            valueTwo:'',
+            valueThree:'',
+            valueFour:'',
+            valueFive:'',
+            valueSix:'',
+            valueSeven:''
         }
     },
     methods:{
@@ -124,7 +273,8 @@ export default {
                 this.form.personal_history =    templatedetail.personal_history 
                 this.form.family_history = templatedetail.family_history 
                 this.form.diagnostic = templatedetail.diagnostic 
-               
+                this.form.doctor_advice = templatedetail.doctor_advice
+                this.form.remark = templatedetail.remark 
               }
           })
         },
@@ -138,7 +288,9 @@ export default {
             past_history:this.form.past_history,
             personal_history:this.form.personal_history,
             family_history:this.form.family_history,
-            diagnostic:this.form.diagnostic
+            diagnostic:this.form.diagnostic,
+            doctor_advice:this.form.doctor_advice,
+            remark:this.form.remark
           }  
           updateRecordTemplate(params).then(response=>{
              if(response.data.state == 1){
@@ -148,7 +300,121 @@ export default {
                 // this.$parents.getlist()
              }
           }) 
+        },
+        
+         getlist(){
+           getMedicalTemplateList().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list",list)
+             this.tabledata = list
+             this.tabledataOne =  response.data.data.listOne
+             this.tabledataTwo = response.data.data.listTwo
+             this.tabledataThree = response.data.data.listThree
+             this.tabledataFour =  response.data.data.listFour
+             this.tabledataFive = response.data.data.listFive
+             this.tabledataSix = response.data.data.listSix
+             this.tabledataSeven =  response.data.data.listSeven
+           }
+        })   
+       },
+
+       changeMainTemplate(values){
+         if(this.case_history.chief_conplaint == ''){
+           this.case_history.chief_conplaint = values
+         } else {
+          if (this.case_history.chief_conplaint.indexOf(values) == -1) {
+            if (this.case_history.chief_conplaint.charAt(this.case_history.chief_conplaint.length - 1).indexOf('。') == -1) {
+              this.case_history.chief_conplaint = this.case_history.chief_conplaint + ',' + values
+            } else {
+              this.case_history.chief_conplaint = this.case_history.chief_conplaint + values
+            }
+          }
+        }
+       },
+       changeMainTemplateOne(values){
+          if(this.case_history.history_of_present_illness == ''){
+           this.case_history.history_of_present_illness = values
+         } else {
+          if (this.case_history.history_of_present_illness.indexOf(values) == -1) {
+            if (this.case_history.history_of_present_illness.charAt(this.case_history.history_of_present_illness.length - 1).indexOf('。') == -1) {
+              this.case_history.history_of_present_illness = this.case_history.history_of_present_illness + ',' + values
+            } else {
+              this.case_history.history_of_present_illness = this.case_history.history_of_present_illness + values
+            }
+          }
         }
+      },
+      changeMainTemplateTwo(values){
+         if(this.case_history.past_history == ''){
+           this.case_history.past_history = values
+         } else {
+          if (this.case_history.past_history.indexOf(values) == -1) {
+            if (this.case_history.past_history.charAt(this.case_history.past_history.length - 1).indexOf('。') == -1) {
+              this.case_history.past_history = this.case_history.past_history + ',' + values
+            } else {
+              this.case_history.past_history = this.case_history.past_history + values
+            }
+          }
+        }
+      },
+      changeMainTemplateThree(values){
+         if(this.case_history.personal_history == ''){
+           this.case_history.personal_history = values
+         } else {
+          if (this.case_history.personal_history.indexOf(values) == -1) {
+            if (this.case_history.personal_history.charAt(this.case_history.personal_history.length - 1).indexOf('。') == -1) {
+              this.case_history.personal_history = this.case_history.personal_history + ',' + values
+            } else {
+              this.case_history.personal_history = this.case_history.personal_history + values
+            }
+          }
+        }
+      },
+      changeMainTemplateFour(values){
+          if(this.case_history.family_history == ''){
+           this.case_history.family_history = values
+         } else {
+          if (this.case_history.family_history.indexOf(values) == -1) {
+            if (this.case_history.family_history.charAt(this.case_history.family_history.length - 1).indexOf('。') == -1) {
+              this.case_history.family_history = this.case_history.family_history + ',' + values
+            } else {
+              this.case_history.family_history = this.case_history.family_history + values
+            }
+          }
+        }
+      },
+
+      changeMainTemplateFive(values){
+          if(this.case_history.diagnostic == ''){
+           this.case_history.diagnostic = values
+         } else {
+          if (this.case_history.diagnostic.indexOf(values) == -1) {
+            if (this.case_history.diagnostic.charAt(this.case_history.diagnostic.length - 1).indexOf('。') == -1) {
+              this.case_history.diagnostic = this.case_history.diagnostic + ',' + values
+            } else {
+              this.case_history.diagnostic = this.case_history.diagnostic + values
+            }
+          }
+        }
+      },
+      changeMainTemplateSix(values){
+          if(this.case_history.doctor_advice == ''){
+           this.case_history.doctor_advice = values
+         } else {
+          if (this.case_history.doctor_advice.indexOf(values) == -1) {
+            if (this.case_history.doctor_advice.charAt(this.case_history.doctor_advice.length - 1).indexOf('。') == -1) {
+              this.case_history.doctor_advice = this.case_history.doctor_advice + ',' + values
+            } else {
+              this.case_history.doctor_advice = this.case_history.doctor_advice + values
+            }
+          }
+        }
+      },
+    },
+
+    created(){
+       this.getlist()  
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/components/saveRecordTemplate.vue

@@ -56,6 +56,8 @@ export default {
             template_name:"",
             template_remark:"",
             mode_status:0,
+            doctor_advice:'',
+            remark:''
         }
      },
     
@@ -77,6 +79,8 @@ export default {
          this.personal_history = obj.personal_history
          this.family_history = obj.family_history
          this.diagnostic = obj.diagnostic
+         this.doctor_advice = obj.doctor_advice
+         this.remark = obj.remark
          this.visible = true
         },
         hide() {
@@ -96,6 +100,8 @@ export default {
              personal_history:this.personal_history,
              family_history:this.family_history,
              diagnostic:this.diagnostic,
+             doctor_advice:this.doctor_advice,
+             remark:this.remark
             }
          console.log("params",params)
        

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -114,18 +114,26 @@
     </el-table>
     <el-dialog
       class="centerDialog"
-      width="560px"
+      width="600px"
       title="打印"
       :visible.sync="innerVisible"
       append-to-body>
-      
-      <print :paramsObj='paramsObj'></print>
+
+      <print v-if="index == 2" :paramsObj='paramsObj'></print>
+      <treatPrint v-if="index == 6" :paramsObj='paramsObj'></treatPrint>
     </el-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="savePrint">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="600px"
+      title="打印"
+      :visible.sync="recordVisible">
+      <recordPrint :patientid="patientid"></recordPrint>
+    </el-dialog>
 
   </div>
 </template>
@@ -141,6 +149,8 @@
   import { uParseTime } from '@/utils/tools'
   import { getPrescriptionList } from "@/api/project/project"
   import print from './print'
+  import treatPrint from './treatPrint'
+  import recordPrint from './recordPrint'
   export default {
     components: {
       BreadCrumb,
@@ -148,7 +158,9 @@
       deskRecord,
       medicalRecord,
       saveRecordTemplate,
-      print
+      print,
+      treatPrint,
+      recordPrint
     },
     data() {
       return {
@@ -196,7 +208,10 @@
         admin_info:{},
         saveLoading:false,
         innerVisible:false,
-        paramsObj:{}
+        paramsObj:{},
+        recordVisible:false,
+        recordObj:{},
+        additions:[],
 
       }
     },
@@ -793,7 +808,8 @@
           }
           this.$refs.child.createCaseHistory()
         } else if (index == 2) {
-          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
+          this.recordVisible = true
+          // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
         } else if (index == 3) {
            var mode_status =   this.$refs.saveRecordTemplate.mode_status
            console.log("数据返回",mode_status)
@@ -862,11 +878,19 @@
            }
            this.paramsObj = obj
            this.innerVisible = true
-           
+
           //  this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
          }
          if(this.index == 6){
-            this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
+          let obj = {
+            record:this.record_date,
+            prescription_id:this.prescription_id,
+            ids:ids,
+            patient_id:this.patientid
+          }
+          this.paramsObj = obj
+          this.innerVisible = true
+          // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
          }
       }
     },
@@ -1156,6 +1180,7 @@
   .centerDialog{
     .el-dialog__body{
       max-height: calc(100vh - 100px) !important;
+      padding: 0 20px;
     }
   }
 </style>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
-       <template>
+      <template>
         <el-button
+          style="position:fixed;right:25px;z-index:999"
           :loading="loading"
           size="small"
           icon="el-icon-printer"
@@ -11,7 +12,7 @@
         >
       </template>
             
-    <div class='dialysisPage'>
+    <div class='dialysisPage' style="padding-top:40px;">
       <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
     </div>
   </div>

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -1,42 +1,18 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-       <template>
-        <el-button
-          size="small"
-          icon="el-icon-printer"
-          @click="printThisPage"
-          type="primary"
-          >打印</el-button
-        >
-      </template>
-    </div>
-    <div class="app-container" style="min-height:0;">
-        <el-container class="newContainer">
-            <!-- <div style="width:270px;margin-right:20px;">
-                <div class="cell clearfix" style="margin-bottom:10px;">
-                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" class="filter-item" type="primary" :model="keyword" @click="searchAction">搜索</el-button>
-                </div>
-                <el-table ref="tab" @row-click="changePatient" highlight-current-row :data="patientTableData" height="480" border style="width: 100%">
-                    <el-table-column prop="date"  label="患者">
-                        <template slot-scope="scope">
-                            {{scope.row.patients.name?scope.row.patients.name:''}}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="name" label="就诊号">
-                        <template slot-scope="scope">
-                           {{ scope.row.his_patient.number ?scope.row.his_patient.number:''}}
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div> -->
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+        >打印</el-button
+      >
+    </template>
             
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-              <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient = "hispatient" :history="history"></printOne>
-            </div>
-        </el-container>
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient="hispatient" :history="history" :patientid="patientid"></printOne>
     </div>
   </div>
 </template>
@@ -57,6 +33,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    patientid:Number,
+  },
   data() {
     return {
       crumbs: [
@@ -70,7 +49,8 @@ export default {
       hispatient:{},
       educationOptions:[],
       history:{},
-      keyword:""
+      keyword:"",
+      patientid:''
     };
   },
   methods: {
@@ -160,7 +140,7 @@ export default {
     
   },
   created() {
-    this.getPatientList() 
+    // this.getPatientList() 
    
   },
   // computed:{

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -1,5 +1,6 @@
 <template>
-    <div id='prescription-print' class="prescription-print">
+<div id='prescription-print'>
+    <div class="prescription-print">
         <div class="printTitle">{{orgname}} &nbsp;&nbsp; 门诊病历</div>
         <div class="infoTitle">
             <div>姓名：{{patient.name?patient.name:''}}</div>
@@ -37,8 +38,9 @@
             <div style="flex:1;">{{patient.id?patient.id:''}}</div>
         </div>
         <div style="page-break-after:always;margin-top:50px;"></div>
+    </div>
 
-
+    <div class="prescription-print">
         <div class="printTitle">病历内容</div>
         <div class="recordTitle">
             <div>科别：{{getDeparment(hispatient.departments)?getDeparment(hispatient.departments):''}}</div>
@@ -89,6 +91,7 @@
             医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
         </div>
     </div>
+</div>
 </template>
 <script>
 
@@ -98,6 +101,7 @@ export default {
     props:{
       patient:Object,
       hispatient:Object,
+      patientid:Number
     //   history:Object,
     },
     data(){
@@ -141,7 +145,7 @@ export default {
       getPatientCaseHistory(){
 
         const params = {
-          patient_id:this.$route.query.patient_id
+          patient_id:this.patientid
         }
       console.log("病历22222",params)
       getPatientCaseHistory(params).then(response=>{
@@ -183,6 +187,13 @@ export default {
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
 .printTitle{
     font-size: 22px;
     text-align: center;

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -2,7 +2,7 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle">{{orgname}} &nbsp;&nbsp; 血液透析中心处方笺</div>
+          <div class="printTitle">血液透析中心处方笺</div>
           <div class="infoTitle">
               <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
               <p>性别：
@@ -69,8 +69,8 @@ export default {
         prescriptionInfo:[],
         hisPatient:{},
         department:[],
-        prescriptions:[],
-        orgname:""
+        prescriptions:[]
+
       }
     },
    methods:{
@@ -150,6 +150,7 @@ export default {
        return name
      },
      getTotalOne(id) {
+        console.log("处方数据",this.prescriptions)
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -161,8 +162,8 @@ export default {
             }
           
             if (this.prescriptions[i].additionalcharge != null) {
-              for (let b = 0; b < this.prescriptions[i].additionalcharge.length; b++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[b].price * this.prescriptions[i].additionalcharge[b].count
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
               }
             }
               addtotal =  Math.floor(addtotal * 100) / 100
@@ -178,17 +179,15 @@ export default {
       this.getInitData()
       this.getPrescriptionPrint()
       this.getHisPatientDetail()
-      var xtuser = this.$store.getters.xt_user
-      this.orgname = xtuser.org.org_name
+
      
    },
-  //  watch:{
-  //    patient_id:function(val){
-  //      console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
-  //      this.getPrescriptionPrint()
-  //      this.getHisPatientDetail()
-  //    }
-  //  }
+   watch:{
+     ids:function(val){
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
+   }
 }
 </script>
 
@@ -199,7 +198,7 @@ export default {
     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
-    padding:20px 0px;
+    padding:20px 10px;
 }
 .printTitle{
     font-size: 22px;

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -1,9 +1,8 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+  <div>
        <template>
         <el-button
+          style="position:fixed;right:25px;z-index:999"
           :loading="loading"
           size="small"
           icon="el-icon-printer"
@@ -12,30 +11,10 @@
           >打印</el-button
         >
       </template>
-    </div>
-    <div class="app-container" style="min-height:0;">
-        <el-container class="newContainer">
-            <!-- <div style="width:270px;margin-right:20px;">
-                <div class="cell clearfix" style="margin-bottom:10px;">
-                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
-                </div>
-                <el-table ref="tab"   @current-change="changePatient" highlight-current-row :data="patientTableData" 
-                 height="480" border style="width: 100%">
-                    <el-table-column prop="date"  label="患者">   
-                      <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template> 
-                    </el-table-column>
-                    <el-table-column prop="name" label="就诊号">
-                        <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
-                    </el-table-column>
-                </el-table>
-            </div> -->
             
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px;margin：0 auto；width：960px;">
-              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-            </div>
-        </el-container>
-    </div>
+      <div class='dialysisPage' style="padding-top:40px;">
+        <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+      </div>
   </div>
 </template>
 
@@ -57,6 +36,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    paramsObj:Object
+  },
   data() {
     return {
       crumbs: [
@@ -71,7 +53,8 @@ export default {
       search_input:"",
       loading:false,
       patient_id:0,
-      prescription_id:0
+      prescription_id:0,
+      ids:''
     };
   },
   methods:{
@@ -126,9 +109,9 @@ export default {
                 cal_two = cal_two + 1
               }
             }
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            console.log(this.patientTableData[0])
-            this.choosePatient(this.patientTableData[0])
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            // console.log(this.patientTableData[0])
+            // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
             this.cal_two = cal_two   
          }
@@ -169,12 +152,29 @@ export default {
 
   created() {
     this.getAllDoctorList()
-    var record_date = this.$route.query.record
+    var record_date = this.paramsObj.record
     this.record_date = record_date
     console.log("record_date",record_date)
-    this.prescription_id = this.$route.query.prescription_id
+    this.prescription_id = this.paramsObj.prescription_id
+    this.patient_id = this.paramsObj.patient_id
+    this.ids = this.paramsObj.ids
     this.getAllHisPatientList(record_date)
   },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObj = val
+        this.patient_id = this.paramsObj.patient_id
+        var record_date = this.paramsObj.record
+        this.record_date = record_date
+        var prescription_id = this.paramsObj.prescription_id
+        this.prescription_id = prescription_id
+        this.ids = this.paramsObj.ids
+        
+      },
+      deep:true
+    }
+  }
 
 };
 </script>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -1,40 +1,39 @@
 <template>
-   <div>
+   <div id='prescriptionPrint'>
     <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
 
-        <div style="display:flex;justify-content: space-between;font-weight:bold;">
-            <p style="width:300px;display:flex;justify-content: space-between;font-weight:bold;">
+        <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
+            <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
                 <span>费别</span>
                 <span>自费</span>
                 <span>公费</span>
                 <span>保险</span>
                 <span>其他</span>
-            </p>
-            <p>就诊日期：{{getTime(item.ctime)}}</p>
+            </div>
+            <div>就诊日期：{{getTime(item.ctime,"{y}-{m}-{d}")}}</div>
         </div>
 
-        <div class="printTitle">{{orgname}} &nbsp;&nbsp; 血液透析中心处方、治疗单</div>
-
-        <!-- <div class="printTitle">处方、治疗单</div> -->
+        <div class="printTitle">{{orgname}}</div>
+        <div class="printTitle">血液透析中心处方、治疗单</div>
 
         <div class="infoTitle">
-            <p>门诊编号：</p>
-            <p>电脑号：</p>
+            <div>门诊编号：</div>
+            <div>电脑号：</div>
         </div>
 
         <div class="infoMain">
-            <p style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</p>
-            <p style="margin-bottom: 10px;width:25%">性别：
+            <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+            <div style="margin-bottom: 10px;width:25%">性别：
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
-            </p>
-            <p style="margin-bottom: 10px;width:25%">年龄：
+            </div>
+            <div style="margin-bottom: 10px;width:25%">年龄：
                 <span>{{item.patient.age}}</span>
-            </p>
-            <p style="margin-bottom: 10px;width:25%">参保类型：</p>
-            <p style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</p>
-            <p style="width:50%;">地址：{{item.patient.unit_address}}</p>
-            <p style="width:50%;">诊断：{{item.patient.diagnose}}</p>
+            </div>
+            <div style="margin-bottom: 10px;width:25%">参保类型：</div>
+            <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+            <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+            <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
         </div>
 
         <div class="prescriptionBox">
@@ -64,13 +63,13 @@
         </div>
 
         <div class="infoTitle">
-            <p>开单医生：{{item.doctor?item.doctor:""}}</p>
-            <p>签章：</p>
+            <div>开单医生：{{item.doctor?item.doctor:""}}</div>
+            <div>签章：</div>
         </div>
 
         <div class="actionBar">
-            <p>执行医生：{{item.doctor?item.doctor:""}}</p>
-            <p>费用：{{getTotalOne(item.id)?getTotalOne(item.id):''}}元</p>
+            <div>执行医生：{{item.doctor?item.doctor:""}}</div>
+            <div>费用：{{getTotalOne(item.id)?getTotalOne(item.id):''}}元</div>
         </div>
 
         <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
@@ -102,7 +101,7 @@
      </div>
 
 
-    <div id='prescriptionPrint'>
+    <!-- <div id='prescriptionPrint'>
 
         <div v-for="(item,index) in advicePrint" :key="index">
             <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
@@ -204,7 +203,7 @@
 
         </div>
 
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -214,7 +213,8 @@ export default {
     props:{
       patient_id:Number,
       record_date:String,
-      prescription_id:Number
+      prescription_id:Number,
+      ids:String
     },
     data(){
       return {
@@ -271,10 +271,10 @@ export default {
         //   patient_id:this.patient_id,
         //   record_date:this.record_date,
         //   prescription_id:this.prescription_id,
-          patient_id:this.$route.query.patient_id,
-          record_date:this.$route.query.record,
-          prescription_id:this.$route.query.prescription_id,
-          ids:this.$route.query.ids,
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids,
         }
         console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
@@ -342,6 +342,11 @@ export default {
      patient_id:function(val){
        console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
     //    this.getPrescriptionPrint()
+     },
+     ids:function(val){
+         this.ids = val
+         console.log('this.idsids',this.ids)
+         this.getPrescriptionPrint()
      }
    }
 }
@@ -349,6 +354,13 @@ export default {
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
 .prescription-print{
     font-size: 14px;
 }
@@ -356,6 +368,7 @@ export default {
     font-size: 18px;
     text-align: center;
     font-weight: bold;
+    margin-top: 10px;
 }
 .infoTitle{
     display: flex;

src/xt_pages/outpatientRegistration/index.vue

@@ -148,9 +148,9 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item>
+                    <!-- <el-form-item>
                         <el-checkbox v-model="form.costChecked">是否需要工本费</el-checkbox>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="挂号费：">
                         <el-input v-model.number="form.registrationFee"></el-input>
                     </el-form-item>
@@ -158,7 +158,7 @@
                         <el-input v-model.number="form.medicalExpenses"></el-input>
                     </el-form-item>
                     <el-form-item label="工本费：">
-                        <el-input v-model.number="form.cost" :readonly="!form.costChecked"></el-input>
+                        <el-input v-model.number="form.cost"></el-input>
                     </el-form-item>
                     <el-form-item label="合计：">
                         <el-input v-model.number="total" readonly></el-input>

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -93,6 +93,9 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="工本费" width="70">
                     <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
+                </el-table-column>
+                 <el-table-column align="center" prop="name" label="结算类型" width="70">
+                    <template slot-scope="scope">{{getBanlance(scope.row.balance_accounts_type) }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作人" width="70">
                     <template slot-scope="scope">{{creator}}</template>
@@ -184,10 +187,11 @@
                     <el-form-item label="科室："  prop="department" :validate-event="is_Name">
                       <div>{{ getDepartMent(form.departments) }}</div>
                     </el-form-item>
-                    <el-form-item label="是否需要工本费："> 
+                    <!-- <el-form-item label="是否需要工本费："> 
                       <div v-if="form.is_need_cost_of_production == 1">是</div>
                       <div v-else>否</div>
-                    </el-form-item>
+                    </el-form-item> -->
+                    
                     <el-form-item label="挂号费：">
                       <div>{{ form.register_cost }}</div>
                     </el-form-item>
@@ -303,29 +307,29 @@ export default {
               {value: 6,label:'职工'},
               {value: 7,label:'合同'}
             ],
-            medicalCare: [{
-              value: 1,
-              label: '职工基本医疗保险'
-              }, {
-              value: 2,
-              label: "公务员医疗补助"
-              },{
-              value: 3,
-              label: "大额医疗费用补助"
-              },{
-              value: 4,
-              label: "离休人员医疗"
-              },{
-              value: 5,
-              label: "城乡居民基本医疗保险"
-              },{
-              value: 6,
-              label: "城乡居民大病医疗保险"
-              },
-              {
-              value: 7,
-              label: "生育保险"
-            }],
+            // medicalCare: [{
+            //   value: 1,
+            //   label: '职工基本医疗保险'
+            //   }, {
+            //   value: 2,
+            //   label: "公务员医疗补助"
+            //   },{
+            //   value: 3,
+            //   label: "大额医疗费用补助"
+            //   },{
+            //   value: 4,
+            //   label: "离休人员医疗"
+            //   },{
+            //   value: 5,
+            //   label: "城乡居民基本医疗保险"
+            //   },{
+            //   value: 6,
+            //   label: "城乡居民大病医疗保险"
+            //   },
+            //   {
+            //   value: 7,
+            //   label: "生育保险"
+            // }],
             newRegister: [{
               value: 1,
               label: '普通'
@@ -580,7 +584,16 @@ export default {
         })
         return str
       },
-
+      
+      getBanlance(id){
+        var label = ""
+         for(let i=0;i<this.settlement.length;i++){
+            if(id == this.settlement[i].value){
+               label = this.settlement[i].label
+             }
+         }
+         return label
+      }
     }
 }
 </script>