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

src/api/his/his.js

@@ -106,6 +106,32 @@ export function delHisProject(params) {
 }
 
 
+export function getHisOrderList() {
+  return request({
+    url: "/api/hisorder/list",
+    method: "get",
+  });
+}
+
+
+export function getHisOrder(params) {
+  return request({
+    url: "/api/hisorder/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
+export function getHisPrescriptionList() {
+  return request({
+    url: "/api/hisprescription/list",
+    method: "get",
+  });
+}
+
+
+
 
 
 

src/xt_pages/management/components/MultipleForm.vue

@@ -137,9 +137,7 @@
             align="center"
             type="index"
           >
-            <!-- <template slot-scope="scope">
-                {{ scope.row.id }}
-              </template>-->
+
           </el-table-column>
           <el-table-column prop="name" label="分区" width="60" align="center">
             <template slot-scope="scope">{{ scope.row.name }}</template>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -4,7 +4,7 @@
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" prop="name" label="名称">
-        <template slot-scope="scope">{{ scope.row.advice_name }}</template>
+        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
@@ -15,26 +15,13 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="用法">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.delivery_way" readonly placeholder="请选择">
-            <el-option
-              v-for="item,index in drugways"
-              :key="index"
-              :label="item.name"
-              :value="item.name">
-            </el-option>
-          </el-select>
+          <el-input v-model="scope.row.delivery_way" readonly></el-input>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="频率">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.execution_frequency" readonly placeholder="请选择">
-            <el-option
-              v-for="item in efs"
-              :key="index"
-              :label="item.name"
-              :value="item.name">
-            </el-option>
-          </el-select>
+          <el-input v-model="scope.row.execution_frequency" readonly></el-input>
         </template>
       </el-table-column>
 
@@ -42,13 +29,13 @@
         <template slot-scope="scope">
           <div style="display:flex;">
             <el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>
-            <div> {{scope.row.min_unit}}</div>
+            <div>{{scope.row.min_unit}}</div>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
@@ -62,49 +49,49 @@
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
 
       <el-table-column align="center" prop="project_name" label="名称">
-        <template slot-scope="scope">{{ scope.row.project.project_name }}</template>
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="50" label="组">
         <template slot-scope="scope">
-          {{getGroup(scope.row.project.statistical_classification)}}
+          {{getGroup(scope.row.statistical_classification)}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
-        <!--<template slot-scope="scope">-->
-          <!--&lt;!&ndash;<el-input v-model="scope.row.project.single_dose" placeholder="" readonly></el-input>&ndash;&gt;-->
-        <!--</template>-->
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="130" label="用法">
-        <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="scope.row.project.delivery_way" placeholder="" readonly></el-input>-->
-        <!--</template>-->
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
-        <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="scope.row.project.execution_frequency" placeholder="" readonly></el-input>-->
-        <!--</template>-->
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="130" label="天数">
-        <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="scope.row.project.number_days" placeholder="" readonly></el-input>-->
-        <!--</template>-->
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.project.total" style="width:50" placeholder="" readonly></el-input>
+            <el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.project.price" placeholder="" readonly></el-input>
+          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="120" label="备注">
-        <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="scope.row.project.remark" readonly></el-input>-->
-        <!--</template>-->
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" readonly></el-input>
+        </template>
       </el-table-column>
     </el-table>
   </div>
@@ -136,66 +123,11 @@
         } else {
           this.drugways = response.data.data.drugways
           this.efs = response.data.data.efs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         }
       })
     }, methods:  {
+
+
       getGroup(id){
         var name = ""
         var statistics_category =  getDictionaryDataConfig('system','statistics_category')

src/xt_pages/outpatientCharges/summary.vue

@@ -1,93 +1,126 @@
 <template>
-    <div class="main-contain outpatientChargesManagement">
-        <div class="position">
-            <bread-crumb :crumbs='crumbs'></bread-crumb>
-        </div>
-        <div class="app-container">
-            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-                <div>
-                    <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
-                    <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                    </el-select>
-                    <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-                    <el-radio v-model="radio" label="1">明细</el-radio>
-                    <el-radio v-model="radio" label="2">汇总</el-radio>
-                </div>
-                <el-button size="small" type="primary">报表下载</el-button>
-            </div>
-            <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                <el-table-column type="selection" width="55" align="center"></el-table-column>
-                <el-table-column align="center" prop="name" label="患者名字">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="处方号">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="创建时间">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="创建医生">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="项目名称">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="试管颜色">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="操作">
-                    <template slot-scope="scope">
-                        <el-button size="mini" type="primary" @click="toDetail">详情</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+  <div class="main-contain outpatientChargesManagement">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+        <div>
+          <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
+            搜索
+          </el-button>
+          <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+          <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date"
+                          @change="handleScheduleDateChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间"
+                          align="right"></el-date-picker>
+          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
+        <!--<el-button size="small" type="primary">报表下载</el-button>-->
+      </div>
+      <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column
+          prop="date"
+          label="序号"
+          width="60"
+          align="center"
+          type="index"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="门诊/销售编号">
+          <template slot-scope="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="患者名字">
+          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="患者类型">
+          <template slot-scope="scope">{{'医保'}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="应收金额">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="实收金额">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="舍入金额">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费员">
+          <template slot-scope="scope">{{ scope.row.p_info.doctor }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_status == 1">待结算</div>
+            <div v-if="scope.row.order_status == 2">已结算</div>
+            <div v-if="scope.row.order_status == 3">结算失败</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
+  </div>
 </template>
 
 
 <script>
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
-export default {
-    components:{
-        BreadCrumb,
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getHisOrderList } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    components: {
+      BreadCrumb
     },
-    data(){
-        return{
-            crumbs: [
-                { path: false, name: '门诊收费' },
-                { path: false, name: '项目消费明细汇总' }
-            ],
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }]
-        }
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊收费' },
+          { path: false, name: '项目消费明细汇总' }
+        ],
+        tableData: []
+      }
     },
-    methods:{
-        toDetail(){
-            this.$router.push('/outpatientCharges/summaryDetail')
+    methods: {
+      getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d}");
+      },
+      toDetail(row) {
+        this.$router.push('/outpatientCharges/summaryDetail?patient_id='+row.patient.id+"&number="+row.number)
+      }, getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
         }
+        return ''
+      }
+    }, created() {
+      getHisOrderList().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.tableData = response.data.data.order
+
+        }
+      })
+
     }
-}
+  }
 </script>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -7,80 +7,38 @@
             <div class="mainCenter">
                 <div class="centerLeft">
                     <div class="tabsBox">
-                        <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
-                        <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" :before-leave="moreState">
-                            <el-tab-pane
-                                v-for="(item, index) in editableTabs"
-                                :key="index"
-                                :label="item.title"
-                                :name="item.name"
-                            >
-                                <div class="RP">Rp</div>
-                                <el-table :data="tableData" border style="width: 99%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                                    <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-                                    <el-table-column align="center" prop="name" label="名称">
-                                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="50" label="组套">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="50" label="用法">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="50" label="频率">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="50" label="天数">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="100" label="总量">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="50" label="单价">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                    <el-table-column align="center" prop="name" width="50" label="备注">
-                                        <template slot-scope="scope">
-
-                                        </template>
-                                    </el-table-column>
-                                </el-table>
-                            </el-tab-pane>
-                        </el-tabs>
+                      <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
+                        <el-tab-pane
+                          v-for="(item, index) in prescriptions"
+                          :key="index"
+                          :label="item.name"
+                          :name="item.name"
+                        >
+                        </el-tab-pane>
+
+                        <div class="RP">
+                          Rp
+                        </div>
+                        <prescription-table ref="prescription_tables"
+                                            :prescription="curPrescriptions"></prescription-table>
+
+                      </el-tabs>
 
                     </div>
                     <div class="costBox">
-                        <span>处方编号：2134348971237883</span>
-                        <span>当前处方总费用：<span style="color:red;">0.00元</span></span>
-                        <span>已收费</span>
+                      <span>当前处方总费用：<span style="color:red;">{{ getTotal() }}元</span></span>
+                      <span>{{ state }}</span>
                     </div>
                 </div>
                 <div class="centerRight">
                     <p class="centerRightTitle">人员信息</p>
                     <ul class="basicUl">
-                        <li style="width:50%;">姓名：张三</li>
-                        <li style="width:50%;">性别：男</li>
-                        <li style="width:50%;">年龄：12</li>
-                        <li style="width:50%;">身高：123</li>
-                        <li style="width:50%;">体重：44kg</li>
-                        <li style="width:50%;">电话：348971237883</li>
+                        <li style="width:50%;">姓名：{{patientInfo.name}}</li>
+                        <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
+                        <li style="width:50%;">年龄：{{patientInfo.age }}</li>
+                        <li style="width:50%;">身高：{{patientInfo.height?patientInfo.height:''}}</li>
+                        <li style="width:50%;">体重：{{patientInfo.weight?patientInfo.weight:''}}</li>
+                        <li style="width:50%;">电话：{{patientInfo.phone}}</li>
                     </ul>
                     <p class="centerRightTitle">收费信息</p>
                     <ul class="basicUl">
@@ -104,9 +62,14 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getHisOrder } from '@/api/his/his'
+import prescriptionTable from './components/prescriptionTable'
+
 export default {
     components:{
         BreadCrumb,
+      prescriptionTable,
+
     },
     data(){
         return{
@@ -114,31 +77,154 @@ export default {
                 { path: false, name: '门诊收费' },
                 { path: false, name: '项目消费明细汇总详情' }
             ],
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }],
-            editableTabsValue: '1',
-            editableTabs: [{
+          info: {},
+          curPrescriptions: {},
+          prescriptions: [],
+          record_date: '',
+          tableData: [],
+          editableTabsValue: '1',
+          loadingone: false,
+          editableTabs: [{
             title: '处方1',
-            name: '1',
-            }],
-            tabIndex: 1,
+            name: '1'
+          }],
+          tabIndex: 1,
+          hisPatientInfo: {},
+          loadingtwo: false,
+          patientTableData: [{
+            name: '杨美英',
+            mdtrt_id: '1709946'
+          }],
+          patientInfo: { id: 0 },
+          doctor: {},
+          total: 0,
+          state: '未收费',
+          radio: 1,
+          radioStatus: 1,
+          search_input: '',
+        }
+    },created(){
+      this.GetOrderDetail()
+  },methods:{
+
+    tabclickEvent(val) {
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (this.prescriptions[i].name == val.name) {
+          this.curPrescriptions = {}
+          var temp = this.deepClone(this.prescriptions[i])
+          this.curPrescriptions = temp
+        }
+      }
+    }, deepClone(source) {
+      if (!source && typeof source !== 'object') {
+        throw new Error('error arguments', 'shallowClone')
+      }
+      const targetObj = source.constructor === Array ? [] : {}
+      Object.keys(source).forEach((keys) => {
+        if (source[keys] && typeof source[keys] === 'object') {
+          targetObj[keys] = this.deepClone(source[keys])
+        } else {
+          targetObj[keys] = source[keys]
+        }
+      })
+      return targetObj
+    },
+    getTotal() {
+      var total = 0
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (this.prescriptions[i].advices != null) {
+          for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+            total = total + this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number
+          }
+        }
+        if (this.prescriptions[i].project != null) {
+          for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+            total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
+          }
+        }
+      }
+      return total
+    },
+    moreState(tab, event) {
+      if (tab == 'more') {
+        return false
+      }
+    },
+    GetOrderDetail(){
+      let params={
+        number:this.$route.query.number,
+        patient_id:this.$route.query.patient_id,
+      }
+      getHisOrder(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.patientInfo = response.data.data.order.patient
+          this.hisPatientInfo = response.data.data.order.his_patient
+          this.info = response.data.data.p_info
+          this.prescriptions = []
+          for (let i = 0; i < response.data.data.prescription.length; i++) {
+            var prescription = response.data.data.prescription[i]
+
+            let tempAdvice = []
+            let tempProject = []
+
+            for (let b = 0; b < prescription.advices.length; b++) {
+              let obj = {
+                advice_id: prescription.advices[b].id,
+                drug_name: prescription.advices[b].advice_name,
+                single_dose: prescription.advices[b].single_dose,
+                delivery_way: prescription.advices[b].delivery_way,
+                execution_frequency: prescription.advices[b].execution_frequency,
+                retail_price: prescription.advices[b].price.toString(),
+                remark: prescription.advices[b].remark,
+                prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                single_dose_unit: prescription.advices[b].single_dose_unit,
+                prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                min_unit: prescription.advices[b].single_dose_unit,
+                medical_insurance_number: prescription.advices[b].med_list_codg
+
+              }
+              tempAdvice.push(obj)
+            }
+
+            for (let b = 0; b < prescription.project.length; b++) {
+              console.log(prescription.project[b].project.project_name)
+              let obj = {
+                id: prescription.project[b].id,
+                project_id: prescription.project[b].project.id,
+                project_name: prescription.project[b].project.project_name,
+                statistical_classification: prescription.project[b].statistical_classification,
+                single_dose: prescription.project[b].single_dose,
+                delivery_way: prescription.project[b].delivery_way,
+                execution_frequency: prescription.project[b].execution_frequency,
+                number_days: prescription.project[b].day,
+                total: prescription.project[b].count.toString(),
+                price: prescription.project[b].price,
+                remark: prescription.project[b].remark,
+                medical_code: prescription.project[b].project.medical_code
+              }
+              tempProject.push(obj)
+            }
+            let index = i + 1
+            let obj = {
+              id: prescription.id,
+              name: '处方' + index,
+              advices: tempAdvice,
+              project: tempProject,
+              type: response.data.data.prescription[i].type
+            }
+            this.prescriptions.push(obj)
+            this.curPrescriptions = this.prescriptions[0]
+
+          }
+          // this.tableData = response.data.data.order
+
         }
+      })
     }
+  }
 }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1,13 +1,13 @@
 <template>
-  <div style="height: calc(100% - 36px);display: flex;flex-direction: column;">
-    <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
+  <div style="height: calc(100% - 36px);display: flex;flex-direction: column;margin-top: 36px;">
+    <!-- <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
         <el-button size="small" @click="open(2)" type="primary">打印</el-button>
         <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
         <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
       </div>
-    </div>
+    </div> -->
     <div class="backColor"></div>
     <div class="mainCenter">
       <div class="centerLeft">
@@ -18,16 +18,16 @@
           <el-form-item label="证件号: " prop="name">
             <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
           </el-form-item>
+          <!--<el-form-item label="挂号类型: " prop="name">-->
+            <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
+          <!--</el-form-item>-->
           <el-form-item label="挂号类型: " prop="name">
-            <el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="挂号类型: " prop="name">
-            <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="">
+            <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
               <el-option
-                v-for="(item,index) in doctors"
+                v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
                 :key="index"
-                :label="item.user_name"
-                :value="item.id">
+                :label="item.name"
+                :value="item.name">
               </el-option>
             </el-select>
           </el-form-item>
@@ -40,7 +40,7 @@
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
-          <el-form-item label="特殊病史: " prop="name">
+          <el-form-item label="过敏史及特殊病史: " prop="name">
             <el-autocomplete
               style="width:100%;"
               class="inline-input"
@@ -78,16 +78,16 @@
               v-for="(item,index) in doctors"
               :key="index"
               :label="item.user_name"
-              :value="item.id">
+              :value="item.user_name">
             </el-option>
           </el-select>
           <span>科室：</span>
           <el-select style="margin-right:5px;" v-model="departmentValue" placeholder="">
             <el-option
-              v-for="(item,index) in departMent"
+              v-for="(item,index) in getDictionaryDataConfig('system','department')"
               :key="index"
               :label="item.name"
-              :value="item.id">
+              :value="item.name">
             </el-option>
           </el-select>
           <span>总计：</span>
@@ -100,20 +100,24 @@
           <p :class="rightTab == 2 ? 'activeP' : ''" @click="clickTab(2)">项目</p>
         </div>
         <template>
-          <!--<div style="margin-top:5px;">-->
-          <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
-          <!--<el-select style="float: right;width: 49%;" v-model="value" placeholder="">-->
-          <!--<el-option-->
-          <!--v-for="item in options"-->
-          <!--:key="item.value"-->
-          <!--:label="item.label"-->
-          <!--:value="item.value">-->
-          <!--</el-option>-->
-          <!--</el-select>-->
-          <!--</div>-->
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
+                <div style="margin-bottom:5px;">
+                  <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                  <el-select style="margin-right:5px;width:100px;" v-model="value" placeholder="" @change="changeKind">
+                    <el-option
+                      label="全部"
+                      value="0">
+                    </el-option>
+                    <el-option
+                      v-for="(item,index) in getDictionaryDataConfig('system','drug_type')"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
                 <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableData"
@@ -133,6 +137,17 @@
 
               </el-tab-pane>
               <el-tab-pane label="医嘱模板" name="2">
+                <div style="margin-bottom:5px;">
+                  <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                  <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
+                      <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                      </el-option>
+                  </el-select>
+                </div>
                 <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;"
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -190,7 +205,7 @@
           </div>
 
           <div class="comfirmBox">
-            <div>
+            <!-- <div>
               <span>药品类型：</span>
               <el-select style="margin-right:5px;width:100px;" v-model="value" placeholder="" @change="changeKind">
                 <el-option
@@ -204,7 +219,7 @@
                   :value="item.id">
                 </el-option>
               </el-select>
-            </div>
+            </div> -->
             <el-button type="primary" size="small" @click="comfirm">确定添加</el-button>
           </div>
         </template>
@@ -222,13 +237,16 @@
     createHisPrescription,
     delHisPrescription,
     getInitData,
+    getPatientInfo,
+    getSchedulePatientList,
+
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
   import selectTemplate from './selectTemplate'
   import saveTemplate from './saveTemplate'
   import additionalCharges from './additionalCharges'
-  import { getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
+  import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
 
   export default {
     props: {
@@ -236,6 +254,7 @@
       hisPatientInfo: Object,
       prescriptions: Array,
       record_date: String,
+
       other_sick: {
         type: Array,
         default: []
@@ -253,6 +272,7 @@
     },
     data() {
       return {
+        register_type:"",
         value: '',
         form: {
           name: ''
@@ -301,16 +321,16 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].advices != null) {
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-              total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+              total = total + this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number
             }
           }
           if (this.prescriptions[i].project != null) {
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
-              total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].count
+              total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
             }
           }
         }
-        return total
+        return Math.floor(total * 100) / 100
       },
       createFilter(queryString) {
         return (restaurant) => {
@@ -365,7 +385,7 @@
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
-            this.departMent = response.data.data.department
+
 
           }
         })
@@ -376,35 +396,81 @@
           console.log(this.prescriptions[i].name)
           if (this.prescriptions[i].name == val.name) {
             this.curPrescriptions = this.prescriptions[i]
+            this.teamList = []
+            this.curDrugs = []
+            this.$refs.multipleTable.clearSelection()
+            this.$refs.tables.clearSelection()
 
             //用来区分处方属于项目还是药品
             if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
               this.customTabIndex = 1
               this.curStatus = 1
+              this.rightTab = 1
+              this.showOne = true
+              this.showTwo = false
             }
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
 
               this.customTabIndex = 2
               this.curStatus = 2
+              this.rightTab = 2
+
+              this.showTwo = true
+              this.showOne = false
             }
 
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
               this.customTabIndex = this.rightTab
+              this.curStatus = 0
+
             }
 
           }
 
         }
-      }, clearData() {
-
+      },
+      clearData() {
+        console.log("111111")
         this.curPrescriptions = []
+        this.curStatus = 0
+        this.curDrugs = []
+        this.preDrugs = []
+        this.teamList = []
+
+
       },
-      setData(data) {
+      setData(data,info) {
+        this.curStatus = 0
         this.prescriptions = data
-        console.log(this.$refs)
-        this.$nextTick(() => {
-          this.$refs.prescription_tables.setNewData(this.prescriptions[0])
-        })
+        this.curPrescriptions = this.prescriptions[0]
+        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0 ){
+          this.curStatus = 1
+          this.customTabIndex= 1
+          this.rightTab = 1
+          this.showOne = true
+          this.showTwo = false
+
+        }
+
+        if(this.curPrescriptions.project.length > 0 && this.curPrescriptions.advices.length == 0 ){
+          this.curStatus = 2
+          this.customTabIndex= 2
+          this.rightTab = 2
+          this.showOne = false
+          this.showTwo = true
+        }
+
+
+        this.state1 = info.diagnosis
+        this.state2 = info.sick_history
+        this.doctorValue = info.doctor
+        this.departmentValue = info.departments
+
+
+        // console.log(this.$refs)
+        // this.$nextTick(() => {
+        //   this.$refs.prescription_tables.setNewData(this.prescriptions[0])
+        // })
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -412,13 +478,23 @@
         }
       },
       open(index) {
+        if(this.doctorValue.length <= 0){
+          this.$message.error("医生不能为空")
+          return
+        }
+
+        if(this.departmentValue.length <= 0){
+          this.$message.error("科室不能为空")
+          return
+        }
+
         if (index == 1) {
           let params = {
             patient_id: this.patientInfo.id,
             diagnose: this.state1,
             sick_history: this.state2,
             doctor: this.doctorValue,
-            department: this.departmentValue,
+               department: this.departmentValue,
             record_date: this.record_date,
             his_patient_id: this.hisPatientInfo.id
           }
@@ -436,13 +512,18 @@
               this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
 
             }
+
+            for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+              this.prescriptions[i].project[b].price = parseFloat(this.prescriptions[i].project[b].price)
+
+            }
           }
           let data = {
             'prescriptions': this.prescriptions
           }
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
-              this.prescriptions = []
+              // this.prescriptions = []
               this.$message.success('保存成功')
             }
           })
@@ -470,60 +551,121 @@
         this.curStatus = 0
       },
       removeTab(targetName) {
-        let id = 0
-        for (let i = 0; i < this.prescriptions.length; i++) {
-          if (this.prescriptions[i].name == targetName) {
-            id = this.prescriptions[i].id
+        this.$confirm("处方删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          let id = 0
+          for (let i = 0; i < this.prescriptions.length; i++) {
+            if (this.prescriptions[i].name == targetName) {
+              id = this.prescriptions[i].id
+            }
           }
-        }
-
-        if (id == 0) {
-          let tabs = this.prescriptions
-          let activeName = this.editableTabsValue
-          if (activeName === targetName) {
-            tabs.forEach((tab, index) => {
-              if (tab.name === targetName) {
-                let nextTab = tabs[index + 1] || tabs[index - 1]
-                if (nextTab) {
-                  activeName = nextTab.name
 
+          if (id == 0) {
+            let tabs = this.prescriptions
+            let activeName = this.editableTabsValue
+            if (activeName === targetName) {
+              tabs.forEach((tab, index) => {
+                if (tab.name === targetName) {
+                  let nextTab = tabs[index + 1] || tabs[index - 1]
+                  if (nextTab) {
+                    activeName = nextTab.name
+
+                  }
+                }
+              })
+            }
+            this.editableTabsValue = activeName
+            this.prescriptions = tabs.filter(tab => tab.name !== targetName)
+
+            for (let i = 0; i < this.prescriptions.length; i++) {
+              if (activeName == this.prescriptions[i].name) {
+                this.curPrescriptions = this.prescriptions[i]
+                if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+                  this.curStatus = 1
+                }
+                if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
+                  this.curStatus = 2
                 }
               }
-            })
+            }
+            if (this.prescriptions.length == 0) {
+              this.curPrescriptions = []
+              this.curStatus = 0
+            }
           }
-          this.editableTabsValue = activeName
-          this.prescriptions = tabs.filter(tab => tab.name !== targetName)
-
-          for (let i = 0; i < this.prescriptions.length; i++) {
-            if (activeName == this.prescriptions[i].name) {
-              this.curPrescriptions = this.prescriptions[i]
-              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
-                this.curStatus = 1
-              }
-              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
-                this.curStatus = 2
-              }
+          else {
+            let params = {
+              'id': id
             }
+            delHisPrescription(params).then(response => {
+              if (response.data.state == 1) {
+                this.$message.success('删除成功')
+                let tabs = this.prescriptions
+                let activeName = this.editableTabsValue
+                if (activeName === targetName) {
+                  tabs.forEach((tab, index) => {
+                    if (tab.name === targetName) {
+                      let nextTab = tabs[index + 1] || tabs[index - 1]
+                      if (nextTab) {
+                        activeName = nextTab.name
+
+                      }
+                    }
+                  })
+                }
+                this.editableTabsValue = activeName
+                this.prescriptions = tabs.filter(tab => tab.name !== targetName)
+
+                for (let i = 0; i < this.prescriptions.length; i++) {
+                  if (activeName == this.prescriptions[i].name) {
+                    this.curPrescriptions = this.prescriptions[i]
+                    if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+                      this.curStatus = 1
+                    }
+                    if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
+                      this.curStatus = 2
+                    }
+                  }
+                }
+                if (this.prescriptions.length == 0) {
+                  this.curPrescriptions = []
+                  this.curStatus = 0
+                }
+              } else {
+                this.$message.success(response.data.msg)
+              }
+            })
           }
-          if (this.prescriptions.length == 0) {
-            this.curPrescriptions = []
-            this.curStatus = 0
+
+        })
+          .catch(() => {});
+
+
+
+      },
+      clickTab(index) {
+        if (index == 1){
+          if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
+            this.$message.error("当前处方为项目，无法切换为药品，需要新开处方")
+            return
           }
-        } else {
-          let params = {
-            'id': id
+        }else{
+          if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+            this.$message.error("当前处方为药品，无法切换为项目，需要新开处方")
+            return
           }
-          delHisPrescription(params).then(response => {
-            if (response.data.state == 1) {
-              this.$message.success('删除成功')
-            } else {
-              this.$message.success(response.data.msg)
-            }
-          })
+
+
         }
-      },
-      clickTab(index) {
+
         if (index == 1) {
+
+            this.teamList = []
+          this.$refs.tables.clearSelection()
+
           this.showOne = true
           this.showTwo = false
           this.$nextTick(() => {
@@ -532,6 +674,9 @@
           this.customTabIndex = 1
         }
         if (index == 2) {
+          this.curDrugs = []
+          this.$refs.multipleTable.clearSelection()
+
           this.showTwo = true
           this.showOne = false
           this.$nextTick(() => {
@@ -543,17 +688,22 @@
 
         //用来区分处方属于项目还是药品
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
-
           this.customTabIndex = 1
+          this.curStatus =1
+
         }
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
-
           this.customTabIndex = 2
+          this.curStatus =2
         }
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           // this.customTabIndex = this.rightTab
           this.customTabIndex = index
+          this.curStatus =0
+
         }
+
+
       }, changeAllGoodInfoTableData: function(selection) {
         this.curDrugs = selection
       }, addCharges() {
@@ -563,10 +713,6 @@
         this.curDrugs = selection
       },
       comfirm() {
-        console.log(this.curStatus)
-        console.log(this.rightTab)
-        console.log(this.curPrescriptions)
-
 
         if (this.curStatus == 1  && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')
@@ -582,15 +728,44 @@
           return
         }
 
+        for (let i = 0; i < this.teamList.length; i++){
+          for (let a = 0; a < this.curPrescriptions.project.length; a++){
+            if(this.teamList[i].id == this.curPrescriptions.project[a].project_id){
+              this.$message.error('改处方存在相同的项目，无法添加相同的项目')
+              return
+
+            }
+          }
+        }
+
+        console.log(this.curDrugs)
+        console.log(this.curPrescriptions.advices)
+
+
+        for (let i = 0; i < this.curDrugs.length; i++){
+          for (let a = 0; a < this.curPrescriptions.advices.length; a++){
+            if(this.curDrugs[i].id == this.curPrescriptions.advices[i].id){
+              this.$message.error('改处方存在相同的药品，无法添加相同的药品')
+              return
+
+            }
+          }
+        }
+
+
+
+
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
             var temp2 = this.deepClone(this.teamList)
 
+            console.log(temp2)
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
                 let obj = {
                   advice_id: 0,
+                  id:  temp[b].id,
                   drug_name: temp[b].drug_name,
                   single_dose: temp[b].single_dose,
                   delivery_way: temp[b].delivery_way,
@@ -600,7 +775,8 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].min_unit,
-                  min_unit: temp[b].min_unit
+                  min_unit: temp[b].min_unit,
+                  medical_insurance_number:temp[b].medical_insurance_number,
 
                 }
                 this.prescriptions[i].advices.push(obj)
@@ -610,10 +786,26 @@
 
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
-                this.prescriptions[i].project.push(temp2[b])
+                let obj = {
+                  id: 0,
+                  project_id: temp2[b].id,
+                  project_name: temp2[b].project_name,
+                  statistical_classification: temp2[b].statistical_classification,
+                  single_dose: temp2[b].single_dose,
+                  delivery_way: temp2[b].delivery_way,
+                  execution_frequency: temp2[b].execution_frequency,
+                  number_days: temp2[b].number_days,
+                  total:temp2[b].total,
+                  price:temp2[b].price,
+                  remark:"",
+                  medical_code:temp2[b].medical_code,
+                }
+                console.log(obj)
+                this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
             }
+
             this.curPrescriptions = this.prescriptions[i]
             this.$refs.multipleTable.clearSelection()
             this.$refs.tables.clearSelection()

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -1,13 +1,13 @@
 <template>
-  <div class="deskRecord">
-    <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
+  <div class="deskRecord" style="margin-top:36px;">
+    <!-- <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
         <el-button size="small" @click="open(2)" type="primary">打印</el-button>
         <el-button size="small" @click="open(3)" type="primary">病历调用</el-button>
         <el-button size="small" @click="open(4)" type="primary">存模板</el-button>
       </div>
-    </div>
+    </div> -->
     <div class="backColor"></div>
     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -51,7 +51,7 @@
                                 <el-button type="primary" size="mini" @click="toHistoryDetail">详情</el-button>
                             </template>
                         </el-table-column>
-                    </el-table> 
+                    </el-table>
                 </el-tab-pane> -->
                 <el-tab-pane label="病历模板" name="first">
                     <div style="display:flex;align-items: center;margin-bottom:10px;">
@@ -108,7 +108,7 @@
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary"  @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>
@@ -168,7 +168,7 @@ export default {
             const params = {
                keyword:this.search_input,
                start_time:this.start_time,
-               end_time:this.end_time  
+               end_time:this.end_time
             }
           getHistoryTemplate(params).then(response=>{
             if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -2,17 +2,17 @@
   <div class="prescriptionTable">
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" prop="name" label="名称">
+      <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="50" :label="'单次\n用量'">
         <template slot-scope="scope">
           <el-input  v-model="scope.row.single_dose"></el-input>
           <div> {{scope.row.min_unit}}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="用法">
+      <el-table-column align="center" prop="delivery_way" width="50" label="用法">
         <template slot-scope="scope">
           <el-select v-model="scope.row.delivery_way" placeholder="请选择">
             <el-option
@@ -24,7 +24,7 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="50" label="频率">
         <template slot-scope="scope">
           <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
             <el-option
@@ -37,7 +37,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="100" label="总量">
+      <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
             <el-input v-model="scope.row.prescribing_number" style="width:50%" placeholder=""></el-input>
@@ -45,12 +45,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="retail_price" width="50" label="单价">
         <template slot-scope="scope">
           <el-input v-model="scope.row.retail_price" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="备注">
+      <el-table-column align="center" prop="remark" width="50" label="备注">
         <template slot-scope="scope">
           <el-input v-model="scope.row.remark" style="width:50%" placeholder=""></el-input>
         </template>
@@ -196,29 +196,43 @@
         })
 
       },deleteDrug:function(index, row){
-        console.log(row)
-       console.log(index)
 
-       if(row.advice_id == 0){
-          this.prescription.advices.splice(index, 1)
-        }else{
-          let params = {
-            'id': row.advice_id,
-          }
-          delHisAdvice(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
-            } else {
-              var temp2 = this.deepClone(this.prescription.advices)
-              temp2.splice(index, 1)
-              this.prescription.advices = temp2
-              this.$message.success(response.data.data.msg)
-            }
-          })
+       this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
+         confirmButtonText: "确 定",
+         cancelButtonText: "取 消",
+         type: "warning"
+       }).then(() => {
+         this.$nextTick(function(){
+           // this.prescription.advices.splice(index, 1)
+           if(row.advice_id == 0){
+           }else{
+             let params = {
+               'id': row.advice_id,
+             }
+             delHisAdvice(params).then(response => {
+               if (response.data.state == 0) {
+                 this.$message.error(response.data.msg)
+                 return false
+               } else {
+                 var temp2 = this.deepClone(this.prescription.advices)
+                 temp2.splice(index, 1)
+                 this.prescription.advices = temp2
+                 this.$message.success(response.data.data.msg)
+               }
+             })
+
+
+           }
+
+         });
+
+
+       })
+         .catch(() => {});
+
+
 
 
-        }
 
       },deepClone(source) {
        if (!source && typeof source !== 'object') {
@@ -255,29 +269,34 @@
          return name
       },
       deleteProject(row){
-        if(row.id == 0){
-          this.prescription.project.splice(i, 1)
+        this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          if(row.id == 0){
+            this.prescription.project.splice(i, 1)
 
-        }else{
-          let params = {
-            'id': row.id,
-          }
-          delHisProject(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
-            } else {
-              for (let i = 0; i < this.prescription.project.length; i++){
-                if(this.prescription.project[i].id == row.id){
-                  this.prescription.project.splice(i, 1)
+          }else{
+            let params = {
+              'id': row.id,
+            }
+            delHisProject(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                for (let i = 0; i < this.prescription.project.length; i++){
+                  if(this.prescription.project[i].id == row.id){
+                    this.prescription.project.splice(i, 1)
+                  }
                 }
+                this.$message.success(response.data.data.msg)
               }
-              this.$message.error(response.data.data.msg)
-            }
-          })
-
-
-        }
+            })
+          }
+        })
+          .catch(() => {});
 
       },
     },mounted(){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -22,8 +22,8 @@
             搜索
           </el-button>
         </div>
-        <div style="flex:1;overflow-y:auto;">
-          <el-table :data="patientTableData" @row-click='choosePatient' border style="width: 100%;"
+        <div>
+          <el-table :data="patientTableData" :height="tableHeight" @row-click='choosePatient' border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row
@@ -40,14 +40,26 @@
       </div>
       <div class="mainRight">
         <div class="mainHeader">
-          <el-radio-group v-model="titleType" @change="changeTab">
+          <el-radio-group class="titleBox" v-model="titleType" @change="changeTab">
             <el-radio-button label="处方"></el-radio-button>
             <el-radio-button label="病历"></el-radio-button>
           </el-radio-group>
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '处方'">
+            <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+            <el-button size="small" @click="open(2)" type="primary">打印</el-button>
+            <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
+            <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
+          </div>
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '病历'">
+            <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+            <el-button size="small" @click="open(2)" type="primary">打印</el-button>
+            <el-button size="small" @click="open(3)" type="primary">病历调用</el-button>
+            <el-button size="small" @click="open(4)" type="primary">存模板</el-button>
+          </div>
         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-        <desk-prescription :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
+        <desk-prescription  :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            :hisPatientInfo="hisPatientInfo"
                            v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
@@ -76,6 +88,8 @@
     },
     data() {
       return {
+        tableHeight:'',
+        fullHeight: document.documentElement.clientHeight,
         prescriptions: [
           {
             name: '处方1',
@@ -99,7 +113,8 @@
         case_history: {},
         patient_id: 0,
         diagnoses: [],
-        other_sick: []
+        other_sick: [],
+        info:{},
 
       }
     },
@@ -167,6 +182,11 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
+
+            this.info = response.data.data.info
+
+
+
             this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
             if (this.case_history.temperature <= 0) {
               this.case_history.temperature = ''
@@ -202,6 +222,8 @@
               for (let i = 0; i < response.data.data.prescription.length; i++) {
                 var prescription = response.data.data.prescription[i]
                 let tempAdvice = []
+                let tempProject = []
+
                 for (let b = 0; b < prescription.advices.length; b++) {
                   let obj = {
                     advice_id: prescription.advices[b].id,
@@ -211,20 +233,45 @@
                     execution_frequency: prescription.advices[b].execution_frequency,
                     retail_price: prescription.advices[b].price.toString(),
                     remark: prescription.advices[b].remark,
-                    prescribing_number:prescription.advices[b].prescribing_number,
+                    prescribing_number:prescription.advices[b].prescribing_number.toString(),
                     single_dose_unit:prescription.advices[b].single_dose_unit,
                     prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
-                    min_unit:prescription.advices[b].single_dose_unit
-
+                    min_unit:prescription.advices[b].single_dose_unit,
+                    medical_insurance_number:prescription.advices[b].med_list_codg,
+                    id:prescription.advices[b].drug_id
                   }
                   tempAdvice.push(obj)
                 }
+
+
+                for (let b = 0; b < prescription.project.length; b++) {
+                  console.log(prescription.project[b])
+                  console.log(prescription.project[b].project)
+                  let obj = {
+                    id: prescription.project[b].id,
+                    project_id: prescription.project[b].project.id,
+                    project_name: prescription.project[b].project.project_name,
+                    statistical_classification: prescription.project[b].project.statistical_classification,
+                    single_dose: prescription.project[b].single_dose,
+                    delivery_way: prescription.project[b].delivery_way,
+                    execution_frequency: prescription.project[b].execution_frequency,
+                    number_days: prescription.project[b].day,
+                    total:prescription.project[b].count.toString(),
+                    price:prescription.project[b].price,
+                    remark:prescription.project[b].remark,
+                    medical_code:prescription.project[b].project.medical_code,
+                  }
+                  tempProject.push(obj)
+                }
+
+
+
                 let index = i + 1
                 let obj = {
                   id: prescription.id,
                   name: '处方' + index,
                   advices: tempAdvice,
-                  project: prescription.project
+                  project: tempProject
                 }
                 this.prescriptions.push(obj)
               }
@@ -238,7 +285,7 @@
               this.prescriptions.push(obj)
             }
 
-            this.$refs.prescriptions.setData(this.prescriptions)
+            this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
         })
 
@@ -274,8 +321,33 @@
       this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
       this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
 
+      console.log('1222232434234',document.documentElement.clientHeight)
+      let tableHeight = document.body.clientHeight - 263
+      this.tableHeight = tableHeight
 
-
+    },
+    mounted(){
+      const that = this
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight
+          that.fullHeight = window.fullHeight
+        })()
+      }
+    },
+    watch: {
+      fullHeight (val) {
+        if(!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 263
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
+          setTimeout(function (){
+            that.timer = false
+          },400)
+        }
+      }
     }
   }
 </script>
@@ -427,6 +499,24 @@
     align-items: center;
     justify-content: space-between;
   }
+  .mainHeader{
+    width:100%;
+    background: #fff;
+    position: fixed;
+    z-index: 100;
+    height: 36px;
+  }
+  .titleBox{
+    position: fixed;
+    z-index: 99;
+    background: #fff;
+  }
+  .fixedCell{
+    position: fixed;
+    z-index: 99;
+    right: 30px;
+    background: #fff;
+  }
 </style>
 
 <style lang="scss">

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -1,100 +1,121 @@
 <template>
-    <div class="main-contain">
-        <div class="position">
-            <bread-crumb :crumbs='crumbs'></bread-crumb>
-        </div>
-        <div class="app-container">
-            <div class="cell clearfix">
-                <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
-                <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-            </div>
-            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                <el-table-column align="center" width="60" label="序号">
-                    <template slot-scope="scope">
-                        1
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="姓名" width="100">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="处方日期" width="110">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="患者类型">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="处方号">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="开立医生">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="诊断">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="状态">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="操作" width="100">
-                    <template slot-scope="scope">
-                        <el-button size="mini" type="primary" @click="handerDelete">详情</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :page-sizes="[10, 50, 100]"
-                :page-size="10"
-                background
-                style="margin-top:20px;float: right"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="total"
-            >
-            </el-pagination>
-            <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
-        </div>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                  class="filter-item"/>
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索
+        </el-button>
+        <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
+                        :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
+                        placeholder="选择日期时间" align="right"></el-date-picker>
+      </div>
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column align="center" width="60" label="序号">
+          <template slot-scope="scope">
+            1
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="姓名" width="100">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="处方日期" width="110">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="患者类型">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="处方号">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="开立医生">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="诊断">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="状态">
+          <template slot-scope="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="handerDelete">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+      <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
+    </div>
+  </div>
 </template>
 
 <script>
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import inquiriesDetail from './components/inquiriesDetail'
-export default {
-    components:{
-        BreadCrumb,
-        inquiriesDetail
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import inquiriesDetail from './components/inquiriesDetail'
+  import { getHisPrescriptionList } from '@/api/his/his'
+
+  export default {
+    components: {
+      BreadCrumb,
+      inquiriesDetail
     },
-    data(){
-        return{
-            crumbs: [
-                { path: false, name: '门诊医生站' },
-                { path: false, name: '既往查询' }
-            ],
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }]
-        }
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊医生站' },
+          { path: false, name: '既往查询' }
+        ],
+        tableData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }]
+      }
     },
-    methods:{
-        handerDelete(){
-            this.$refs.inquiriesDetail.show()
-        }
+    methods: {
+      handerDelete() {
+        this.$refs.inquiriesDetail.show()
+      }, getHisPrescriptionList() {
+        getHisPrescriptionList().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+          }
+        })
+
+      }
+    }, created() {
+
+      this.getHisPrescriptionList()
+
     }
-}
+  }
 </script>