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

src/api/drug/drug_stock.js

@@ -645,3 +645,11 @@ export function getDrugInitDataList(params) {
   })
 }
 
+export function getDrugFlowDetailByDrugId(params){
+  
+  return request({
+    url:"/api/drug/getdrugflowdetailbyid",
+    method:"Get",
+    params:params
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -2144,7 +2144,7 @@
                         <td height="32px">
                             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                         </td>
-                    </tr>
+                        </tr>
                         </template>
                       </tbody>
                     </table>
@@ -3401,6 +3401,17 @@ export default {
               this.records[recordIndex].isShowZero = true;
             }
 
+
+            if(this.org_id == 0|| this.org_id ==10571){
+             
+               if(this.records!=null&& this.records.length>0){
+                for(let i=0;i<this.records.length;i++){
+                  this.records[i].advices.push(...this.records[i].his_advices)
+                 }
+               }
+             
+            }
+
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
@@ -3424,6 +3435,8 @@ export default {
             }
 
 
+
+
           
             if(this.org_id == 10206){
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
@@ -3525,6 +3538,8 @@ export default {
             }
           }
           console.log("数据我哦我我", this.records);
+
+        
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -51,6 +51,8 @@
         
         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+
+          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
         </span>
         
       </div>
@@ -186,7 +188,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow } from '@/api/drug/drug_stock'
+  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow,getDrugFlowDetailByDrugId } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -725,6 +727,14 @@
     formatJson(filterVal, jsonData) {
      return jsonData.map(v => filterVal.map(j => v[j]))
     },
+    toTongBu(){
+      var params = {
+        drug_id:this.$route.query.drug_id
+      }
+      getDrugFlowDetailByDrugId(params).then(response=>{
+
+      })
+    }
     }
   }
 </script>