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/components/deskRecord.vue

@@ -77,7 +77,7 @@
     </el-form>
     <div class="mainTitle">病历信息：</div>
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
-     <el-form-item label="疾病类型: " prop="name" style="width:49%;">
+     <el-form-item filterable label="疾病类型: " prop="name" style="width:49%;">
         <el-select v-model="case_history.sick" style="width:100%;" placeholder="请选择">
           <el-option
             v-for="(item,index) in sick"

src/xt_pages/hospitalStation/index.vue

@@ -75,7 +75,7 @@
         <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
 
           <el-form-item label="疾病类型：" prop="sick_type" :validate-event="is_Name">
-            <el-select v-model="form.sick_type" placeholder="">
+            <el-select filterable v-model="form.sick_type" placeholder="">
               <el-option
                 v-for="(item,index) in sick"
                 :key="index"

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -64,6 +64,17 @@
 
                         </el-button>
 
+                        <!--<el-button-->
+                                <!--size="small" @click="sz_open(8)" type="primary"-->
+                        <!--&gt;预结算-->
+                        <!--</el-button>-->
+
+                        <!--<el-button-->
+                                <!--v-if="this.order.order_status == 1"-->
+                                <!--size="small" @click="sz_open(7)" type="primary"-->
+                        <!--&gt;撤销明细-->
+                        <!--</el-button>-->
+
                         <el-button
                                 v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
                                 size="small"
@@ -71,13 +82,6 @@
                                 type="primary">收费
                         </el-button>
 
-                        <el-button size="small" @click="sz_open(11)" type="primary"
-                                   v-if="this.hisPatientInfo.id > 0 "
-                        >
-                            退号
-                        </el-button>
-
-
                         <el-button size="small" @click="sz_open(5)" type="primary"
                                    v-if="this.order.order_status == 2"
                         >
@@ -85,10 +89,12 @@
                         </el-button>
                         <el-button size="small" @click="sz_open(10)" type="primary">打印</el-button>
 
-                        <!--<el-button-->
-                        <!--size="small" @click="sz_open(7)" type="primary"-->
-                        <!--&gt;撤销明细-->
-                        <!--</el-button>-->
+                        <el-button size="small" @click="sz_open(11)" type="primary"
+                                   v-if="this.hisPatientInfo.id > 0 "
+                        >
+                            退号
+                        </el-button>
+
                     </div>
 
 
@@ -525,14 +531,14 @@
     },
     methods: {
       query() {
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
-          var that = this;
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
+          var that = this
           axios.get('http://127.0.0.1:9532/api/org/info', {
             params: {}
           })
             .then(function(response) {
               if (response.data.state == 0) {
-                that.$message.error(response.data.msg);
+                that.$message.error(response.data.msg)
                 return false
               } else {
 
@@ -564,11 +570,10 @@
           patient_id: this.patientInfo.id,
           start_time: val,
           end_time: this.other_end_time,
-          p_type:2,
-          type: this.radio,
+          p_type: 2,
+          type: this.radio
 
-
-        };
+        }
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
             this.month_prescriptions = []
@@ -585,13 +590,13 @@
           patient_id: this.patientInfo.id,
           start_time: this.other_start_time,
           end_time: val,
-          p_type:2
+          p_type: 2
 
-        };
+        }
         getDayOrMonthHisPrescription(params).then(response => {
           if (response.data.state == 1) {
-            this.month_prescriptions = [];
-            this.setMonthPrescription(response.data.data.day_prescription);
+            this.month_prescriptions = []
+            this.setMonthPrescription(response.data.data.day_prescription)
             this.curMonthPrescriptions = this.month_prescriptions[0]
 
           } else {
@@ -618,7 +623,7 @@
 
         }
 
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10138) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
           var that = this
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
             params: form
@@ -639,16 +644,15 @@
                   }).catch(() => {
                   })
 
-
                 } else {
-                  that.changeRadioAndPatient(2);
-                  that.radio = 2;
-                  that.$refs.charge.hide();
-                  that.state = '已收费';
-                  that.$message({ message: '收费成功', type: 'success' });
-                  that.loadingtwo = false;
-                  that.cal_one = this.cal_one - 1;
-                  that.cal_two = this.cal_two + 1;
+                  that.changeRadioAndPatient(2)
+                  that.radio = 2
+                  that.$refs.charge.hide()
+                  that.state = '已收费'
+                  that.$message({ message: '收费成功', type: 'success' })
+                  that.loadingtwo = false
+                  that.cal_one = this.cal_one - 1
+                  that.cal_two = this.cal_two + 1
                   that.patientTableData.splice(this.current_index, 1)
                 }
               }
@@ -657,8 +661,8 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990  ) {
-          var that = this;
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
+          var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
             headers: {
@@ -681,20 +685,18 @@
                   }).catch(() => {
                   })
 
-
                 } else {
-                  that.changeRadioAndPatient(2);
-                  that.radio = 2;
-                  that.$refs.charge.hide();
-                  that.loadingtwo = false;
-                  that.state = '已收费';
-                  that.$message({ message: '收费成功', type: 'success', duration: 5000 });
-                  that.loadingtwo = false;
-                  that.cal_one = this.cal_one - 1;
-                  that.cal_two = this.cal_two + 1;
+                  that.changeRadioAndPatient(2)
+                  that.radio = 2
+                  that.$refs.charge.hide()
+                  that.loadingtwo = false
+                  that.state = '已收费'
+                  that.$message({ message: '收费成功', type: 'success', duration: 5000 })
+                  that.loadingtwo = false
+                  that.cal_one = this.cal_one - 1
+                  that.cal_two = this.cal_two + 1
                   that.patientTableData.splice(this.current_index, 1)
 
-
                 }
               }
             })
@@ -704,19 +706,19 @@
         } else {
           upload(form).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              this.loadingtwo = false;
-              this.$refs.charge.hide();
+              this.$message.error(response.data.msg)
+              this.loadingtwo = false
+              this.$refs.charge.hide()
               return false
             } else {
-              this.$refs.charge.hide();
-              this.radio = 2;
-              this.changeRadioAndPatient(2);
-
-              this.loadingtwo = false;
-              this.state = '已收费';
-              this.$message({ message: '收费成功', type: 'success' });
-              this.$refs.charge.hide();
+              this.$refs.charge.hide()
+              this.radio = 2
+              this.changeRadioAndPatient(2)
+
+              this.loadingtwo = false
+              this.state = '已收费'
+              this.$message({ message: '收费成功', type: 'success' })
+              this.$refs.charge.hide()
               this.loadingtwo = false
             }
           })
@@ -727,14 +729,14 @@
         this.$refs.register9504.hide()
 
       }, registerConfirm(forms) {
-        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['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
 
-        this.loadingone = true;
+        this.loadingone = true
 
         var that = this
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id ==  10138) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
             headers: {
@@ -757,11 +759,10 @@
                   }).catch(() => {
                   })
 
-
                 } else {
                   that.changeRadio(1)
-                  that.$refs.register9504.hide();
-                  that.$message({ message: '挂号成功', type: 'success' });
+                  that.$refs.register9504.hide()
+                  that.$message({ message: '挂号成功', type: 'success' })
                   // let params = {
                   //   'record_date': that.record_date
                   // }
@@ -879,7 +880,7 @@
 
         var that = this
 
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 ||this.$store.getters.xt_user.org_id == 10138) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
@@ -1016,7 +1017,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
@@ -1184,9 +1185,9 @@
           'record_date': val,
           'patient_id': this.patientInfo.id,
           'type': this.radio,
-          'p_type':2,
-          'his_patient_id':this.hisPatientInfo.id
-        };
+          'p_type': 2,
+          'his_patient_id': this.hisPatientInfo.id
+        }
         getChargeHisPatientInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1247,23 +1248,21 @@
                   remark: prescription.project[b].remark,
                   // medical_code: prescription.project[b].project.medical_code,
                   unit: prescription.project[b].unit,
-                  type:prescription.project[b].type,
+                  type: prescription.project[b].type
 
                 }
 
-                if(prescription.project[b].type == 2){
-                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
-                  obj['medical_code'] =  prescription.project[b].project.medical_code
-                  obj['project_name'] =  prescription.project[b].project.project_name
+                if (prescription.project[b].type == 2) {
+                  obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                  obj['medical_code'] = prescription.project[b].project.medical_code
+                  obj['project_name'] = prescription.project[b].project.project_name
 
-                }else if(prescription.project[b].type == 3){
-                  obj['statistical_classification'] = ""
-                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
-                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                } else if (prescription.project[b].type == 3) {
+                  obj['statistical_classification'] = ''
+                  obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] = prescription.project[b].good_info.good_name
                 }
 
-
-
                 tempProject.push(obj)
               }
               let index = i + 1
@@ -1274,7 +1273,7 @@
                 project: tempProject,
                 type: prescription.type,
                 order_status: prescription.order_status
-              };
+              }
               this.prescriptions.push(obj)
             }
             this.curPrescriptions = this.prescriptions[0]
@@ -1818,7 +1817,7 @@
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
@@ -1855,8 +1854,8 @@
                       })
 
                     } else {
-                      that.changeRadioAndPatient(1);
-                      that.$message({ message: '退费成功', type: 'success', duration: 5000 });
+                      that.changeRadioAndPatient(1)
+                      that.$message({ message: '退费成功', type: 'success', duration: 5000 })
                       that.loadingtwo = false
                     }
 
@@ -1890,9 +1889,9 @@
                   this.loadingtwo = false
                   return false
                 } else {
-                  this.radio = 1;
-                  this.changeRadioAndPatient(1);
-                  this.$message({ message: '退费成功', type: 'success' });
+                  this.radio = 1
+                  this.changeRadioAndPatient(1)
+                  this.$message({ message: '退费成功', type: 'success' })
                   this.loadingtwo = false
 
                 }
@@ -1921,9 +1920,9 @@
             clr_type: '11',
             org_id: this.$store.getters.xt_user.org_id
 
-          };
+          }
 
-          var that = this;
+          var that = this
 
           if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
@@ -1931,7 +1930,7 @@
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg);
+                  that.$message.error(response.data.msg)
                   // that.loadingtwo = false
                   return false
                 } else {
@@ -1948,15 +1947,15 @@
           let params = {
             start_time: '2020-12-28',
             end_time: '2020-12-30'
-          };
-          var that = this;
+          }
+          var that = this
           axios.get('http://127.0.0.1:9532/api/checkdetailaccount/get', {
             params: params
           })
             .then(function(response) {
               if (response.data.state == 0) {
-                that.$message.error(response.data.msg);
-                that.loadingtwo = false;
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
                 return false
               } else {
 
@@ -1967,18 +1966,18 @@
             })
 
         } else if (index == 9) {
-          this.statementVisible = true;
+          this.statementVisible = true
           let obj = {
             order_id: this.order.id,
-            settle_type:this.order.settle_type,
-            start_time:this.order.settle_start_time,
-            end_time:this.order.settle_end_time,
-          };
+            settle_type: this.order.settle_type,
+            start_time: this.order.settle_start_time,
+            end_time: this.order.settle_end_time
+          }
           this.orderObj = obj
           // this.$refs.print.getInfo(this.order.id)
 
         } else if (index == 10) {
-          var that = this;
+          var that = this
           this.$confirm('是否退号', '退号', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -1990,7 +1989,7 @@
               'record_time': this.record_date,
               'org_id': this.$store.getters.xt_user.org_id,
               'admin_user_id': this.$store.getters.xt_user.user.id
-            };
+            }
             axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
               params: params
             })
@@ -2010,8 +2009,8 @@
                     })
 
                   } else {
-                    that.radio = 1;
-                    that.changeRadioAndPatient(1);
+                    that.radio = 1
+                    that.changeRadioAndPatient(1)
                     that.$message({ message: '退号成功', type: 'success', duration: 5000 })
                   }
 
@@ -2028,7 +2027,7 @@
             'patient_id': this.patientInfo.id,
             'record_time': this.record_date,
             'org_id': this.$store.getters.xt_user.org_id
-          };
+          }
           axios.get('http://127.0.0.1:9532/api/refunddetail/post', {
             params: params
           })
@@ -2050,7 +2049,7 @@
           let params = {
             'name': '琥珀酸亚铁片',
             'codg': 'XB03AAH026A001010104942'
-          };
+          }
           axios.get('http://127.0.0.1:9532/api/code/get', {
             params: params
           })
@@ -2077,8 +2076,8 @@
           })
             .then(function(response) {
               if (response.data.state == 0) {
-                that.$message.error(response.data.msg);
-                that.loadingtwo = false;
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
                 return false
               } else {
                 that.loadingtwo = false
@@ -2087,22 +2086,22 @@
             .catch(function(error) {
             })
         } else if (index == 15) {
-          var that = this;
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 ||   this.$store.getters.xt_user.org_id == 9990) {
+          var that = this
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
-              that.$message.error('诊断不能为空,请选择诊断内容');
+              that.$message.error('诊断不能为空,请选择诊断内容')
               return
             }
 
             if (this.sick_type.length || this.sick_type == 0) {
 
-              that.$message.error('疾病类型不能为空,请选择疾病类型');
+              that.$message.error('疾病类型不能为空,请选择疾病类型')
               return
             }
 
             if (this.reg_type.length || this.reg_type == 0) {
-              that.$message.error('处方类型不能为空,请选择处方类型');
+              that.$message.error('处方类型不能为空,请选择处方类型')
               return
             }
 
@@ -2283,7 +2282,7 @@
         console.log(id)
         this.radioStatus = id
         this.getPatientList()
-      },      changeRadioAndPatient(id) {
+      }, changeRadioAndPatient(id) {
         // console.log(id)
         // this.radioStatus = id
         // this.getPatientList()
@@ -2368,8 +2367,7 @@
                 }
               }
 
-            }
-            else { //月结
+            } else { //月结
 
               for (let i = 0; i < this.hisPatientDatas.length; i++) {
                 if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1) {
@@ -2400,7 +2398,7 @@
                 this.patientTableData = []
                 if (this.activeName == 'first') {
 
-                  console.log("~~~~~~")
+                  console.log('~~~~~~')
                   console.log(this.all_table_data)
 
                   for (let i = 0; i < this.all_table_data.length; i++) {
@@ -2418,8 +2416,6 @@
                   }
                 }
 
-
-
                 break
               case 2:
                 this.patientTableData = []
@@ -2465,33 +2461,33 @@
 
             }
 
-            this.current_index = 0;
-            for (let i = 0; i < this.patientTableData.length; i++){
-              if(this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
-                this.$refs.tab.setCurrentRow(this.patientTableData[i]);
+            this.current_index = 0
+            for (let i = 0; i < this.patientTableData.length; i++) {
+              if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
+                this.$refs.tab.setCurrentRow(this.patientTableData[i])
                 this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id)
               }
             }
           }
         })
 
-      },   changeRadio(id) {
-        let temp_id = id;
+      }, changeRadio(id) {
+        let temp_id = id
         this.radio = id
         let params = {
           'record_date': this.record_date
-        };
+        }
         getChargeHisPatientList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            this.$message.error(response.data.msg)
             return false
           } else {
-            this.patientTableData = [];
-            this.hisPatientDatas = [];
-            this.all_table_data = [];
-            let one_count = 0;
-            let two_count = 0;
-            let three_count = 0;
+            this.patientTableData = []
+            this.hisPatientDatas = []
+            this.all_table_data = []
+            let one_count = 0
+            let two_count = 0
+            let three_count = 0
 
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (response.data.data.list[i].his_patient.length == 0) { //没挂号
@@ -2543,8 +2539,6 @@
               }
             }
 
-
-
             if (this.activeName == 'first') { //日结
 
               for (let i = 0; i < this.all_table_data.length; i++) {
@@ -2556,8 +2550,7 @@
                 }
               }
 
-            }
-            else { //月结
+            } else { //月结
 
               for (let i = 0; i < this.hisPatientDatas.length; i++) {
                 if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1) {
@@ -2577,9 +2570,9 @@
 
             }
 
-            this.cal_one = one_count;
-            this.cal_two = two_count;
-            this.cal_three = three_count;
+            this.cal_one = one_count
+            this.cal_two = two_count
+            this.cal_three = three_count
             switch (temp_id) {
 
               case 1:
@@ -2646,11 +2639,11 @@
 
             }
 
-            this.current_index = 0;
+            this.current_index = 0
 
-            for (let i = 0; i < this.patientTableData.length; i++){
-              if(this.patientInfo.id == this.patientTableData[i].id) {
-                this.$refs.tab.setCurrentRow(this.patientTableData[i]);
+            for (let i = 0; i < this.patientTableData.length; i++) {
+              if (this.patientInfo.id == this.patientTableData[i].id) {
+                this.$refs.tab.setCurrentRow(this.patientTableData[i])
                 // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id)
               }
             }
@@ -2658,7 +2651,7 @@
           }
         })
 
-      },formatDecimal(num, decimal) {
+      }, formatDecimal(num, decimal) {
         num = num.toString()
         let index = num.indexOf('.')
         if (index !== -1) {
@@ -2754,7 +2747,7 @@
 
             switch (this.radio) {
               case 1:
-                this.patientTableData = [];
+                this.patientTableData = []
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
@@ -2896,16 +2889,15 @@
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
-              if(project_month_prescriptions.project[a].type == 2){
-                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
-                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
-                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+              if (project_month_prescriptions.project[a].type == 2) {
+                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] = project_month_prescriptions.project[a].project.project_name
 
-
-              }else if(project_month_prescriptions.project[a].type == 3){
-                obj['statistical_classification'] = ""
-                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
-                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+              } else if (project_month_prescriptions.project[a].type == 3) {
+                obj['statistical_classification'] = ''
+                obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
 
               }
 
@@ -3015,7 +3007,7 @@
           'start_time': this.other_start_time,
           'end_time': this.other_end_time,
           'type': this.radio,
-          'p_type':2,
+          'p_type': 2
 
         }
         this.loading = true
@@ -3109,23 +3101,20 @@
                   remark: prescription.project[b].remark,
                   // medical_code: prescription.project[b].project.medical_code,
                   unit: prescription.project[b].unit,
-                  type:prescription.project[b].type,
+                  type: prescription.project[b].type
                 }
 
+                if (prescription.project[b].type == 2) {
+                  obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                  obj['medical_code'] = prescription.project[b].project.medical_code
+                  obj['project_name'] = prescription.project[b].project.project_name
 
-                if(prescription.project[b].type == 2){
-                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
-                  obj['medical_code'] =  prescription.project[b].project.medical_code
-                  obj['project_name'] =  prescription.project[b].project.project_name
-
-                }else if(prescription.project[b].type == 3){
-                  obj['statistical_classification'] = ""
-                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
-                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                } else if (prescription.project[b].type == 3) {
+                  obj['statistical_classification'] = ''
+                  obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] = prescription.project[b].good_info.good_name
                 }
 
-
-
                 tempProject.push(obj)
               }
 
@@ -3210,7 +3199,7 @@
                     that.$message.error(response.data.data.msg)
 
                   } else {
-                    that.changeRadioAndPatient(1);
+                    that.changeRadioAndPatient(1)
                     that.$message({ message: '预结算成功', type: 'success' })
                   }
 
@@ -3253,7 +3242,7 @@
                       that.$message.error(response.data.data.msg)
 
                     } else {
-                      that.changeRadioAndPatient(1);
+                      that.changeRadioAndPatient(1)
                       that.$message({ message: '退费成功', type: 'success' })
                     }
                   }
@@ -3293,10 +3282,10 @@
                 }
               })
               .catch(function(error) {
-              });
-            break;
+              })
+            break
           case 7:
-            var that = this;
+            var that = this
             axios.get('http://127.0.0.1:9532/sz/api/detail/cancel', {
               params: {
                 order_id: this.order.id,
@@ -3308,7 +3297,7 @@
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg);
+                  that.$message.error(response.data.msg)
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
@@ -3321,7 +3310,6 @@
                     }).catch(() => {
                     })
 
-
                   } else {
 
                     that.$message({ message: '明细撤销成功', type: 'success' })
@@ -3330,11 +3318,63 @@
                 }
               })
               .catch(function(error) {
-              });
+              })
+
+            break
+          case 8:
+            var that = this
+            let form = {}
+            form['id'] = this.patientInfo.id
+            form['his_patient_id'] = this.hisPatientInfo.id
+            form['record_time'] = this.record_date
+            form['admin_user_id'] = this.$store.getters.xt_user.user.id
+            form['org_id'] = this.$store.getters.xt_user.org_id
+            if (this.activeName == 'first') {
+              form['settle_accounts_type'] = 1
+            } else {
+              form['start_time'] = this.other_start_time
+              form['end_time'] = this.other_end_time
+              form['settle_accounts_type'] = 2
+            }
+            this.$confirm('是否进行预结算', '预结算', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              axios.get('http://127.0.0.1:9532/sz/api/presettle/get', {
+                params:form,
+                headers: {
+                  'Permission': 5
+                }
+              })
+                .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.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
 
-            break;
+                      }).catch(() => {
+                      })
+                    } else {
+                      that.changeRadioAndPatient(1)
+                      that.$message({ message: '预结算成功', type: 'success', duration: 5000 })
+                    }
+                  }
+                })
+                .catch(function(error) {
+
+                })
+            }).catch(() => {
+
+            })
+            break
           case 10:
-            this.newStatementVisible = true;
+            this.newStatementVisible = true
             let obj = {
               record_time: this.record_date,
               patient_id: this.patient_id,
@@ -3342,12 +3382,12 @@
               order_id: this.order.id,
               admin_user_id: this.$store.getters.xt_user.user.id
 
-            };
-            this.newOrderObj = obj;
+            }
+            this.newOrderObj = obj
             // this.$refs.print.getInfo(this.order.id)
-            break;
+            break
           case 11:
-            var that = this;
+            var that = this
             this.$confirm('是否退号', '退号', {
               confirmButtonText: '确 定',
               cancelButtonText: '取 消',
@@ -3359,12 +3399,12 @@
                   record_time: this.record_date,
                   admin_user_id: this.$store.getters.xt_user.user.id,
                   patient_id: this.patientInfo.id,
-                  his_patient_id: this.hisPatientInfo.id,
+                  his_patient_id: this.hisPatientInfo.id
                 }
               })
                 .then(function(response) {
                   if (response.data.state == 0) {
-                    that.$message.error(response.data.msg);
+                    that.$message.error(response.data.msg)
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
@@ -3376,9 +3416,8 @@
                       }).catch(() => {
                       })
 
-
                     } else {
-                      that.changeRadioAndPatient(1);
+                      that.changeRadioAndPatient(1)
                       that.$message({ message: '退号成功', type: 'success' })
                     }
                   }
@@ -3386,7 +3425,7 @@
                 .catch(function(error) {
                 })
             }).catch(() => {
-            });
+            })
             break
 
         }
@@ -3394,10 +3433,10 @@
       }
     },
     mounted() {
-      const that = this;
+      const that = this
       window.onresize = () => {
         return (() => {
-          window.fullHeight = document.documentElement.clientHeight;
+          window.fullHeight = document.documentElement.clientHeight
           that.fullHeight = window.fullHeight
         })()
       }
@@ -3405,11 +3444,11 @@
     watch: {
       fullHeight(val) {
         if (!this.timer) {
-          this.fullHeight = val;
-          let tableHeight = val - 243;
-          this.tableHeight = tableHeight;
-          this.timer = true;
-          let that = this;
+          this.fullHeight = val
+          let tableHeight = val - 243
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
           setTimeout(function() {
             that.timer = false
           }, 400)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -35,7 +35,7 @@
                     </el-form-item>
                     <el-form-item label="疾病类型:" prop="name" label-position="right">
 
-                        <el-select style="width:100%;" v-model="state1" placeholder="">
+                        <el-select  filterable style="width:100%;" v-model="state1" placeholder="">
                             <el-option
                                     v-for="(item,index) in sick"
                                     :key="index"
@@ -373,6 +373,10 @@
                                 </div>
                             </el-tab-pane>
                             <el-tab-pane label="项目组套" name="2">
+                                <el-input style="width:50%;" @input="searchProjectTeamAction"
+                                          @keyup.enter.native='searchProjectTeamAction'
+                                          v-model.trim="search_project_team_keyword"
+                                          placeholder="请输入项目组套名称"></el-input>
                                 <div style="width: 100%;flex:1;overflow-y: auto;">
                                     <el-table :data="tabPrjectTeam" border ref="tabProjectTeam"
                                               :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
@@ -509,6 +513,7 @@
         register_type: '',
         value: '0',
         search_project_keyword: '',
+        search_project_team_keyword:"",
         form: {
           name: ''
         },
@@ -550,6 +555,7 @@
         showTwo: false,
         tableData: [],
         tabPrjectTeam: [],
+        allTabPrjectTeam:[],
         teamList: [],
         doctors: [],
         departMent: [],
@@ -1489,6 +1495,20 @@
 
         }
 
+      },searchProjectTeamAction(){
+        if (this.search_project_team_keyword.length == 0) {
+          this.tabPrjectTeam = this.allTabPrjectTeam
+
+        } else {
+          let arr = []
+          for (let i = 0; i < this.allTabPrjectTeam.length; i++) {
+            if (this.allTabPrjectTeam[i].project_team.indexOf(this.search_project_team_keyword) != -1) {
+              arr = arr.concat(this.allTabPrjectTeam[i])
+            }
+          }
+          this.tabPrjectTeam = arr
+        }
+
       },
       searchAction() {
         if (this.search_keyword.length == 0) {
@@ -2659,6 +2679,9 @@
           if (response.data.state == 1) {
             var team = response.data.data.team
             this.tabPrjectTeam = team
+            this.allTabPrjectTeam = team
+
+
             this.projectList = team
           }
         })
@@ -2694,7 +2717,7 @@
             this.teamList = []
             var project = response.data.data.project
             for (let i = 0; i < project.length; i++) {
-              if (project[i].type == 2) {
+              if (project[i].type == 2 && project[i].status == 1) {
 
                 let obj = {
                   id: project[i].project_id,
@@ -2716,7 +2739,7 @@
                 }
 
                 this.teamList.push(obj)
-              } else if (project[i].type == 3) {
+              } else if (project[i].type == 3 && project[i].status == 1) {
                 let obj = {
                   id: project[i].project_id,
                   project_name: project[i].good_info.good_name,

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -78,7 +78,7 @@
     <div class="mainTitle">病历信息：</div>
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
      <el-form-item label="疾病类型: " prop="name" style="width:49%;">
-        <el-select v-model="case_history.sick" style="width:100%;" placeholder="请选择">
+        <el-select  filterable v-model="case_history.sick" style="width:100%;" placeholder="请选择">
           <el-option
             v-for="(item,index) in sick"
             :key="index"
@@ -393,7 +393,7 @@
 
 
       getTemplateDetail(id){
-         
+
           getTemplateDetail(id).then(response=>{
               if(response.data.state == 1){
                 var templatedetail =  response.data.data.templateDetail
@@ -409,7 +409,7 @@
                 this.case_history.remark = templatedetail.remark
                 this.case_history.sick = templatedetail.sick
                 this.case_history.diagnose = templatedetail.diagnose
-                
+
               }
           })
         },
@@ -428,7 +428,7 @@
              this.tabledataSix = response.data.data.listSix
              this.tabledataSeven =  response.data.data.listSeven
            }
-        })   
+        })
        },
 
        changeMainTemplate(values){
@@ -531,7 +531,7 @@
           } else {
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
-          
+
           }
         })
 
@@ -547,7 +547,7 @@
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-    
+
     },
     watch:{
       detalid:function(val){
@@ -579,7 +579,7 @@
             this.case_history.diagnose = ""
           }
           this.form.id = this.case_history.id
-         
+
           this.watchSign++
         },
         deep:true

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -104,7 +104,7 @@
 
                 <el-table-column align="center" prop="name" label="疾病类型">
                     <template slot-scope="scope">
-                        <el-select style="width:100%;" v-model="scope.row.record.sick_type" placeholder="请选择">
+                        <el-select  filterable style="width:100%;" v-model="scope.row.record.sick_type" placeholder="请选择">
                             <el-option
                                     v-for="(item,index) in sick"
                                     :key="index"