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

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -907,9 +907,19 @@ export default {
           switch (this.radio) {
             case 1:
               this.patientTableData = response.data.data.list
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
+              if (this.hisPatientInfo.id > 0){
+                for (let i = 0; i < this.patientTableData.length; i++) {
+                  if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
+                    this.current_index = i
+                    this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                    this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
 
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.patientTableData[0])
+                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].id)
+              }
               break
             case 2:
               this.patientTableData = response.data.data.list_two

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -106,12 +106,12 @@
 <!--            </el-button>-->
 
 
-            <el-button v-loading="loadingtwo"
-                       v-if="(( this.activeName != 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0))"
-                       size="small"
-                       @click="open(8)"
-                       type="primary">上传费用明细
-            </el-button>
+<!--            <el-button v-loading="loadingtwo"-->
+<!--                       v-if="(( this.activeName != 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0))"-->
+<!--                       size="small"-->
+<!--                       @click="open(8)"-->
+<!--                       type="primary">上传费用明细-->
+<!--            </el-button>-->
 
             <!--<el-button size="small" @click="open(1)" type="primary">打印</el-button>-->
             <el-button v-loading="loadingone" size="small"
@@ -152,12 +152,12 @@
             >结算单
             </el-button>
 
-            <el-button
-                v-if="( this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+<!--            <el-button-->
+<!--                v-if="( this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"-->
 
-                size="small" @click="open(9)" type="primary"
-            >撤销明细
-            </el-button>
+<!--                size="small" @click="open(9)" type="primary"-->
+<!--            >撤销明细-->
+<!--            </el-button>-->
 
             <!--                        <el-button-->
             <!--                                v-if="(this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"-->
@@ -189,180 +189,180 @@
 
         <div class="mainCenter" v-loading="loading">
           <el-tabs class="settlementTabs" v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="日结" name="first">
-              <div style="display:flex;height:100%;">
-                <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="border-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-->
-                      <!--<el-date-picker-->
-                      <!--v-model="record_date"-->
-                      <!--type="date"-->
-                      <!--:clearable="false"-->
-                      <!--@change="changeDate"-->
-                      <!--format="yyyy-MM-dd"-->
-                      <!--value-format="yyyy-MM-dd"-->
-                      <!--placeholder="选择日期">-->
-                      <!--</el-date-picker>-->
-                      <!--</div>-->
-                      <!--<charge-prescription-table ref="prescription_tables"-->
-                      <!--:prescription="curPrescriptions"></charge-prescription-table>-->
-                      <!--<charge-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></charge-prescription-table>-->
-                      <charge-prescription-table ref="prescription_tables"
-                                                 :manufacturers="manufacturers"
-                                                 :prescription="curPrescriptions"></charge-prescription-table>
-
-                    </el-tabs>
-
-                  </div>
-                  <div class="costBox">
-                    <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
-                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>
-                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>
-                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>
-                  </div>
-                </div>
-                <div class="centerRight">
-                  <p class="centerRightTitle">人员信息</p>
-                  <div style="display:flex;justify-content: space-between;line-height:30px;">
-                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
-                    <span style="font-size:14px;">日期:{{ record_date }}</span>
-                  </div>
-                  <ul class="basicUl">
-                    <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.phone }}</li>
-
-                    <!--<span>过敏病史:</span>-->
-                    <!--<el-autocomplete-->
-                    <!--style="width:100%;"-->
-                    <!--class="inline-input"-->
-                    <!--v-model="sick_history"-->
-                    <!--:fetch-suggestions="querySearch2"-->
-                    <!--placeholder="请输入内容"-->
-                    <!--&gt;</el-autocomplete>-->
-                    <!--<li style="width:100%;">地址：{{patientInfo.home_address}}</li>-->
-                    <!--<li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>-->
-                  </ul>
-                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
-                  <div style="display:flex;justify-content: space-between;line-height:30px;">
-                    <span style="font-size:14px;">住院编号:{{ hisPatientInfo.number }}</span>
-                  </div>
-                  <ul class="basicUl">
-                    <li style="width:50%;">医生：{{ info.doctor }}</li>
-                    <li style="width:50%;">科室：{{ info.departments }}</li>
-                    <li style="width:100%;">总费用：{{ getTotal() }}</li>
-
-                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
-                    <li style="width:100%;">是否有传染病：</li>
-                    <li style="width:100%;">血压：</li>
-                  </ul>
-                </div>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="月结" name="second">
-              <div style="display:flex;height:100%;">
-                <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="border-card"
-                             @tab-click="tabclickEventTwo">
-
-                      <el-tab-pane
-                          v-for="(item, index) in month_prescriptions"
-                          :key="index"
-                          :label="item.name"
-                          :name="item.name">
-                      </el-tab-pane>
-
-                      <div class="RP">
-                        Rp
-                        <el-date-picker
-                            v-model="other_start_time"
-                            prefix-icon="el-icon-date"
-                            @change="changeTime"
-                            :editable="false"
-                            style="width: 150px;"
-                            type="date"
-                            :picker-options="pickerOptions"
-                            placeholder="选择开始时间"
-                            align="right"
-                            format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                        <span class>-</span>
-                        <el-date-picker
-                            v-model="other_end_time"
-                            prefix-icon="el-icon-date"
-                            @change="changeEndTime"
-                            :editable="false"
-                            style="width: 150px;"
-                            type="date"
-                            placeholder="选择结束时间"
-                            align="right"
-                            format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                      </div>
-                      <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
-                      <!--<month-prescription-table ref="prescription_tables"-->
-                      <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
-                      <charge-month-prescription-table
-                          :prescription="curMonthPrescriptions"></charge-month-prescription-table>
-
-                    </el-tabs>
-
-                  </div>
-                  <div class="costBox">
-                    <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>
-                    <!--<span>{{ state }}</span>-->
-                  </div>
-                </div>
-                <div class="centerRight">
-                  <p class="centerRightTitle">人员信息</p>
-                  <div style="display:flex;justify-content: space-between;line-height:30px;">
-                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
-                    <span style="font-size:14px;">日期:{{ record_date }}</span>
-                  </div>
-
-                  <ul class="basicUl">
-                    <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.phone }}</li>
-                    <li style="width:100%;">过敏史及其他病史：{{ info.sick_history }}</li>
-
-                  </ul>
-                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
-                  <div style="display:flex;justify-content: space-between;line-height:30px;">
-                    <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number }}</span>
-                  </div>
-                  <ul class="basicUl">
-                    <li style="width:50%;">医生：{{ info.doctor }}</li>
-                    <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>
-                    <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>
-                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}
-                    </li>
-
-                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
-                    <!--<li style="width:100%;">是否有传染病：</li>-->
-                    <!--<li style="width:100%;">血压：</li>-->
-                  </ul>
-                </div>
-              </div>
-            </el-tab-pane>
+<!--            <el-tab-pane label="日结" name="first">-->
+<!--              <div style="display:flex;height:100%;">-->
+<!--                <div class="centerLeft">-->
+<!--                  <div class="tabsBox">-->
+<!--                    &lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
+<!--                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"-->
+<!--                             @tab-click="tabclickEvent">-->
+<!--                      <el-tab-pane-->
+<!--                          v-for="(item, index) in prescriptions"-->
+<!--                          :key="index"-->
+<!--                          :label="item.name"-->
+<!--                          :name="item.name"-->
+<!--                      >-->
+<!--                      </el-tab-pane>-->
+
+<!--                      &lt;!&ndash;<div class="RP">&ndash;&gt;-->
+<!--                      &lt;!&ndash;Rp&ndash;&gt;-->
+<!--                      &lt;!&ndash;<el-date-picker&ndash;&gt;-->
+<!--                      &lt;!&ndash;v-model="record_date"&ndash;&gt;-->
+<!--                      &lt;!&ndash;type="date"&ndash;&gt;-->
+<!--                      &lt;!&ndash;:clearable="false"&ndash;&gt;-->
+<!--                      &lt;!&ndash;@change="changeDate"&ndash;&gt;-->
+<!--                      &lt;!&ndash;format="yyyy-MM-dd"&ndash;&gt;-->
+<!--                      &lt;!&ndash;value-format="yyyy-MM-dd"&ndash;&gt;-->
+<!--                      &lt;!&ndash;placeholder="选择日期">&ndash;&gt;-->
+<!--                      &lt;!&ndash;</el-date-picker>&ndash;&gt;-->
+<!--                      &lt;!&ndash;</div>&ndash;&gt;-->
+<!--                      &lt;!&ndash;<charge-prescription-table ref="prescription_tables"&ndash;&gt;-->
+<!--                      &lt;!&ndash;:prescription="curPrescriptions"></charge-prescription-table>&ndash;&gt;-->
+<!--                      &lt;!&ndash;<charge-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></charge-prescription-table>&ndash;&gt;-->
+<!--                      <charge-prescription-table ref="prescription_tables"-->
+<!--                                                 :manufacturers="manufacturers"-->
+<!--                                                 :prescription="curPrescriptions"></charge-prescription-table>-->
+
+<!--                    </el-tabs>-->
+
+<!--                  </div>-->
+<!--                  <div class="costBox">-->
+<!--                    <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>-->
+<!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
+<!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
+<!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div class="centerRight">-->
+<!--                  <p class="centerRightTitle">人员信息</p>-->
+<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+<!--                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>-->
+<!--                    <span style="font-size:14px;">日期:{{ record_date }}</span>-->
+<!--                  </div>-->
+<!--                  <ul class="basicUl">-->
+<!--                    <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.phone }}</li>-->
+
+<!--                    &lt;!&ndash;<span>过敏病史:</span>&ndash;&gt;-->
+<!--                    &lt;!&ndash;<el-autocomplete&ndash;&gt;-->
+<!--                    &lt;!&ndash;style="width:100%;"&ndash;&gt;-->
+<!--                    &lt;!&ndash;class="inline-input"&ndash;&gt;-->
+<!--                    &lt;!&ndash;v-model="sick_history"&ndash;&gt;-->
+<!--                    &lt;!&ndash;:fetch-suggestions="querySearch2"&ndash;&gt;-->
+<!--                    &lt;!&ndash;placeholder="请输入内容"&ndash;&gt;-->
+<!--                    &lt;!&ndash;&gt;</el-autocomplete>&ndash;&gt;-->
+<!--                    &lt;!&ndash;<li style="width:100%;">地址：{{patientInfo.home_address}}</li>&ndash;&gt;-->
+<!--                    &lt;!&ndash;<li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>&ndash;&gt;-->
+<!--                  </ul>-->
+<!--                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
+<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+<!--                    <span style="font-size:14px;">住院编号:{{ hisPatientInfo.number }}</span>-->
+<!--                  </div>-->
+<!--                  <ul class="basicUl">-->
+<!--                    <li style="width:50%;">医生：{{ info.doctor }}</li>-->
+<!--                    <li style="width:50%;">科室：{{ info.departments }}</li>-->
+<!--                    <li style="width:100%;">总费用：{{ getTotal() }}</li>-->
+
+<!--                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>-->
+<!--                    <li style="width:100%;">是否有传染病：</li>-->
+<!--                    <li style="width:100%;">血压：</li>-->
+<!--                  </ul>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-tab-pane>-->
+<!--            <el-tab-pane label="月结" name="second">-->
+<!--              <div style="display:flex;height:100%;">-->
+<!--                <div class="centerLeft">-->
+<!--                  <div class="tabsBox">-->
+<!--                    &lt;!&ndash; <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> &ndash;&gt;-->
+<!--                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"-->
+<!--                             @tab-click="tabclickEventTwo">-->
+
+<!--                      <el-tab-pane-->
+<!--                          v-for="(item, index) in month_prescriptions"-->
+<!--                          :key="index"-->
+<!--                          :label="item.name"-->
+<!--                          :name="item.name">-->
+<!--                      </el-tab-pane>-->
+
+<!--                      <div class="RP">-->
+<!--                        Rp-->
+<!--                        <el-date-picker-->
+<!--                            v-model="other_start_time"-->
+<!--                            prefix-icon="el-icon-date"-->
+<!--                            @change="changeTime"-->
+<!--                            :editable="false"-->
+<!--                            style="width: 150px;"-->
+<!--                            type="date"-->
+<!--                            :picker-options="pickerOptions"-->
+<!--                            placeholder="选择开始时间"-->
+<!--                            align="right"-->
+<!--                            format="yyyy-MM-dd"-->
+<!--                            value-format="yyyy-MM-dd">-->
+<!--                        </el-date-picker>-->
+<!--                        <span class>-</span>-->
+<!--                        <el-date-picker-->
+<!--                            v-model="other_end_time"-->
+<!--                            prefix-icon="el-icon-date"-->
+<!--                            @change="changeEndTime"-->
+<!--                            :editable="false"-->
+<!--                            style="width: 150px;"-->
+<!--                            type="date"-->
+<!--                            placeholder="选择结束时间"-->
+<!--                            align="right"-->
+<!--                            format="yyyy-MM-dd"-->
+<!--                            value-format="yyyy-MM-dd">-->
+<!--                        </el-date-picker>-->
+<!--                      </div>-->
+<!--                      &lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
+<!--                      &lt;!&ndash;<month-prescription-table ref="prescription_tables"&ndash;&gt;-->
+<!--                      &lt;!&ndash;:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>&ndash;&gt;-->
+<!--                      <charge-month-prescription-table-->
+<!--                          :prescription="curMonthPrescriptions"></charge-month-prescription-table>-->
+
+<!--                    </el-tabs>-->
+
+<!--                  </div>-->
+<!--                  <div class="costBox">-->
+<!--                    <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>-->
+<!--                    &lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div class="centerRight">-->
+<!--                  <p class="centerRightTitle">人员信息</p>-->
+<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+<!--                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>-->
+<!--                    <span style="font-size:14px;">日期:{{ record_date }}</span>-->
+<!--                  </div>-->
+
+<!--                  <ul class="basicUl">-->
+<!--                    <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.phone }}</li>-->
+<!--                    <li style="width:100%;">过敏史及其他病史：{{ info.sick_history }}</li>-->
+
+<!--                  </ul>-->
+<!--                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
+<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+<!--                    <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number }}</span>-->
+<!--                  </div>-->
+<!--                  <ul class="basicUl">-->
+<!--                    <li style="width:50%;">医生：{{ info.doctor }}</li>-->
+<!--                    <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>-->
+<!--                    <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>-->
+<!--                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}-->
+<!--                    </li>-->
+
+<!--                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>-->
+<!--                    &lt;!&ndash;<li style="width:100%;">是否有传染病：</li>&ndash;&gt;-->
+<!--                    &lt;!&ndash;<li style="width:100%;">血压：</li>&ndash;&gt;-->
+<!--                  </ul>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-tab-pane>-->
             <el-tab-pane label="结算" name="third">
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1019,14 +1019,15 @@
         }
       },
       confirm(forms) {
-        var param =  "_api_access_key="+"1781ce9fb73a478289326c16ba8bf2c4"+"&_api_name="+"hssServives"+"&_api_timestamp="+ Date.now()+"&_api_version="+"1.0.0";
-        var signature = cryptoJs.enc.Base64.stringify(cryptoJs.HmacSHA1(param, "b5DPOGjc08DAAMJ8FP31pwwNHKo="));
+       var time =  Math.round(new Date().getTime()/1000).toString()
+        var param =  "_api_access_key="+"1781ce9fb73a478289326c16ba8bf2c4"+"&_api_name="+"hssServives"+"&_api_timestamp="+ time+"&_api_version="+"1.0.0";
+        var signature = cryptoJs.enc.Base64.stringify(cryptoJs.HmacSHA1(param, "+b5DPOGjc08DAAMJ8FP31pwwNHKo="));
+        console.log(Math.round(new Date().getTime()/1000).toString())
         forms['record_time'] = this.record_date
         forms['admin_user_id'] = this.$store.getters.xt_user.user.id
         forms['org_id'] = this.$store.getters.xt_user.org_id
         forms['key'] = signature
-
-
+        forms['time_stamp'] = time
         this.loadingone = true
         var that = this
         if (forms.settlement_value == 2) {