8月15日

src/api/dialysis.js

@@ -301,10 +301,17 @@ export function changeRole(params) {
 }
 
 export function getPatientDialysisSolutionGroupList(params) {
-  console.log('params22222', params)
   return request({
     url: '/api/patient/getpatientdialysissolutiongrouplist',
     method: 'get',
     params: params
   })
 }
+
+export function getDialysisAdviceTemplateList(params) {
+  return request({
+    url: '/api/patient/getdialysisadvicetemplatelist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -429,7 +429,9 @@
                                     <span>{{ advice.advice_name }}</span>
                                     <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
                                     <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
-                                    <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                                    <span v-if="advice.single_dose != 0">
+                                      <span v-if="advice.delivery_way !='口服'"> {{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                                    </span>
                                     <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                                     <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -46,23 +46,7 @@
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
-    <div class="cell clearfix" style="justify-content: space-between;">
-      <div style="display:flex;">
-        <label class="title"> <span class="name">出库状态</span> : </label>
-        <div class="time">
-          <ul class>
-            <li
-              :class="item.id == goodType ? 'active' : ''"
-              @click="selectGoodType(item.id)"
-              v-for="item in goodList"
-              :key="item.id"
-            >
-              {{ item.name }}
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
+  
     <div>
       <el-table
         :data="list"
@@ -73,24 +57,38 @@
           color: '#606266'
         }"
       >
-        <el-table-column
-          align="center"
-          type="selection"
-          width="55">
+        <el-table-column label="序号" align="center"  width="55">
+           <template slot-scope="scope">
+             {{scope.$index + 1}}
+           </template>
+        </el-table-column>
+
+        <el-table-column label="透析机号" align="center" width="55">
+           <template slot-scope="scope">
+              {{scope.row.device_number.number}}
+           </template>
+        </el-table-column>
+
+        <el-table-column label="姓名" align="center"  width="55">
+           <template slot-scope="scope">
+            {{scope.row.patient.name}}
+           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="name"
-          v-for="(item,index) in good_types"
-          :key="index"
-          :label="item"
-        >
-          <template slot-scope="scope">
-            <span>{{scope.row.good_type[index].name}}</span>
-          </template>
 
+        <el-table-column label="透析号" align="center" width="55">
+           <template slot-scope="scope">
+            {{scope.row.patient.dialysis_no}}
+           </template>
         </el-table-column>
 
+        <el-table-column label="推送医嘱" align="center" width="1280">
+           <template slot-scope="scope">
+             {{getAdviceContent(scope.row.patient_id)}}
+             {{getHisAdviceContent(scope.row.patient_id)}}
+           </template>
+        </el-table-column>
+     
+     
       </el-table>
     </div>
 
@@ -113,7 +111,7 @@
 
 
 <script>
-  import { GetAllZone,GetDialysisgoods } from '@/api/dialysis'
+  import { GetAllZone,getDialysisAdviceTemplateList } from '@/api/dialysis'
 
   import { uParseTime } from "@/utils/tools";
 
@@ -165,7 +163,8 @@
         arrKey:[],
         arrList:[],
         total:0,
-
+        adviceList:[],
+        templateList:[]
       }
     },
     created() {
@@ -183,17 +182,31 @@
       this.query.schedule_type = 0
       this.query.partition_id = 0
       this.query.page = 1
-      this.GetDialysisgoods()
+      this.getlist()
     },
     methods: {
+      getlist(){
+        getDialysisAdviceTemplateList(this.query).then(response=>{
+          if(response.data.state == 1){
+          
+            var list = response.data.data.list
+            this.list = list
+            this.total = response.data.data.total
+            var adviceList = response.data.data.adviceList
+            this.adviceList = adviceList
+            var templateList = response.data.data.templateList
+            this.templateList = templateList
+          }
+        })
+      },
 
       handleSizeChange(val) {
         this.query.limit = val;
-        this.GetDialysisgoods();
+        this.getlist();
       },
       handleCurrentChange(val) {
         this.query.page = val;
-        this.GetDialysisgoods();
+        this.getlist();
       },
 
       calCount(query_warehouseout_info) {
@@ -218,147 +231,13 @@
           return desc
         }
         return ""
-
-        // else if (good_user != null && good_user.length <= 0) {
-        //   if (last_good_user != null && last_good_user.length > 0) {
-        //     let desc = ""
-        //     for (let b = 0; b < last_good_user.length; b++){
-        //       if(good_type_id == last_good_user[b].good_type_id)
-        //         desc = desc+ "\n" + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
-        //     }
-        //     console.log(desc)
-        //
-        //     return desc
-        //
-        //   }
-        //   return ""
-        // }
-      },
-      GetDialysisgoods() {
-        GetDialysisgoods(this.query).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-
-            this.list = []
-            this.good_types = []
-            this.allGoodInfo = []
-
-            var res = response.data
-            this.total = res.data.total
-            this.good_types.push("姓名")
-            var arr = []
-            arr.push("name")
-            for (let a = 0; a <  res.data.good_type.length; a++){
-              Object.keys(res.data.good_type[a]).map(item => {
-                if(item == 'type_name'){
-                  arr.push('name')
-                }
-              })
-              this.good_types.push(res.data.good_type[a].type_name)
-            }
-
-            this.arrKey.push(...arr)
-
-            this.allGoodInfo = res.data.dialysis_goods
-
-            for(let i = 0; i < res.data.dialysis_goods.length; i++){
-              let arr =[]
-              let obj = {
-                id:0,
-                name:  res.data.dialysis_goods[i].patient.name,
-              }
-              arr.push(obj)
-
-              for (let a = 0; a <  res.data.good_type.length; a++){
-                let obj = {
-                  id:res.data.good_type[a].id,
-                  name:""
-
-                }
-                arr.push(obj)
-              }
-
-
-
-              let newObj = {
-                "good_type":arr,
-                "good_user":res.data.dialysis_goods[i].good_user,
-                "last_good_user":res.data.dialysis_goods[i].last_good_user,
-                "good_user_detail":res.data.dialysis_goods[i].good_user_detail,
-                "last_good_user_detail":res.data.dialysis_goods[i].last_good_user_detail,
-              }
-
-              this.list.push(newObj)
-            }
-
-
-           for (let a = 0; a <  this.list.length; a++){
-              for (let b = 0; b <  this.list[a].good_type.length; b++){
-
-                if(this.list[a].good_type[b].id > 0){
-                  this.list[a].good_type[b].name = this.getGoodUserInfo(this.list[a].good_type[b].id,this.list[a].good_user,this.list[a].last_good_user)
-                }
-
-              }
-            }
-
-          //  console.log("99999999",this.list)
-           let a = []
-          this.list.map(item => {
-            a.push(item.good_type)
-          })
-          // console.log('aaaaaaaaa',a)
-          let b = []
-
-          a.map(item => {
-            let obj = []
-            item.map((it,index) => {
-              let i = 0
-              let c = {}
-              let str = 'name' + index
-              c[str] = it.name
-              obj.push(c)
-
-            })
-
-            b.push(obj)
-          })
-          var temp = []
-          // console.log('bbbbbbbbbb',b)
-          for(let i=0;i<b.length;i++){
-            var objC = {...b[i]}
-            temp.push(objC)
-          }
-
-          // console.log("temp--------",temp)
-          var tempTwo = []
-          temp.map(item => {
-            let obj = []
-            Object.values(item).map(it => {
-              obj.push(it)
-            })
-            let obj2 = {}
-            obj.map((i,ind) => {
-
-              let str = 'name' + ind
-              obj2[str] = i[str]
-            })
-            tempTwo.push(obj2)
-            // console.log(325556574342354234234,tempTwo)
-          })
-
-          this.arrList.push(...tempTwo)
-          console.log("cccccccc",this.arrList)
-          }
-        })
       },
+   
       selectSchedulType(scheduleType) {
         this.schedulType = scheduleType
         this.query.schedule_type = scheduleType
         this.query.page = 1
-        this.GetDialysisgoods()
+        this.getlist()
 
       },
       selectPartitionType(partitionType) {
@@ -366,13 +245,13 @@
         this.query.partition_id = partitionType
         this.query.page = 1
 
-        this.GetDialysisgoods()
+        this.getlist()
 
       },
       selectGoodType(goodType){
         this.goodType = goodType
         this.query.good_type = goodType
-        this.GetDialysisgoods()
+        this.getlist()
       },
       getAllZone: function() {
         GetAllZone().then(response => {
@@ -391,11 +270,11 @@
       handleScheduleDateChange(val) {
         this.query.schedule_date = val
         this.query.page = 1
-        this.GetDialysisgoods()
+        this.getlist()
       },
       search() {
         this.query.page = 1
-        this.GetDialysisgoods()
+        this.getlist()
       },
 
        exportList(){
@@ -429,7 +308,38 @@
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
-
+      getAdviceContent(patient_id){
+        var newArr = []
+        var his_str = ""
+        if(this.templateList!=null && this.templateList.length > 0){
+          for(let i=0;i<this.templateList.length;i++){
+            if(patient_id == this.templateList[i].patient_id){
+              newArr.push(this.templateList[i])
+            }
+          }
+        }
+        if(newArr!=null && newArr.length > 0){
+          for(let i=0;i<newArr.length;i++){
+            his_str += newArr[i].advice_name +''+newArr[i].advice_desc +''+ newArr[i].prescribing_number +''+newArr[i].prescribing_number_unit + "。"
+          }
+        }
+        return his_str
+      },
+      getHisAdviceContent(patient_id){
+        var arr = []
+        for(let i=0;i<this.adviceList.length;i++){
+          if(patient_id == this.adviceList[i].patient_id){
+             arr.push(this.adviceList[i])
+          }
+        } 
+        var str = ""
+        if(arr!=null && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            str += arr[i].advice_name +''+ arr[i].advice_desc+'' + arr[i].prescribing_number+'' + arr[i].prescribing_number_unit +  "。"
+          }
+        }
+        return str 
+      }
     }
   }
 </script>

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -42,27 +42,12 @@
         </div>
       </div>
       <div>
+        <el-button size="small" icon="el-icon-printer" @click="toDialog" type="primary">设置</el-button>
         <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
-    <div class="cell clearfix" style="justify-content: space-between;">
-      <div style="display:flex;">
-        <label class="title"> <span class="name">出库状态</span> : </label>
-        <div class="time">
-          <ul class>
-            <li
-              :class="item.id == goodType ? 'active' : ''"
-              @click="selectGoodType(item.id)"
-              v-for="item in goodList"
-              :key="item.id"
-            >
-              {{ item.name }}
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
+  
     <div>
       <el-table
         :data="list"
@@ -92,6 +77,29 @@
         </el-table-column>
 
       </el-table>
+
+      <el-dialog
+        title="提示"
+        :visible.sync="dialogVisible"
+        width="30%">
+        <span>
+          <el-checkbox-group v-model="form.predialysis_condition">
+            <el-checkbox
+              v-for="item in predialysisConditionOptions"
+              :label="item.filed_name_cn"
+              :key="item.value"
+              :value="item.filed_name_cn"
+              disabled
+              >{{ item.filed_name_cn }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+       </span>
+      </el-dialog>
+
     </div>
 
     <el-pagination
@@ -106,14 +114,12 @@
       :total="total"
     >
     </el-pagination>
-
-   
   </div>
 </template>
 
 
 <script>
-  import { GetAllZone,GetDialysisgoods } from '@/api/dialysis'
+  import { GetAllZone } from '@/api/dialysis'
 
   import { uParseTime } from "@/utils/tools";
 
@@ -165,10 +171,28 @@
         arrKey:[],
         arrList:[],
         total:0,
-
+        dialogVisible:false,
+        predialysisConditionOptions:[],
       }
     },
     created() {
+       var filedList = store.getters.xt_user.fileds
+       console.log("哈哈哈哈",filedList)
+       var newArr = [
+        {value:999999,filed_name_cn:"姓名"},
+        {value:888888,filed_name_cn:"透析号"},
+        {value:777777,filed_name_cn:"透析机号"}
+        ]
+       for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 1 && filedList[i].is_show == 1) {
+           newArr.push(filedList[i])
+        }
+        if (filedList[i].module == 3 && filedList[i].is_show == 1 &&(filedList[i].filed_name_cn == "干体重"  || filedList[i].filed_name_cn == "透前称重" || filedList[i].filed_name_cn == "收缩压" || filedList[i].filed_name_cn == "舒张压" )) {
+           newArr.push(filedList[i])
+        }
+        this.predialysisConditionOptions = newArr
+       }
+      console.log("newArr23232323232wo",newArr)
       this.getAllZone()
       let date = uParseTime(new Date(), "{y}-{m}-{d}")
       var newDate = new Date();
@@ -183,17 +207,20 @@
       this.query.schedule_type = 0
       this.query.partition_id = 0
       this.query.page = 1
-      this.GetDialysisgoods()
+      this.getlist()
+     
     },
     methods: {
+      getlist(){
 
+      },
       handleSizeChange(val) {
         this.query.limit = val;
-        this.GetDialysisgoods();
+        this.getlist();
       },
       handleCurrentChange(val) {
         this.query.page = val;
-        this.GetDialysisgoods();
+        this.getlist();
       },
 
       calCount(query_warehouseout_info) {
@@ -234,131 +261,12 @@
         //   return ""
         // }
       },
-      GetDialysisgoods() {
-        GetDialysisgoods(this.query).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-
-            this.list = []
-            this.good_types = []
-            this.allGoodInfo = []
-
-            var res = response.data
-            this.total = res.data.total
-            this.good_types.push("姓名")
-            var arr = []
-            arr.push("name")
-            for (let a = 0; a <  res.data.good_type.length; a++){
-              Object.keys(res.data.good_type[a]).map(item => {
-                if(item == 'type_name'){
-                  arr.push('name')
-                }
-              })
-              this.good_types.push(res.data.good_type[a].type_name)
-            }
-
-            this.arrKey.push(...arr)
-
-            this.allGoodInfo = res.data.dialysis_goods
-
-            for(let i = 0; i < res.data.dialysis_goods.length; i++){
-              let arr =[]
-              let obj = {
-                id:0,
-                name:  res.data.dialysis_goods[i].patient.name,
-              }
-              arr.push(obj)
-
-              for (let a = 0; a <  res.data.good_type.length; a++){
-                let obj = {
-                  id:res.data.good_type[a].id,
-                  name:""
-
-                }
-                arr.push(obj)
-              }
-
-
-
-              let newObj = {
-                "good_type":arr,
-                "good_user":res.data.dialysis_goods[i].good_user,
-                "last_good_user":res.data.dialysis_goods[i].last_good_user,
-                "good_user_detail":res.data.dialysis_goods[i].good_user_detail,
-                "last_good_user_detail":res.data.dialysis_goods[i].last_good_user_detail,
-              }
-
-              this.list.push(newObj)
-            }
-
-
-           for (let a = 0; a <  this.list.length; a++){
-              for (let b = 0; b <  this.list[a].good_type.length; b++){
-
-                if(this.list[a].good_type[b].id > 0){
-                  this.list[a].good_type[b].name = this.getGoodUserInfo(this.list[a].good_type[b].id,this.list[a].good_user,this.list[a].last_good_user)
-                }
-
-              }
-            }
-
-          //  console.log("99999999",this.list)
-           let a = []
-          this.list.map(item => {
-            a.push(item.good_type)
-          })
-          // console.log('aaaaaaaaa',a)
-          let b = []
-
-          a.map(item => {
-            let obj = []
-            item.map((it,index) => {
-              let i = 0
-              let c = {}
-              let str = 'name' + index
-              c[str] = it.name
-              obj.push(c)
-
-            })
-
-            b.push(obj)
-          })
-          var temp = []
-          // console.log('bbbbbbbbbb',b)
-          for(let i=0;i<b.length;i++){
-            var objC = {...b[i]}
-            temp.push(objC)
-          }
-
-          // console.log("temp--------",temp)
-          var tempTwo = []
-          temp.map(item => {
-            let obj = []
-            Object.values(item).map(it => {
-              obj.push(it)
-            })
-            let obj2 = {}
-            obj.map((i,ind) => {
-
-              let str = 'name' + ind
-              obj2[str] = i[str]
-            })
-            tempTwo.push(obj2)
-            // console.log(325556574342354234234,tempTwo)
-          })
-
-          this.arrList.push(...tempTwo)
-          console.log("cccccccc",this.arrList)
-          }
-        })
-      },
+   
       selectSchedulType(scheduleType) {
         this.schedulType = scheduleType
         this.query.schedule_type = scheduleType
         this.query.page = 1
-        this.GetDialysisgoods()
+        this.getlist()
 
       },
       selectPartitionType(partitionType) {
@@ -366,13 +274,13 @@
         this.query.partition_id = partitionType
         this.query.page = 1
 
-        this.GetDialysisgoods()
+        this.getlist()
 
       },
       selectGoodType(goodType){
         this.goodType = goodType
         this.query.good_type = goodType
-        this.GetDialysisgoods()
+        this.getlist()
       },
       getAllZone: function() {
         GetAllZone().then(response => {
@@ -391,11 +299,11 @@
       handleScheduleDateChange(val) {
         this.query.schedule_date = val
         this.query.page = 1
-        this.GetDialysisgoods()
+        this.getlist()
       },
       search() {
         this.query.page = 1
-        this.GetDialysisgoods()
+        this.getlist()
       },
 
        exportList(){

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1457,14 +1457,13 @@
                           >
                           
                          
-                          <span v-if="advice.single_dose != 0"
-                            >{{ advice.single_dose
-                            }}{{ advice.single_dose_unit }}</span
+                          <span v-if="advice.single_dose != 0">
+                             <span v-if="advice.delivery_way =='口服'">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                             <span v-if="advice.delivery_way!='口服'"> {{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                           </span
                           >
                           <span v-if="advice && advice.project">{{advice.project.unit}}</span>
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.delivery_way
-                          }}</span>
+                          <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                           <span v-if="advice.parent_id == 0">{{
                             advice.execution_frequency
                           }}</span>
@@ -1739,7 +1738,10 @@
                       }}{{ advice.drug_spec_unit }})</span
                     >
                     <span v-if="advice.prescribing_number" >&nbsp;&nbsp; {{ advice.prescribing_number}}{{ advice.prescribing_number_unit }}</span>
-                    <span v-if="advice.single_dose != 0" >{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                    <span v-if="advice.single_dose != 0" >
+                      <span v-if="advice.delivery_way =='口服'">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                      <span v-if="advice.delivery_way!='口服'"> {{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                     </span>
                      <span v-if="advice.project && advice.project.unit">{{ advice.project.unit }}</span>
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                     <span v-if="advice.parent_id == 0">{{

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -882,10 +882,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"

src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue

@@ -445,14 +445,6 @@ export default {
      }
      return storehouse_name
    },
-
-  
-   startFirstTimeChange(){
-     this.getlist()
-   },
-   endEndTimeChange(){
-     this.getlist()
-   },
   getTime(val) {
     if(val < 0){
       return ""
@@ -473,9 +465,11 @@ export default {
     return name
   },
   endTimeChange(){
+     this.drugTypeList = []
     this.getlist()
   },
   startTimeChange(){
+     this.drugTypeList = []
     this.getlist()
   },
   getDrugWarehouseInfoOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
@@ -752,7 +746,7 @@ export default {
    var total_price = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      totalOne += (arr[i].warehousing_count/min_number*arr[i].price) + arr[i].warehousing_count*(arr[i].price/min_number)
+      totalOne += (arr[i].count/min_number*arr[i].price) + arr[i].count*(arr[i].price/min_number)
      }
    }
   
@@ -914,11 +908,14 @@ export default {
 
    if(arr5!=null&&arr5.length > 0){
     for(let i=0;i<arr5.length;i++){
-      total_four+=arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
+      total_five+=arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
      }
    }
-   console.log("arr333333333332",arr3)
-   console.log("arr4233232323223233wi",arr4)
+   console.log("total_one",totalOne)
+   console.log("totalTwo",totalTwo)
+   console.log("total_three",total_three)
+   console.log("total_four",total_four)
+  
    console.log("total_pricewode",(totalOne - totalTwo+total_three - total_four).toFixed(2))
    total_price =(totalOne - totalTwo+total_three - total_four + total_five).toFixed(2)
    if(total_price > 0){

src/xt_pages/stock/drugs/components/purchaseDrugQueryPrint.vue

@@ -641,7 +641,7 @@ export default {
    var total_price = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      totalOne += (arr[i].warehousing_count/min_number*arr[i].price) + arr[i].warehousing_count*(arr[i].price/min_number)
+      totalOne += (arr[i].count/min_number*arr[i].price) + arr[i].count*(arr[i].price/min_number)
      }
    }
   
@@ -803,7 +803,7 @@ export default {
 
    if(arr5!=null&&arr5.length > 0){
     for(let i=0;i<arr5.length;i++){
-      total_four+=arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
+      total_five+=arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
      }
    }
    

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -324,23 +324,30 @@
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
                     <span v-if="is_sys == 1">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
-                    <span v-if="is_sys == 0">{{getPriceOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                    <span v-if="is_sys == 0">
+                      <span v-if="scope.row.child.length == 1">
+                         {{getPriceTwo(item.warehouse_out_id,item.drug_id)}}
+                      </span>
+                      <span v-if="scope.row.child.length > 1">
+                          {{item.price}}
+                      </span>
+                    
+                    </span>
                   </td>
                </tr>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="进货价" align="center" v-if="is_sys == 0">
-            <template slot-scope="scope">
-              {{scope.row.last_price}}
-            </template>
-          </el-table-column> -->
+       
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
                     <span v-if="is_sys == 1">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
-                    <span v-if="is_sys == 0">{{getTotalPriceOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
-                  </td>
+                    <span v-if="is_sys == 0">
+                      <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
+                      <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
+                    </span>
+
                   </td>
                </tr>
             </template>
@@ -658,6 +665,7 @@ export default {
       tabList:[],
       tabListOne:[],
       outList:[],
+      warehouseOutList:[],
     };
   },
   methods: {
@@ -1184,7 +1192,7 @@ export default {
           this.tableShow = true;
           this.tableList = [];
           var list = response.data.data.list;
-         
+          this.warehouseOutList = list
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
           var drugFlowList = response.data.data.drugFlowList;
@@ -1216,6 +1224,7 @@ export default {
             console.log("数据元23322323232323322332我的",drugFlowList)
             this.drugFlowList = drugFlowList;
           }
+
           if (is_sys == 0 || is_sys == 12) {
             var flowlist = response.data.data.flowlist;
             this.drugFlowList = [];
@@ -1228,20 +1237,20 @@ export default {
               if (flowlist[i].count_unit == flowlist[i].min_unit) {
                 flowlist[i].count = flowlist[i].count;
               }
-              if(list[i].is_sys == 1){
-               for(let j=0;j<drugListOne.length;j++){
-                if(flowlist[i].drug_id == drugListOne[j].drug_id){
-                  flowlist[i].child.push(drugListOne[j])
-                }
-               }
-              }
-              if(list[i].is_sys == 0){
-               for(let j=0;j<drugListTwo.length;j++){
-                if(flowlist[i].drug_id == drugListTwo[j].drug_id){
-                  flowlist[i].child.push(drugListTwo[j])
-                }
-               }
-              }
+              // if(list[i].is_sys == 1){
+              //  for(let j=0;j<drugListOne.length;j++){
+              //   if(flowlist[i].drug_id == drugListOne[j].drug_id){
+              //     flowlist[i].child.push(drugListOne[j])
+              //   }
+              //  }
+              // }
+              // if(list[i].is_sys == 0){
+              //  for(let j=0;j<drugListTwo.length;j++){
+              //   if(flowlist[i].drug_id == drugListTwo[j].drug_id){
+              //     flowlist[i].child.push(drugListTwo[j])
+              //   }
+              //  }
+              // }
              
             }
             this.drugFlowList = flowlist;
@@ -1494,9 +1503,8 @@ export default {
           "/" +
           this.exportList[i].max_unit;
 
-        this.exportList[i].total_price = (
-          this.exportList[i].count * this.exportList[i].price
-        ).toFixed(2);
+        this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2);
+        this.exportList[i].out_count = this.getAllOut(this.exportList[i].count,this.exportList[i].max_unit,this.exportList[i].min_unit,this.exportList[i].min_number)
         this.exportList[i].expiry_date = this.getTime(
           this.exportList[i].expire_date
         );
@@ -1548,9 +1556,9 @@ export default {
           "drug_type",
           "unit",
           "batch_number",
-          "count",
-          "price",
+          "out_count",
           "retail_price",
+          "price",
           "total_price",
           "manufacturer",
           "product_date",
@@ -1828,7 +1836,7 @@ export default {
         return 0
       }
     },
-   getTotalPriceOne(number,max_unit,min_unit,min_number){
+   getTotalPriceOne(number,max_unit,min_unit,min_number,retail_price){
    
       var arr = []
       var total = 0
@@ -1836,19 +1844,20 @@ export default {
       var min_str = 0
       var price = 0
       var all_price = 0
+     
       for(let j=0;j<this.tabList.length;j++){
         if(number == this.tabList[j].batch_number){
            arr.push(this.tabList[j])
         }
       }
-      console.log("Arr233322332",arr)
+      console.log("Arr233322332",arr) 
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
            total +=arr[i].count
-           price = arr[0].price
-        }
+         }
       }
-     
+      price = retail_price
+      console.log("price",price)
       if (total < min_number) {
         min_str = total
       }
@@ -1864,13 +1873,18 @@ export default {
           min_str = (total % min_number)
         }
       }
-     
+      console.log("max_str2323232323",max_str)
+      console.log("min_str",min_str)
+      console.log("max_unit",max_unit)
+      console.log("min",min_unit)
+
       if(max_unit!=min_unit){
-        all_price = max_str  * min_number * price + min_str * price
+        all_price = max_str  * price + min_str * price
       }
       if(max_unit == min_unit){
          all_price = max_str * price + min_str * price
       }
+      console.log("arr_pirce",all_price)
       if(all_price > 0){
         return all_price.toFixed(2)
       }else{
@@ -2033,6 +2047,38 @@ export default {
         }
       }
       return remark
+    },
+    getAllOut(count,max_unit,min_unit,min_number){
+      
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+      total = count
+      if (total < min_number) {
+        min_str = total + min_unit
+      }
+      if (total == 0) {
+        min_str = 0;
+        max_str = 0;
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number)+ min_unit
+        }
+      }
+      return max_str + min_str
+    },
+    getPriceTwo(warehouse_out_id,drug_id){
+      var price = 0
+      for(let i=0;i<this.warehouseOutList.length;i++){
+       if(drug_id == this.warehouseOutList[i].drug_id){
+          price = this.warehouseOutList[i].price
+       }
+       return price
+      }
     }
   },
 };

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -967,13 +967,13 @@ export default {
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
           this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
-          this.tableList[i].specification_name = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
+          this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
         }
         import('@/vendor/Export2Excel').then(excel => {
            const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
            const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
            const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
-           const filterVal = ['index', 'query_date', 'good_type','good_name','specification_name','manufacturer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+           const filterVal = ['index', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
     
            const data = this.formatJson(filterVal, this.tableList)
            

src/xt_pages/stock/stockOutOrder.vue

@@ -325,7 +325,8 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                      {{(getAllStockCount(scope.row.child,item.warehousing_id) * getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}}
+                      <!-- {{(getAllStockCount(scope.row.child,item.warehousing_id) * getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}} -->
+                       {{(getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)}}
                   </td>
                </tr>
             </template>
@@ -1402,7 +1403,7 @@ export default {
           this.stockFlowListGroup = response.data.data.stockFlowListGroup
           var cancelInfolist = response.data.data.cancelInfolist
           this.cancelInfoList = cancelInfolist
-          console.log("退库数据2333333333333333333333",cancelInfolist)
+    
           this.tableList = [];
           for (let i = 0; i < list.length; i++) {
             list[i].child= []
@@ -1420,7 +1421,7 @@ export default {
          
             this.tableList.push(list[i]);
           }
-          console.log("hhhhhhwode ",this.tableList)
+         
         }
       });
     },
@@ -1841,23 +1842,96 @@ export default {
           this.stockFlowList = stockflowlist;
             
           var cancelInfo = response.data.data.cancelInfo
-          console.log("cancelInfowowoowowowowowowo",cancelInfo)
-          for(let i=0;i<this.stockFlowList.length;i++){
-            this.stockFlowList[i].cancel_count = 0
-            for(let j=0;j<cancelInfo.length;j++){
-              if(this.stockFlowList[i].patient_id == cancelInfo[j].patient_id){
-                 this.stockFlowList[i].cancel_count  = cancelInfo[j].count
+          console.log("哈哈哈哈哈",this.stockFlowList)
+
+
+
+          let dataInfo = {}
+          if(this.stockFlowList.length > 0){
+            this.stockFlowList.forEach((item, index) => {
+            let { patient_id } = item
+            if (!dataInfo[patient_id]) {
+              dataInfo[patient_id] = {
+                patient_id,
+                child: [],
+                name:item.name,
+                ctime:item.ctime,
+                count:0,
+                cancel_count:0,
+                is_sys:item.is_sys,
+              }
+            }
+          })
+          let arr = Object.values(dataInfo)  
+           console.log("arr2332323232wode",arr)
+           if(arr!=null && arr.length > 0){
+              for(let i=0;i<arr.length;i++){
+                for(let j=0;j<this.stockFlowList.length;j++){
+                    if(arr[i].patient_id == this.stockFlowList[j].patient_id){
+                       arr[i].child.push(this.stockFlowList[j])
+                    }
+                }
+              }
+           }
+
+           for(let i=0;i<arr.length;i++){
+            for(let j=0;j<arr[i].child.length;j++){
+              arr[i].count += arr[i].child[j].count
+            }
+           }
+          var newArrOne = []
+          if(cancelInfo!=null && cancelInfo.length > 0){
+           
+           let dataInfoOne = {}
+          if(this.stockFlowList.length > 0){
+            this.stockFlowList.forEach((item, index) => {
+            let { patient_id } = item
+            if (!dataInfoOne[patient_id]) {
+              dataInfoOne[patient_id] = {
+                patient_id,
+                child: [],
+                name:item.name,
+                ctime:item.ctime,
+                count:0,
+                is_sys:item.is_sys,
+              }
+             }
+            })
+           }
+           let newArr = Object.values(dataInfoOne)  
+            if(newArr!=null && newArr.length > 0){
+              for(let i=0;i<newArr.length;i++){
+               for(let j=0;j<cancelInfo.length;j++){
+                 if(newArr[i].patient_id == cancelInfo[j].patient_id){
+                    newArr[i].child.push(cancelInfo[j])
+                 }
+               }
               }
             }
+            for(let i=0;i<newArr.length;i++){
+              for(let j=0;j<newArr[i].child.length;j++){
+                 newArr[i].count+=newArr[i].child[j].count
+              } 
+            }
+            newArrOne = newArr
           }
-          for (let i = 0; i < this.stockFlowList.length; i++) {
-            var obj = this.stockFlowList[i];
+           
+         for(let i=0;i<arr.length;i++){
+            for(let j=0;j<newArrOne.length;j++){
+              if(arr[i].patient_id == newArrOne[j].patient_id){
+                arr[i].cancel_count  = newArrOne[j].count
+              }
+            }
+          }
+          console.log("2o32o3o3232j32oo23o2332oj2wo",arr)
+          for (let i = 0; i <arr.length; i++) {
+            var obj = arr[i];
             obj["is_total"] = 0;
             this.userList.push(obj);
-            if(this.stockFlowList[i].is_sys == 1){
-              total = total + this.stockFlowList[i].count - this.stockFlowList[i].cancel_count;
+            if(arr[i].is_sys == 1){
+              total = total + arr[i].count - arr[i].cancel_count;
             }else{
-              total = total + this.stockFlowList[i].count;
+              total = total + arr[i].count;
             }
             
           }
@@ -1871,6 +1945,9 @@ export default {
           if (val.is_sys == 0) {
             this.editdialogVisibleTwo = true;
           }
+          }
+
+   
         }
       });
     },
@@ -2229,8 +2306,7 @@ export default {
       }
     },
     getCancelInfo(warehousing_id,good_id){
-    console.log("warehousing_id",warehousing_id)
-    console.log("good_ud2323322332",good_id)
+    
      var count =0
      var arr = []
      for(let i=0;i<this.cancelInfoList.length;i++){