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

@@ -105,6 +105,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/additionalCharges.vue

@@ -74,7 +74,7 @@ export default {
              patient_id:this.patientInfo.id,
              medicineData:this.chargeTable
            }
-           console.log("params",params)
+        //    console.log("params",params)
           saveCharges(params).then(response=>{
              if(response.data.state == 1){
                var additionalCharge =  response.data.data.additionalCharge

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="second">
                     <div style="display:flex;align-items: center;margin-bottom:10px;">
@@ -106,7 +106,7 @@
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>
@@ -119,6 +119,7 @@ export default {
     },
     data(){
         return{
+          submitLoading:false,
             visible:false,
             activeName:'first',
             form:{

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -47,7 +47,7 @@
         </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>
@@ -99,7 +99,8 @@
         case_history: {},
         patient_id: 0,
         diagnoses: [],
-        other_sick: []
+        other_sick: [],
+        info:{},
 
       }
     },
@@ -155,7 +156,6 @@
           'record_date': this.record_date,
           'patient_id': val.patients.id
         }
-        console.log("-------")
         getPatientInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -168,6 +168,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 = ''
@@ -203,6 +208,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,
@@ -212,20 +219,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)
               }
@@ -239,7 +271,7 @@
               this.prescriptions.push(obj)
             }
 
-            this.$refs.prescriptions.setData(this.prescriptions)
+            this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
         })
 

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>

src/xt_pages/outpatientRegistration/index.vue

@@ -6,7 +6,7 @@
         <div class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
-                <el-form class="basicForm"  :rules="rules" ref="form" :model="form" label-width="100px">
+                <el-form class="basicForm" :model="form" :rules="rules" ref="form"  label-width="100px">
                     <el-form-item label="结算类型：">
                         <el-select v-model="form.settlementValue" placeholder="请选择">
                             <el-option
@@ -64,13 +64,17 @@
                     </el-form-item>
                     <el-form-item label="证件号码：" required prop="idCard">
                         <el-input v-model="form.idCard"></el-input>
+                        <!-- <div class="el-form-item__error" v-show="show">
+                          请填写证件号码
+                        </div> -->
                     </el-form-item>
+   
                 </el-form>
             </div>
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" ref="form" :model="form" :rules="rules" label-width="100px">
-                    <el-form-item label="挂号类型：" required prop="register">
+                <el-form class="basicForm" :model="form" :rules="rules" label-width="100px">
+                    <el-form-item label="挂号类型："  prop="register">
                         <el-select v-model="form.register"  placeholder="请选择">
                             <el-option
                             v-for="item in register"
@@ -80,7 +84,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="医生：" required prop="doctor" >
+                    <el-form-item label="医生："  prop="doctor" >
                         <el-select v-model="form.doctor" placeholder="请选择">
                             <el-option
                             v-for="item in doctorList"
@@ -90,7 +94,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="科室：" required prop="department">
+                    <el-form-item label="科室："  prop="department">
                         <el-select v-model="form.department"  placeholder="请选择">
                             <el-option
                             v-for="item in departmentList"
@@ -244,14 +248,15 @@ export default {
             },
 
             rules: {
-              idCard: [{ required: true, message: '请填写证件号码', trigger: 'blur'  }],
+              idCard: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
               register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
               doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
               department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
            },
            doctorList:[],
            departmentList:[],
-           check:0
+           check:0,
+           show:false
         }
     },
     computed:{
@@ -355,37 +360,38 @@ export default {
              }
            })   
         },
-        saveHisPatient(formName){
-           
-            if(this.form.costChecked == true){
-               this.check = 1
-            }
-            if(this.form.costChecked == false){
-               this.check = 2
-            } 
-            var params = {
-              settlementValue:this.form.settlementValue,
-              medicalInsuranceCard:this.form.medicalInsuranceCard,
-              name:this.form.name,
-              sex:this.form.sex,
-              certificates:this.form.certificates, 
-              medicalCare:this.form.medicalCare,
-              birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
-              age:parseInt(this.form.age),
-              idCard:this.form.idCard,
-              register:this.form.register,
-              doctor:this.form.doctor,
-              department:this.form.department,
-              costChecked:this.check,
-              registrationFee:this.form.registrationFee,
-              medicalExpenses:this.form.medicalExpenses,
-              cost:this.form.cost,
-              total:this.total
-            }
-            console.log("params",params)
- 
+        saveHisPatient(formName){   
           this.$refs[formName].validate((valid)=>{
              if(valid){
+                  if(this.form.costChecked == true){
+                this.check = 1
+                }
+                if(this.form.costChecked == false){
+                this.check = 2
+                } 
+                if(this.form.idCard == ""){
+                   this.show = true
+                }
+                var params = {
+                    settlementValue:this.form.settlementValue,
+                    medicalInsuranceCard:this.form.medicalInsuranceCard,
+                    name:this.form.name,
+                    sex:this.form.sex,
+                    certificates:this.form.certificates, 
+                    medicalCare:this.form.medicalCare,
+                    birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
+                    age:parseInt(this.form.age),
+                    idCard:this.form.idCard,
+                    register:this.form.register,
+                    doctor:this.form.doctor,
+                    department:this.form.department,
+                    costChecked:this.check,
+                    registrationFee:this.form.registrationFee,
+                    medicalExpenses:this.form.medicalExpenses,
+                    cost:this.form.cost,
+                    total:this.total
+                }
+                console.log("params",params)
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
@@ -412,7 +418,8 @@ export default {
                 })
              } 
           })
-        }
+        },
+      
     },
     created(){
       //获取当前机构有人员信息
@@ -452,4 +459,13 @@ export default {
         width: 100%;
     }
 }
+    .el-form-item__error{
+        color: #F56C6C;
+        font-size: 12px;
+        line-height: 1;
+        padding-top: 4px;
+        position: absolute;
+        top: 100%;
+        left: 0;
+    }
 </style>