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

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -111,7 +111,8 @@
           found_price:'',
           total:0,
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          order:null
 
 
         },
@@ -164,7 +165,7 @@
       }
     },
     methods: {
-      show: function (total) {
+      show: function (total,order) {
         this.total = total
         this.form.private_price = total
         this.form.pay_price = total
@@ -174,8 +175,15 @@
 
         this.form.fapiao_code =""
         this.form.fapiao_number = ""
+        this.order = order
+
+        if(this.order && this.order.id > 0){
+          this.total = this.order.medfee_sumamt
+          this.medical_insurance_price = this.order.fund_pay_sumamt
+          this.private_price =  this.order.psn_part_amt
 
 
+        }
 
         this.visibility = true
 

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -423,7 +423,7 @@
           }
         })
       },
-      reading(medicalInsuranceCard) {
+      reading() {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
           this.$message.error('请先选择读卡类型')
@@ -431,10 +431,10 @@
         }
         let params = {
           'id_card_type': this.form.id_card_type,
-          'admin_user_id': this.$store.getters.xt_user.user.id
-
+          'admin_user_id': this.$store.getters.xt_user.user.id,
+          'certificates':this.form.certificates,
         }
-        axios.get('http://127.0.0.1:9532/api/sscard', {
+        axios.get('http://127.0.0.1:9532/api/readcard', {
           params: params
         })
           .then(function(response) {

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -44,7 +44,7 @@
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;">
                                 <p style="width:50%;">个人账号</p>
-                                <p style="width:50%;">{{info.transBody.akc266?info.transBody.akc266:0}}元</p>
+                                <p style="width:50%;">{{info.transBody.akb066?info.transBody.akb066:0}}元</p>
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                                 <p style="width:50%;">现金支付</p>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -64,16 +64,16 @@
 
                         </el-button>
 
-                        <!--<el-button-->
-                                <!--size="small" @click="sz_open(8)" type="primary"-->
-                        <!--&gt;预结算-->
-                        <!--</el-button>-->
+                        <el-button
+                                size="small" @click="sz_open(8)" type="primary"
+                        >预结算
+                        </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.order.order_status == 1"
+                                size="small" @click="sz_open(7)" type="primary"
+                        >撤销明细
+                        </el-button>
 
                         <el-button
                                 v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
@@ -120,6 +120,11 @@
                                    type="primary">挂号
                         </el-button>
 
+                        <el-button
+                                size="small" @click="open(8)" type="primary"
+                        >预结算
+                        </el-button>
+
 
                         <el-button v-loading="loadingtwo"
                                    v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3"
@@ -1809,10 +1814,10 @@
 
           if (this.activeName == 'first') {
 
-            this.$refs.charge.show(this.getTotal())
+            this.$refs.charge.show(this.getTotal(),this.order)
 
           } else {
-            this.$refs.charge.show(this.getTotalTwo())
+            this.$refs.charge.show(this.getTotalTwo(),this.order)
 
           }
 
@@ -1944,26 +1949,77 @@
           }
 
         } else if (index == 8) {
-          let params = {
-            start_time: '2020-12-28',
-            end_time: '2020-12-30'
-          }
-          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
-                return false
-              } else {
 
+          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/api/presettle/get', {
+              params:form,
+              headers: {
+                'Permission': 5
               }
             })
-            .catch(function(error) {
+              .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(() => {
 
-            })
+                    }).catch(() => {
+                    })
+                  } else {
+                    that.changeRadioAndPatient(1)
+                    that.$message({ message: '预结算成功', type: 'success', duration: 5000 })
+                  }
+                }
+              })
+              .catch(function(error) {
+
+              })
+          }).catch(() => {
+
+          })
+          // let params = {
+          //   start_time: '2020-12-28',
+          //   end_time: '2020-12-30'
+          // }
+          // 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
+          //       return false
+          //     } else {
+          //
+          //     }
+          //   })
+          //   .catch(function(error) {
+          //
+          //   })
 
         } else if (index == 9) {
           this.statementVisible = true

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1817,6 +1817,9 @@
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
+        // this.$refs.tabProjectTeam.clearSelection()
+
+
 
         console.log(doctors)
         for (let i = 0; i < doctors.length; i++) {
@@ -1950,6 +1953,7 @@
           return false
         }
       }, open_three() {
+        console.log(this.prescriptions)
         for (let i = 0; i < this.prescriptions.length; i++) {
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
@@ -2019,6 +2023,7 @@
             this.$message.error('疾病类型不能为空')
             return
           }
+          console.log(this.prescriptions)
           for (let i = 0; i < this.prescriptions.length; i++) {
             for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
               if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
@@ -2085,14 +2090,14 @@
             }
             isLoading = true
 
-            createHisPrescription(data, params).then(response => {
-              if (response.data.state == 1) {
-                this.$emit('change', this.patientInfo.id)
-                this.$message.success('保存成功')
-              } else {
-                this.$message.error(response.data.msg)
-              }
-            })
+            // createHisPrescription(data, params).then(response => {
+            //   if (response.data.state == 1) {
+            //     this.$emit('change', this.patientInfo.id)
+            //     this.$message.success('保存成功')
+            //   } else {
+            //     this.$message.error(response.data.msg)
+            //   }
+            // })
           } else if (index == 2) {
             this.$router.push('/outpatientDoctorStation/print')
           } else if (index == 4) {