Browse Source

新分支

28169 10 months ago
parent
commit
aba6423519

+ 8 - 0
src/api/drug/drug_stock.js View File

645
   })
645
   })
646
 }
646
 }
647
 
647
 
648
+export function getDrugFlowDetailByDrugId(params){
649
+  
650
+  return request({
651
+    url:"/api/drug/getdrugflowdetailbyid",
652
+    method:"Get",
653
+    params:params
654
+  })
655
+}

+ 16 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

2144
                         <td height="32px">
2144
                         <td height="32px">
2145
                             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
2145
                             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
2146
                         </td>
2146
                         </td>
2147
-                    </tr>
2147
+                        </tr>
2148
                         </template>
2148
                         </template>
2149
                       </tbody>
2149
                       </tbody>
2150
                     </table>
2150
                     </table>
3401
               this.records[recordIndex].isShowZero = true;
3401
               this.records[recordIndex].isShowZero = true;
3402
             }
3402
             }
3403
 
3403
 
3404
+
3405
+            if(this.org_id == 0|| this.org_id ==10571){
3406
+             
3407
+               if(this.records!=null&& this.records.length>0){
3408
+                for(let i=0;i<this.records.length;i++){
3409
+                  this.records[i].advices.push(...this.records[i].his_advices)
3410
+                 }
3411
+               }
3412
+             
3413
+            }
3414
+
3404
             var delghTwo = 0;
3415
             var delghTwo = 0;
3405
             if (
3416
             if (
3406
               this.records[recordIndex].advices &&
3417
               this.records[recordIndex].advices &&
3424
             }
3435
             }
3425
 
3436
 
3426
 
3437
 
3438
+
3439
+
3427
           
3440
           
3428
             if(this.org_id == 10206){
3441
             if(this.org_id == 10206){
3429
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
3442
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
3525
             }
3538
             }
3526
           }
3539
           }
3527
           console.log("数据我哦我我", this.records);
3540
           console.log("数据我哦我我", this.records);
3541
+
3542
+        
3528
           // this.records.forEach(o => {
3543
           // this.records.forEach(o => {
3529
           //   console.log(o,'jj')
3544
           //   console.log(o,'jj')
3530
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
3545
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(

+ 11 - 1
src/xt_pages/stock/drugs/drugStockFlow.vue View File

51
         
51
         
52
         <span>
52
         <span>
53
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
53
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
54
+
55
+          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
54
         </span>
56
         </span>
55
         
57
         
56
       </div>
58
       </div>
186
 <script>
188
 <script>
187
   import { uParseTime } from '@/utils/tools'
189
   import { uParseTime } from '@/utils/tools'
188
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
190
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
189
-  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow } from '@/api/drug/drug_stock'
191
+  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow,getDrugFlowDetailByDrugId } from '@/api/drug/drug_stock'
190
   import SettingDialog from './settingDialog/index'
192
   import SettingDialog from './settingDialog/index'
191
   import { getDictionaryDataConfig } from "@/utils/data";
193
   import { getDictionaryDataConfig } from "@/utils/data";
192
   export default {
194
   export default {
725
     formatJson(filterVal, jsonData) {
727
     formatJson(filterVal, jsonData) {
726
      return jsonData.map(v => filterVal.map(j => v[j]))
728
      return jsonData.map(v => filterVal.map(j => v[j]))
727
     },
729
     },
730
+    toTongBu(){
731
+      var params = {
732
+        drug_id:this.$route.query.drug_id
733
+      }
734
+      getDrugFlowDetailByDrugId(params).then(response=>{
735
+
736
+      })
737
+    }
728
     }
738
     }
729
   }
739
   }
730
 </script>
740
 </script>