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

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -83,6 +83,8 @@
           <div v-if="this.radio == 1">
             <el-button
               size="small"
+              v-loading="isloading"
+              :disabled="isdisabled"
               @click="open(1)"
               type="primary">上传明细
             </el-button>
@@ -195,6 +197,18 @@
                             :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>
+
                       </div>
 
                       <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
@@ -233,6 +247,7 @@
 import axios from 'axios'
 import { getUploadZuoBiaoPatientInfo, getZuoBiaoPatientInfo, getZuoBiaoPatientList } from '@/api/his/his_zuobiao'
 import { uParseTime } from '@/utils/tools'
+import { getInitData } from '@/api/his/his'
 
 import MonthPrescriptionTable from './componenttwo/ChargePrescriptionTable'
 import ChargeMonthPrescriptionTable from './componenttwo/chargeMonthPrescriptionTable'
@@ -248,6 +263,8 @@ export default {
   },
   data() {
     return {
+      isloading:false,
+      isdisabled:false,
       register: [
         { value: 11, label: '普通门诊' },
         // { value: 12, label: '门诊挂号' },
@@ -316,7 +333,9 @@ export default {
         name: '1'
       }],
       tabIndex: 1,
+
       hisPatientInfo: {},
+      prescription_info:{},
       loadingtwo: false,
       upload_list: [],
       patientTableData: [{}],
@@ -372,9 +391,21 @@ export default {
 
     // this.getInitData()
     //获取患者信息
+    this.getInitData()
     this.getPatientList()
   },
   methods: {
+    getInitData() {
+      getInitData().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.sick = response.data.data.sick
+        }
+      })
+
+    },
     changeScheduleType() {
 
       this.getPatientList()
@@ -649,7 +680,7 @@ export default {
         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
@@ -682,17 +713,25 @@ export default {
 
           })
       } else if (index == 1) {
+        this.isloading = true
+        this.isdisabled = true
+        var that = this
         if (this.hisPatientInfo.id == 0) {
           this.$message.error("请选择需要记账的患者")
           return
         }
+        if (this.sick_type == 0 || this.sick_type == "") {
+          this.$message.error("请选择疾病类型")
+          return
+        }
 
         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
+          org_id: this.$store.getters.xt_user.org_id,
+          sick_type:this.sick_type,
         }
         obj['start_time'] = this.other_start_time
         obj['end_time'] = this.other_end_time
@@ -703,9 +742,13 @@ export default {
           .then(function(response) {
             if (response.data.state == 0) {
               that.$message.error(response.data.msg)
-              that.loadingtwo = false
+              that.isloading = false
+              that.isdisabled = false
+
               return false
             } else {
+              that.isloading = false
+              that.isdisabled = false
               if (response.data.data.failed_code == -10) {
                 that.$confirm(response.data.data.msg, '医保错误信息', {
                   confirmButtonText: '确 定',
@@ -715,7 +758,10 @@ export default {
                 }).catch(() => {
                 })
 
+
               } else {
+                that.isloading = false
+                that.isdisabled = false
                 that.radio = 2
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
                 that.getPatientList()
@@ -1036,6 +1082,12 @@ export default {
           this.curMonthPrescriptions = {}
           this.zuobiao_info = {}
           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 = ""
+          }
+          console.log(this.sick_type)
           this.hisPatientInfo = response.data.data.patient
           this.zuobiao_info = response.data.data.zuobiao_info
           this.setMonthPrescription(response.data.data.month_prescriptions)
@@ -1184,6 +1236,12 @@ export default {
           this.curMonthPrescriptions = {}
           this.loading = false
           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 = ""
+          }
+          console.log(this.sick_type)
           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]