Browse Source

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 2 days ago
parent
commit
f78e504421

+ 1 - 0
src/xt_pages/Pharmacy/drugCode.vue View File

@@ -119,6 +119,7 @@
119 119
 
120 120
 
121 121
     </el-table>
122
+    
122 123
     <el-pagination
123 124
       @size-change="handleSizeChange"
124 125
       @current-change="handleCurrentChange"

+ 33 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -936,7 +936,7 @@
936 936
         </el-option>
937 937
       </el-select>
938 938
 
939
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217"
939
+      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10633  && this.$store.getters.xt_user.org_id != 0"
940 940
                  style="width:50%;" v-model="temp_med_type"
941 941
                  placeholder="医疗类型" @change="changevalue">
942 942
         <el-option
@@ -946,6 +946,16 @@
946 946
           :value="item.value">
947 947
         </el-option>
948 948
       </el-select>
949
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10633"
950
+                 style="width:50%;" v-model="temp_med_type"
951
+                 placeholder="医疗类型" @change="changevalue">
952
+        <el-option
953
+          v-for="(item,index) in register10633"
954
+          :key="index"
955
+          :label="item.label"
956
+          :value="item.value">
957
+        </el-option>
958
+      </el-select>
949 959
 
950 960
       <el-select v-if="this.$store.getters.xt_user.org_id == 10721  "
951 961
                  style="width:50%;" v-model="temp_med_type"
@@ -1188,6 +1198,13 @@ export default {
1188 1198
       //   { value: '91', label: '新冠肺炎门诊' },
1189 1199
 
1190 1200
       // ],
1201
+      register10633: [
1202
+        { value: 11, label: '普通门诊' },
1203
+        { value: 14, label: '门诊特殊病' },
1204
+        { value: '140201', label: '门诊特殊病(140201)' },
1205
+        { value: '1104', label: '异地门特'},
1206
+        { value: '999999', label: '自费' },
1207
+      ],
1191 1208
       register: [
1192 1209
         { value: 11, label: '普通门诊' },
1193 1210
         { value: 12, label: '门诊挂号' },
@@ -1569,6 +1586,21 @@ export default {
1569 1586
         })
1570 1587
     },
1571 1588
     openDialog(item) {
1589
+
1590
+      if(this.org_id == 10644 && item.order.order_status == 1 && item.order.med_type == item.med_type){
1591
+        this.$confirm("当前处方处于预结算状态,无法调整医疗类型,请撤销明细后再进行调整医疗类型", '错误信息', {
1592
+          confirmButtonText: '确 定',
1593
+          type: 'warning'
1594
+        }).then(() => {
1595
+          this.dialogVisible = false
1596
+        }).catch(() => {
1597
+          this.dialogVisible = false
1598
+        })
1599
+        return
1600
+      }
1601
+      if(this.org_id == 10633){
1602
+        this.temp_med_type = "140201"
1603
+      }
1572 1604
       this.dialogVisible = true
1573 1605
       this.temp_prescriptions = item
1574 1606
     },

+ 34 - 3
src/xt_pages/outpatientTool/components/settle.vue View File

@@ -141,8 +141,24 @@
141 141
               <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
142 142
           </el-table-column>
143 143
 
144
+        <el-table-column align="center" prop="preselfpay_amt" label="先行自付金额">
145
+          <template slot-scope="scope">{{scope.row.preselfpay_amt.toFixed(2)}}</template>
146
+        </el-table-column>
147
+
148
+        <el-table-column align="center" prop="overlmt_self_pay" label="超限价金额">
149
+          <template slot-scope="scope">{{scope.row.overlmt_self_pay.toFixed(2)}}</template>
150
+        </el-table-column>
151
+
152
+        <el-table-column align="center" prop="fulamt_ownpay_amt" label="全自费金额">
153
+          <template slot-scope="scope">{{scope.row.fulamt_ownpay_amt.toFixed(2)}}</template>
154
+        </el-table-column>
144 155
 
145
-          <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
156
+        <el-table-column align="center" prop="inscp_scp_amt" label="符合政策范围金额">
157
+          <template slot-scope="scope">{{scope.row.inscp_scp_amt.toFixed(2)}}</template>
158
+        </el-table-column>
159
+
160
+
161
+        <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
146 162
               <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
147 163
           </el-table-column>
148 164
 
@@ -322,7 +338,21 @@
322 338
       <el-table-column align="center" prop="hifob_pay" label="大额基金支付">
323 339
         <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
324 340
       </el-table-column>
341
+      <el-table-column align="center" prop="preselfpay_amt" label="先行自付金额">
342
+        <template slot-scope="scope">{{scope.row.preselfpay_amt.toFixed(2)}}</template>
343
+      </el-table-column>
325 344
 
345
+      <el-table-column align="center" prop="overlmt_self_pay" label="超限价金额">
346
+        <template slot-scope="scope">{{scope.row.overlmt_self_pay.toFixed(2)}}</template>
347
+      </el-table-column>
348
+
349
+      <el-table-column align="center" prop="fulamt_ownpay_amt" label="全自费金额">
350
+        <template slot-scope="scope">{{scope.row.fulamt_ownpay_amt.toFixed(2)}}</template>
351
+      </el-table-column>
352
+
353
+      <el-table-column align="center" prop="inscp_scp_amt" label="符合政策范围金额">
354
+        <template slot-scope="scope">{{scope.row.inscp_scp_amt.toFixed(2)}}</template>
355
+      </el-table-column>
326 356
 
327 357
       <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
328 358
         <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
@@ -514,13 +544,14 @@ import { uParseTime } from '@/utils/tools'
514 544
           }
515 545
 
516 546
         }else if(row.insutype == '310'){
517
-          // let a =  config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
547
+          // let c =  config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
518 548
           let a = this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
519 549
 
520 550
 
521
-          // let aa=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
551
+          // let d=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
522 552
           let b=  row.his.insuplc_admdvs.slice(0, 3); //参保地前3位编码
523 553
           if(a == b){
554
+
524 555
             name = "本地职工"
525 556
           }else{
526 557
             name = "异地职工"

+ 3 - 1
src/xt_pages/outpatientTool/gatherPrint.vue View File

@@ -23,7 +23,9 @@
23 23
          <div class="listInfo" style="border-bottom: 2px solid;margin-bottom: 20px;padding-bottom: 20px;">
24 24
             <div>预交款:</div>
25 25
             <div>总费用:{{getAllPice()}}</div>
26
-            <div>门诊日期:{{this.$route.query.end_time}}</div>
26
+           <div v-if=" this.$store.getters.xt_user.org_id != 10387">门诊日期:{{this.$route.query.end_time}}</div>
27
+           <div v-if=" this.$store.getters.xt_user.org_id == 10387">门诊日期:{{this.$route.query.start_time}} ~ {{this.$route.query.end_time}}</div>
28
+
27 29
         </div>
28 30
         <div class="listInfo">
29 31
             <div>西药:{{getWesternMedicineCostTotal()}}</div>

+ 5 - 5
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue View File

@@ -626,14 +626,14 @@ export default {
626 626
            
627 627
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
628 628
              
629
-              if(this.org_id == 0 || this.org_id == 10644){
629
+              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
630 630
                 list[i].drugInMoney = ""
631 631
               }else{
632 632
                 list[i].drugInMoney = list[i].last_price
633 633
               }
634 634
               if(this.org_id == 10697){
635 635
                 list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
636
-              }else if(this.org_id == 0 || this.org_id == 10644){
636
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
637 637
               
638 638
                 list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
639 639
               } else{
@@ -647,7 +647,7 @@ export default {
647 647
               if( this.org_id == 10697){
648 648
                  list[i].drugAddPrice = list[i].last_price
649 649
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
650
-              }else if(this.org_id == 0 || this.org_id == 10644){
650
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
651 651
                 list[i].drugAddPrice = "/"
652 652
                 list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
653 653
                 console.log("本期增加加淀粉",list[i].drugAddSalePrice)
@@ -663,7 +663,7 @@ export default {
663 663
               if( this.org_id == 10697){
664 664
                 list[i].drugOutPrice = list[i].retail_price
665 665
                 list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
666
-              }else if(this.org_id == 0 || this.org_id == 10644){
666
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
667 667
                 list[i].drugOutPrice = "/"
668 668
                 list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
669 669
               } else{
@@ -683,7 +683,7 @@ export default {
683 683
             if(this.org_id == 10697){
684 684
                 list[i].overDrugPrice = list[i].retail_price
685 685
                 list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
686
-            }else if(this.org_id == 0 || this.org_id ==10644){
686
+            }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
687 687
               console.log("加个2323323",list[i].drugAddSalePrice)
688 688
                 list[i].overDrugPrice = ""
689 689
                 list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)

+ 5 - 5
src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue View File

@@ -357,7 +357,7 @@ export default {
357 357
               
358 358
                list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
359 359
                
360
-               if(this.org_id == 0 || this.org_id == 10644){
360
+               if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
361 361
                 list[i].drugInMoney = ""
362 362
               }else{
363 363
                 list[i].drugInMoney = list[i].last_price
@@ -365,7 +365,7 @@ export default {
365 365
 
366 366
                 if( this.org_id == 10697){
367 367
                   list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
368
-                }else if(this.org_id == 0 || this.org_id == 10644){
368
+                }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
369 369
                   list[i].drugAddPrice = ""
370 370
                   list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
371 371
                 }else{
@@ -379,7 +379,7 @@ export default {
379 379
                 if(this.org_id == 10697){
380 380
                  list[i].drugAddPrice = list[i].last_price
381 381
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
382
-                }else if(this.org_id == 0 || this.org_id ==10644){
382
+                }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
383 383
                   list[i].drugAddPrice = "/"
384 384
                   list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
385 385
                   console.log("本期增加加淀粉",list[i].drugAddSalePrice)
@@ -396,7 +396,7 @@ export default {
396 396
                 if( this.org_id == 10697){
397 397
                   list[i].drugOutPrice = list[i].retail_price
398 398
                   list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
399
-                }else if(this.org_id == 0 || this.org_id == 10644){
399
+                }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
400 400
                   list[i].drugOutPrice = "/"
401 401
                   list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
402 402
                 } else{
@@ -415,7 +415,7 @@ export default {
415 415
                 if(this.org_id == 10697){
416 416
                   list[i].overDrugPrice = list[i].retail_price
417 417
                   list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
418
-                }else if(this.org_id == 0 || this.org_id ==10644){
418
+                }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
419 419
                   list[i].overDrugPrice = ""
420 420
                   list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
421 421
                 } else{

+ 18 - 7
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -1336,6 +1336,7 @@ export default {
1336 1336
        
1337 1337
           this.outList = drugoutlist
1338 1338
           this.drugOutInfo = drugoutlist
1339
+
1339 1340
           if (is_sys == 1) {
1340 1341
             if (drugFlowList.length > 0) {
1341 1342
               for (let i = 0; i < drugFlowList.length; i++) {
@@ -1362,9 +1363,12 @@ export default {
1362 1363
             this.drugFlowList = drugFlowList;
1363 1364
           }
1364 1365
 
1366
+
1367
+
1365 1368
           if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
1366 1369
             //出库详情
1367 1370
             var flowlist = response.data.data.flowlist;
1371
+            console.log("flowList========================",flowlist)
1368 1372
             this.drugFlowList = [];
1369 1373
             for (let i = 0; i < flowlist.length; i++) {
1370 1374
                flowlist[i].childOne = []
@@ -1429,6 +1433,9 @@ export default {
1429 1433
          
1430 1434
           this.tableList = list;
1431 1435
         }
1436
+
1437
+
1438
+
1432 1439
         if(is_sys == 12){
1433 1440
           
1434 1441
           for(let i=0;i<list.length;i++){
@@ -1449,14 +1456,20 @@ export default {
1449 1456
           this.tableList = list;
1450 1457
         }
1451 1458
 
1459
+
1460
+
1452 1461
         if(is_sys == 0){
1453 1462
           console.log("list999992332232323",list)
1454 1463
           for(let i=0;i<list.length;i++){
1455 1464
             for(let j=0;j<list[i].childOne.length;j++){
1456
-              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id))
1457
-               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id)
1465
+              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehousing_detail_id))
1466
+               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].childOne[j].warehousing_detail_id)
1467
+
1458 1468
             }
1469
+            
1459 1470
           }
1471
+          console.log("中国list=====================",list)
1472
+
1460 1473
 
1461 1474
          for(let i=0;i<list.length;i++){
1462 1475
             for(let j=0;j<list[i].childOne.length;j++){
@@ -1468,7 +1481,7 @@ export default {
1468 1481
           this.tableList = list;
1469 1482
         }
1470 1483
          
1471
-         console.log("tableLIST==================",this.tableList)
1484
+         console.log("hhahhahwotableLIST==================",this.tableList)
1472 1485
 
1473 1486
         }
1474 1487
       });
@@ -2038,9 +2051,7 @@ export default {
2038 2051
       return max_str + min_str;
2039 2052
     },
2040 2053
     getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id,warehousing_detail_id){
2041
-      
2042
-      console.log("warehousing_detail_id",warehousing_detail_id)
2043
-      console.log("tabList-----------------",this.tabList)
2054
+     
2044 2055
       var arr = []
2045 2056
       var total = 0
2046 2057
       var max_str = ""
@@ -2145,7 +2156,7 @@ export default {
2145 2156
       }
2146 2157
       total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
2147 2158
     
2148
-      console.log("taolaa------",total,drug_id)
2159
+     
2149 2160
       if(arr.length > 0){
2150 2161
         for(let i=0;i<arr.length;i++){
2151 2162
            price = arr[0].price

+ 4 - 4
src/xt_pages/stock/query/purchaseNewStockQuery.vue View File

@@ -292,7 +292,7 @@ export default {
292 292
                if(this.org_id ==10697){
293 293
                   list[i].stock_in_price = list[i].buy_price
294 294
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
295
-               }else if(this.org_id == 0 || this.org_id == 10644){
295
+               }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
296 296
                  list[i].stock_in_price = "/"
297 297
                  console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
298 298
                  console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
@@ -317,7 +317,7 @@ export default {
317 317
               if(this.org_id ==10697){
318 318
                list[i].addStockMoney = list[i].buy_price 
319 319
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
320
-              }else if(this.org_id == 0 || this.org_id == 10644){
320
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
321 321
                 list[i].addStockMoney = "/"
322 322
                 list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
323 323
               } else{
@@ -330,7 +330,7 @@ export default {
330 330
               if(this.org_id == 10697){
331 331
                 list[i].stockOutprice = list[i].packing_price
332 332
                 list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
333
-              }else if(this.org_id == 0 || this.org_id == 10644){
333
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
334 334
                 list[i].stockOutprice = "/"
335 335
                 list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
336 336
                 if(list[i].saleOutMoney == "NaN"){
@@ -358,7 +358,7 @@ export default {
358 358
               if(this.org_id ==10697){
359 359
                 list[i].overPrice = list[i].packing_price
360 360
                 list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
361
-              }else if(this.org_id == 0 || this.org_id ==10644){
361
+              }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
362 362
                 list[i].overPrice = "/"
363 363
                 // console.log("stockMoney-00000000000000",list[i].stockMoney)
364 364
                 // console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)

+ 4 - 4
src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue View File

@@ -187,7 +187,7 @@ export default {
187 187
                     if(this.org_id == 0 || this.org_id ==10697){
188 188
                       list[i].stock_in_price = list[i].buy_price
189 189
                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
190
-                    }else if(this.org_id == 0 || this.org_id == 10644){
190
+                    }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
191 191
                       list[i].stock_in_price = "/"
192 192
                       list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
193 193
                       if(list[i].stockMoney>0){
@@ -204,7 +204,7 @@ export default {
204 204
                     if(this.org_id == 0 || this.org_id ==10697){
205 205
                         list[i].addStockMoney = list[i].buy_price 
206 206
                         list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
207
-                    }else if(this.org_id == 0 || this.org_id == 10644){
207
+                    }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
208 208
                       list[i].addStockMoney = "/"
209 209
                       list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
210 210
                      
@@ -220,7 +220,7 @@ export default {
220 220
                     if(this.org_id == 0 || this.org_id == 10697){
221 221
                       list[i].stockOutprice = list[i].packing_price
222 222
                       list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
223
-                    }else if(this.org_id == 0 || this.org_id == 10644){
223
+                    }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
224 224
                       list[i].stockOutprice = "/"
225 225
                       list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
226 226
                       if(list[i].saleOutMoney == "NaN"){
@@ -241,7 +241,7 @@ export default {
241 241
                     if(this.org_id == 0 || this.org_id ==10697){
242 242
                       list[i].overPrice = list[i].packing_price
243 243
                       list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
244
-                     }else if(this.org_id == 0 || this.org_id == 10644){
244
+                     }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
245 245
                       list[i].overPrice = "/"
246 246
                       console.log("stockMoney-00000000000000",list[i].stockMoney)
247 247
                       console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)

+ 12 - 11
src/xt_pages/user/courseOfDisease_new.vue View File

@@ -65,7 +65,9 @@
65 65
                 记录时间:
66 66
                 <el-date-picker v-model="record_date" prefix-icon="el-icon-date" :editable="false"
67 67
                               style="width: 250px;"
68
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
68
+                              format="yyyy-MM-dd HH:mm:ss"
69
+                               value-format="yyyy-MM-dd HH:mm:ss"
70
+                              type="datetime" placeholder="选择日期时间" align="right" 
69 71
                               ></el-date-picker>
70 72
               </div>
71 73
               <div style="flex: 1;">
@@ -1368,7 +1370,13 @@
1368 1370
       },
1369 1371
       getCurrentChangeOne(val){
1370 1372
         this.$refs.editor.contents = val.content
1371
-        this.record_date = this.getTimeThree(val.record_time)
1373
+        this.record_date = ""
1374
+        if(val.id > 0){
1375
+          this.record_date = this.getTimeThree(val.record_time)
1376
+        }else{
1377
+          this.record_date  = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
1378
+        }
1379
+        console.log("record_date----------------",this.record_date)
1372 1380
         this.admin_user_id = val.recorder
1373 1381
         if(this.admin_user_id == 0){
1374 1382
            this.admin_user_id = ""
@@ -1493,20 +1501,13 @@
1493 1501
         var params = {
1494 1502
           id:this.id,
1495 1503
           patient_id:this.patient_id,
1496
-          record_date:"",
1504
+          record_date:this.record_date,
1497 1505
           content:this.new_content,
1498 1506
           admin_user_id:this.admin_user_id,
1499 1507
         }
1500
-        if(this.id == 0){
1501
-          params.record_date = this.getTimeThree(this.record_date)
1502
-        }
1503
-        if(this.id > 0){
1504
-          params.record_date = this.record_date
1505
-        }
1508
+       
1506 1509
         console.log("params",params)
1507 1510
 
1508
-      
1509
-
1510 1511
         createNewCourseOfDiseaseRecord(params).then(response => {
1511 1512
          if(response.data.state == 1){
1512 1513
            var msg = response.data.data.msg