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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -427,6 +427,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 31">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -657,6 +667,11 @@
             v-if="org_template_info.template_id == 30"
           >
           </DialysisPrintOrderThirty>
+          <DialysisPrintOrderThirtyOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 31"
+          >
+          </DialysisPrintOrderThirtyOne>
         </div>
       </el-container>
     </div>
@@ -706,9 +721,11 @@ import DialysisPrintOrderTwentySeven from "./template/DialysisPrintOrderTwentySe
 import DialysisPrintOrderTwentyEight from "./template/DialysisPrintOrderTwentyEight";
 import DialysisPrintOrderTwentyNine from "./template/DialysisPrintOrderTwentyNine";
 import DialysisPrintOrderThirty from "./template/DialysisPrintOrderThirty";
+import DialysisPrintOrderThirtyOne from "./template/DialysisPrintOrderThirtyOne";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyOne,
     DialysisPrintOrderThirty,
     DialysisPrintOrderTwentyNine,
     DialysisPrintOrderTwentyEight,
@@ -1116,7 +1133,14 @@ export default {
           style: style,
           scanStyles: false
         });
-      }
+      } else if (this.org_template_info.template_id == 31) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style3,
+          scanStyles: false
+        });
+      } 
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -29,6 +29,8 @@
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
+          <el-input size="small" v-model="key" class="filter-item"/>
+
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
@@ -69,17 +71,36 @@
           </el-button>
 
 
-          <el-button size="small" @click="open(7)" type="primary"
-          >对账
-          </el-button>
+          <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(7)" type="primary"-->
+          <!--&gt;对账-->
+          <!--</el-button>-->
 
 
-          <el-button size="small" @click="open(8)" type="primary"
-          >明细对账
-          </el-button>
-          <el-button size="small" @click="open(9)" type="primary"
+          <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(8)" type="primary"-->
+          <!--&gt;明细对账-->
+          <!--</el-button>-->
+          <el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(9)" type="primary"
           >结算单
           </el-button>
+
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"-->
+          <!--&gt;退号-->
+          <!--</el-button>-->
+
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(11)" type="primary"-->
+          <!--&gt;撤销明细-->
+          <!--</el-button>-->
+
+
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->
+          <!--&gt;查编码-->
+          <!--</el-button>-->
+
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(13)" type="primary"-->
+          <!--&gt;查待遇-->
+          <!--</el-button>-->
+
+
         </div>
 
         <div class="mainCenter">
@@ -157,70 +178,59 @@
               </div>
             </el-tab-pane>
             <!--<el-tab-pane label="月结" name="second">-->
-            <!--<div style="display:flex;height:100%;">-->
-            <!--<div class="centerLeft">-->
-            <!--<div class="tabsBox">-->
-            <!--&lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-            <!--<el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>-->
-            <!--<el-tab-pane-->
-            <!--v-for="(item, index) in editableTabs"-->
-            <!--:key="index"-->
-            <!--:label="item.title"-->
-            <!--:name="item.name"-->
-            <!--&gt;-->
-            <!--<div class="RP">-->
-            <!--Rp-->
-            <!--<el-date-picker-->
-            <!--style="width:420px;"-->
-            <!--v-model="value1"-->
-            <!--type="daterange"-->
-            <!--range-separator="至"-->
-            <!--start-placeholder="开始日期"-->
-            <!--end-placeholder="结束日期">-->
-            <!--</el-date-picker>-->
-            <!--</div>-->
-            <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
-            <!--</el-tab-pane>-->
-            <!--&lt;!&ndash;<el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span></el-tab-pane>&ndash;&gt;-->
-            <!--</el-tabs>-->
-
-            <!--</div>-->
-            <!--<div class="costBox">-->
-            <!--<span>处方编号：2134348971237883</span>-->
-            <!--<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>-->
-            <!--<span>{{ state }}</span>-->
-            <!--</div>-->
-            <!--</div>-->
-            <!--<div class="centerRight">-->
-            <!--<p class="centerRightTitle">人员信息</p>-->
-            <!--<div style="display:flex;justify-content: space-between;line-height:30px;">-->
-            <!--<span style="font-size:14px;">人员编码:</span>-->
-            <!--<span style="font-size:14px;">日期:{{start_time}}</span>-->
-            <!--</div>-->
-            <!--<ul class="basicUl">-->
-            <!--<li style="width:50%;">姓名：{{ patientInfo.name }}</li>-->
-            <!--<li style="width:50%;">性别：{{ patientInfo && patientInfo.gend == 1 ? '男' : "女" }}</li>-->
-            <!--<li style="width:50%;">年龄：{{ patientInfo.age }}</li>-->
-            <!--<li style="width:50%;">身高：</li>-->
-            <!--<li style="width:50%;">体重：</li>-->
-            <!--<li style="width:50%;">电话：</li>-->
-            <!--<li style="width:100%;">地址：</li>-->
-            <!--<li style="width:100%;">过敏史：</li>-->
-            <!--</ul>-->
-            <!--<p class="centerRightTitle">诊断信息</p>-->
-            <!--<div style="display:flex;justify-content: space-between;line-height:30px;">-->
-            <!--<span style="font-size:14px;">门诊编号:676273816287361</span>-->
-            <!--</div>-->
-            <!--<ul class="basicUl">-->
-            <!--<li style="width:50%;">医生：{{ doctor.name }}</li>-->
-            <!--<li style="width:50%;">科室：{{ doctor.department }}</li>-->
-            <!--<li style="width:100%;">费用：{{ doctor.total }}元</li>-->
-            <!--<li style="width:100%;">判断结果：</li>-->
-            <!--<li style="width:100%;">是否有传染病：</li>-->
-            <!--<li style="width:100%;">血压：</li>-->
-            <!--</ul>-->
-            <!--</div>-->
-            <!--</div>-->
+              <!--<div style="display:flex;height:100%;">-->
+                <!--<div class="centerLeft">-->
+                  <!--<div class="tabsBox">-->
+                    <!--&lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
+                    <!--<el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>-->
+
+                      <!--<el-tab-pane-->
+                        <!--v-for="(item, index) in month_prescriptions"-->
+                        <!--:key="index"-->
+                        <!--:label="item.name"-->
+                        <!--:name="item.name"-->
+                      <!--&gt;-->
+                      <!--</el-tab-pane>-->
+
+                      <!--<div class="RP">-->
+                        <!--Rp-->
+                        <!--<el-date-picker-->
+                          <!--v-model="other_start_time"-->
+                          <!--prefix-icon="el-icon-date"-->
+                          <!--@change="changeTime"-->
+                          <!--:editable="false"-->
+                          <!--style="width: 150px;"-->
+                          <!--type="date"-->
+                          <!--:picker-options="pickerOptions"-->
+                          <!--placeholder="选择开始时间"-->
+                          <!--align="right"-->
+                          <!--format="yyyy-MM-dd"-->
+                          <!--value-format="yyyy-MM-dd"-->
+                        <!--&gt;</el-date-picker>-->
+                        <!--<span class>-</span>-->
+                        <!--<el-date-picker-->
+                          <!--v-model="other_end_time"-->
+                          <!--prefix-icon="el-icon-date"-->
+                          <!--@change="changeEndTime"-->
+                          <!--:editable="false"-->
+                          <!--style="width: 150px;"-->
+                          <!--type="date"-->
+                          <!--placeholder="选择结束时间"-->
+                          <!--align="right"-->
+                          <!--format="yyyy-MM-dd"-->
+                          <!--value-format="yyyy-MM-dd"-->
+                        <!--&gt;</el-date-picker>-->
+                      <!--</div>-->
+                      <!--&lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
+                    <!--</el-tabs>-->
+
+                  <!--</div>-->
+                  <!--&lt;!&ndash;<div class="costBox">&ndash;&gt;-->
+                    <!--&lt;!&ndash;<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
+                  <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                <!--</div>-->
+              <!--</div>-->
             <!--</el-tab-pane>-->
           </el-tabs>
 
@@ -284,6 +294,9 @@
     },
     data() {
       return {
+        key: "",
+        other_start_time:"",
+        other_end_time:"",
         crumbs: [
           {path: false, name: '门诊收费'},
           {path: false, name: '门诊收费管理'}
@@ -298,6 +311,8 @@
         info: {},
         curPrescriptions: {},
         prescriptions: [],
+        month_prescriptions: [],
+
         record_date: '',
         tableData: [],
         editableTabsValue: '处方1',
@@ -327,11 +342,9 @@
         order: {},
         addtions_charge: [],
         treatVisible: false,
-        orderObj:{
-        },
-        paramsObj: {
-        },
-        statementVisible:false
+        orderObj: {},
+        paramsObj: {},
+        statementVisible: false
       }
     },
     created() {
@@ -352,12 +365,30 @@
       this.getPatientList()
     },
     methods: {
-      chargeConfirm(form) {
+      changeTime(val){
+        this.other_start_time = val
+
+
+      },changeEndTime(val){
+        this.other_end_time = val
+
+
+
+      }, chargeConfirm(form) {
+
         form['id'] = this.patientInfo.id
         form['record_time'] = this.record_date
+        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.loadingtwo = true
-        if (this.$store.getters.xt_user.org_id == 4) {
-         var  that = this
+        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+          var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form
           })
@@ -368,6 +399,7 @@
                 that.$refs.charge.hide()
                 return false
               } else {
+                that.changeRadio(2)
                 that.$refs.charge.hide()
                 that.loadingtwo = false
                 that.state = '已收费'
@@ -381,8 +413,7 @@
             .catch(function (error) {
 
             });
-        }
-        else {
+        } else {
           upload(form).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -411,8 +442,8 @@
           forms['record_time'] = this.record_date,
           this.loadingone = true
 
-        if (this.$store.getters.xt_user.org_id == 4) {
-          var  that = this
+        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+          var that = this
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms
@@ -652,16 +683,17 @@
           // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
 
-          if (this.hisPatientInfo.id == 0) {
-            this.$message({message: '该患者尚未挂号,请先挂号', type: 'error'})
-            return
-          }
+          // if (this.hisPatientInfo.id == 0) {
+          //   this.$message({message: '该患者尚未挂号,请先挂号', type: 'error'})
+          //   return
+          // }
 
           this.$refs.charge.show(this.getTotal())
 
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 4) {
+          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+
             var that = this
             this.$confirm('是否退费', '退费', {
               confirmButtonText: '确 定',
@@ -684,6 +716,7 @@
                     that.loadingtwo = false
                     return false
                   } else {
+                    that.changeRadio(1)
                     that.$message({message: '退费成功', type: 'success'})
                     that.loadingtwo = false
 
@@ -742,16 +775,16 @@
 
 
         } else if (index == 7) {
-          let params={
-            start_time:"2020-12-28",
-            end_time:"2020-12-30",
-            insutype:"390",
-            clr_type:"11",
+          let params = {
+            start_time: "2020-12-28",
+            end_time: "2020-12-30",
+            insutype: "390",
+            clr_type: "11",
           }
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 4) {
+          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
@@ -773,9 +806,9 @@
           }
 
         } else if (index == 8) {
-          let params={
-            start_time:"2020-12-28",
-            end_time:"2020-12-30",
+          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', {
@@ -795,16 +828,99 @@
             });
 
 
-
-        } else if (index == 9){
+        } else if (index == 9) {
           this.statementVisible = true
           let obj = {
-            order_id:this.order.id
+            order_id: this.order.id
           }
           this.orderObj = obj
           // this.$refs.print.getInfo(this.order.id)
 
 
+        } else if (index == 10) {
+          let params = {
+
+            'patient_id': this.patientInfo.id,
+            'record_time': this.record_date,
+          }
+          axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
+            params: params
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                return false
+              } else {
+                that.$message({message: '退号成功', type: 'success'})
+                that.loadingtwo = false
+              }
+            })
+            .catch(function (error) {
+            });
+        } else if (index == 11) {
+          let params = {
+            'order_id': this.order.id,
+            'number': this.order.number,
+            'patient_id': this.patientInfo.id,
+            'record_time': this.record_date,
+          }
+          axios.get('http://127.0.0.1:9532/api/refunddetail/post', {
+            params: params
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                return false
+              } else {
+                that.$message({message: '退号成功', type: 'success'})
+                that.loadingtwo = false
+              }
+            })
+            .catch(function (error) {
+            });
+
+        } else if (index == 12) {
+          let params = {
+            'name': "琥珀酸亚铁片",
+            'codg': "XB03AAH026A001010104942"
+          }
+          axios.get('http://127.0.0.1:9532/api/code/get', {
+            params: params
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                return false
+              } else {
+
+                that.loadingtwo = false
+              }
+            })
+            .catch(function (error) {
+            });
+
+        } else if (index == 13) {
+          let params = {
+            'id': this.patientInfo.id,
+            'record_time': this.record_date,
+          }
+          axios.get('http://127.0.0.1:9532/api/record/put', {
+            params: params
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                return false
+              } else {
+                that.loadingtwo = false
+              }
+            })
+            .catch(function (error) {
+            });
         }
       },
 
@@ -833,7 +949,6 @@
             let two_count = 0
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
-              console.log('99999999', response.data.data.list)
 
               if (response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 || response.data.data.list[i].info.prescription_status == 2) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
@@ -1008,9 +1123,9 @@
 
             this.prescriptions = []
             console.log("9991323242r5253535", response.data.data.prescription)
-            if( response.data.data.prescription[0].advices.length > 0 ) {
+            if (response.data.data.prescription[0].advices.length > 0) {
               this.prescription_id = response.data.data.prescription[0].advices[0].prescription_id
-            }else{
+            } else {
               this.prescription_id = 0
             }
             for (let i = 0; i < response.data.data.prescription.length; i++) {
@@ -1054,7 +1169,7 @@
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
                   medical_code: prescription.project[b].project.medical_code,
-                  unit:prescription.project[b].project.unit
+                  unit: prescription.project[b].project.unit
                 }
                 tempProject.push(obj)
               }
@@ -1128,15 +1243,18 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    .mainLeft {
-      width: 200px;
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      padding-top: 20px;
-    .el-radio {
-      margin-right: 5px;
-    }
+
+  .mainLeft {
+    width: 200px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    padding-top: 20px;
+
+  .el-radio {
+    margin-right: 5px;
+  }
+
   }
   .mainCell {
     height: 36px;
@@ -1265,10 +1383,10 @@
     /* line-height: 38px;
     text-indent: 5px; */
     font-size: 14px;
-    display:flex;
-    align-items:center;
-    padding:5px;
-    box-sizing:border-box;
+    display: flex;
+    align-items: center;
+    padding: 5px;
+    box-sizing: border-box;
   }
 
   }
@@ -1277,29 +1395,35 @@
 
 <style lang="scss">
   #tab-more {
-    .el-icon-close {
-      display: none;
-    }
+
+  .el-icon-close {
+    display: none;
+  }
+
   }
   .settlementTabs {
-    .el-tabs__content {
-      height: 90%;
-    }
+
+  .el-tabs__content {
+    height: 90%;
+  }
+
   }
   .preTabs {
 
-    .el-tabs__content {
-      flex: 1;
-      overflow-y: auto;
-      padding: 5px 0 5px 5px;
-    }
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 5px 0 5px 5px;
+  }
 
   }
-  .centerDialog{
-    .el-dialog__body{
-      max-height: calc(100vh - 100px) !important;
-      padding: 0 20px;
-    }
+  .centerDialog {
+
+  .el-dialog__body {
+    max-height: calc(100vh - 100px) !important;
+    padding: 0 20px;
+  }
+
   }
 </style>
 

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -68,8 +68,15 @@
             </tr>
             <tr>
                 <td>业务类别</td>
-                <td colspan="5" style="text-align:left;padding-left:10px;">普通门诊</td>
-                <td>结算时间</td>
+                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '11'">普通门诊</td>
+                 <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '12'">门诊挂号</td>
+                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '13'">急诊</td>
+                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊特殊病</td>
+                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '15'">门诊统筹</td>
+                <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>
+              <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
+
+              <td>结算时间</td>
                 <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time}}</td>
             </tr>
             <tr>