11月14日 库存扣减更新

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  //BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+   host: 'xt.test.sgjyun.com',
+    //host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -330,7 +330,7 @@
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
                         <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量<br /><br />ml</td>
-                        <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
+                        <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
                         <td width="">病情变化及处理</td>
                     </tr>
 
@@ -354,7 +354,7 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
                         <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
                         <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
-                        <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
+                        <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
                         <td style="text-align:left;padding-left:10px;">
                             <div style="line-height:20px;text-align: left;display: inline-block;">
                                 &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -113,11 +113,11 @@
           <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555 && this.$store.getters.xt_user.template_info.org_id != 9671"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 9671" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
-        <li v-if="isShow('葡萄糖')">
+        <!-- <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
           <span class="content">{{ glucose != "0" ? glucose : "" }}</span>
           <span class="unit">{{ glucose != "0" ? "mmol/l" : "" }}</span>
-        </li>
+        </li> -->
 
         <li v-if="isShow('钾')">
           <label>钾 : </label>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -306,7 +306,7 @@
                   <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
                   <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>
                   <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>
-                  <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td>
+                  <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
                   <td width="">病情变化及处理</td>
               </tr>
 
@@ -330,7 +330,7 @@
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
                   <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
                   <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
-                  <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
+                  <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
                   <td style="text-align:left;padding-left:10px;">
                       <div style="line-height:20px;text-align: left;display: inline-block;">
                           &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -288,7 +288,7 @@
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
                                           <span
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 ">
+                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 ">
                                               <span
                                                   v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
                                               <span
@@ -387,7 +387,7 @@
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
                                                 <span
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10088 || org_id == 10265 || org_id == 10164">
+                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191">
                                                     {{ scope.row.stock_count }}
                                                 </span>
                         <span v-else> {{ scope.row.total }}</span>
@@ -2666,7 +2666,7 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191) {
         if (row.count <= 0) {
           if (selection) {
             selection.forEach(row => {
@@ -2940,7 +2940,7 @@ export default {
     },
     selectChange(selection, row) {
       console.log('row', row)
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191) {
         if (row.stock_count <= 0) {
           if (row.type == 3) {
             if (selection) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088 || org_id == 10265 || org_id == 10164">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 ">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088 || org_id == 10265 || org_id == 10164">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2661,7 +2661,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2936,7 +2936,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/stock/inventory.vue

@@ -107,7 +107,7 @@
         >
           <i class="el-icon-search el-input__icon" slot="suffix"></i>
         <template slot-scope="{ item }">
-          <div class="name">{{ item.specification_name }}</div>
+          <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
         </template>
        </el-autocomplete>  
     </el-collapse>

src/xt_pages/user/components/PatientSidebar.vue

@@ -108,7 +108,7 @@ export default {
             },
             {
               name: '1-10',
-              label: '住院小结'
+              label: '出院小结'
             },
             {
               name: '1-3',

src/xt_pages/user/coursePrint.vue

@@ -20,21 +20,29 @@
 
             <div style="flex:1;text-align: center;">
               科别：
-              <div  style="width: 120px;text-align: left;display:inline-block;">{{"内科"}}</div>
+              <div  style="width: 120px;text-align: left;display:inline-block;">{{"血透中心"}}</div>
+            </div>
+            
+           <div style="flex:1;text-align: center;" v-if="org_id == 9671 || org_id == 10215" >
+              病案号：
+                <div  style="width: 120px;text-align: left;display:inline-block;">
+                  {{patient.dialysis_no?patient.dialysis_no:"/"}}
+                </div>
             </div>
 
-            <div style="flex:1;text-align: center;">
+
+            <div style="flex:1;text-align: center;" v-if="org_id!=10215 && org_id!=9671" >
               透析号：
                 <div  style="width: 120px;text-align: left;display:inline-block;">
                   {{patient.dialysis_no?patient.dialysis_no:"/"}}
                 </div>
             </div>
 
-            <div  style="flex:1;text-align: center;">
+            <div  style="flex:1;text-align: center;" v-if="org_id!=10215 && org_id!=9671">
               住院号：
               <div style="width: 100px;text-align: left;display:inline-block;">
                  {{patient.admission_number?patient.admission_number:"/"}}
-              </div>
+            </div>
            
             </div>
 
@@ -86,11 +94,14 @@
         loading: false,
         orgname: '',
         record:[],
-        patient: {}
+        patient: {},
+        org_id:0,
       }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
+      this.org_id = this.$store.getters.xt_user.org_id
+     
       this.orgname = xtuser.org.org_name
 
     },

src/xt_pages/user/dialysisSolution.vue

@@ -438,7 +438,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode_id == 2 || addPlan.mode_id == 3 || addPlan.mode_id == 12 || addPlan.mode_id == 5)">
+          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode == 2 || addPlan.mode == 3 || addPlan.mode == 12 || addPlan.mode == 5)">
              <el-form-item label="灌流器:">
                <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
              </el-form-item>
@@ -1751,6 +1751,7 @@ export default {
     },
     isShows(name) {
       var filedList = store.getters.xt_user.fileds
+      console.log("filedList2323232",filedList)
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 1 &&
@@ -1947,6 +1948,7 @@ export default {
 
     addPlanModeChange() {
       var thismode = parseInt(this.addPlan.mode)
+      console.log("addplan22323",this.addPlan.mode)
       if(thismode == 2 || thismode == 5 || thismode ==12){
           this.zhiShow = true
           this.huShow= true

src/xt_pages/user/hospitalSummary.vue

@@ -59,7 +59,7 @@
             </el-col>
             <el-col :span="14">
               <div class="record_content_panel">
-                <div style="background-color:rgb(245, 247, 250)" class="title">住院小结内容</div>
+                <div style="background-color:rgb(245, 247, 250)" class="title">出院小结内容</div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;">标题:
                    {{hosDetail.title}}
                 </div>
@@ -124,7 +124,7 @@
 
   
      
-      <el-dialog title="新增住院小结" width="60%" top="5vh" :visible.sync="show_dialog">
+      <el-dialog title="新增出院小结" width="60%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
@@ -320,7 +320,7 @@
         </div>
       </el-dialog>
       
-      <el-dialog title="编辑住院小结" width="60%" top="5vh" :visible.sync="edit_show_dialog">
+      <el-dialog title="编辑出院小结" width="60%" top="5vh" :visible.sync="edit_show_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">