新分支

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintThree.vue

               医    师：
               <span
                 style="width: 100px; display: inline-block"
-                v-if="i.info.creator == 0"
+                v-if="setAdminUserES(i.info.creator)==''"
               >
                {{ i.info.doctor ? i.info.doctor : "" }}
               </span>
                 :src="setAdminUserES(i.info.creator)"
                 alt=""
                 srcset=""
-                v-else
+                 v-if="setAdminUserES(i.info.creator)!=''"
               />
             </div>
             <!-- <div>药品金额：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}</div> -->

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

                                             <template slot-scope="scope">{{ scope.row.zuobiao_stock_num }}</template>
                                           </el-table-column>
 
-
                                           <el-table-column label="规格" width="60" v-if="org_id == 10206 || org_id == 0">
                                             <template slot-scope="scope">
                                               <span>{{scope.row.drug_spec}}</span>
                                             </template>
                                           </el-table-column>
-                                            <el-table-column label="单价" width="40">
+                                          <el-table-column label="单价" width="40">
                                                 <template slot-scope="scope">{{ scope.row.retail_price }}</template>
+                                           </el-table-column>
+
+                                            <el-table-column label="库存" width="60" v-if="org_id != 10206" >
+                                              <template slot-scope="scope">{{ getSumCount(scope.row.sum_count,scope.row.min_number,scope.row.min_unit,scope.row.max_unit)}}</template>
                                             </el-table-column>
                                         </el-table>
                                     </div>
                                                 <template slot-scope="scope">{{ scope.row.type == 3?scope.row.zuobiao_stock_num :""}}</template>
                                               </el-table-column>
 
+                                           
+
 
                                                 <el-table-column label="规格" width="60">
                                                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                                 <el-table-column label="单价" width="40">
                                                     <template slot-scope="scope">{{ scope.row.price }}</template>
                                                 </el-table-column>
+                                               
+                                                <el-table-column label="库存" width="60" v-if="org_id != 10206" >
+                                                <template slot-scope="scope">
+                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span> 
+                                                </template>
+                                              </el-table-column>
+                                                
                                             </el-table>
                                         </div>
                                     </el-tab-pane>
             return false
           } else {
             this.drugs = response.data.data.drugs
+            console.log("drugs------------------------",this.drugs)
             if (this.org_id == 10206) {
               for (let i = 0; i < this.zuobiao_drug.length; i++) {
                 for (let b = 0; b < this.drugs.length; b++) {
         getHisProject().then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
+            
             for (let i = 0; i < project.length; i++) {
               let obj = {
                 id: project[i].id,
                 number: "",
                 bbx01:project[i].bbx01,
                 bby01:project[i].bby01,
-
+                sum_count:""
 
               }
 
             }
 
             var good_info = response.data.data.good_info
-
+            console.log("good_info000000000000000000000",good_info)
             for (let i = 0; i < good_info.length; i++) {
               let obj = {
                 id: good_info[i].id,
                 number: good_info[i].good_number,
                 bbx01:good_info[i].bbx01,
                 bby01:good_info[i].bby01,
-
+                sum_count:good_info[i].sum_count
 
               }
               this.tabProject.push(obj)
 
           }
         })
+      },
+      getSumCount(total,min_number,min_unit,max_unit){
+          var min_str  =""
+          var max_str = ""
+          if (total < min_number) {
+              min_str = total + min_unit;
+          }
+          if (total == 0) {
+              min_str = "";
+              max_str = "";
+          }
+          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;
+              }
+          }
+         
+          if(max_str == "" && min_str == ""){
+              return "0"
+          }else{
+          return max_str + min_str
+          }
       }
     }, created() {
       for(let key in this.$store.getters.treatment_mode){

src/xt_pages/stock/detail/cancelStockDetail.vue

           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
+
 
     </div>
 
         this.GetCancelStock();
       }
     },
+    getAllQuery(){
+      this.GetCancelStock();
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

src/xt_pages/stock/detail/stockInDetail.vue

           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
           
         ></el-date-picker>
         <span class="cellLine"> - </span>
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
-
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="getAllQuery"
+          >查询</el-button
+        >
     </div>
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
         this.GetCancelStock();
       }
     },
+    getAllQuery(){
+      this.GetCancelStock();
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

src/xt_pages/stock/detail/stockOutDetail.vue

           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
 
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
+
     </div>
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
       this.GetCancelStock();
       // this.getPrintStockGood()
     },
+    getAllQuery(){
+      this.GetCancelStock();
+    },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
       if (time > 0) {

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

           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
       </div>
     </div>
 
         this.getlist()
       }
     },
+    getAllQuery(){
+      this.getlist()
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

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

           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
          
         ></el-date-picker>
         <span class="cellLine"> - </span>
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
     </div>
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
         this.getDrugWarehouseInfoPrint()
       }
     },
+    getAllQuery(){
+      this.getlist()
+      this.getDrugWarehouseInfoPrint()
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

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

           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
 
     </div>
 
         this.getDrugOutOrderPrint()
       }
     },
+    getAllQuery(){
+      this.getlist()
+      this.getDrugOutOrderPrint()
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

src/xt_pages/stock/drugs/drugInventory.vue

           <drug-damaged ref="childOne"></drug-damaged>
         </el-tab-pane>
 
-        <!-- <el-tab-pane label="盘点日志表" name="seven">
+        <el-tab-pane label="盘点日志表" name="seven">
             <inventory-record ref="childSeven"></inventory-record>
-         </el-tab-pane> -->
+         </el-tab-pane>
       </el-tabs>
     </div>
   </div>

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

                     <tr>
                         <td align="center">药品名称</td>
                         <td align="center">规格</td>
-                     
                         <td align="center">本月入库数量</td>
                         <td align="center">本月出库数量</td>
                         <td align="center">本月剩余库存</td>
                     </tr>
 
                     <tr v-for="(item,index) in tableList" :key="index">
-                        <td align="center">{{ item.good_name }}</td>
+                        <td align="center">{{ item.drug_name }}</td>
                         <td align="center">{{ item.specification_name }}</td>
-                        <td align="center">{{ getInCount(item.good_id) }}</td>
-                        <td align="center">{{ getOutCount(item.good_id) }}</td> 
-                        <td align="center">{{ getSumCount(item.good_id) }}</td>
+                        <td align="center">{{ getInCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td>
+                        <td align="center">{{ getOutCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td> 
+                        <td align="center">{{ getSumCount(item.sum_count,item.min_number,item.min_unit,item.max_unit) }}</td>
                         <td align="center">
                             <table
                                 class="ware_table"
                                         },
                                     ]"
                                     >
-                                    {{ it.number }}
+                                    {{ it.batch_number }}
                                     </td>
                               </tr>
                             </table>
                         </td>
                        
                         <td align="center">
-                            <table
+                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                 >
                             </table>
                         </td>
                         <td align="center">
-                            <table
+                          <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                 >
                                     {{ getTime(it.expiry_date) }}
                                     </td>
                               </tr>
-                            </table>
+                            </table> 
                         </td>
                         <td align="center">
 
        return{
         crumbs: [
             { path: false, name: '库存管理' },
-            { path: false, name: '耗材管理' },
-            { path: false, name: '耗材模版打印' },
+            { path: false, name: '药品管理' },
+            { path: false, name: '药品模版打印' },
           ],
           tableList:[],
           org_name: this.$store.getters.xt_user.org.org_name,
           end_time:"",
           manufacturerList:[],
           infoList:[],
-          outinfo:[],
-          flowProList:[],
-          flowNoProList:[],
-          goodInfo:[]
+          drugList:[],
+          outList:[]
        }
      },
      methods:{
               if(response.data.state == 1){
                  var list  =  response.data.data.list
 
-                 console.log("list===============",list)
+                 console.log("list===============998",list)
 
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
                   list.forEach((item, index) => {
-                  let { good_id } = item
-                  if (!dataInfo[good_id]) {
-                    dataInfo[good_id] = {
-                      good_id:item.good_id,
+                  let { drug_id } = item
+                  if (!dataInfo[drug_id]) {
+                    dataInfo[drug_id] = {
+                      drug_id:item.drug_id,
                       child: [],
                       count:0,
-                      specification_name:item.specification_name,
-                      good_name:item.good_name,
+                      specification_name:item.dose +item.dose_unit+"*"+item.min_number+item.min_unit+"/"+item.max_unit,
+                      drug_name:item.drug_name,
+                      min_number:item.min_number,
+                      min_unit:item.min_unit,
+                      max_unit:item.max_unit,
+                      sum_count:item.sum_count,
                     }
                   }
                 })
                 
                 for(let i=0;i<arr.length;i++){
                    for(let j=0;j<list.length;j++){
-                       if(arr[i].good_id == list[j].good_id){
+                       if(arr[i].drug_id == list[j].drug_id){
                           arr[i].child.push(list[j])
                        }
                    }
 
                  this.infoList = response.data.data.infoList
 
-                 this.outinfo = response.data.data.outinfo
+                 this.outList = response.data.data.outList
 
-                 this.flowNoProList = response.data.data.flowNoProList
-
-                 this.flowProList = response.data.data.flowProList
-
-                 this.goodInfo = response.data.data.goodInfo
+              
+                 this.drugList = response.data.data.drugList
               }
           })
         },
            return manufacturer_name
         },
         
-        getInCount(good_id){
+        getInCount(drug_id,min_number,min_unit,max_unit){
           
           var newArr =[]
-          var total_count =0
-          var newArrOne = []
-          var total_count_one  = 0
           var total =0
+          var min_str  =""
+          var max_str = ""
           for(let i=0;i<this.infoList.length;i++){
-            if(good_id == this.infoList[i].good_id){
+            if(drug_id == this.infoList[i].drug_id){
                newArr.push(this.infoList[i])
             }
           }
+        
+         if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+               if(newArr[i].max_unit == max_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count * min_number
+               } 
+               if(newArr[i].max_unit == min_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+               if(newArr[i].max_unit == max_unit && max_unit==min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+            }
+         }
+
+
+
+        console.log("newARR========",newArr)
           if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
-                total_count += parseInt(newArr[i].warehousing_count)
+                total += parseInt(newArr[i].last_stock_max_number)
             }
           }
 
-          for(let i=0;i<this.flowProList.length;i++){
-            if(good_id == this.flowProList[i].good_id){
-               newArrOne.push(this.flowProList[i])
+        
+          if (total < min_number) {
+               min_str = total + min_unit;
+           }
+            if (total == 0) {
+                min_str = "";
+                max_str = "";
             }
-          }
-          if(newArrOne!=null){
-            for(let i=0;i<newArrOne.length;i++){
-               total_count_one += newArrOne[i].count
+            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;
+                }
+            }
+            console.log("max_str",max_str)
+            console.log("min_str",min_str)
+            if(max_str == "" && min_str == ""){
+                return "0"
+            }else{
+            return max_str + min_str
             }
-          }
-          total = total_count + total_count_one
-          return total
         },
-        getOutCount(good_id){
-
+        getOutCount(drug_id,min_number,min_unit,max_unit){
+          
           var newArr =[]
-          var newArrOne = []
-          var total_count =0
-          var total_count_one  = 0
-          var total = 0
-          for(let i=0;i<this.outinfo.length;i++){
-            if(good_id == this.outinfo[i].good_id){
-               newArr.push(this.outinfo[i])
+          var total =0
+          var min_str  =""
+          var max_str = ""
+          for(let i=0;i<this.outList.length;i++){
+            if(drug_id == this.outList[i].drug_id){
+               newArr.push(this.outList[i])
             }
           }
+        
+         if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+               if(newArr[i].max_unit == max_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count * min_number
+               } 
+               if(newArr[i].max_unit == min_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+               if(newArr[i].max_unit == max_unit && max_unit==min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+            }
+         }
+
+
+
+        console.log("newARR========",newArr)
           if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
-              total_count += parseInt(newArr[i].count)
+                total += parseInt(newArr[i].last_stock_max_number)
             }
           }
 
-          for(let i=0;i<this.flowNoProList.length;i++){
-            if(good_id == this.flowNoProList[i].good_id){
-               newArrOne.push(this.flowNoProList[i])
+        
+          if (total < min_number) {
+               min_str = total + min_unit;
+           }
+            if (total == 0) {
+                min_str = "";
+                max_str = "";
             }
-          }
-          if(newArrOne!=null){
-            for(let i=0;i<newArrOne.length;i++){
-               total_count_one += newArrOne[i].count
+            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;
+                }
+            }
+            console.log("max_str",max_str)
+            console.log("min_str",min_str)
+            if(max_str == "" && min_str == ""){
+                return "0"
+            }else{
+            return max_str + min_str
             }
-          }
-
-
-          total = total_count + total_count_one
-          return total
         },
-        getSumCount(good_id){
-          var sum_count = 0
-          for(let i=0;i<this.goodInfo.length;i++){
-             if(good_id == this.goodInfo[i].id){
-                sum_count = this.goodInfo[i].sum_count
-             }
-          }
-          return sum_count
+        getSumCount(total,min_number,min_unit,max_unit){
+           var min_str  =""
+           var max_str = ""
+           if (total < min_number) {
+               min_str = total + min_unit;
+           }
+            if (total == 0) {
+                min_str = "";
+                max_str = "";
+            }
+            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;
+                }
+            }
+            console.log("max_str",max_str)
+            console.log("min_str",min_str)
+            if(max_str == "" && min_str == ""){
+                return "0"
+            }else{
+            return max_str + min_str
+            }
         }
 
         

src/xt_pages/stock/drugs/inventoryRecordPrint.vue

                         <td align="center">{{ getTime(item.expiry_date) }}</td>
                         <td align="center">{{ getHouseName(item.storehouse_id) }}</td>
                         <td align="center">
-                             {{ item.stock_max_number }}
-                           <span v-if="item.stock_max_number>0">{{ item.max_unit }}</span> 
-                             {{ item.stock_min_number }}
-                           <span v-if="item.stock_min_number>0">{{ item.min_unit }}</span> 
+                            
+                           <span v-if="item.stock_max_number>0"> {{ item.stock_max_number}}{{ item.max_unit }}</span> 
+                          
+                           <span v-if="item.stock_min_number>0"> {{ item.stock_min_number}}{{ item.min_unit }}</span> 
                         </td> 
                         <td align="center">
-                            {{ item.last_stock_max_number }}
-                           <span v-if="item.last_stock_max_number>0">{{ item.max_unit }}</span> 
-                             {{ item.last_stock_min_number }}
-                           <span v-if="item.last_stock_min_number>0">{{ item.min_unit }}</span> 
+                           
+                           <span v-if="item.last_stock_max_number>0">
+                            {{ item.last_stock_max_number }} {{ item.max_unit }}
+                            </span> 
+                            
+                           <span v-if="item.last_stock_min_number>0"> {{ item.last_stock_min_number }}{{ item.min_unit }}</span> 
                         </td>
                         <td align="center">
                             <span v-if="item.reason == 10">盘盈</span>

src/xt_pages/stock/drugs/inventory_record.vue

             </div>
             <div>
                <el-button size="small" type="primary" @click="print_1">打印</el-button>
-               <el-button size="small" type="primary" @click="print_2">盘点模版打印2</el-button>
+               <el-button size="small" type="primary" @click="print_2">盘点模版打印</el-button>
             </div>
           
         </div>
             end_time_one= moment().endOf('month').format("YYYY-MM-DD")
 
           }
-          this.$router.push({path:'/stock/drugs/drugInventoryModePrint?start_time='+"&start_time="+start_time_one+"&end_time="+end_time_one}) 
+          this.$router.push({path:'/stock/drugs/drugInventoryModePrint?start_time='+start_time_one+"&end_time="+end_time_one}) 
         },
         handleSizeChange(val){
          this.limit = val