新分支

src/router/modules/patient.js

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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3382,7 +3382,7 @@
 
 
                   </div>
-                  <div v-if="org_id!=10440">
+                  <div v-if="org_id ==10644">
                     <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
                       穿刺护士：
                       <div
@@ -3504,7 +3504,130 @@
                     </div>
                   </div>
 
-                  <div v-if="org_id==0||org_id==10440">
+
+                  <div v-if="org_id !=10644 && org_id!=10440">
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
+                      穿刺护士：
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
+                      穿刺护士：
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id==10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id!=10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  </div>
+
+                  <div v-if="org_id==10440">
 
                     <div class="inline_block" style="flex: 1">
                      <div>

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -12,6 +12,7 @@
             size="small"
             type="primary"
             @click="submit()"
+            v-if="is_sys!=1 && is_check!=1"
             class="filter-item"
             >保 存</el-button
           >
@@ -36,7 +37,7 @@
       </div>
       <div class="app-container" v-loading="loading">
        
-        <div class="cell clearfix">
+        <div class="cell clearfix" v-if="is_sys == 0">
           <label class="title"
             ><span class="name"><span style="color: red">*</span>患者</span>
             :</label
@@ -637,6 +638,14 @@
         return name;
       },
       handleEdit: function (index, row) {
+        if(this.is_sys == 1){
+           this.$message.error("自动出库不能编辑!")
+           return
+        }
+        if(this.is_check == 1){
+           this.$message.error("自动出库不能编辑!")
+           return
+        }
         const tempObj = {};
         tempObj["id"] = 0;
         tempObj["drug_id"] = 0;
@@ -669,6 +678,14 @@
         this.recordInfo.recordData.push(tempObj);
       },
       handleDelete: function (index, row) {
+        if(this.is_sys == 1){
+         this.$message.error("自动出库不能删除!")
+         return
+        }
+        if(this.is_check == 1){
+          this.$message.error("已经审核不能删除!")
+          return
+        }
         if (this.recordInfo.recordData.length <= 1) {
           this.$message.error("只有一条记录的时候无法删除");
           return;

src/xt_pages/stock/selfPreparedMedicine/warehouseOut.vue

@@ -164,11 +164,11 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="患者名称" align="center">
+        <!-- <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
              {{getPatientName(scope.row.patient_id)}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">

src/xt_pages/user/components/PatientSidebar.vue

@@ -179,7 +179,12 @@ export default {
             }, {
               name: '1-10',
               label: '出院小结'
-            }
+            },
+            // {
+            //   name: '1-12',
+            //   label: '转归记录'
+            // }
+
           ]
         },
         {
@@ -283,6 +288,7 @@ export default {
   },
   methods: {
     handleNodeClick(data) {
+      console.log("Data-----------",data.name)
       var name = data.name
       this.name = data.name
       window.sessionStorage.setItem('patientKey',data.name)
@@ -328,6 +334,8 @@ export default {
         this.$router.push({path:'/patient/patient/'+this.id+'/hospitalSummary'})
       } else if(name == '1-11'){
         this.$router.push({path:'/patient/patient/'+this.id+'/firstDisease'})
+      }else if(name == '1-12'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       } else if(name == '3-1'){
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
 
@@ -496,9 +504,9 @@ export default {
     }
   },
   created() {
-    var patientKey =  window.sessionStorage.getItem('patientKey')
+    var patientKey = window.sessionStorage.getItem('patientKey')
+    console.log("patient-----------------",patientKey)
     this.org_id = this.$store.getters.xt_user.template_info.org_id
-    console.log("patient",patientKey)
     var query = this.$route.path
     console.log("query",this.$route.path)
     if(patientKey){
@@ -519,11 +527,10 @@ export default {
           path: '/patients/patient/' + this.id + '/dryWeight'
         })
       }else if(patientKey == '1-11'){
-       this.$router.push({
-          path: '/patients/patient/' + this.id + '/firstDisease'
-        })
-      }
-       else if (patientKey == '1-5') {
+       this.$router.push({path: '/patients/patient/' + this.id + '/firstDisease'})
+      }else if(patientKey == '1-12'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
+      }else if (patientKey == '1-5') {
         this.$router.push({ path: '/patients/rescue?id=' + this.id })
       } else if (patientKey == '2-1') {
         this.$router.push({