11月14日 库存扣减更新

src/lang/zh.js

@@ -255,13 +255,13 @@ export default {
     pastInquiries: '既往查询',
 
     prescriptionTemplate: '处方模版',
-    hospitalRecord:"住院登记",
-    hisTool:"HIS工具",
-    hospitalCharges:'住院收费',
+    hospitalRecord: '住院登记',
+    hisTool: 'HIS工具',
+    hospitalCharges: '住院收费',
 
-    summary_tool:'项目消费明细汇总',
-    labelPrint:'标签打印',
-    faPiao:"发票设置",
+    summary_tool: '项目消费明细汇总',
+    labelPrint: '标签打印',
+    faPiao: '发票设置'
   },
   navbar: {
     logOut: '退出登录',
@@ -369,5 +369,7 @@ export default {
     special_record: '特殊记录',
     template_summary: '治疗小结',
     template_plan: '个性化方案'
+    // admitting_diagnosis: '入院诊断',
+    // discharge_diagnosis: '出院诊断'
   }
 }

src/router/modules/patient.js

@@ -160,6 +160,17 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/patient/patient/:id/hospitalSummary',
+    component: () => import('@/xt_pages/user/hospitalSummary'),
+    hidden: true,
+    is_menu: false,
+    name: 'hospitalSummary',
+    meta: {
+      title: 'hospitalSummary',
+      noCache: true
+    }
+  },
   {
     path: '/patients/course',
     component: () => import('@/xt_pages/user/courseOfDisease'),

src/xt_pages/data/template.vue

@@ -47,7 +47,8 @@ export default {
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
         { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
         { label: this.$t("data_config.template_summary"), key: "template_summary" },
-        { label: this.$t("data_config.template_plan"), key: "template_plan" }
+        { label: this.$t("data_config.template_plan"), key: "template_plan" },
+        // { label: this.$t("data_config.admitting_diagnosis"), key: "admitting_diagnosis" }
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -371,7 +371,7 @@
             <span v-if="scope.row.parent_id == 0">
               {{getXuserName(scope.row.execution_staff)}}
             </span>
-            <span v-else></span>
+            <span v-else>{{getXuserName(scope.row.execution_staff)}}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -385,7 +385,7 @@
             <span v-if="scope.row.parent_id == 0">
               {{getXuserName(scope.row.checker)}}
             </span>
-            <span v-else></span>
+            <span v-else>{{getXuserName(scope.row.checker)}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -2329,6 +2329,7 @@
 
       },
       getDialysisScheduleDetail() {
+        console.log("触发伏组件")
         if(this.$route.query.showView && this.$route.query.showView == true){
           return
         }
@@ -2336,6 +2337,7 @@
           if (response.data.state == 1) {
             var doctor_advices = response.data.data.doctor_advices
             this.doctorAdvices = doctor_advices
+            this.doctor_advices = doctor_advices
           }
         })
       }

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -2305,6 +2305,7 @@ export default {
           var advice = response.data.data.advice;
           this.$message.success("保存成功!");
           this.groupEditFormVisible = false;
+          this.$parent.getDialysisScheduleDetail()
         }
       });
     },

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2091,7 +2091,7 @@
             this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
-            this.dialysisPrescription.target_ultrafiltration = last.target_ultrafiltration
+            
 
             weight_before = 0
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -41,6 +41,7 @@
           style="width: 100%"
           border
           max-height="450"
+          v-loading="listLoading"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
           <el-table-column align="center" width="200" fixed="left">
@@ -329,7 +330,7 @@
         warehousing_time: '',
         adminUserOptions: null,
         currentIndex: 0,
-
+        listLoading: false,
         recordInfo: {
           recordData: [],
           stock_in_code: '',
@@ -717,7 +718,7 @@
                 return false
               } else {
                 this.$message.success('入库成功')
-
+                this.listLoading = false
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -106,6 +106,7 @@
           style="width: 100%"
           border
           max-height="450"
+          v-loading="listLoading"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
           <el-table-column align="center" width="200">
@@ -442,6 +443,7 @@ export default {
       manufacturerList:[],
       dealerList:[],
       org_id:0,
+      listLoading:false,
     };
   },
   methods: {
@@ -700,10 +702,11 @@ export default {
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+              this.listLoading = false
               return false;
             } else {
               this.$message.success("入库成功");
-
+              this.listLoading = false
               this.$router.back(-1);
             }
           });

src/xt_pages/user/components/PatientSidebar.vue

@@ -106,6 +106,10 @@ export default {
               name: '1-9',
               label: '阶段小结'
             },
+            // {
+            //   name: '1-10',
+            //   label: '住院小结'
+            // },
             {
               name: '1-3',
               label: '检验检查'
@@ -189,6 +193,8 @@ export default {
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
       }else if (name == '1-9'){
         this.$router.push({path:'/patient/patient/'+this.id+'/templateSummary'})
+      }else if(name == '1-10'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/hospitalSummary'})
       }
     },
     changePatient(value) {