Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/his/his_zuobiao.js

 }
 
 
+export function getUploadZuoBiaoPatientInfo(params) {
+  return request({
+    url: "/api/uploadzuobiaodetail/info",
+    method: "get",
+    params:params
+  });
+}
+
+
+
+
 
 
 

src/xt_pages/data/druguseTemplate.vue

 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) !=-1);
         };
      },
 

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

 <!--                  //从1到20-->
                   <span v-if="scope.row.single_dose != 0" @click="lili(scope.row)">
                    {{ scope.row.single_dose}}
-                   <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
-                   <span v-else>{{ scope.row.single_dose_unit }}</span> 
+                   <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span>
+                   <span v-else>{{ scope.row.single_dose_unit }}</span>
                     <!-- <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
                     <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
                     <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
             </span>
           </el-row>
         </el-form>
-      
+
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="infoDialogVisible = false">取 消</el-button>
           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
         }
       }
-      
+
       if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
          var date = new Date()
           var year = date.getFullYear()
           }
       }
 
-    
+
       if( this.$store.getters.xt_user.org.id == 10469 ){
           var year = date.getFullYear()
           var month = date.getMonth() + 1
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 
          }
          return name
       },
-    
+
     saveInformation(){
         var params = {
           selected_date:this.selected_date,

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

                     }}{{ scope.row.single_dose_unit }}</span
                   > -->
                  {{ scope.row.single_dose}}
-                <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
-                <span v-else>{{ scope.row.single_dose_unit }}</span> 
+                <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span>
+                <span v-else>{{ scope.row.single_dose_unit }}</span>
                 </template>
               </el-table-column>
               <el-table-column
                   >{{ scope.row.single_dose
                   }}{{ scope.row.single_dose_unit }}</span
                 >
-               
+
               </template>
             </el-table-column>
             <el-table-column
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

 
           </el-radio-group>
         </div>
-        <div class="mainCell" style="margin-bottom:10px;">
+        <div class="mainCell" style="margin-bottom:10px;" v-if="this.radio == 1">
           <el-input size="small" v-model.trim="search_input"
                     class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
             搜索
           </el-button>
         </div>
+
+        <div class="mainCell" style="margin-bottom:10px;" v-if="this.radio == 2">
+          <el-input size="small" v-model.trim="search_input_two"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                     @click="searchActiontwo">
+            搜索
+          </el-button>
+        </div>
         <div>
-          <el-table :data="patientTableData" :height="tableHeight" border
+          <el-table v-if="this.radio == 1" :data="patientTableData" :height="tableHeight" border
                     style="width: 100%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
             <el-table-column align="center" prop="name" label="姓名" wdith='89'>
               <template slot-scope="scope">{{ scope.$index + 1 }}.{{ scope.row.name }}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="就诊号" width="110">
-              <template slot-scope="scope">{{ scope.row ? scope.row.number : '' }}
-              </template>
+          </el-table>
+
+
+          <el-table v-if="this.radio == 2" :data="upload_list" :height="tableHeight" border
+                    style="width: 100%;"
+                    :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                    highlight-current-row ref="tab"
+                    @current-change="handleCurrentChangetwo">
+            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
+              <template slot-scope="scope">{{ scope.$index + 1 }}.{{ scope.row.his_patient.name }}</template>
             </el-table-column>
           </el-table>
 
+
         </div>
       </div>
 
             <el-button
               size="small"
               @click="open(1)"
-              type="primary">上传费用明细
+              type="primary">上传明细
             </el-button>
           </div>
 
             <el-button
               size="small"
               @click="open(2)"
-              type="primary">撤销费用明细
+              type="primary">撤销明细
             </el-button>
           </div>
 
 
         <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">-->
-<!--                    &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>-->
-
-<!--                      <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.radio == 2&&this.hisPatientInfo.balance_accounts_type != 2">处方总价：<span style="color:red;">{{-->
-<!--                        all_total + '元' + ' = 全自费总金额:' + fulamt_ownpay_amt + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'-->
-<!--                      }}</span></span>-->
-<!--                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type == 2">处方总价：<span style="color:red;">{{-->
-<!--                        all_total + '元' + ' = 全自费总金额:' + all_total + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'-->
-<!--                      }}</span></span>-->
-<!--                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{ all_total }}元</span></span>-->
-
-<!--                  </div>-->
-<!--                </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>-->
+
+            <!--                      <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.radio == 2&&this.hisPatientInfo.balance_accounts_type != 2">处方总价：<span style="color:red;">{{-->
+            <!--                        all_total + '元' + ' = 全自费总金额:' + fulamt_ownpay_amt + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'-->
+            <!--                      }}</span></span>-->
+            <!--                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type == 2">处方总价：<span style="color:red;">{{-->
+            <!--                        all_total + '元' + ' = 全自费总金额:' + all_total + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'-->
+            <!--                      }}</span></span>-->
+            <!--                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{ all_total }}元</span></span>-->
+
+            <!--                  </div>-->
+            <!--                </div>-->
+
+            <!--              </div>-->
+            <!--            </el-tab-pane>-->
             <el-tab-pane label="月结" name="first">
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
 
                       <div class="RP">
                         Rp
+                        <div v-if="radio == 2">
+                          <span>处方日期：{{ getTimes(zuobiao_info.start_time) }}~{{ getTimes(zuobiao_info.end_time) }}</span>
+                        </div>
+                        <div v-if="radio == 2">
+                          <span>医嘱单id：{{ zuobiao_info.cbm01 }}</span>
+                        </div>
                         <el-date-picker
+                          v-if="radio == 1"
                           v-model="other_start_time"
                           prefix-icon="el-icon-date"
                           @change="changeTime"
                           format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd">
                         </el-date-picker>
-                        <span class>-</span>
+                        <span v-if="radio == 1" class>-</span>
                         <el-date-picker
+                          v-if="radio == 1"
                           v-model="other_end_time"
                           prefix-icon="el-icon-date"
                           @change="changeEndTime"
                           value-format="yyyy-MM-dd">
                         </el-date-picker>
                         <el-select v-model="month_is_upload" @change="changeMonthData"
-                                   placeholder="请选择">
+                                   placeholder="请选择" v-if="radio == 1">
                           <el-option
                             v-for="item in upload_options"
                             :key="item.value"
                       <!--<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>
+                      <charge-month-prescription-table v-if="this.radio == 1"
+                                                       :prescription="curMonthPrescriptions"></charge-month-prescription-table>
+
+                      <settle-prescription-table v-if="this.radio == 2"
+                                                 :prescription="curMonthPrescriptions"></settle-prescription-table>
 
                     </el-tabs>
 
 
 <script>
 import axios from 'axios'
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getZuoBiaoPatientList, getZuoBiaoPatientInfo } from '@/api/his/his_zuobiao'
+import { getUploadZuoBiaoPatientInfo, getZuoBiaoPatientInfo, getZuoBiaoPatientList } from '@/api/his/his_zuobiao'
 import { uParseTime } from '@/utils/tools'
 
 import MonthPrescriptionTable from './componenttwo/ChargePrescriptionTable'
 import ChargeMonthPrescriptionTable from './componenttwo/chargeMonthPrescriptionTable'
 import { getZuoBiaoPatientMonthInfo } from '../../api/his/his_zuobiao'
+import SettlePrescriptionTable from '../hospitalStation/components/settlePrescriptionTable.vue'
+
 const moment = require('moment')
 export default {
   components: {
+    SettlePrescriptionTable,
     ChargeMonthPrescriptionTable,
-    MonthPrescriptionTable,
+    MonthPrescriptionTable
   },
   data() {
     return {
 
       ],
       upload_options: [
-        { value: 0, label: '全部' },
+        // { value: 0, label: '全部' },
         { value: 2, label: '已上传' },
         { value: 1, label: '未上传' }
 
       ],
       loading: false,
       dise_loading: false,
-      month_is_upload: 0,
+      month_is_upload: 1,
       sick_history: '',
       p_type: '',
       sick_type: '',
       other_end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       curMonthPrescriptions: null,
       curSettlePrescriptions: null,
+      zuobiao_info: {},
 
       month_total: 0,
       crumbs: [
       tabIndex: 1,
       hisPatientInfo: {},
       loadingtwo: false,
-      patientTableData: [{
-
-      }],
+      upload_list: [],
+      patientTableData: [{}],
       patientInfo: { id: 0 },
       doctor: {},
       total: 0,
       radio: 1,
       radioStatus: 1,
       search_input: '',
+      search_input_two: '',
       start_time: moment().locale('zh-cn').format('YYYY-MM-DD'),
       patient_id: 0,
       prescription_id: 0,
       all_table_data: [],
+      all_upload_list: [],
       manufacturers: [],
       hisPatientDatas: [],
       order: {},
       }
 
     },
+    searchActiontwo() {
+      if (this.search_input_two.length == 0) {
+        this.upload_list = this.all_upload_list
+
+      } else {
+        let arr2 = []
+        for (let i = 0; i < this.all_upload_list.length; i++) {
+          if (this.all_upload_list[i].his_patient.name.indexOf(this.search_input_two) != -1) {
+            arr2 = arr2.concat(this.all_upload_list[i])
+          }
+        }
+        this.upload_list = arr2
+      }
+    },
+
     tabclickEventTwo(val) {
       for (let i = 0; i < this.month_prescriptions.length; i++) {
         if (this.month_prescriptions[i].name == val.name) {
     },
     open(index) {
       if (index == 2) {
-        let settle_accounts_type = ''
-        if (this.activeName == 'first') {
-          settle_accounts_type = 1
-          var that = this
-          this.$confirm('是否撤销明细', '撤销明细', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-            if (that.hisPatientInfo.balance_accounts_type != 2){
-              let params = {
-                'settle_accounts_type': settle_accounts_type,
-                'patient_id': that.hisPatientInfo.id,
-                'record_time': that.record_date,
-                'admin_user_id': that.$store.getters.xt_user.user.id
-              }
-              axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
-                params: params
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    that.loadingtwo = false
-                    return false
-                  } else {
-                    if (response.data.data.failed_code == -10) {
-                      // that.$message.error(response.data.data.msg)
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
-                    } else {
-                      that.$message.success('撤销明细成功')
-                      that.radio = 1
-                      that.getPatientList()
-                    }
+        var that = this
+        let obj3 = {
+          id: this.zuobiao_info.id,
+          admin_user_id: this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532' + '/nmg/coordinate/settleAccount/cancel', {
+          params: obj3
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingtwo = false
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
 
-                  }
-                })
-                .catch(function(error) {
+                }).catch(() => {
                 })
 
-
-            }else{
-              let params = {
-                'settle_accounts_type': settle_accounts_type,
-                'patient_id': that.hisPatientInfo.id,
-                'his_patient_id': that.hisPatientInfo.id,
-                'record_time': that.record_date,
-                'admin_user_id': that.$store.getters.xt_user.user.id
+              } else {
+                that.radio = 1
+                that.$message({ message: '撤销成功', type: 'success', duration: 5000 })
               }
-              refundDetail(params).then(response => {
-                if (response.data.state == 0) {
-                  this.loading = false
-                  this.$message.error(response.data.msg)
-                  return false
-                } else {
-                  that.$message.success('撤销明细成功')
-                  that.radio = 1
-                  that.getPatientList()
-                }
-              })
 
             }
-          }).catch(() => {
           })
-        } else {
-
-          if (this.hisPatientInfo.balance_accounts_type != 2) {
-            settle_accounts_type = 2
-            var that = this
-            this.$confirm('该操作会撤销此次入院后所有处方明细，是否继续操作？', '撤销明细', {
-              confirmButtonText: '确 定',
-              cancelButtonText: '取 消',
-              type: 'warning'
-            }).then(() => {
-
-              let params = {
-                'settle_accounts_type': settle_accounts_type,
-                'patient_id': that.hisPatientInfo.id,
-                'his_patient_id': that.hisPatientInfo.id,
-                'record_time': that.record_date,
-                'order_id': that.order.id,
-                'admin_user_id': that.$store.getters.xt_user.user.id
-              }
-              axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
-                params: params
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    that.loadingtwo = false
-                    return false
-                  } else {
-                    if (response.data.data.failed_code == -10) {
-                      // that.$message.error(response.data.data.msg)
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
-                    } else {
-                      that.$message.success('撤销明细成功')
-                      that.radio = 1
-                      that.getPatientList()
-                    }
-
-                  }
-                })
-                .catch(function(error) {
-                })
-
-            }).catch(() => {
-            })
-
-          }else{
-            settle_accounts_type = 2
-            var that = this
-            this.$confirm('该操作会撤销此次入院后所有处方明细，是否继续操作？', '撤销明细', {
-              confirmButtonText: '确 定',
-              cancelButtonText: '取 消',
-              type: 'warning'
-            }).then(() => {
-              let params = {
-                'settle_accounts_type': settle_accounts_type,
-                'patient_id': that.hisPatientInfo.id,
-                'his_patient_id': that.hisPatientInfo.id,
-                'record_time': that.record_date,
-                'admin_user_id': that.$store.getters.xt_user.user.id
-              }
-              refundDetail(params).then(response => {
-                if (response.data.state == 0) {
-                  this.loading = false
-                  this.$message.error(response.data.msg)
-                  return false
-                } else {
-                  that.$message.success('撤销明细成功')
-                  that.radio = 1
-                  that.getPatientList()
-                }
-              })
-
-
-
-            }).catch(() => {
-            })
-
-
-          }
-
-
-
-        }
+          .catch(function(error) {
 
+          })
       } else if (index == 1) {
+        if (this.hisPatientInfo.id == 0) {
+          this.$message.error("请选择需要记账的患者")
+          return
+        }
         var that = this
-        let params = {
-          'in_hospital_id': that.hisPatientInfo.id,
-          'id': that.hisPatientInfo.id,
-          'admin_user_id': that.$store.getters.xt_user.user.id,
-          'record_time': that.record_date
-
+        let obj = {
+          patient_id: this.hisPatientInfo.id,
+          diagnosis_time: this.record_date,
+          record_date: this.record_date,
+          admin_user_id: this.$store.getters.xt_user.user.id,
+          org_id: this.$store.getters.xt_user.org_id
         }
-        if (this.activeName == 'first') {
-          params['settle_accounts_type'] = 1
+        obj['start_time'] = this.other_start_time
+        obj['end_time'] = this.other_end_time
+        obj['settle_accounts_type'] = 2
+        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount', {
+          params: obj
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingtwo = false
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
 
-        } else {
-          params['start_time'] = that.other_start_time
-          params['end_time'] = that.other_end_time
-          params['settle_accounts_type'] = 2
+                }).catch(() => {
+                })
 
-        }
-        if (this.hisPatientInfo.balance_accounts_type != 2) {
-          axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
-            params: params
-          })
-            .then(function(response) {
-              if (response.data.state == 0) {
-                that.$message.error(response.data.msg)
-                return false
               } else {
-                if (response.data.data.failed_code == -10) {
-                  // that.$message.error(response.data.data.msg)
-                  that.$confirm(response.data.data.msg, '医保错误信息', {
-                    confirmButtonText: '确 定',
-                    type: 'warning'
-                  }).then(() => {
-
-                  }).catch(() => {
-                  })
-                } else {
-                  that.$message.success('上传明细成功')
-                  that.radio = 2
-                  that.changePatientInfo()
-                }
-
+                that.radio = 2
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
               }
-            })
-            .catch(function(error) {
-            })
-        } else if (this.hisPatientInfo.balance_accounts_type == 2) {
-          var that = this
-          let params = {
-            'in_hospital_id': that.hisPatientInfo.id,
-            'id': that.hisPatientInfo.id,
-            'admin_user_id': that.$store.getters.xt_user.user.id,
-            'record_time': that.record_date
-
-          }
-          if (this.activeName == 'first') {
-            params['settle_accounts_type'] = 1
-
-          } else {
-            params['start_time'] = that.other_start_time
-            params['end_time'] = that.other_end_time
-            params['settle_accounts_type'] = 2
-
-          }
-          upLoadChargeInfo(params).then(response => {
-            if (response.data.state == 0) {
-              this.loading = false
-              this.$message.error(response.data.msg)
-              return false
-            } else {
-              that.$message.success('上传明细成功')
-              that.radio = 2
-              that.changePatientInfo()
             }
           })
-        }
+          .catch(function(error) {
+          })
       }
     }, changePatientInfo() {
       let params = {
             case 2:
               this.all_table_data = response.data.data.list_two
               this.patientTableData = response.data.data.list_two
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.getPatientInformation(this.patientTableData[0].id)
+              this.upload_list = response.data.data.upload_list
+              this.all_upload_list = response.data.data.upload_list
+              this.$refs.tab.setCurrentRow(this.upload_list[0])
+              console.log(this.upload_list[0].id)
+              this.getPatientInformationtwo(this.upload_list[0].id)
               break
 
           }
             case 2:
               this.all_table_data = response.data.data.list_two
               this.patientTableData = response.data.data.list_two
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.getPatientInformation(this.patientTableData[0].id)
+              this.upload_list = response.data.data.upload_list
+              this.all_upload_list = response.data.data.upload_list
+
+              this.$refs.tab.setCurrentRow(this.upload_list[0])
+              console.log(this.upload_list[0].id)
+              this.getPatientInformationtwo(this.upload_list[0].id)
               break
           }
         }
     handleCurrentChange(val) {
       this.getPatientInformation(val.id)
     },
+    handleCurrentChangetwo(val) {
+      this.getPatientInformationtwo(val.id)
+    },
     //获取患者的基本信息
+    getPatientInformationtwo(id) {
+      console.log(id)
+      let params = {
+        'id': id
+      }
+      this.loading = true
+      getUploadZuoBiaoPatientInfo(params).then(response => {
+        if (response.data.state == 0) {
+          this.loading = false
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.prescriptions = []
+          this.month_prescriptions = []
+          this.curPrescriptions = {}
+          this.curMonthPrescriptions = {}
+          this.zuobiao_info = {}
+          this.loading = false
+          this.hisPatientInfo = response.data.data.patient
+          this.zuobiao_info = response.data.data.zuobiao_info
+          this.setMonthPrescription(response.data.data.month_prescriptions)
+          for (let i = 0; i < response.data.data.prescription.length; i++) {
+            var prescription = response.data.data.prescription[i]
+            let tempAdvice = []
+            let tempProject = []
+            let tempAddition = []
+            for (let b = 0; b < prescription.advices.length; b++) {
+              let spec = prescription.advices[b].drug.dose + prescription.advices[b].drug.dose_unit + '*' + prescription.advices[b].drug.min_number + prescription.advices[b].drug.min_unit + '/' + prescription.advices[b].drug.max_unit
+
+              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,
+                day: prescription.advices[b].day,
+                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,
+                medical_insurance_number: prescription.advices[b].med_list_codg,
+
+                spec: spec,
+                code: prescription.advices[b].drug.medical_insurance_number,
+                det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
+                name_id: prescription.advices[b].drug.manufacturer,
+                fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
+                overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
+                preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
+                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+                execution_state: prescription.advices[b].execution_state
+
+              }
+              tempAdvice.push(obj)
+            }
+
+            for (let b = 0; b < prescription.project.length; b++) {
+              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,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type,
+                det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
+                fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
+                overlmt_amt: prescription.project[b].order_info.overlmt_amt,
+                preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
+                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+                execution_state: prescription.project[b].execution_state
+
+              }
+
+              if (prescription.project[b].type == 2) {
+                obj['statistical_classification'] = prescription.project[b].team.project_team
+                obj['medical_code'] = prescription.project[b].project.medical_code
+                obj['project_name'] = prescription.project[b].project.project_name
+                obj['spec'] = ''
+                obj['name_id'] = 0
+
+              } else if (prescription.project[b].type == 3) {
+                obj['statistical_classification'] = prescription.project[b].team.project_team
+                obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] = prescription.project[b].good_info.good_name
+                obj['spec'] = prescription.project[b].good_info.specification_name
+                obj['name_id'] = prescription.project[b].good_info.manufacturer
+
+              }
+
+              tempProject.push(obj)
+            }
+
+            let index = i + 1
+            let obj = {
+              id: prescription.id,
+              name: '处方' + index,
+              advices: tempAdvice,
+              project: tempProject,
+              addition: tempAddition,
+              order_status: prescription.order_status,
+              type: prescription.type
+            }
+            this.prescriptions.push(obj)
+
+            for (let i = 0; i < this.prescriptions.length; i++) {
+              if (this.prescriptions[i].order_status != 4) {
+                this.isShowUpload = 2
+              }
+
+            }
+
+          }
+          if (this.prescriptions.length > 0) {
+            this.curPrescriptions = this.prescriptions[0]
+          } else {
+            this.curPrescriptions = {}
+          }
+          if (this.month_prescriptions.length > 0) {
+            this.curMonthPrescriptions = this.month_prescriptions[0]
+          } else {
+            this.curMonthPrescriptions = {}
+          }
+          this.total = 0
+          this.total = this.getTotalOne()
+          this.month_total = this.getMonthTotalOne()
+          this.all_total = this.getTotal()
+          this.all_month_total = this.getTotalTwo()
+          this.fulamt_ownpay_amt = this.getFulamtOwnpayAmtTotal()
+          this.overlmt_amt = this.getOverlmtAmtTotal()
+          this.preselfpay_amt = this.getPreselfpayAmtTotal()
+          this.inscp_scp_amt = this.getInscpScpAmtTotal()
+
+        }
+      })
+    },
     getPatientInformation(id) {
       let params = {
         'id': id,

src/xt_pages/outpatientCharges/invoicePrint.vue

         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>
     </div> -->
-
     <!-- <div class="app-container" style="padding-top:40px;" v-if="org_id == 0">
       <div class='dialysisPage'>
         <printthirteen :paramsObj="invoiceParams"></printthirteen>

src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue

   <div id='invoice-print' style="position: relative;">
     <div>
       <div style="display: inline-block; position: absolute;top: 30px;left: 30px;">{{list.order.mdtrt_id}}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 260px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 330px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 400px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 260px;">{{  list.date ? getTime(list.date, '{y}-{m}-{d}').slice(0,4): getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 330px;">{{ list.date ?  getTime(list.date, '{y}-{m}-{d}').slice(5,7) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 400px;">{{ list.date? getTime(list.date, '{y}-{m}-{d}').slice(8,11) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
     </div>
     <div>
       <div style="position: absolute;top: 50px;left: 60px;">{{ paramsObj.name }}</div>

src/xt_pages/role/admin.vue

         >医药师登记</el-button>
 
 
-        <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toJiaBan">加班</el-button>
-        -->
+       
 
          <!-- <el-button
           type="primary"

src/xt_pages/user/components/EditGroupAdvice.vue

 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 

src/xt_pages/user/doctorAdvice.vue

             <span v-if="item.value != 1">
               {{ item.label }}
             </span>
-            
-            
+
+
             </li>
           </ul>
         </div>
         >
           <template slot-scope="scope">
             <span v-if="scope.row.advice_type == 1">
-              <span v-if="org_id != 9671 && org_id != 10440">长嘱</span> 
-              <span v-if="org_id == 9671 || org_id == 10440">长期医嘱模版</span> 
+              <span v-if="org_id != 9671 && org_id != 10440">长嘱</span>
+              <span v-if="org_id == 9671 || org_id == 10440">长期医嘱模版</span>
             </span>
             <span v-else-if="scope.row.advice_type == 3 || scope.row.advice_type == 2">临嘱</span>
             <span v-else-if="scope.row.advice_type == 4">普通医嘱</span>
                     v-for="item in adviceTypeOptions"
                   ></el-option>
                 </el-select>
-               
+
               </el-form-item>
             </el-col>
 
                     >
                   </template>
                 </el-table-column>
-                <el-table-column 
+                <el-table-column
                  label="推送截止日期"
                   min-width="80"
                   align="center"
                 <template slot-scope="scope">
                    {{scope.row.push_start_time}}
                 </template>
-                
+
                 </el-table-column>
 
-                <el-table-column 
+                <el-table-column
                  label="医嘱嘱托"
                   min-width="80"
                   align="center"
                 <template slot-scope="scope">
                    {{scope.row.remark}}
                 </template>
-                
+
                 </el-table-column>
               </el-table>
             </el-col>
               </el-form-item>
             </el-col>
 
-           
+
 
             <el-col :span="12" v-if="nameForm.frequency_type == 2">
               <el-form-item prop="day_count">
             </el-col>
           </el-row>
 
-          
+
           <el-form-item label="备注 :">
             <el-input type="textarea" v-model="adviceForm.remark"></el-input>
           </el-form-item>
             <span>{{ adminusername }} </span>
           </el-form-item>
 
-        
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <template v-if="isEdit">
       drug_id: 0,
       src_type:"",
       org_id:0,
-     
+
     };
   },
   methods: {
               this.dialogFormVisible = false;
               this.resetForm(formName);
               var advice = response.data.data.advice;
-              
+
               this.adviceTableData[this.currentIndex].drug_spec =
                 advice.drug_spec;
               this.adviceTableData[this.currentIndex].drug_spec_unit =
               }
           }
           console.log("模板数据",submitForm)
-          
+
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
               this.adviceForm.advice_name = arr[0]
           }
           console.log("222222???????this.adviceForm",this.adviceForm)
-          
+
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
             response => {
               if (response.data.state == 0) {
 
         remark: groups[0].remark,
         groupno: groupno,
-        
+
       };
       console.log("到了",groups[0]);
 
               }
             }
           }
-         
+
           var one = response.data.data.advicetwo;
           let dataInfo = {};
           one.forEach((item, index) => {
       // this.sameRowArr = sameRowArr;
     },
     mergeSpan({ row, column, rowIndex, columnIndex }) {
-     
+
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
         const _row = this.tempArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) !=-1);
         };
      },
 
       for (const i in this.multipleSelection) {
         arr.push(this.multipleSelection[i]);
         group.push(this.multipleSelection[i].groupno);
-       
+
       }
       grouptwo.push(this.getdata(group));
       // console.log('组号', group)

src/xt_permission.js

 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))