28169 1 år sedan
förälder
incheckning
a134ca6415

+ 4 - 4
src/xt_pages/stock/Dialog/goodInfoDailog.vue Visa fil

@@ -34,7 +34,7 @@
34 34
                 </el-option>
35 35
               </el-select>
36 36
             </el-form-item>
37
-            <el-form-item label="医保等级 : " prop="medical_insurance_level">
37
+            <el-form-item label="医保等级 : " >
38 38
               <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
39 39
                 <el-option
40 40
                   v-for="(item, index) in medicalInsuranceLevelList"
@@ -421,9 +421,9 @@
421 421
           good_kind: [
422 422
             { required: true, message: '请选择耗材种类', trigger: 'change' }
423 423
           ],
424
-          medical_insurance_level: [
425
-            { required: true, message: '请输入医保等级', trigger: 'blur' }
426
-          ],
424
+          // medical_insurance_level: [
425
+          //   { required: true, message: '请输入医保等级', trigger: 'blur' }
426
+          // ],
427 427
           manufacturer: [
428 428
             { required: true, message: '请选择生产厂商', trigger: 'blur' }
429 429
           ], good_unit: [

+ 69 - 1
src/xt_pages/stock/drugs/components/drugOutDetail.vue Visa fil

@@ -9,11 +9,20 @@
9 9
       >打印
10 10
     </el-button>
11 11
      <el-button
12
+      v-if="org_id != 10265 && org_id != 0"
12 13
       style="float: right;margin-right:10px"
13 14
       size="small"
14 15
       @click="exportListDetai"
15 16
       type="primary"
16 17
       >明细导出
18
+    </el-button>
19
+    <el-button
20
+      v-if="org_id == 10265 || org_id == 0"
21
+      style="float: right;margin-right:10px"
22
+      size="small"
23
+      @click="exportListDetaiOne"
24
+      type="primary"
25
+      >明细导出
17 26
     </el-button>
18 27
      <el-button
19 28
       style="float: right;margin-right:10px"
@@ -182,7 +191,7 @@
182 191
       <el-pagination
183 192
         @size-change="handleSizeChange"
184 193
         @current-change="handleCurrentChange"
185
-        :page-sizes="[10, 50, 100,1000]"
194
+        :page-sizes="[10, 50, 100,1000,2000,3000,4000,5000]"
186 195
         :page-size="10"
187 196
         background
188 197
         style="margin-top:20px;float: right"
@@ -676,6 +685,65 @@ export default {
676 685
        const data = this.formatJson(filterVal, this.tableData)
677 686
 
678 687
 
688
+       excel.export_json_to_excel({
689
+           header: tHeader,
690
+           data,
691
+           filename: '药品出库明细'
692
+         })
693
+          this.downloadLoading = false
694
+      })
695
+    },
696
+    exportListDetaiOne(){
697
+      import('@/vendor/Export2Excel').then(excel => {
698
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','出货价','数量','单位','总价']
699
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','time','user_name','in_retail_price','price','count','count_unit','total_price']
700
+
701
+       console.log("hwhhwhwhwhwhw",this.tableData)
702
+        
703
+      
704
+       for(let i=0;i<this.tableData.length;i++){
705
+         if(this.tableData[i].is_total == 0){
706
+            this.tableData[i].index = i+1
707
+            if(this.tableData[i].drug_type == 1){
708
+              this.tableData[i].drugtype = "西药"
709
+            }
710
+            if(this.tableData[i].drug_type == 2){
711
+              this.tableData[i].drugtype = "草药"
712
+            }
713
+            if(this.tableData[i].drug_type == 3){
714
+              this.tableData[i].drugtype = "成药"
715
+            }
716
+            this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
717
+            this.tableData[i].time = this.getTime(this.tableData[i].ctime)
718
+            this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
719
+            this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
720
+            this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
721
+            this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
722
+            if(this.org_id == 9919){
723
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
724
+              if(this.tableData[i].count >=this.tableData[i].min_number){
725
+               this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)/this.tableData[i].min_number
726
+              }else{
727
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
728
+              }
729
+
730
+            }else{
731
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
732
+              if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
733
+                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
734
+              }
735
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
736
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
737
+              }
738
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
739
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
740
+              }
741
+            }
742
+         }
743
+       }
744
+       const data = this.formatJson(filterVal, this.tableData)
745
+
746
+
679 747
        excel.export_json_to_excel({
680 748
            header: tHeader,
681 749
            data,

+ 6 - 1
src/xt_pages/stock/drugs/components/expiryDateDrugQuery.vue Visa fil

@@ -90,7 +90,12 @@
90 90
 
91 91
             <el-table-column label="剩余天数" align="center">
92 92
               <template slot-scope="scope">
93
-                {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
93
+                <span style="color: red;" v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))<=30">
94
+                  {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
95
+                </span>
96
+                <span  v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))>30">
97
+                  {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
98
+                </span>
94 99
               </template>
95 100
             </el-table-column>
96 101
           </el-table>

+ 6 - 0
src/xt_pages/stock/drugs/drugStockInOrder.vue Visa fil

@@ -449,6 +449,7 @@
449 449
             </template>
450 450
           </el-table-column>
451 451
         </el-table>
452
+        
452 453
       </span>
453 454
       <span slot="footer" class="dialog-footer">
454 455
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -1042,6 +1043,7 @@ export default {
1042 1043
       }
1043 1044
       for (let i = 0; i < this.exportList.length; i++) {
1044 1045
         this.exportList[i].index = i + 1;
1046
+        this.exportList[i].warehousing_time = this.getTime(this.exportList[i].warehousing_time)
1045 1047
         this.exportList[i].unit =
1046 1048
           this.exportList[i].dose +
1047 1049
           this.exportList[i].dose_unit +
@@ -1071,6 +1073,7 @@ export default {
1071 1073
           if (this.exportList[i].dealer == 0) {
1072 1074
             this.exportList[i].dealer = "";
1073 1075
           }
1076
+
1074 1077
         }
1075 1078
       }
1076 1079
 
@@ -1085,6 +1088,7 @@ export default {
1085 1088
 
1086 1089
         const tHeader = [
1087 1090
           "序号",
1091
+          "单据日期",
1088 1092
           "药品名称",
1089 1093
           "药品类型",
1090 1094
           "规格&单位",
@@ -1101,6 +1105,7 @@ export default {
1101 1105
         ];
1102 1106
         const filterVal = [
1103 1107
           "index",
1108
+          "warehousing_time",
1104 1109
           "drug_name",
1105 1110
           "drug_type",
1106 1111
           "unit",
@@ -1143,6 +1148,7 @@ export default {
1143 1148
     changeCheckType() {
1144 1149
       this.GetWarehouse();
1145 1150
     },
1151
+   
1146 1152
   },
1147 1153
 };
1148 1154
 </script>

+ 18 - 0
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue Visa fil

@@ -400,6 +400,8 @@
400 400
             </template>
401 401
           </el-table-column>
402 402
         </el-table>
403
+
404
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
403 405
       </el-form>
404 406
     </div>
405 407
   </div>
@@ -1113,6 +1115,22 @@ export default {
1113 1115
     //      }
1114 1116
     //    }
1115 1117
     //  }
1118
+    },
1119
+    getTotalPirce(){
1120
+      
1121
+      var total_price = 0
1122
+      if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
1123
+        
1124
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
1125
+           total_price += this.recordInfo.recordData[i].last_price * parseInt(this.recordInfo.recordData[i].warehousing_count)
1126
+        }
1127
+
1128
+        if(total_price>0){
1129
+          return total_price.toFixed(4)
1130
+        }else{
1131
+         return ""
1132
+        }
1133
+      }
1116 1134
     }
1117 1135
   },
1118 1136
   created() {

+ 18 - 0
src/xt_pages/stock/drugs/drugStockInOrderEdit.vue Visa fil

@@ -383,6 +383,8 @@
383 383
             </template>
384 384
           </el-table-column>
385 385
         </el-table>
386
+
387
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
386 388
       </el-form>
387 389
     </div>
388 390
   </div>
@@ -1011,6 +1013,22 @@ export default {
1011 1013
         return uParseTime(val, '{y}-{m}-{d}')
1012 1014
         }
1013 1015
     },
1016
+    getTotalPirce(){
1017
+      
1018
+      var total_price = 0
1019
+      if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
1020
+        
1021
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
1022
+           total_price += this.recordInfo.recordData[i].last_price * parseInt(this.recordInfo.recordData[i].warehousing_count)
1023
+        }
1024
+
1025
+        if(total_price>0){
1026
+          return total_price.toFixed(4)
1027
+        }else{
1028
+         return ""
1029
+        }
1030
+      }
1031
+    }
1014 1032
   },
1015 1033
   created() {
1016 1034
 

+ 3 - 0
src/xt_pages/stock/drugs/drugStockOutOrder.vue Visa fil

@@ -1627,6 +1627,7 @@ export default {
1627 1627
           }
1628 1628
         }
1629 1629
         const tHeader = [
1630
+          "单据日期",
1630 1631
           "药品名称",
1631 1632
           "药品类型",
1632 1633
           "规格&单位",
@@ -1642,8 +1643,10 @@ export default {
1642 1643
           "批准文号",
1643 1644
           "出库时间",
1644 1645
           "备注",
1646
+          
1645 1647
         ];
1646 1648
         const filterVal = [
1649
+          "ctime",
1647 1650
           "drug_name",
1648 1651
           "drug_type",
1649 1652
           "unit",

+ 1 - 1
src/xt_pages/stock/drugs/inventory.vue Visa fil

@@ -330,7 +330,7 @@ export default {
330 330
                    list[i].last_stock_min_number = ""
331 331
                    list[i].min_number = list[i].XtBaseDrug.min_number
332 332
                    list[i].manufacturer_name  = ""
333
-                   list[i].type = 6
333
+                   list[i].type = 4
334 334
                    for(let j=0;j<this.manufacturerList.length;j++){
335 335
                      if(list[i].manufacturer == this.manufacturerList[j].id){
336 336
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

+ 1 - 1
src/xt_pages/stock/drugs/newDrugInventory.vue Visa fil

@@ -809,7 +809,7 @@ export default {
809 809
                 list[i].last_stock_min_number = ""
810 810
                 list[i].min_number = list[i].XtBaseDrug.min_number
811 811
                 list[i].manufacturer_name  = ""
812
-                list[i].type = 6
812
+                list[i].type = 4
813 813
                 list[i].last_stock_max_number = list[i].stock_max_number
814 814
                 list[i].last_stock_min_number = list[i].stock_min_number
815 815
                 for(let j=0;j<this.manufacturerList.length;j++){

+ 1 - 1
src/xt_pages/stock/inventory.vue Visa fil

@@ -455,7 +455,7 @@ export default {
455 455
          if(response.data.state == 1){
456 456
            var list = response.data.data.list
457 457
            for(let i=0;i<list.length;i++){
458
-              list[i].type = 6
458
+              list[i].type = 4
459 459
               list[i].good_name = list[i].GoodInfo.good_name
460 460
               list[i].specification_name = list[i].GoodInfo.specification_name
461 461
               list[i].manufacturer_name = ""

+ 1 - 1
src/xt_pages/stock/newInventory.vue Visa fil

@@ -446,7 +446,7 @@ export default {
446 446
           this.manufacturerList = response.data.data.manufacturerList
447 447
           loading.close()
448 448
           for(let i=0;i<list.length;i++){
449
-              list[i].type = 6
449
+              list[i].type = 4
450 450
               list[i].good_name = list[i].GoodInfo.good_name
451 451
               list[i].specification_name = list[i].GoodInfo.specification_name
452 452
               list[i].manufacturer_name = ""

+ 3 - 2
src/xt_pages/stock/query/expiryDateQuery.vue Visa fil

@@ -90,8 +90,9 @@
90 90
             </el-table-column>
91 91
 
92 92
             <el-table-column label="剩余天数" align="center">
93
-              <template slot-scope="scope">
94
-                {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
93
+              <template slot-scope="scope" >
94
+                <span v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))<=30" style="color: red;">{{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}</span>
95
+                <span v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))>30">   {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}</span>
95 96
               </template>
96 97
             </el-table-column>
97 98
           </el-table>

+ 5 - 2
src/xt_pages/stock/stockInOrder.vue Visa fil

@@ -1698,6 +1698,8 @@ export default {
1698 1698
         this.$message.error("请勾选入库单")
1699 1699
         return
1700 1700
       }
1701
+      console.log("this.wowoowow",this.exportList)
1702
+     
1701 1703
       import('@/vendor/Export2Excel').then(excel => {
1702 1704
       for(let i=0;i<this.exportList.length;i++){
1703 1705
         for(let j=0;j<this.goodType.length;j++){
@@ -1714,10 +1716,11 @@ export default {
1714 1716
         if(this.exportList[i].good_type_id == 0){
1715 1717
           this.exportList[i].good_type_id = ""
1716 1718
         }
1719
+        this.exportList[i].warehousing_time  = this.getTime(this.exportList[i].warehousing_time,"{y}-{m}-{d}")
1717 1720
       }
1718 1721
 
1719
-      const tHeader = ['耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']
1720
-      const filterVal = ['good_name', 'good_type_id', 'unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','license_number','remark']
1722
+      const tHeader = ['单据日期','耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']
1723
+      const filterVal = ['warehousing_time','good_name', 'good_type_id', 'unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','license_number','remark']
1721 1724
 
1722 1725
 
1723 1726
 

+ 20 - 1
src/xt_pages/stock/stockInOrderAdd.vue Visa fil

@@ -258,6 +258,8 @@
258 258
           </el-table-column>
259 259
 
260 260
         </el-table>
261
+
262
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
261 263
       </el-form>
262 264
 
263 265
 
@@ -572,7 +574,8 @@
572 574
         } else {
573 575
           this.recordInfo.recordData.splice(index, 1)
574 576
         }
575
-      }, calculate: function(val) {
577
+      },
578
+       calculate: function(val) {
576 579
         if (val == 0) {
577 580
           return ''
578 581
         }
@@ -937,6 +940,22 @@
937 940
             loading.close()
938 941
           }
939 942
        })
943
+     },
944
+     getTotalPirce(){
945
+      
946
+       var total_price = 0
947
+       if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
948
+         
949
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
950
+            total_price += this.recordInfo.recordData[i].price * parseInt(this.recordInfo.recordData[i].warehousing_count)
951
+         }
952
+
953
+         if(total_price>0){
954
+           return total_price.toFixed(4)
955
+         }else{
956
+          return ""
957
+         }
958
+       }
940 959
      }
941 960
     }
942 961
     ,

+ 19 - 0
src/xt_pages/stock/stockInOrderEdit.vue Visa fil

@@ -345,6 +345,8 @@
345 345
             </template>
346 346
           </el-table-column>
347 347
         </el-table>
348
+
349
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
348 350
       </el-form>
349 351
     </div>
350 352
   </div>
@@ -978,6 +980,23 @@ export default {
978 980
         return uParseTime(val, '{y}-{m}-{d}')
979 981
         }
980 982
      },
983
+     getTotalPirce(){
984
+      
985
+      var total_price = 0
986
+      if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
987
+        
988
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
989
+           total_price += this.recordInfo.recordData[i].price * parseInt(this.recordInfo.recordData[i].warehousing_count)
990
+        }
991
+
992
+        if(total_price>0){
993
+          return total_price.toFixed(4)
994
+        }else{
995
+         return ""
996
+        }
997
+      }
998
+    }
999
+     
981 1000
   },
982 1001
   created() {
983 1002
     this.GetConfigInfo();

+ 4 - 0
src/xt_pages/stock/stockOutOrder.vue Visa fil

@@ -2092,6 +2092,7 @@ export default {
2092 2092
             list[i].total_price = (list[i].total_count * list[i].price).toFixed(2);
2093 2093
             list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{m}-{d}");
2094 2094
             list[i].product_date = this.getTime(list[i].product_date,"{y}-{m}-{d}");
2095
+           
2095 2096
             for (let j = 0; j < this.manufacturer.length; j++) {
2096 2097
               if (list[i].manufacturer == this.manufacturer[j].id) {
2097 2098
                 list[i].manufacturer = this.manufacturer[j].manufacturer_name;
@@ -2140,9 +2141,11 @@ export default {
2140 2141
             this.exportList[i].good_type_id = "";
2141 2142
           }
2142 2143
           this.exportList[i].ctime = this.getTime(this.exportList[i].ctime, "{y}-{m}-{d}")
2144
+          this.exportList[i].warehouse_out_time = this.getTime(this.exportList[i].warehouse_out_time,"{y}-{m}-{d}")
2143 2145
         }
2144 2146
 
2145 2147
         const tHeader = [
2148
+          "单据日期",
2146 2149
           "耗材名称",
2147 2150
           "耗材类型",
2148 2151
           "规格&单位",
@@ -2157,6 +2160,7 @@ export default {
2157 2160
           "出库时间"
2158 2161
         ];
2159 2162
         const filterVal = [
2163
+          "warehouse_out_time",
2160 2164
           "good_name",
2161 2165
           "good_type_id",
2162 2166
           "unit",

+ 62 - 62
src/xt_pages/user/components/PatientSidebar.vue Visa fil

@@ -207,68 +207,68 @@ export default {
207 207
             },
208 208
           ]
209 209
         },
210
-        {
211
-          name: '5',
212
-          label: '评估工具',
213
-          children: [
214
-            {
215
-              name: '5-1',
216
-              label: '跌倒评估'
217
-            },
218
-            {
219
-              name: '5-2',
220
-              label: '小儿跌倒风险评估'
221
-            },
222
-            {
223
-              name: '5-3',
224
-              label: '压疮风险评估'
225
-            },
226
-            {
227
-              name: '5-4',
228
-              label: 'OH压疮评估'
229
-            },
230
-            {
231
-              name: '5-5',
232
-              label: '日常生活能力评估'
233
-            },
234
-            {
235
-              name: '5-6',
236
-              label: '导管脱落风险评估'
237
-            },
238
-            {
239
-              name: '5-7',
240
-              label: 'RASS及疼痛评估'
241
-            },
242
-            {
243
-              name: '5-8',
244
-              label: '营养状况评估'
245
-            },
246
-            {
247
-              name: '5-9',
248
-              label: '约束告知单'
249
-            },
250
-            {
251
-              name: '5-10',
252
-              label: '心理评估'
253
-            },
254
-            {
255
-              name: '5-11',
256
-              label: '瘙痒评估'
257
-            },
258
-            {
259
-              name: '5-12',
260
-              label: '血液透析患者评估'
261
-            },
262
-            {
263
-              name: '5-13',
264
-              label: 'Glasgow昏迷评分量表'
265
-            },
266
-            {
267
-              name: '5-14',
268
-              label: '肌力评估表'
269
-            },
270
-          ]
271
-        },
210
+        // {
211
+        //   name: '5',
212
+        //   label: '评估工具',
213
+        //   children: [
214
+        //     {
215
+        //       name: '5-1',
216
+        //       label: '跌倒评估'
217
+        //     },
218
+        //     {
219
+        //       name: '5-2',
220
+        //       label: '小儿跌倒风险评估'
221
+        //     },
222
+        //     {
223
+        //       name: '5-3',
224
+        //       label: '压疮风险评估'
225
+        //     },
226
+        //     {
227
+        //       name: '5-4',
228
+        //       label: 'OH压疮评估'
229
+        //     },
230
+        //     {
231
+        //       name: '5-5',
232
+        //       label: '日常生活能力评估'
233
+        //     },
234
+        //     {
235
+        //       name: '5-6',
236
+        //       label: '导管脱落风险评估'
237
+        //     },
238
+        //     {
239
+        //       name: '5-7',
240
+        //       label: 'RASS及疼痛评估'
241
+        //     },
242
+        //     {
243
+        //       name: '5-8',
244
+        //       label: '营养状况评估'
245
+        //     },
246
+        //     {
247
+        //       name: '5-9',
248
+        //       label: '约束告知单'
249
+        //     },
250
+        //     {
251
+        //       name: '5-10',
252
+        //       label: '心理评估'
253
+        //     },
254
+        //     {
255
+        //       name: '5-11',
256
+        //       label: '瘙痒评估'
257
+        //     },
258
+        //     {
259
+        //       name: '5-12',
260
+        //       label: '血液透析患者评估'
261
+        //     },
262
+        //     {
263
+        //       name: '5-13',
264
+        //       label: 'Glasgow昏迷评分量表'
265
+        //     },
266
+        //     {
267
+        //       name: '5-14',
268
+        //       label: '肌力评估表'
269
+        //     },
270
+        //   ]
271
+        // },
272 272
         
273 273
       ],
274 274
       name:""

+ 1 - 1
src/xt_pages/user/vascularAccess.vue Visa fil

@@ -459,7 +459,7 @@
459 459
         <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
460 460
      </span>
461 461
      </el-dialog>
462
-     <sitemap> </sitemap>
462
+     <!-- <sitemap> </sitemap> -->
463 463
     </div>
464 464
 
465 465
      <multi-select-box

+ 42 - 11
src/xt_pages/workforce/components/editTableData.vue Visa fil

@@ -66,10 +66,15 @@
66 66
               style="width: 100%; margin-right: 14px ;"
67 67
           >
68 68
             <el-table-column
69
-                prop="name"
70 69
                 label="患者名称"
71 70
                 align="center"
72 71
             >
72
+             <template slot-scope="scope">
73
+                <span v-if="scope.row.is_infectious == 2" style="color: red;">{{scope.row.name  }}</span>
74
+                <span v-if="scope.row.is_infectious != 2" >
75
+                  {{scope.row.name  }}
76
+                </span>
77
+             </template>
73 78
             </el-table-column>
74 79
           </el-table>
75 80
 
@@ -1914,6 +1919,7 @@ export default {
1914 1919
         zone_name:"",
1915 1920
         bed_name:"",
1916 1921
         id:"",
1922
+        contagions:[],
1917 1923
       },
1918 1924
       // 左侧患者名称表格数据
1919 1925
       cur_info: {
@@ -1921,6 +1927,7 @@ export default {
1921 1927
         patient_id: 0,
1922 1928
         mode_name: "",
1923 1929
         mode_id: 0,
1930
+        contagions:[],
1924 1931
       },
1925 1932
       // 左侧透析模式
1926 1933
       modes: [],
@@ -2494,7 +2501,7 @@ export default {
2494 2501
       this.currentData.partition_type = row.zone_type;
2495 2502
       this.currentData.mode_id = this.cur_info.mode_id;
2496 2503
       this.currentData.id = 0;
2497
-      this.currentData.contagions = [];
2504
+      this.currentData.contagions = this.cur_info.contagions;
2498 2505
       this.currentData.patient_id = this.cur_info.patient_id;
2499 2506
       this.currentData.patient = this.cur_info.patient_name;
2500 2507
       this.setSchedule()
@@ -3110,14 +3117,31 @@ export default {
3110 3117
         patient_id : this.cur_info.patient_id,
3111 3118
         patient_name : this.cur_info.patient_name,
3112 3119
         mode_id : this.cur_info.mode_id,
3113
-        mode_name : this.cur_info.mode_name
3114
-      }
3115
-      // console.log('拖拽的内容',this.cur_drag_info);
3120
+        mode_name : this.cur_info.mode_name,
3121
+        contagions:this.cur_info.contagions,
3122
+      },
3123
+       console.log('拖拽的内容',this.cur_drag_info);
3116 3124
     },
3117 3125
     // 左侧选择病人(单击)
3118 3126
     patientClick(row) {
3127
+      console.log("row-222--2-2",row)
3119 3128
       this.cur_info.patient_name = row.name;
3120 3129
       this.cur_info.patient_id = row.id;
3130
+      var obj = {
3131
+        created_time:0,
3132
+        disease_id:2,
3133
+        id:0,
3134
+        patient_id:row.patient_id,
3135
+        status:1,
3136
+        updated_time:0
3137
+      }
3138
+      if(row.is_infectious==2){
3139
+        this.cur_info.contagions = []
3140
+        this.cur_info.contagions.push(obj)
3141
+      }else{
3142
+        this.cur_info.contagions = []
3143
+      }
3144
+     
3121 3145
       this.patient_id_hover = row.id
3122 3146
     },
3123 3147
     // 选择透析模式
@@ -3126,6 +3150,7 @@ export default {
3126 3150
       this.cur_info.mode_id = row.id;
3127 3151
     },
3128 3152
     setEditData(patients, modes, days, zones) {
3153
+      console.log("patients2oo2o2o2o",patients)
3129 3154
       var date = new Date()
3130 3155
       this.time = date
3131 3156
       var year = date.getFullYear()
@@ -3396,26 +3421,27 @@ export default {
3396 3421
                       that.currentData.patient_id = that.cur_drag_info.patient_id
3397 3422
                       that.currentData.patient = that.cur_drag_info.patient_name
3398 3423
                        that.currentData.contagions = that.cur_drag_info.contagions
3399
-                        console.log( that.cur_drag_info.contagions)
3424
+                        console.log("中国hshshshshhs",that.cur_drag_info.contagions)
3400 3425
 
3401
-                        console.log( that.currentData.contagions)
3426
+                      
3402 3427
                         that.setScheduleTwo(this.cur_drag_info.id);
3403 3428
                 }
3404 3429
               }else{ // 非同一天
3405 3430
                 if(row[key].patient_id == 0) { //空床位
3406 3431
                   this.currentData.mode_id = this.cur_drag_info.mode_id;
3407 3432
                   this.currentData.id = 0;
3408
-                  this.currentData.contagions = [];
3433
+                  this.currentData.contagions = this.cur_drag_info.contagions;
3409 3434
                   this.currentData.patient_id = this.cur_drag_info.patient_id;
3410 3435
                   this.currentData.patient = this.cur_drag_info.patient_name;
3411 3436
                   this.setSchedule();
3412 3437
                 }
3413 3438
               }
3414 3439
             }else{
3440
+              console.log("wowowowowowowowow",this.cur_drag_info)
3415 3441
               //接口提交排班数据
3416 3442
               this.currentData.mode_id = this.cur_drag_info.mode_id;
3417 3443
               this.currentData.id = 0;
3418
-              this.currentData.contagions = [];
3444
+              this.currentData.contagions = this.cur_drag_info.contagions;
3419 3445
               this.currentData.patient_id = this.cur_drag_info.patient_id;
3420 3446
               this.currentData.patient = this.cur_drag_info.patient_name;
3421 3447
               this.setSchedule();
@@ -4957,7 +4983,7 @@ export default {
4957 4983
           this.patient_id_hover = this.cur_info.patient_id;
4958 4984
           this.cur_info.patient_name = row[column.property].patient
4959 4985
           this.cur_info.mode_name = row[column.property].mode_name
4960
-          // console.log('row的数据',row[column.property]);
4986
+          console.log('单击选中患者',row[column.property]);
4961 4987
 
4962 4988
       } else {
4963 4989
         var week = this.weekDay(column.property);
@@ -5378,7 +5404,7 @@ export default {
5378 5404
       }
5379 5405
     },    
5380 5406
     setScheduleTwo(id_two) {
5381
-      console.log("1112222222")
5407
+      console.log("1112222222",this.currentData.contagions.length)
5382 5408
       var that = this;
5383 5409
       // var submitFlag = true;
5384 5410
       // if (this.currentData.patient_id <= 0) {
@@ -5452,6 +5478,7 @@ export default {
5452 5478
     },
5453 5479
     // 排班成功调用的方法
5454 5480
     setSchedule() {
5481
+      console.log("6666969696969699",this.currentData.contagions.length)
5455 5482
       var that = this;
5456 5483
       // var submitFlag = true;
5457 5484
       // if (this.currentData.patient_id <= 0) {
@@ -5477,10 +5504,12 @@ export default {
5477 5504
       if (this.currentData.contagions.length > 0) {
5478 5505
         var cflag = false;
5479 5506
         this.currentData.contagions.forEach(function (contagion) {
5507
+          console.log("woowowowowowow",that.currentData.partition_type)
5480 5508
           if (contagion.disease_id == that.currentData.partition_type) {
5481 5509
             cflag = true;
5482 5510
           }
5483 5511
         });
5512
+      
5484 5513
         if (!cflag) {
5485 5514
           this.$confirm(
5486 5515
               "此患者有传染病,与此透析机不匹配,确定在此排班吗?",
@@ -5504,6 +5533,7 @@ export default {
5504 5533
         } else {
5505 5534
           this.CreateSchedule(this.currentData.patient_id, this.currentData);
5506 5535
         }
5536
+        
5507 5537
       } else if (that.currentData.partition_type > 1) {
5508 5538
         this.$confirm(
5509 5539
             "此患者没有传染病,与此透析机不匹配,确定在此排班吗?",
@@ -5867,6 +5897,7 @@ export default {
5867 5897
     this.partitions = this.partitionsProp;
5868 5898
 
5869 5899
     var contagions = this.$store.getters.contagions;
5900
+ 
5870 5901
     if (contagions.length > 0) {
5871 5902
       var that = this;
5872 5903
       contagions.forEach(function (citem) {