数据

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

@@ -8,14 +8,19 @@
       type="primary"
       >打印
     </el-button>
-
+    <!-- <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListOne"
+      type="primary"
+      >明细导出
+    </el-button> -->
     <el-button
       style="float: right;margin-right:10px"
       size="small"
-      icon="el-icon-printer"
       @click="exportList"
       type="primary"
-      >导出
+      >汇总导出
     </el-button>
     <div class="cell clearfix">
       <el-input
@@ -40,7 +45,7 @@
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -54,7 +59,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -145,12 +150,12 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="单据类型" align="center">
+        <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.type == 1">药品退库单</span>
             <span v-if="scope.row.type == 2">其他</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
@@ -162,12 +167,21 @@
           {{getAdminUser(scope.row.creater)}}
           </template>
         </el-table-column>
-
+        <el-table-column label="退货价" align="center">
+          <template slot-scope="scope">
+          {{scope.row.price}}
+          </template>
+        </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{scope.row.count}}
           </template>
         </el-table-column>
+        <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.count * scope.row.price}}
+          </template>
+        </el-table-column>
       </el-table>
 
       <el-pagination
@@ -391,7 +405,7 @@ export default {
           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
         }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','备注']
+       const tHeader = ['序号','单据编号', '药品名称', '规格型号','单据类型','操作时间','制单人','数量']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','remark']
        
        const data = this.formatJson(filterVal, this.tableList)
@@ -408,6 +422,47 @@ export default {
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
+    exportListOne(){
+      let obj = {'index':'合计','total_price':0}
+       for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
+          if(this.tableData[i].drug_type == 1){
+             this.tableData[i].drugtype = "西药"
+          }
+          if(this.tableData[i].drug_type == 2){
+             this.tableData[i].drugtype = "草药"
+          }
+          if(this.tableData[i].drug_type == 3){
+             this.tableData[i].drugtype = "成药"
+          }
+          this.tableData[i].time = this.getTime(this.tableData[i].ctime)
+          this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+          
+          this.tableData[i].total_price = this.tableData[i].count * this.tableData[i].price
+           obj.total_price += this.tabelePrintList[i].count * this.tabelePrintList[i].price
+        }
+        obj.total_price = obj.total_price.toFixed(2)
+       this.tableData.push(obj)
+       for(let i=0;i<this.tableData.length;i++){
+         this.tableData[i].total_price = this.tableData[i].total_price.toFixed(2)
+       }
+       import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','操作时间','制单人','退货价','数量','总价']
+       const filterVal = ['index','order_number','drugtype','drug_name', 'unit', 'time','user_name','price','count','total_price']
+       
+       const data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+       
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品退库明细'
+         })
+          this.downloadLoading = false
+        })
+     },
+
   }
 };
 </script>

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

@@ -12,9 +12,9 @@
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
-      @click="exportList"
+      @click="c"
       type="primary"
-      >导出
+      >汇总导出
     </el-button>
     <div class="cell clearfix">
       <el-input

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

@@ -3,18 +3,25 @@
     <el-button
       style="float: right"
       size="small"
-      icon="el-icon-printer"
       @click="PrintAction"
       type="primary"
       >打印
     </el-button>
+    
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetail"
+      type="primary"
+      >明细导出
+    </el-button>
 
      <el-button
       style="float: right;margin-right:10px"
       size="small"
       @click="exportList"
       type="primary"
-      >导出
+      >汇总导出
     </el-button>
 
     <div class="cell clearfix">
@@ -40,13 +47,14 @@
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           @change="startTimeChange"
+         
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
@@ -54,7 +62,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -321,7 +329,8 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
-        this.getlist();
+        this.getlist()
+        this.getDrugWarehouseInfoPrint()
       }
     },
     endTimeChange(val) {
@@ -330,7 +339,8 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.getlist();
+        this.getlist()
+        this.getDrugWarehouseInfoPrint()
       }
     },
     getTimestamp(time) {
@@ -436,7 +446,6 @@ export default {
       })
     },
     PrintAction(){
-      console.log("打印",this.order_type)
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     select(){
@@ -482,10 +491,53 @@ export default {
          })
           this.downloadLoading = false
         })
-       },
+      },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
+     exportListDetail(){
+       
+       import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','进货价','数量','总价']
+       const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','time','user_name','price','warehousing_count','total']
+       console.log(" ba323223323223",this.cancelStockDate.length)
+       var newArr = []
+       newArr = this.cancelStockDate
+       let obj = {'index':'合计','total':0}
+       for(let i=0;i<newArr.length;i++){
+          newArr.specification_name = ""
+          newArr.index = i+1
+          if(newArr[i].drug_type == 1){
+             newArr[i].drugtype = "西药"
+          }
+          if(newArr[i].drug_type == 2){
+             newArr[i].drugtype = "草药"
+          }
+          if(newArr[i].drug_type == 3){
+             newArr[i].drugtype = "成药"
+          }
+        
+         newArr[i].specification_name = newArr[i].dose + newArr[i].dose_unit +"*" + newArr[i].min_number + newArr[i].min_unit +  "/" + newArr[i].max_unit
+
+         newArr[i].time = this.getTime(newArr[i].ctime)
+         newArr[i].user_name = this.getAdminUser(newArr[i].creater)
+         newArr[i].total = (newArr[i].price * newArr[i].warehousing_count).toFixed(2)
+         obj.total += (newArr[i].price * newArr[i].warehousing_count)
+       }
+       obj.total = obj.total.toFixed(2)
+       newArr.push(obj)
+       const data = this.formatJson(filterVal, newArr)
+       console.log("data",data)
+       
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品入库明细'
+         })
+          this.downloadLoading = false
+        })
+
+     }
   }
 };
 </script>

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

@@ -7,14 +7,22 @@
       @click="PrintAction"
       type="primary"
       >打印
+    </el-button>
+     <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetai"
+      type="primary"
+      >明细导出
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
       size="small"
       @click="exportList"
       type="primary"
-      >导出
+      >汇总导出
     </el-button>
+   
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -38,7 +46,7 @@
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -52,7 +60,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -462,35 +470,25 @@ export default {
      exportList(){
 
         for(let i=0;i<this.tablePrint.length;i++){
-          // for(let j=0;j<this.drugList.length;j++){
-          //    if(this.tableList[i].drug_id == this.drugList[j].id){
-          //      this.tableList[i].last_price = this.drugList[j].last_price
-               
-          //    }
-          // }
           this.tablePrint[i].index = i+1
           
         }
         for(let i=0;i<this.tablePrint.length;i++){
            this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
-          //  this.tablePrint[i].total_price = this.tablePrint[i].last_price * this.tablePrint[i].count
            this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
            this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+            this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
         }
        console.log("列表数据333333333",this.tablePrint)
      
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
-      //  let obj = {'index':'合计','total_price':0}
-      //  for(let i=0;i<this.tablePrint.length;i++){
-      //    obj.total_price += (this.tablePrint[i].min_price * this.tablePrint[i].count)
-      //  }
-      //  for(let j=0;j<this.tablePrint.length;j++){
-      //     this.tablePrint[j].total_price = this.tablePrint[j].total_price.toFixed(2)
-      //  }
-      //  obj.total_price = obj.total_price.toFixed(2)
-      //  this.tablePrint.push(obj)
+       let obj = {'index':'合计','total_price':0}
+       for(let i=0;i<this.tablePrint.length;i++){
+         obj.total_price += this.tablePrint[i].total 
+       }
+       this.tablePrint.push(obj)
        const data = this.formatJson(filterVal, this.tablePrint)
        console.log("data",data)
        
@@ -502,9 +500,51 @@ export default {
           this.downloadLoading = false
         })
        },
+      
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
+    exportListDetai(){
+      import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','time','user_name','price','count','total_price']
+       for(let i=0;i<this.tableData.length;i++){
+         this.tableData[i].index = i+1
+         if(this.tableData[i].drug_type == 1){
+            this.tableData[i].drugtype = "西药"
+         }
+         if(this.tableData[i].drug_type == 2){
+            this.tableData[i].drugtype = "草药"
+         }
+         if(this.tableData[i].drug_type == 3){
+            this.tableData[i].drugtype = "成药"
+         }
+        this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
+        this.tableData[i].time = this.getTime(this.tableData[i].ctime)
+        this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+        this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+       }
+       let obj = {'index':'合计','total_price':0}
+       for(let i=0;i<this.tableData.length;i++){
+         obj.total_price += this.tableData[i].total 
+       }
+       
+       this.tableData.push(obj)
+       for(let j=0;j<this.tableData.length;j++){
+          this.tableData[j].total_price = this.tableData[j].total_price.toFixed(2)
+       }
+       const data = this.formatJson(filterVal, this.tableData)
+       console.log("data",data)
+       
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品出库明细'
+         })
+          this.downloadLoading = false
+      }) 
+    },
 
     getBaseDrugLibList() {
         let params = {
@@ -617,6 +657,22 @@ export default {
         }
         console.log("total23232",total)
         return (total*min_price).toFixed(2)
+      },
+
+      getTotalPriceOne(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * min_number
+          }else{
+            arr[i].count = arr[i].count
+          }
+        }  
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+        console.log("total23232",total)
+        return total*min_price
       }
   }
 };

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -36,11 +36,12 @@
                 <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.min_unit}}</span>
+                <span>{{item.unit}}</span>
               </td>
             
               <td style="line-height: 50px">
                   {{item.count}}
+               
               </td>
               <td style="line-height:50px">
                   {{item.price}}
@@ -166,6 +167,17 @@
           var drugInOrder = response.data.data.order
           console.log("drug3434444",drugInOrder)
           this.cancelStockDate = drugInOrder
+          var orderPrint = response.data.data.orderPrint
+          
+          for(let i=0;i<orderPrint.length;i++){
+             orderPrint[i].child = []
+            for(let j=0;j<drugInOrder.length;j++){
+               if(orderPrint[i].drug_id == drugInOrder[j].drug_id){
+                 orderPrint[i].child.push(drugInOrder[j])   
+               }
+            }
+          }
+          console.log("orderPrint",orderPrint)
         }
       })  
       },

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -1010,16 +1010,14 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            console.log("list",list)
-          //  this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit + list.stock_min_number + list.XtBaseDrug.min_unit
-          if(list.stock_max_number > 0){
+         
+          if(list.stock_max_number >0 ){
             this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit
-            this.form.stock_max_number = list.stock_max_number
           }
-          if(list.stock_min_number >0 ){
-            this.form.total = list.stock_min_number + list.XtBaseDrug.min_unit
-            this.form.stock_min_number = list.stock_min_number
+          if(list.stock_min_number > 0){
+            this.form.total =  this.form.total + list.stock_min_number + list.XtBaseDrug.min_unit 
           }
-          
+          // this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit + list.stock_min_number + list.XtBaseDrug.min_unit
          }
       })
      },

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -120,7 +120,7 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.warehousing_count'"
                 :rules="tableRules.warehousing_count"
-                style="padding-top: 20px"
+                style="padding-top: 10px"
               >
               <div style="display:flex;">
                 <el-input
@@ -128,6 +128,7 @@
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
+                  style="width:80px"
                 ></el-input>
                  {{scope.row.max_unit}}
               </div>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -185,7 +185,7 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.warehousing_count'"
                 :rules="tableRules.warehousing_count"
-                style="padding-top: 20px;"
+                style="padding-top: 10px;"
               >
                 <div style="display:flex;">
                   <el-input
@@ -193,6 +193,7 @@
                     placeholder="请输入入库数量"
                     type="number"
                     v-model="scope.row.warehousing_count"
+                    style="width:80px"
                   ></el-input>
                   {{scope.row.max_unit}}
                 </div>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -233,8 +233,8 @@
           </el-table-column> -->
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
-              <span v-if="scope.row.is_sys == 1"> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
+              <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->
+              <span> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="出货单价" align="center">
@@ -249,7 +249,7 @@
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span>{{getAllPrice(scope.row.drug_id,scope.row.price,scope.row.min_price).toFixed(2)}}</span>
+              <span>{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.min_price).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -667,7 +667,7 @@ export default {
     handleSearch(val){
        console.log("val23233232",val)
        this.getInitializtion()
-       this.getSinleOrderDetail(val.id,val.warehouse_out_time)
+       this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
        this.list = []
       //  this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
 
@@ -938,7 +938,7 @@ export default {
      }
      return name
    },
-   getSinleOrderDetail(id,start_time){
+   getSinleOrderDetail(id,start_time,is_sys){
        var params = {
          id:id,
          start_time:start_time,
@@ -948,20 +948,34 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
+          console.log("list",list)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
-         for(let i=0;i<drugFlowList.length;i++){
-           if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.max_unit){
-               drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
-           }
-           if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
-              drugFlowList[i].count = drugFlowList[i].count 
+         if (is_sys == 1){
+            for(let i=0;i<drugFlowList.length;i++){
+              if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.max_unit){
+                  drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
+              }
+              if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
+                  drugFlowList[i].count = drugFlowList[i].count 
+              }
+
            }
+            this.drugFlowList = drugFlowList
          }
-         console.log("库存柳树",drugFlowList)
- 
-         this.drugFlowList = drugFlowList
+         if(is_sys == 0){
+            for(let i=0;i<list.length;i++){
+              if(list[i].count_unit == list[i].max_unit){
+                  list[i].count = list[i].count * list[i].min_number
+              }
+              if(list[i].count_unit == list[i].min_unit){
+                  list[i].count = list[i].count 
+              }
+            }
+            this.drugFlowList = list
+         }
+
          for(let i=0;i<list.length;i++){
            if(list[i].batch_number == "0" || list[i].batch_number == 0){
               list[i].batch_number = ""
@@ -1100,14 +1114,16 @@ export default {
         }
         var str = ""
         var min_str = ""
+        var total = 0
         if(arr.length > 0){
           for(let i=0;i<arr.length;i++){
-            if(parseInt(arr[i].count/min_number)!=0){
-              str = parseInt(arr[i].count/min_number)+ max_unit
-            }
-            if(arr[i].count%min_number !=0){
-              min_str =  arr[i].count%min_number + min_unit
-            }
+             total +=arr[i].count
+          }
+          if(parseInt(total/min_number)!=0){
+              str = parseInt(total/min_number)+ max_unit
+          }
+          if(total%min_number !=0){
+            min_str =  total%min_number + min_unit
           }
         }
         return str + min_str 
@@ -1213,6 +1229,18 @@ export default {
      formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
      },
+      getAllPriceOne(drug_id,price,min_price){
+        var total = 0
+        var all_price = 0
+        for(let i=0;i<this.drugFlowList.length;i++){
+          if(drug_id == this.drugFlowList[i].drug_id){
+              total += this.drugFlowList[i].count
+          }
+        }
+        all_price = total * min_price
+        console.log("total",total,min_price)
+        return  all_price
+      },
   }
 };
 </script>

src/xt_pages/stock/drugs/inventory.vue

@@ -1111,16 +1111,13 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            console.log("list",list)
-        
-          if(list.stock_max_number > 0){
+          
+          if(list.stock_max_number >0 ){
             this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit
-            this.form.stock_max_number = list.stock_max_number
           }
-          if(list.stock_min_number >0 ){
-            this.form.total = list.stock_min_number + list.XtBaseDrug.min_unit
-            this.form.stock_min_number = list.stock_min_number
+          if(list.stock_min_number > 0){
+            this.form.total =  this.form.total + list.stock_min_number + list.XtBaseDrug.min_unit 
           }
-          
          }
       })
      },

src/xt_pages/stock/stockFlow.vue

@@ -112,11 +112,11 @@
              <span>{{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="批准文号" align="center">
+        <!-- <el-table-column prop="drug_name" label="批准文号" align="center">
            <template slot-scope="scope" >
              <span>{{scope.row.license_number}}</span>
            </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              <span > {{getManufacturer(scope.row.manufacturer)}}</span>

src/xt_pages/stock/stockOutOrder.vue

@@ -637,15 +637,6 @@
                <span v-if="scope.row.is_total ==0">{{scope.row.number}}</span>
             </template>
           </el-table-column>
-<!-- 
-          <el-table-column min-width="70" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>批次详情</span>
-            </template>
-            <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">批次详情</span>
-            </template>
-          </el-table-column> -->
         </el-table>
       </el-row>
     </div>
@@ -1100,19 +1091,18 @@ export default {
         getOrderDetailByOrderId(params).then(response=>{
             if(response.data.state == 1){
               this.tableShow = true
-              var list = response.data.data.list
-              // console.log("list22222222",list)
-              // for(let i=0;i<list.length;i++){
-              //   if(list[i].dealer == 0){
-              //     list[i].dealer = ""
-              //   }
-              //   if(list[i].manufacturer == 0){
-              //     list[i].manufacturer = ""
-              //   }
-              //   this.tableList.push(list[i])
-              // }
+              var info = response.data.data.list
+              console.log("list22222222",info)
               var list = response.data.data.info
+              for(let i=0;i<info.length;i++){
+                for(let j=0;j<list.length;j++){
+                  if(info[i].good_id == list[j].good_id){
+                     list[j].count = info[i].count
+                  }
+                }
+              }
               console.log("info2232323",list)
+              this.tableList = []
               for(let i=0;i<list.length;i++){
                 if(list[i].dealer == 0){
                   list[i].dealer = ""
@@ -1538,16 +1528,7 @@ export default {
               var stockflowlist = response.data.data.stockFlowList
               console.log("stockflowlist",stockflowlist)
               this.stockFlowList = stockflowlist
-              // for (let i = 0; i < arrList.length; i++) {
-              //   var obj = arrList[i]
-              //   obj['is_total'] = 0
-              //   this.userList.push(obj)
-              //   total = total + arrList[i].count
-              // }
-              // this.userList.push({
-              //   is_total: 1,
-              //   total: total,
-              // })
+             
 
               for (let i = 0; i <  this.stockFlowList.length; i++) {
                 var obj =  this.stockFlowList[i]
@@ -1673,6 +1654,24 @@ export default {
     formatJson(filterVal, jsonData) {
     return jsonData.map(v => filterVal.map(j => v[j]));
    },
+   unique(arr) {
+      let newArr = [arr[0]];
+      for (let i = 1; i < arr.length; i++) {
+          let repeat = false;
+          for (let j = 0; j < newArr.length; j++) {
+              if (arr[i] === newArr[j]) {
+                  repeat = true;
+                  break;
+              }else{
+                  
+              }
+          }
+          if (!repeat) {
+              newArr.push(arr[i]);
+          }
+      }
+      return newArr;
+    },
    getBatchNumber(patient_id,good_id){
      var arr = []
      for(let i=0;i<this.stockFlowList.length;i++){
@@ -1680,6 +1679,7 @@ export default {
            arr.push(this.stockFlowList[i].number)
         }
      }
+     arr = this.unique(arr)
      return arr.join(',')
    }
   }

src/xt_pages/stock/stockQuery.vue

@@ -165,6 +165,18 @@ import {
 export default {
   name: "stockIn",
   created() {
+    var start_time =  window.sessionStorage.getItem('start_time')
+    var end_time =  window.sessionStorage.getItem('end_time')
+    console.log("start_time",start_time,end_time)
+    if(start_time !=null){
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = end_time
+    }
+   
+    window.sessionStorage.removeItem('start_time')
+    window.sessionStorage.removeItem('end_time')
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -331,8 +343,10 @@ export default {
       return Math.round(parseFloat(val) * 100) / 100;
     },
     startTimeChange: function(val) {
+      window.sessionStorage.removeItem('start_time')
+     
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
-
+      console.log("ime2222",time)
       if (time > 0) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
@@ -344,7 +358,9 @@ export default {
       }
     },
     endTimeChange: function(val) {
+      window.sessionStorage.removeItem('end_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      console.log("ime2222",time)
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
@@ -432,6 +448,8 @@ export default {
        this.getlist()
       },
       toPrint(){
+        window.sessionStorage.setItem('start_time',this.start_time)
+        window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name+"&page="+this.page+"&limit="+this.limit)
 
       },