提交代码

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -80,64 +80,68 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="this.radio == 1">
+          <div v-if="this.radio == 1&&this.activeName=='first'">
             <el-button
               size="small"
               v-loading="isloading"
               :disabled="isdisabled"
-              @click="open(1)"
+              @click="open(1,0)"
               type="primary">上传明细
             </el-button>
           </div>
-
           <div v-if="this.radio == 2">
             <el-button
               size="small"
-              @click="open(2)"
+              @click="open(2,0)"
               type="primary">撤销明细
             </el-button>
           </div>
-
         </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="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="tabclickEvent">
+                      <el-tab-pane
+                        v-for="(item, index) in prescriptions"
+                        :key="index"
+                        :label="item.name"
+                        :name="item.name"
+                      >
+                        <el-button type="primary"  v-loading="isloading"
+                                     :disabled="isdisabled"  @click="open(1,item.id)">上传处方费用</el-button>
+
+
+                      </el-tab-pane>
+
+                      <charge-month-prescription-table v-if="this.radio == 1"
+                                                       :prescription="curPrescriptions"></charge-month-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">
@@ -156,7 +160,9 @@
                       <div class="RP">
                         Rp
                         <div v-if="radio == 2">
-                          <span>处方日期：{{ getTimes(zuobiao_info.start_time) }}~{{ getTimes(zuobiao_info.end_time) }}</span>
+                          <span>处方日期：{{ getTimes(zuobiao_info.start_time) }}~{{
+                              getTimes(zuobiao_info.end_time)
+                            }}</span>
                         </div>
                         <div v-if="radio == 2">
                           <span>医嘱单id：{{ zuobiao_info.cbm01 }}</span>
@@ -197,17 +203,17 @@
                             :value="item.value">
                           </el-option>
                         </el-select>
-                          <label>
-                            疾病类型：
-                          </label>
-                          <el-select filterable  v-model="sick_type" placeholder="请选择疾病类型">
-                            <el-option
-                              v-for="(item,index) in sick"
-                              :key="index"
-                              :label="item.class_name"
-                              :value="item.id">
-                            </el-option>
-                          </el-select>
+                        <label>
+                          疾病类型：
+                        </label>
+                        <el-select filterable v-model="sick_type" placeholder="请选择疾病类型">
+                          <el-option
+                            v-for="(item,index) in sick"
+                            :key="index"
+                            :label="item.class_name"
+                            :value="item.id">
+                          </el-option>
+                        </el-select>
 
                       </div>
 
@@ -263,8 +269,8 @@ export default {
   },
   data() {
     return {
-      isloading:false,
-      isdisabled:false,
+      isloading: false,
+      isdisabled: false,
       register: [
         { value: 11, label: '普通门诊' },
         // { value: 12, label: '门诊挂号' },
@@ -335,7 +341,7 @@ export default {
       tabIndex: 1,
 
       hisPatientInfo: {},
-      prescription_info:{},
+      prescription_info: {},
       loadingtwo: false,
       upload_list: [],
       patientTableData: [{}],
@@ -675,12 +681,12 @@ export default {
     }, formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
-    open(index) {
+    open(index,id) {
       if (index == 2) {
         var that = this
         let obj3 = {
           id: this.zuobiao_info.id,
-          admin_user_id: this.$store.getters.xt_user.user.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
@@ -717,11 +723,11 @@ export default {
         this.isdisabled = true
         var that = this
         if (this.hisPatientInfo.id == 0) {
-          this.$message.error("请选择需要记账的患者")
+          this.$message.error('请选择需要记账的患者')
           return
         }
-        if (this.sick_type == 0 || this.sick_type == "") {
-          this.$message.error("请选择疾病类型")
+        if (this.sick_type == 0 || this.sick_type == '') {
+          this.$message.error('请选择疾病类型')
           return
         }
 
@@ -731,12 +737,18 @@ export default {
           record_date: this.record_date,
           admin_user_id: this.$store.getters.xt_user.user.id,
           org_id: this.$store.getters.xt_user.org_id,
-          sick_type:this.sick_type,
+          sick_type: this.sick_type,
+          settle_type: this.activeName,
+          p_id:id,
+        }
+        if (this.activeName == "first"){
+          obj['settle_accounts_type'] = 2
+        }else{
+          obj['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', {
+        axios.get('http://127.0.0.1:9532' + '/nmg/coordinate/settleAccount', {
           params: obj
         })
           .then(function(response) {
@@ -758,7 +770,6 @@ export default {
                 }).catch(() => {
                 })
 
-
               } else {
                 that.isloading = false
                 that.isdisabled = false
@@ -862,13 +873,13 @@ export default {
             case 1:
               this.all_table_data = response.data.data.list
               this.patientTableData = response.data.data.list
-              if (this.hisPatientInfo&&this.hisPatientInfo.id > 0){
-                for(let i = 0; i < this.patientTableData.length;i++){
-                  if(this.hisPatientInfo.id == this.patientTableData[i].id){
+              if (this.hisPatientInfo && this.hisPatientInfo.id > 0) {
+                for (let i = 0; i < this.patientTableData.length; i++) {
+                  if (this.hisPatientInfo.id == this.patientTableData[i].id) {
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id)
               }
@@ -878,15 +889,15 @@ export default {
               this.patientTableData = response.data.data.list_two
               this.upload_list = response.data.data.upload_list
               this.all_upload_list = response.data.data.upload_list
-              if (this.hisPatientInfo && this.hisPatientInfo.id > 0){
-                for(let i = 0; i < this.upload_list.length;i++){
-                  if(this.hisPatientInfo.id == this.upload_list[i].his_patient.id){
+              if (this.hisPatientInfo && this.hisPatientInfo.id > 0) {
+                for (let i = 0; i < this.upload_list.length; i++) {
+                  if (this.hisPatientInfo.id == this.upload_list[i].his_patient.id) {
                     this.$refs.tab.setCurrentRow(this.upload_list[i])
                     this.getPatientInformation(this.upload_list[0].his_patient.id)
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.upload_list[0])
                 this.getPatientInformation(this.upload_list[0].his_patient.id)
               }
@@ -1088,8 +1099,8 @@ export default {
           this.loading = false
           this.prescription_info = response.data.data.prescription_info
           this.sick_type = this.prescription_info.sick_type
-          if(this.sick_type == 0){
-            this.sick_type = ""
+          if (this.sick_type == 0) {
+            this.sick_type = ''
           }
           console.log(this.sick_type)
           this.hisPatientInfo = response.data.data.patient
@@ -1242,8 +1253,8 @@ export default {
           this.hisPatientInfo = response.data.data.patient
           this.prescription_info = response.data.data.prescription_info
           this.sick_type = this.prescription_info.sick_type
-          if(this.sick_type == 0){
-            this.sick_type = ""
+          if (this.sick_type == 0) {
+            this.sick_type = ''
           }
           console.log(this.sick_type)
           this.setMonthPrescription(response.data.data.month_prescriptions)