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/outpatientChargesManagement.vue

@@ -5,20 +5,25 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
-         <!-- <div class="mainCell" style="justify-content: space-between;font-size:14px;">
-          <p >未收费：<span style="color: red">{{cal_one}}</span>人</p>
-          <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
-          <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
-        </div> -->
+
+        <!-- <div class="mainCell" style="justify-content: space-between;font-size:14px;">
+         <p >未收费：<span style="color: red">{{cal_one}}</span>人</p>
+         <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
+         <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
+       </div> -->
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="changeRadio">
             <!-- <el-radio :label=1>未收费</el-radio>
             <el-radio :label=2>已收费</el-radio>
             <el-radio :label=3>已退费</el-radio>
             <el-radio :label=4>全部</el-radio> -->
-            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>
-            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>
-            <el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>
+            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人
+            </el-radio>
+            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人
+            </el-radio>
+            <el-radio :label=3>已退费<span
+              style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人
+            </el-radio>
             <el-radio :label=4>全部</el-radio>
 
           </el-radio-group>
@@ -62,6 +67,16 @@
           <el-button size="small" @click="open(5)" type="primary"
                      v-if="this.info && this.info.prescription_status == 3">退费
           </el-button>
+
+
+          <el-button size="small" @click="open(7)" type="primary"
+          >对账
+          </el-button>
+
+
+          <el-button size="small" @click="open(8)" type="primary"
+          >明细对账
+          </el-button>
         </div>
 
         <div class="mainCenter">
@@ -227,6 +242,8 @@
 
 
 <script>
+  import axios from 'axios'
+
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import noCharge from './components/noCharge'
   import charged from './components/charged'
@@ -319,56 +336,101 @@
       this.getPatientList()
     },
     methods: {
-      chargeConfirm(form){
+      chargeConfirm(form) {
         form['id'] = this.patientInfo.id
-        form['record_time'] =  this.record_date
+        form['record_time'] = this.record_date
         this.loadingtwo = true
-        upload(form).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            this.loadingtwo = false
-            this.$refs.charge.hide()
-            return false
-          } else {
-            this.state = '已收费'
-            this.$message({message: '收费成功', type: 'success'})
-            this.$refs.charge.hide()
-            this.loadingtwo = false
-            this.cal_one = this.cal_one - 1
-            this.cal_two = this.cal_two + 1
-            this.patientTableData.splice(this.current_index, 1)
-          }
-        })
+        if (this.$store.getters.xt_user.org_id == 4) {
+          axios.get('http://127.0.0.1:9532/api/upload/get', {
+            params: form
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                this.loadingtwo = false
+                this.$refs.charge.hide()
+                return false
+              } else {
+                this.state = '已收费'
+                this.$message({message: '收费成功', type: 'success'})
+                this.$refs.charge.hide()
+                this.loadingtwo = false
+                this.cal_one = this.cal_one - 1
+                this.cal_two = this.cal_two + 1
+                this.patientTableData.splice(this.current_index, 1)
+              }
+            })
+            .catch(function (error) {
 
-      },chargeCancel(){
+            });
+        } else {
+          upload(form).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              this.loadingtwo = false
+              this.$refs.charge.hide()
+              return false
+            } else {
+              this.state = '已收费'
+              this.$message({message: '收费成功', type: 'success'})
+              this.$refs.charge.hide()
+              this.loadingtwo = false
+              this.cal_one = this.cal_one - 1
+              this.cal_two = this.cal_two + 1
+              this.patientTableData.splice(this.current_index, 1)
+            }
+          })
+        }
+      }, chargeCancel() {
         this.$refs.charge.hide()
       },
       confirm(forms) {
         forms['id'] = this.patientInfo.id,
           forms['record_time'] = this.record_date,
           this.loadingone = true
-        register(forms).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            this.loadingone = false
-            this.$refs.register.hide()
-            return false
-          } else {
-            this.getPatientList()
-            this.$message({message: '挂号成功', type: 'success'})
-            this.$refs.register.hide()
-            this.loadingone = false
-            var his_info = response.data.data.his_info
-            this.hisPatientInfo = his_info
-          }
-        })
 
+        if (this.$store.getters.xt_user.org_id == 4) {
+          axios.get('http://127.0.0.1:9532/api/register/get', {
+            params: forms
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                this.loadingone = false
+                this.$refs.register.hide()
+                return false
+              } else {
+                this.getPatientList()
+                this.$message({message: '挂号成功', type: 'success'})
+                this.$refs.register.hide()
+                this.loadingone = false
+                var his_info = response.data.data.his_info
+                this.hisPatientInfo = his_info
+              }
+            })
+            .catch(function (error) {
+
+            });
+        } else {
+          register(forms).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              this.loadingone = false
+              this.$refs.register.hide()
+              return false
+            } else {
+              this.getPatientList()
+              this.$message({message: '挂号成功', type: 'success'})
+              this.$refs.register.hide()
+              this.loadingone = false
+              var his_info = response.data.data.his_info
+              this.hisPatientInfo = his_info
+            }
+          })
+        }
 
       }, cancel() {
-
         this.$refs.register.hide()
-
-
       },
       addCharges() {
         this.$refs.additionalCharges.show()
@@ -571,33 +633,74 @@
           this.$refs.charge.show(this.getTotal())
 
 
-
         } else if (index == 5) {
+          if (this.$store.getters.xt_user.org_id == 4) {
+            this.$confirm('是否退费', '退费', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              let params = {
+                'order_id': this.order.id,
+                'number': this.order.number,
+                'patient_id': this.patientInfo.id,
+                'record_time': this.record_date,
 
-          this.$confirm('是否退费', '退费', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-            let params = {
-              'order_id': this.order.id,
-              'number': this.order.number,
-            }
-            Refund(params).then(response => {
-              if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
-                this.loadingtwo = false
-                return false
-              } else {
-                this.$message({message: '退费成功', type: 'success'})
-                this.loadingtwo = false
+              }
+              axios.post('http://127.0.0.1:9532/api/refund/post', {
+                params: params
+              })
+                .then(function (response) {
+                  if (response.data.state == 0) {
+                    this.$message.error(response.data.msg)
+                    this.loadingtwo = false
+                    return false
+                  } else {
+                    this.$message({message: '退费成功', type: 'success'})
+                    this.loadingtwo = false
+
+                  }
+                })
+                .catch(function (error) {
+
+                });
+
+            }).catch(() => {
+
+            })
+
+          } else {
+
+            this.$confirm('是否退费', '退费', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              let params = {
+                'order_id': this.order.id,
+                'number': this.order.number,
+                'patient_id': this.patientInfo.id,
+                'record_time': this.record_date,
 
               }
+              Refund(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  this.loadingtwo = false
+                  return false
+                } else {
+                  this.$message({message: '退费成功', type: 'success'})
+                  this.loadingtwo = false
+
+                }
+              })
+
+            }).catch(() => {
+
             })
 
-          }).catch(() => {
 
-          })
+          }
 
 
         } else if (index == 6) {
@@ -610,6 +713,58 @@
           this.$refs.register.show(this.patientInfo)
 
 
+        } else if (index == 7) {
+          let params={
+            start_time:"2020-12-01",
+            end_time:"2020-12-30",
+            insutype:"390",
+            clr_type:"11",
+          }
+
+          if (this.$store.getters.xt_user.org_id == 4) {
+            axios.post('http://127.0.0.1:9532/api/checkaccount/get', {
+              params: params
+            })
+              .then(function (response) {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  this.loadingtwo = false
+                  return false
+                } else {
+
+
+                }
+              })
+              .catch(function (error) {
+
+              });
+
+
+          }
+
+        } else if (index == 8) {
+          let params={
+            start_time:"2020-12-01",
+            end_time:"2020-12-30",
+          }
+          axios.post('http://127.0.0.1:9532/api/checkdetailaccount/get', {
+            params: params
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                this.loadingtwo = false
+                return false
+              } else {
+
+              }
+            })
+            .catch(function (error) {
+
+            });
+
+
+
         }
       },
 
@@ -894,6 +1049,7 @@
       }
     },
     mounted() {
+      console.log(this.$store.getters.xt_user.org_id)
       const that = this
       window.onresize = () => {
         return (() => {
@@ -992,7 +1148,7 @@
   .mainCenter {
     display: flex;
     flex: 1;
-    height:100%;
+    height: 100%;
   }
 
   .costBox {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -518,6 +518,12 @@
           this.$message.error('处方已经结算,无法添加')
           return
         }
+        if (this.patientInfo.id == 0) {
+          this.$message.error('请选择患者')
+          return
+        }
+
+
         if (val == 1) {
           this.isVisibility = false
           this.request_record_date = this.record_date
@@ -545,6 +551,10 @@
           this.$message.error('处方已经结算,无法添加')
           return
         }
+        if (this.patientInfo.id == 0) {
+          this.$message.error('请选择患者')
+          return
+        }
         if (val == 2) {
           this.isVisibility = false
           this.request_record_date = this.record_date
@@ -933,6 +943,10 @@
           this.$message.error('处方已经结算,无法添加')
           return
         }
+        if (this.patientInfo == null || this.patientInfo.id == 0) {
+          this.$message.error('请选择患者')
+          return
+        }
         let params = {
           end_time: this.record_date,
           start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),