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

@@ -69,8 +69,8 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-    <el-button @click="cancel('formValue')">取 消</el-button>
-    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button v-loading="loadingtwo" @click="cancel('formValue')">取 消</el-button>
+    <el-button v-loading="loadingtwo" type="primary" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
 
@@ -157,6 +157,8 @@
         this.visibility = true
 
       }, hide: function () {
+        this.form = Object.assign({}, this.resetForm)
+        this.loadingtwo = false
         this.visibility = false
       }, cancel: function (formName) {
         this.$emit('cancel', this.getValue())
@@ -168,7 +170,7 @@
             let value = {}
             value = this.getValue()
             this.$emit('confirm', value)
-            this.form = Object.assign({}, this.resetForm)
+            this.loadingtwo = true
           }
         })
       },

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -50,8 +50,8 @@
             </el-form-item>
 
 
-            <el-form-item label="医疗类别：">
-                <el-select v-model="form.medical_care" prop="medical_care" placeholder="请选择" style="width:100%;">
+            <el-form-item label="医疗类别：" prop="medical_care">
+                <el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">
                     <el-option
                             v-for="(item,index) in medical_care"
                             :key="index"
@@ -448,7 +448,7 @@
               if (that.form.id_card_type == 1) {
                 that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender.toString()
+                that.form.gender = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
@@ -457,7 +457,7 @@
               } else if (that.form.id_card_type == 2) {
                 this.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender
+                that.form.gender = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -112,7 +112,8 @@
                   that.info['health_card_no'] = response.data.data.health_card_no
                   that.info['order_number'] = response.data.data.order_number
 
-
+                  that.info['department'] =  response.data.data.department
+                  that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie
 
                   that.info['org_name'] = that.$store.getters.xt_user.org.org_name
                   console.log("～～～～" + that.info)

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -8,11 +8,11 @@
                     <div class="infoP">名称：{{info.org_name}}</div>
                     <div class="infoP">医生工号：{{info.doctor_code}}</div>
                     <div class="infoP">门诊流水号：{{info.transBody.akc190}}</div>
-                    <div class="infoP">科别: 全科</div>
+                    <div class="infoP">科别: {{info.department}}</div>
                     <div class="infoP">处方单据号：{{info.order_number}}</div>
                     <div class="infoP">姓名：{{info.patient_name}}</div>
                     <div class="infoP">医疗账号：{{info.health_card_no}}</div>
-                    <div class="infoP">医疗类别：普通</div>
+                    <div class="infoP">医疗类别：{{info.yiliao_leibie}}</div>
                 </div>
                 <div class="chargeBox">
                     <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
@@ -32,23 +32,23 @@
                         <div style="width:20%;">
                             <div class="chargeUl" v-for="(item,index) in info.transBody.outputlist2" :key="index">
                                 <p style="width:50%;">{{getItemName(item.aka111)}}</p>
-                                <p style="width:50%;">{{item.bka058}}</p>
+                                <p style="width:50%;">{{item.bka058?item.bka058:0}}元</p>
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;">
                                 <p style="width:50%;">费用合计</p>
-                                <p style="width:50%;">{{info.transBody.akc264}}</p>
+                                <p style="width:50%;">{{info.transBody.akc264?info.transBody.akc264:0}}元</p>
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;">
                                 <p style="width:50%;">记账支付</p>
-                                <p style="width:50%;">{{info.transBody.akb068}}</p>
+                                <p style="width:50%;">{{info.transBody.akb068?info.transBody.akb068:0}}元</p>
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;">
                                 <p style="width:50%;">个人账号</p>
-                                <p style="width:50%;">{{info.transBody.akc266}}</p>
+                                <p style="width:50%;">{{info.transBody.akc266?info.transBody.akc266:0}}元</p>
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                                 <p style="width:50%;">现金支付</p>
-                                <p style="width:50%;">{{info.transBody.akb067}}</p>
+                                <p style="width:50%;">{{info.transBody.akb067?info.transBody.akb067:0}}元</p>
                             </div>
                         </div>
                         <div style="width:80%;display:flex;height:300px;">
@@ -66,21 +66,21 @@
                                     {{item}}次</p>
                             </div>
                             <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                <p v-for="(item,f) in info.price_arr" :key="f" class="chargeP">{{item}}</p>
+                                <p v-for="(item,f) in info.price_arr" :key="f" class="chargeP">{{item}}元</p>
                             </div>
                             <div style="width:15%;text-align:center;">
-                                <p v-for="(item,d) in info.total_arr" :key="d" class="chargeP">{{item}}</p>
+                                <p v-for="(item,d) in info.total_arr" :key="d" class="chargeP">{{item}}元</p>
                             </div>
                         </div>
                     </div>
 
                 </div>
                 <div class="moneyBox">
-                    <p>实收金：{{info.transBody.akc264}}</p>
-                    <p>记账前金额：{{0.00}}</p>
-                    <p>扣款金额：{{0.00}}</p>
-                    <p>记账后金额：{{0.00}}</p>
-                    <p>找赎金：{{0.00}}</p>
+                    <p>实收金：{{info.transBody.akc264}}元</p>
+                    <p>记账前金额：{{0.00}}元</p>
+                    <p>扣款金额：{{0.00}}元</p>
+                    <p>记账后金额：{{0.00}}元</p>
+                    <p>找赎金：{{0.00}}元</p>
                 </div>
                 <div class="actionBar">
                     <div>收费员：{{info.doctor_name}}</div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -64,7 +64,7 @@
 
                         </el-button>
 
-                        <el-button v-loading="loadingtwo"
+                        <el-button
                                    v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
                                    size="small"
                                    @click="sz_open(3)"
@@ -84,6 +84,11 @@
                             退费
                         </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>-->
                     </div>
 
 
@@ -97,11 +102,7 @@
                     <!--&gt;打印-->
                     <!--</el-button>-->
 
-                    <!--<el-button-->
-                    <!--v-if="$store.getters.xt_user.org_id == 4  ||  this.$store.getters.xt_user.org_id == 3877"-->
-                    <!--size="small" @click="sz_open(7)" type="primary"-->
-                    <!--&gt;深圳撤销明细-->
-                    <!--</el-button>-->
+
 
 
                     <!-- <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
@@ -612,9 +613,7 @@
 
         }
 
-        this.loadingtwo = true
         if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9504) {
-
           var that = this
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
             params: form
@@ -622,7 +621,6 @@
             .then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.msg)
-                that.loadingtwo = false
                 that.$refs.charge.hide()
                 return false
               } else {
@@ -633,18 +631,14 @@
                 } else {
                   that.changeRadio(2)
                   that.radio = 2
-
                   that.$refs.charge.hide()
-                  that.loadingtwo = false
                   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)
-
                 }
-
               }
             })
             .catch(function(error) {
@@ -2592,7 +2586,6 @@
                 record_time: this.record_date,
                 admin_user_id: this.$store.getters.xt_user.user.id,
                 patient_id: this.patientInfo.id
-
               }
             })
               .then(function(response) {
@@ -2601,18 +2594,9 @@
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
-
                     that.$message.error(response.data.data.msg)
-
                   } else {
-                    if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
-
-                    } else {
-                      that.$message({ message: '查询成功', type: 'success' })
-
-                    }
-
+                    that.$message({ message: '查询成功', type: 'success' })
                   }
                 }
               })
@@ -2640,13 +2624,9 @@
                     that.$message.error(response.data.data.msg)
 
                   } else {
-                    if (response.data.data.failed_code == -10) {
-                      that.$message.error(response.data.data.msg)
 
-                    } else {
                       that.$message({ message: '明细撤销成功', type: 'success' })
 
-                    }
 
                   }
                 }
@@ -2654,13 +2634,16 @@
               .catch(function(error) {
               })
 
+            break
           case 10:
             this.newStatementVisible = true
             let obj = {
               record_time: this.record_date,
               patient_id: this.patient_id,
               prescription_id: this.prescription_id,
-              order_id: this.order.id
+              order_id: this.order.id,
+              admin_user_id: this.$store.getters.xt_user.user.id,
+
             }
             this.newOrderObj = obj
             // this.$refs.print.getInfo(this.order.id)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1699,7 +1699,7 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
-     
+
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
 
@@ -1867,6 +1867,14 @@
             return
           }
 
+          if (this.state1  <= 0) {
+            this.$message.error('疾病类型不能为空')
+            return
+          }
+
+
+
+
           if (index == 1) {
             let params = {
               patient_id: this.patientInfo.id,
@@ -2229,10 +2237,10 @@
       selectDrugs(selection, row) {
         this.curDrugs = selection
       },
-    
+
       comfirm() {
         console.log("222222222222",this.curPrescriptions)
-   
+
         if (this.dayorMonth == 'month') {
           this.$message.error('月结状态下，无法添加药品或者项目')
           return
@@ -2368,7 +2376,7 @@
             }
 
            if(this.activeName == 2){
-             
+
               for(let i = 0; i<temp2.length;i++){
                for(let j=0;j<this.hisList.length;j++){
                    if(temp2[i].id == this.hisList[j].project_id){
@@ -2377,7 +2385,7 @@
                }
               }
             }
-          
+
 
             if (temp2.length > 0) {
               console.log("temp2222222222",temp2)
@@ -2448,7 +2456,7 @@
         getAllProjectTeam().then(response => {
           if (response.data.state == 1) {
             var team = response.data.data.team
-            console.log("team2222",team) 
+            console.log("team2222",team)
             this.tabPrjectTeam = team
           }
         })
@@ -2522,12 +2530,12 @@
       this.getlist()
       //获取所以项目组套
       this.getAllProjectTeam()
-      
+
       this.getAllProjectList()
       this.$nextTick(() => {
         this.multipleTableHeight = parseInt(this.$refs.rightTable.offsetHeight)
       })
-      
+
     },
     watch: {