Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -42,15 +42,15 @@
           <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
           <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
           <el-button size="small" @click="open(3)" type="primary">打印</el-button>
-          <!--<el-button v-loading="loadingone" v-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small"-->
-                     <!--@click="open(6)"-->
-                     <!--type="primary">挂号-->
-          <!--</el-button>-->
-          <el-button v-loading="loadingtwo" v-if="(curPrescriptions.advices.length >0 || curPrescriptions.project.length >0) && (this.info.prescription_status == 1)" size="small"
+          <el-button v-loading="loadingone"  size="small"
+                     @click="open(6)"
+                     type="primary">挂号
+          </el-button>
+          <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
-          <el-button size="small" @click="open(5)" type="primary" v-if="this.info.prescription_status == 3">退费</el-button>
+          <el-button size="small" @click="open(5)" type="primary" v-if="this.info && this.info.prescription_status == 3">退费</el-button>
         </div>
 
         <div class="mainCenter">
@@ -347,15 +347,9 @@
               this.curPrescriptions = this.prescriptions[0]
               this.total = 0
               this.total = this.getTotalOne()
-              console.log(this.total)
-
             }
           }
         })
-
-        console.log(val)
-        console.log(patientInfo.id)
-
       },
       handleClick() {
 
@@ -497,9 +491,6 @@
         }
       },
 
-      // addCharges(){
-      //     this.$refs.additionalCharges.show()
-      // },
       choosePatient() {
         console.log(id)
         this.radioStatus = id

src/xt_pages/outpatientCharges/summary.vue

@@ -67,6 +67,8 @@
             <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>
+            <div v-if="scope.row.order_status == 4">已退费</div>
+
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -78,7 +78,7 @@
               v-for="(item,index) in doctors"
               :key="index"
               :label="item.user_name"
-              :value="item.user_name">
+              :value="item.admin_user_id">
             </el-option>
           </el-select>
           <span>科室：</span>
@@ -247,7 +247,7 @@
   import saveTemplate from './saveTemplate'
   import additionalCharges from './additionalCharges'
   import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
- 
+
   export default {
     props: {
       patientInfo: Object,
@@ -426,7 +426,6 @@
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
               this.customTabIndex = this.rightTab
               this.curStatus = 0
-
             }
 
           }
@@ -434,7 +433,6 @@
         }
       },
       clearData() {
-        console.log('111111')
         this.curPrescriptions = []
         this.curStatus = 0
         this.curDrugs = []
@@ -465,7 +463,7 @@
 
         this.state1 = info.diagnosis
         this.state2 = info.sick_history
-        this.doctorValue = info.doctor
+        this.doctorValue = info.doctor_id
         this.departmentValue = info.departments
         this.register_type = info.register_type
 
@@ -555,6 +553,7 @@
         this.curStatus = 0
       },
       removeTab(targetName) {
+
         this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
@@ -713,6 +712,14 @@
         this.curDrugs = selection
       },
       comfirm() {
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法继续添加')
+          this.teamList = []
+          this.curDrugs = []
+          this.$refs.tables.clearSelection()
+          this.$refs.multipleTable.clearSelection()
+          return
+        }
 
         if (this.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -45,10 +45,10 @@
             <el-radio-button label="病历"></el-radio-button>
           </el-radio-group>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '处方'">
-            <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
-            <el-button size="small" @click="open(2)" type="primary">打印</el-button>
-            <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
-            <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
+            <el-button size="small" ref="button_one"   @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+            <el-button size="small" ref="button_two"   @click="open(2)" type="primary">打印</el-button>
+            <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>
+            <el-button size="small" ref="button_four"  @click="open(5)" type="primary">存模板</el-button>
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '病历'">
             <el-button size="small" @click="opentwo(1)" type="primary" style="margin-left:10px;">保存</el-button>
@@ -62,9 +62,9 @@
         <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>
+                           v-show="titleType == '处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo" v-if="titleType == '病历'"></desk-record>
+                     :hisPatientInfo="hisPatientInfo" v-show="titleType == '病历'"></desk-record>
         <medicalRecord ref='medicalRecord'  @func="getMsgFormSon"></medicalRecord>
        <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       </div>
@@ -180,7 +180,6 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            console.log("999888811111")
 
             this.prescriptions = []
             // this.$refs.prescriptions.clearData()
@@ -276,7 +275,8 @@
                   id: prescription.id,
                   name: '处方' + index,
                   advices: tempAdvice,
-                  project: tempProject
+                  project: tempProject,
+                  orderStatus:prescription.order_status
                 }
                 this.prescriptions.push(obj)
               }
@@ -285,10 +285,12 @@
                 id:0,
                 name: '处方' + 1,
                 advices: [],
-                project: []
+                project: [],
+                orderStatus:0,
               }
               this.prescriptions.push(obj)
             }
+            console.log(this.prescriptions)
 
             this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
@@ -304,7 +306,18 @@
         //     psn_name:"杨美英",
         //     age:60.7
         // }
+      },open(index) {
+        if (index == 1) {
+          this.$refs.prescriptions.open(1)
+        } else if (index == 2) {
+          this.$refs.prescriptions.open(2)
+        } else if (index == 3) {
+          this.$refs.prescriptions.open(3)
+        } else if (index == 4) {
+          this.$refs.prescriptions.open(4)
+        }
       },
+
       opentwo(index) {
         console.log("index",index)
         if (index == 1) {
@@ -344,7 +357,7 @@
             "doctor_advice":this.doctor_advice,
             "remark":this.remark
           }
-        
+
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error("患者病历已存在")
@@ -367,7 +380,7 @@
       //   this.hisPatientInfo = val.hisPatientInfo
       //   console.log("333333",this.hisPatientInfo)
       // }
-    }, 
+    },
     created() {
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()

src/xt_pages/upload/fast/FastCountry.vue

@@ -1,28 +1,28 @@
 <template>
   <div class="patient-container">
-    <!-- <fast-patients-sidebar
+     <fast-patients-sidebar
       :id="patientID"
       v-on:patient="patientInfoClick()"
       v-on:inspection="inspectionClick()"
-    ></fast-patients-sidebar> -->
+    ></fast-patients-sidebar>
     <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
     <el-container>
-      <div style="width:170px">
-        <el-form :inline="true" :model="listQuery">
-          <el-form-item label style="margin-bottom:0;">
-            <el-input v-model.trim="searchVal" placeholder="姓名/透析号" style="width:70%"></el-input>
-            <el-button type="primary" style="padding: 10px 6px;" @click="onSearch">搜索</el-button>
-          </el-form-item>
-        </el-form>
-        <div style="width:170px">
-          <div class="tableTitle">患者列表</div>
-          <el-table :data="tableData" border style="width: 100%;" height="500">
-            <el-table-column prop="date" label="日期" width="80"></el-table-column>
-            <el-table-column prop="name" label="姓名" width="90"></el-table-column>
-          </el-table>
-        </div>
-      </div>
-      
+      <!--<div style="width:170px">-->
+        <!--<el-form :inline="true" :model="listQuery">-->
+          <!--<el-form-item label style="margin-bottom:0;">-->
+            <!--<el-input v-model.trim="searchVal" placeholder="姓名/透析号" style="width:70%"></el-input>-->
+            <!--<el-button type="primary" style="padding: 10px 6px;" @click="onSearch">搜索</el-button>-->
+          <!--</el-form-item>-->
+        <!--</el-form>-->
+        <!--<div style="width:170px">-->
+          <!--<div class="tableTitle">患者列表</div>-->
+          <!--<el-table :data="tableData" border style="width: 100%;" height="500">-->
+            <!--<el-table-column prop="date" label="日期" width="80"></el-table-column>-->
+            <!--<el-table-column prop="name" label="姓名" width="90"></el-table-column>-->
+          <!--</el-table>-->
+        <!--</div>-->
+      <!--</div>-->
+
       <div style="margin-left:20px;flex:1;" >
         <div class="cell clearfix">
           <div class="time">

src/xt_pages/upload/fast/FastPatientsSidebar.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- <div> -->
   <div class="patient-menu">
-    <!-- <el-autocomplete
+    <el-autocomplete
       style="margin:16px 5px"
       popper-class="my-autocomplete"
       v-model.trim="value"
@@ -38,10 +38,10 @@
       :default-expanded-keys="[defaultActive]"
       @node-click="handleNodeClick"
     >
-    </el-tree> -->
+    </el-tree>
     <!-- </div> -->
 
-    
+
   </div>
 </template>
 <script>
@@ -83,7 +83,7 @@ export default {
           ]
         }
       ],
-      
+
     };
   },
   methods: {

src/xt_pages/upload/fast_upload.vue

@@ -6,9 +6,9 @@
     <div class="app-container">
       <div class="service-box">
         <el-tabs v-model="activeName">
-          <!-- <el-tab-pane label="国家质控平台" name="first">
+      <el-tab-pane label="国家质控平台" name="first">
            <fast-country></fast-country>
-          </el-tab-pane> -->
+          </el-tab-pane>
           <el-tab-pane label="省级质控平台" name="first">
             <fast-province></fast-province>
           </el-tab-pane>