Browse Source

hah阿凡达

28169 4 days ago
parent
commit
34aad7bf78

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

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

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

1336
        
1336
        
1337
           this.outList = drugoutlist
1337
           this.outList = drugoutlist
1338
           this.drugOutInfo = drugoutlist
1338
           this.drugOutInfo = drugoutlist
1339
+
1339
           if (is_sys == 1) {
1340
           if (is_sys == 1) {
1340
             if (drugFlowList.length > 0) {
1341
             if (drugFlowList.length > 0) {
1341
               for (let i = 0; i < drugFlowList.length; i++) {
1342
               for (let i = 0; i < drugFlowList.length; i++) {
1362
             this.drugFlowList = drugFlowList;
1363
             this.drugFlowList = drugFlowList;
1363
           }
1364
           }
1364
 
1365
 
1366
+
1367
+
1365
           if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
1368
           if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
1366
             //出库详情
1369
             //出库详情
1367
             var flowlist = response.data.data.flowlist;
1370
             var flowlist = response.data.data.flowlist;
1371
+            console.log("flowList========================",flowlist)
1368
             this.drugFlowList = [];
1372
             this.drugFlowList = [];
1369
             for (let i = 0; i < flowlist.length; i++) {
1373
             for (let i = 0; i < flowlist.length; i++) {
1370
                flowlist[i].childOne = []
1374
                flowlist[i].childOne = []
1429
          
1433
          
1430
           this.tableList = list;
1434
           this.tableList = list;
1431
         }
1435
         }
1436
+
1437
+
1438
+
1432
         if(is_sys == 12){
1439
         if(is_sys == 12){
1433
           
1440
           
1434
           for(let i=0;i<list.length;i++){
1441
           for(let i=0;i<list.length;i++){
1449
           this.tableList = list;
1456
           this.tableList = list;
1450
         }
1457
         }
1451
 
1458
 
1459
+
1460
+
1452
         if(is_sys == 0){
1461
         if(is_sys == 0){
1453
           console.log("list999992332232323",list)
1462
           console.log("list999992332232323",list)
1454
           for(let i=0;i<list.length;i++){
1463
           for(let i=0;i<list.length;i++){
1455
             for(let j=0;j<list[i].childOne.length;j++){
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
          for(let i=0;i<list.length;i++){
1474
          for(let i=0;i<list.length;i++){
1462
             for(let j=0;j<list[i].childOne.length;j++){
1475
             for(let j=0;j<list[i].childOne.length;j++){
1468
           this.tableList = list;
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
       return max_str + min_str;
2051
       return max_str + min_str;
2039
     },
2052
     },
2040
     getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id,warehousing_detail_id){
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
       var arr = []
2055
       var arr = []
2045
       var total = 0
2056
       var total = 0
2046
       var max_str = ""
2057
       var max_str = ""
2145
       }
2156
       }
2146
       total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
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
       if(arr.length > 0){
2160
       if(arr.length > 0){
2150
         for(let i=0;i<arr.length;i++){
2161
         for(let i=0;i<arr.length;i++){
2151
            price = arr[0].price
2162
            price = arr[0].price

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

65
                 记录时间:
65
                 记录时间:
66
                 <el-date-picker v-model="record_date" prefix-icon="el-icon-date" :editable="false"
66
                 <el-date-picker v-model="record_date" prefix-icon="el-icon-date" :editable="false"
67
                               style="width: 250px;"
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
                               ></el-date-picker>
71
                               ></el-date-picker>
70
               </div>
72
               </div>
71
               <div style="flex: 1;">
73
               <div style="flex: 1;">
1368
       },
1370
       },
1369
       getCurrentChangeOne(val){
1371
       getCurrentChangeOne(val){
1370
         this.$refs.editor.contents = val.content
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
         this.admin_user_id = val.recorder
1380
         this.admin_user_id = val.recorder
1373
         if(this.admin_user_id == 0){
1381
         if(this.admin_user_id == 0){
1374
            this.admin_user_id = ""
1382
            this.admin_user_id = ""
1493
         var params = {
1501
         var params = {
1494
           id:this.id,
1502
           id:this.id,
1495
           patient_id:this.patient_id,
1503
           patient_id:this.patient_id,
1496
-          record_date:"",
1504
+          record_date:this.record_date,
1497
           content:this.new_content,
1505
           content:this.new_content,
1498
           admin_user_id:this.admin_user_id,
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
         console.log("params",params)
1509
         console.log("params",params)
1507
 
1510
 
1508
-      
1509
-
1510
         createNewCourseOfDiseaseRecord(params).then(response => {
1511
         createNewCourseOfDiseaseRecord(params).then(response => {
1511
          if(response.data.state == 1){
1512
          if(response.data.state == 1){
1512
            var msg = response.data.data.msg
1513
            var msg = response.data.data.msg