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

src/lang/zh.js

     outpatientCharges:'门诊收费',
     outpatientChargesManagement:'门诊收费管理',
     outpatientInvoice:'门诊发票',
-    outpatientRecord:'门诊备案',
+    outpatientRecord:'住院工作站',
     advancePayment:'预交金',
     labelPrinting:'标签打印',
     summary:'项目消费明细汇总',

src/router/index.js

   dataDruguse,
   dataShowconfig,
   dataPrint,
-  hospitalStation,
   outpatientRegistration,
   outpatientDoctorStation,
   outpatientCharges,
   outpatientPharmacy,
   outpatientRecord,
+  hospitalStation,
   // kuyiShopping,
   integration,
   basicConfig

src/router/modules/hospitalStation.js

     //   name: 'outpatientDoctorStationTemplateManagement',
     //   meta: { title: 'outpatientDoctorStationTemplateManagement', noCache: true }
     // },
-    {
-      path: '/hospitalStation/print',
-      component: () => import('@/xt_pages/hospitalStation/print'),
-      hidden: true,
-      is_menu: false,
-      name: 'outpatientDoctorStationPrint',
-      meta: { title: 'outpatientDoctorStationPrint', noCache: true }
-    },
-    {
-      path: '/hospitalStation/printtwo',
-      component: () => import('@/xt_pages/hospitalStation/printtwo'),
-      hidden: true,
-      is_menu: false,
-      name: 'outpatientDoctorStationPrint',
-      meta: { title: 'outpatientDoctorStationPrint', noCache: true }
-    },
-    {
-      path: '/hospitalStation/recordPrint',
-      component: () => import('@/xt_pages/hospitalStation/recordPrint'),
-      hidden: true,
-      is_menu: false,
-      name: 'outpatientDoctorStationRecordPrint',
-      meta: { title: 'outpatientDoctorStationRecordPrint', noCache: true }
-    },
-    {
-      path: '/hospitalStation/treatPrint',
-      component: () => import('@/xt_pages/hospitalStation/treatPrint'),
-      hidden: true,
-      is_menu: false,
-      name: 'outpatientDoctorStationTreatPrint',
-      meta: { title: 'outpatientDoctorStationTreatPrint', noCache: true }
-    },
-
-    {
-      path: '/hospitalStation/printone',
-      component: () => import('@/xt_pages/hospitalStation/template/printOne'),
-      hidden: true,
-      is_menu: false,
-      name: 'outpatientDoctorStationPrint',
-      meta: { title: 'outpatientDoctorStationPrint', noCache: true }
-    },
+    // {
+    //   path: '/hospitalStation/print',
+    //   component: () => import('@/xt_pages/hospitalStation/print'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'outpatientDoctorStationPrint',
+    //   meta: { title: 'outpatientDoctorStationPrint', noCache: true }
+    // },
+    // {
+    //   path: '/hospitalStation/printtwo',
+    //   component: () => import('@/xt_pages/hospitalStation/printtwo'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'outpatientDoctorStationPrint',
+    //   meta: { title: 'outpatientDoctorStationPrint', noCache: true }
+    // },
+    // {
+    //   path: '/hospitalStation/recordPrint',
+    //   component: () => import('@/xt_pages/hospitalStation/recordPrint'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'outpatientDoctorStationRecordPrint',
+    //   meta: { title: 'outpatientDoctorStationRecordPrint', noCache: true }
+    // },
+    // {
+    //   path: '/hospitalStation/treatPrint',
+    //   component: () => import('@/xt_pages/hospitalStation/treatPrint'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'outpatientDoctorStationTreatPrint',
+    //   meta: { title: 'outpatientDoctorStationTreatPrint', noCache: true }
+    // },
+    //
+    // {
+    //   path: '/hospitalStation/printone',
+    //   component: () => import('@/xt_pages/hospitalStation/template/printOne'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'outpatientDoctorStationPrint',
+    //   meta: { title: 'outpatientDoctorStationPrint', noCache: true }
+    // },
   ]
 }

src/router/modules/outpatientRecord.js

     isChild: true
   },
   children: [
+    // {
+    //     path: '/outpatientRecord/outpatientRecord',
+    //     component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
+    //     name: 'outpatientSickRecord',
+    //     meta: { title: 'outpatientSickRecord', noCache: true }
+    // },
     {
-        path: '/outpatientRecord/outpatientRecord',
-        component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
-        name: 'outpatientSickRecord',
-        meta: { title: 'outpatientSickRecord', noCache: true }
+      path: '/outpatientRecord/index',
+      component: () => import('@/xt_pages/hospitalStation/index'),
+      name: 'hospitalIndex',
+      meta: { title: 'hospitalIndex', noCache: true }
     },
+    {
+      path: '/outpatientRecord/doctorDesk',
+      component: () => import('@/xt_pages/hospitalStation/doctorDesk'),
+      name: 'outpatientDoctorStationDoctorDesk',
+      meta: { title: 'outpatientDoctorStationDoctorDesk', noCache: true }
+    },
+    {
+      path: '/outpatientRecord/outpatientChargesManagement',
+      component: () => import('@/xt_pages/hospitalStation/outpatientChargesManagement'),
+      name: 'hospitalChargesManagement',
+      meta: { title: 'hospitalChargesManagement', noCache: true }
+    },
+
+
   ]
 }

src/xt_pages/hospitalStation/doctorDesk.vue

       //   })
       //
       // },
-      change() {
+      change(patient_id) {
         let params = {
           'record_date': this.record_date,
           'type': this.radio
             this.cal_two = response.data.data.total_two;
             this.admin_info = response.data.data.info;
 
+
+
+
             if (this.patientTableData.length > 0) {
               this.$refs.tab.setCurrentRow(this.patientTableData[0]);
               this.oldCurrentRow = this.patientTableData[0];

src/xt_pages/hospitalStation/index.vue

 
           <el-form-item label="入院时间：" prop="start_time" :validate-event="is_Name">
             <el-date-picker v-model="form.start_time" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+                            value-format="yyyy-MM-dd HH:mm:ss"
                             placeholder="请选择入院时间">
             </el-date-picker>
 
     },
     data() {
       return {
+        record_date:"",
         loadingone: false,
         read_loading: false,
         registers: [
             if (this.form.id_card_no == '') {
               this.show = true
             }
+            var nowDate = new Date();
+            var nowYear = nowDate.getFullYear();
+            var nowMonth = nowDate.getMonth() + 1;
+            var nowDay = nowDate.getDate();
+            this.record_date =
+              nowYear +
+              '-' +
+              (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+              '-' +
+              (nowDay < 10 ? '0' + nowDay : nowDay);
 
             var params = {
               id: this.form.id,
               phone: this.form.phone,
               med_type: this.form.med_type,
               diagnosis: this.form.diagnosis,
-              sick_type: this.form.sick_type
+              sick_type: this.form.sick_type,
+              start_time: this.form.start_time,
             };
             params['record_time'] = this.record_date;
             params['admin_user_id'] = this.$store.getters.xt_user.user.id;

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

                 <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
                     <div>
-                        <!--<el-button size="small" @click="open(1)" type="primary">打印</el-button>-->
+
+                      <el-button v-loading="loadingtwo"
+                                 v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0)"
+                                 size="small"
+                                 @click="open(8)"
+                                 type="primary">上传费用明细
+                      </el-button>
+
+                      <!--<el-button size="small" @click="open(1)" type="primary">打印</el-button>-->
                         <el-button v-loading="loadingone" size="small"
-                                   v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                                   v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.order_status == 1)"
 
                                    @click="open(2)"
                                    type="primary">出院
                         </el-button>
 
                         <el-button v-loading="loadingtwo"
-                                   v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.id == 0) || (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1)||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
+                                   v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1)||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
                                    size="small"
                                    @click="open(3)"
                                    type="primary">收费
                         >结算单
                         </el-button>
 
+                      <el-button
+                        v-if="(this.hisPatientInfo.id > 0 && this.order.order_status == 1) || (this.hisPatientInfo.id > 0 && this.order.order_status == 2) "
+                        size="small" @click="open(9)" type="primary"
+                      >撤销明细
+                      </el-button>
+
                       <el-button
                         v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
                         size="small" @click="open(6)" type="primary"
         })
 
       }, chargeConfirm(form) {
-
-        form['id'] = this.patientInfo.id;
-        form['record_time'] = this.record_date;
+        form['in_hospital_id'] = this.hisPatientInfo.id;
+        form['patient_id'] = this.patientInfo.id;
         form['admin_user_id'] = this.$store.getters.xt_user.user.id;
         form['order_id'] = this.order.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
-
-        }
-
         if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
           var that = this;
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9990  ) {
+        } else if (this.$store.getters.xt_user.org_id == 9990 ||this.$store.getters.xt_user.org_id == 4 ) {
           var that = this;
-          axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
+          axios.get('http://127.0.0.1:9532/zh/api/settle/get', {
             params: form,
             headers: {
               'Permission': 5
                   if (response.data.data.failed_code == -10) {
                     that.$message.error(response.data.data.msg)
                   } else {
-                    this.changeRadio(1);
-                    that.$message({ message: '出院成功', type: 'success', duration: 5000 })
+                    that.$message.success("出院成功");
+                    that.changeRadio(1);
                   }
 
                 }
                   if (response.data.data.failed_code == -10) {
                     that.$message.error(response.data.data.msg)
                   } else {
-                    this.changeRadio(1);
+                    that.changeRadio(1);
 
                     that.$message({ message: '撤销出院成功', type: 'success', duration: 5000 })
                   }
                   if (response.data.data.failed_code == -10) {
                     that.$message.error(response.data.data.msg)
                   } else {
-                    this.changeRadio(1);
+                    that.changeRadio(1);
 
                     that.$message({ message: '撤销入院成功', type: 'success', duration: 5000 })
                   }
           } else {
             this.$refs.charge.show(this.getTotalTwo())
           }
+        }else if(index == 8){
+          var that = this;
+          let params = {
+            'in_hospital_id': that.hisPatientInfo.id,
+            'id': that.patientInfo.id,
+            'admin_user_id': that.$store.getters.xt_user.user.id,
+            'record_time': that.record_date,
+
+          };
+          if (this.activeName == 'first') {
+            params['settle_accounts_type'] = 1
+
+          } else {
+            params['start_time'] = that.other_start_time;
+            params['end_time'] = that.other_end_time;
+            params['settle_accounts_type'] = 2
+
+          }
+          axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
+            params: params
+          })
+            .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.$message.error(response.data.data.msg)
+                } else {
+                  that.$message.success("上传明细成功");
+                  that.changeRadio(1);
+                }
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+        }else if(index == 9){
+          var that = this;
+          this.$confirm('是否撤销明细', '撤销明细', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'order_id': this.order.id,
+              'admin_user_id': this.$store.getters.xt_user.user.id,
+            };
+            axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
+              params: params
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg);
+                  that.loadingtwo = false;
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10) {
+                    that.$message.error(response.data.data.msg)
+                  } else {
+                    that.$message.success("撤销明细成功");
+
+                    that.changeRadio(1);
+                  }
+
+                }
+              })
+              .catch(function(error) {
+              })
+
+          }).catch(() => {
+          })
         }
       },
 

src/xt_pages/qcd/basicInformationAnalysis.vue

       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-      // console.log("本月最后一天",timeEnd)
+       console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量