Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/addDrugs.vue

@@ -115,26 +115,42 @@
                     <el-form-item label="默认单次用量 : " prop="drug_dose">
                          <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
                                       maxlength="30"></el-input>
-                          <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
+                          <!-- <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
                                 <el-option
                                         v-for="(item,index) in unitList"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">
                                 </el-option>
-                           </el-select>
+                           </el-select> -->
+                         <el-select v-model="form.drug_dose_unit" style="width:80px;" filterable placeholder="单次用量单位">
+                               <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
+                              </el-option>
+                        </el-select>
                      </el-form-item>
                     <el-form-item label="默认开药数量:" prop="prescribing_number">
                         <el-input v-model="form.prescribing_number" style="width:70px;margin-right:5px;" placeholder=""
                                   maxlength="30"></el-input>
-                        <el-select v-model="form.prescribing_number_unit" style="width:80px;" placeholder="开药数量单位">
+                        <!-- <el-select v-model="form.prescribing_number_unit" style="width:80px;" placeholder="开药数量单位">
                               <el-option
                                 v-for="(item,index) in packingUnit"
                                 :key="index"
                                 :label="item.name"
                                 :value="item.name">
                               </el-option>
-                          </el-select>
+                          </el-select> -->
+                         <el-select v-model="form.prescribing_number_unit" style="width:80px;" filterable placeholder="开药数量单位">
+                               <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                        </el-select>
                     </el-form-item>
                      <!-- <el-form-item label="开药数量单位:" prop="prescribing_number">
                           <el-select v-model="form.prescribing_number_unit" style="width:160px;" placeholder="开药数量单位">
@@ -574,7 +590,7 @@
           packing_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
           drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
           drug_stock_limit: [{ required: true, message: '请填写库存警戒', trigger: 'blur' }],
-          drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
+          // drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
           drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
 
@@ -925,156 +941,156 @@
            }
         })
       },
-      changeDoseUnit(val){
-        if(val == this.form.min_unit){
-          // this.form.dose = 1
-          this.form.min_number = 1
-          this.dosageShow = true
-        }
-        if(val !=this.form.min_unit){
-          this.dosageShow = false
-        }
-        var arr =  getDataConfig('hemodialysis','units')
-        this.unitList = []
-        for(let i=0;i<arr.length;i++){
-
-          if(this.form.min_unit == arr[i].name){
-            this.unitList.push(arr[i])
-          }
-          if(val == arr[i].name){
-            this.unitList.push(arr[i])
-          }
-          let idArr = []
-          this.unitList.map(item => {
-            idArr.push(item.id)
-          })
-          if(idArr.indexOf(this.form.drug_dose_unit) == -1){
-            if(this.form.drug_dose_unit == arr[i].id){
-              this.unitList.push(arr[i])
-            }
-          }
-
-        }
-        let ojb = {};
-        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
-            //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-            ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
-            return prevArr
-        }, [])
-
-      },
-      changeMinUnit(val){
-        if(val == this.form.dose_unit){
-          // this.form.dose = 1
-          this.form.min_number = 1
-          this.dosageShow = true
-        }else{
-          this.dosageShow = false
-        }
-        // if(val != this.form.max_unit){
-        //   this.dosageShow = false
-        // }
-        if(val == this.form.max_unit){
-          this.form.min_number = 1
-          this.minNumberShow = true
-        }else{
-          this.minNumberShow = false
-        }
-
-        // if(this.form.dosage == "" || this.form.max_unit == ""){
-        //    this.form.min_number = 1
-        // }
-        var arr = getDataConfig('hemodialysis','units')
-        this.unitList = []
-        this.packingUnit = []
-        for(let i=0;i<arr.length;i++){
-            if(val == arr[i].name){
-              this.unitList.push(arr[i])
-              this.packingUnit.push(arr[i])
-            }
-            if(this.form.max_unit == arr[i].name){
-              this.unitList.push(arr[i])
-              this.packingUnit.push(arr[i])
-            }
-            if(this.form.drug_dose_unit == arr[i].id){
-              this.unitList.push(arr[i])
-            }
-            if(this.form.prescribing_number_unit == arr[i].id){
-              this.packingUnit.push(arr[i])
-            }
+      // changeDoseUnit(val){
+      //   if(val == this.form.min_unit){
+      //     // this.form.dose = 1
+      //     this.form.min_number = 1
+      //     this.dosageShow = true
+      //   }
+      //   if(val !=this.form.min_unit){
+      //     this.dosageShow = false
+      //   }
+      //   var arr =  getDataConfig('hemodialysis','units')
+      //   this.unitList = []
+      //   for(let i=0;i<arr.length;i++){
+
+      //     if(this.form.min_unit == arr[i].name){
+      //       this.unitList.push(arr[i])
+      //     }
+      //     if(val == arr[i].name){
+      //       this.unitList.push(arr[i])
+      //     }
+      //     let idArr = []
+      //     this.unitList.map(item => {
+      //       idArr.push(item.id)
+      //     })
+      //     if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+      //       if(this.form.drug_dose_unit == arr[i].id){
+      //         this.unitList.push(arr[i])
+      //       }
+      //     }
+
+      //   }
+      //   let ojb = {};
+      //   this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+      //       //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //       ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+      //       return prevArr
+      //   }, [])
+
+      // },
+      // changeMinUnit(val){
+      //   if(val == this.form.dose_unit){
+      //     // this.form.dose = 1
+      //     this.form.min_number = 1
+      //     this.dosageShow = true
+      //   }else{
+      //     this.dosageShow = false
+      //   }
+      //   // if(val != this.form.max_unit){
+      //   //   this.dosageShow = false
+      //   // }
+      //   if(val == this.form.max_unit){
+      //     this.form.min_number = 1
+      //     this.minNumberShow = true
+      //   }else{
+      //     this.minNumberShow = false
+      //   }
+
+      //   // if(this.form.dosage == "" || this.form.max_unit == ""){
+      //   //    this.form.min_number = 1
+      //   // }
+      //   var arr = getDataConfig('hemodialysis','units')
+      //   this.unitList = []
+      //   this.packingUnit = []
+      //   for(let i=0;i<arr.length;i++){
+      //       if(val == arr[i].name){
+      //         this.unitList.push(arr[i])
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       if(this.form.max_unit == arr[i].name){
+      //         this.unitList.push(arr[i])
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       if(this.form.drug_dose_unit == arr[i].id){
+      //         this.unitList.push(arr[i])
+      //       }
+      //       if(this.form.prescribing_number_unit == arr[i].id){
+      //         this.packingUnit.push(arr[i])
+      //       }
             
 
 
 
-            let idArr = []
-            this.unitList.map(item => {
-              idArr.push(item.id)
-            })
-            if(idArr.indexOf(this.form.drug_dose_unit) == -1){
-              if(this.form.drug_dose_unit == arr[i].id){
-                this.unitList.push(arr[i])
-              }
-            }
-            let packingIdArr = []
-            this.packingUnit.map(item => {
-              packingIdArr.push(item.id)
-            })
-            if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
-              if(this.form.prescribing_number_unit == arr[i].id){
-                this.packingUnit.push(arr[i])
-              }
-            }
-        }
-        let ojb = {};
-        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
-          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-          ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
-          return prevArr
-        }, [])
-
-        let newojb = {};
-        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
-          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
-          return prevArr
-        }, [])
-
-      },
-      changeMaxUnit(val){
-        if(val == this.form.min_unit){
-          this.form.min_number = 1
-          this.minNumberShow = true
-        }else{
-          this.minNumberShow = false
-        }
-        var arr = getDataConfig('hemodialysis','units')
-        this.packingUnit = []
-        for(let i=0;i<arr.length;i++){
-            if(val == arr[i].name){
-              this.packingUnit.push(arr[i])
-            }
-            if(this.form.min_unit == arr[i].name){
-              this.packingUnit.push(arr[i])
-            }
-            let packingIdArr = []
-            this.packingUnit.map(item => {
-              packingIdArr.push(item.id)
-            })
-            if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
-              if(this.form.prescribing_number_unit == arr[i].id){
-                this.packingUnit.push(arr[i])
-              }
-            }
-        }
-
-
-        let newojb = {};
-        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
-          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
-          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
-          return prevArr
-        }, [])
-      }
+      //       let idArr = []
+      //       this.unitList.map(item => {
+      //         idArr.push(item.id)
+      //       })
+      //       if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+      //         if(this.form.drug_dose_unit == arr[i].id){
+      //           this.unitList.push(arr[i])
+      //         }
+      //       }
+      //       let packingIdArr = []
+      //       this.packingUnit.map(item => {
+      //         packingIdArr.push(item.id)
+      //       })
+      //       if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
+      //         if(this.form.prescribing_number_unit == arr[i].id){
+      //           this.packingUnit.push(arr[i])
+      //         }
+      //       }
+      //   }
+      //   let ojb = {};
+      //   this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+      //     //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //     ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+      //     return prevArr
+      //   }, [])
+
+      //   let newojb = {};
+      //   this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+      //     //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //     newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+      //     return prevArr
+      //   }, [])
+
+      // },
+      // changeMaxUnit(val){
+      //   if(val == this.form.min_unit){
+      //     this.form.min_number = 1
+      //     this.minNumberShow = true
+      //   }else{
+      //     this.minNumberShow = false
+      //   }
+      //   var arr = getDataConfig('hemodialysis','units')
+      //   this.packingUnit = []
+      //   for(let i=0;i<arr.length;i++){
+      //       if(val == arr[i].name){
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       if(this.form.min_unit == arr[i].name){
+      //         this.packingUnit.push(arr[i])
+      //       }
+      //       let packingIdArr = []
+      //       this.packingUnit.map(item => {
+      //         packingIdArr.push(item.id)
+      //       })
+      //       if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
+      //         if(this.form.prescribing_number_unit == arr[i].id){
+      //           this.packingUnit.push(arr[i])
+      //         }
+      //       }
+      //   }
+
+
+      //   let newojb = {};
+      //   this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+      //     //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+      //     newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+      //     return prevArr
+      //   }, [])
+      // }
     }, watch: {
       visible(val) {
         // this.form = this.formValue

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -188,7 +188,7 @@
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+            <el-table-column align="center" prop="remark" width="70" label="推送频率">
                 <template slot-scope="scope">
                     <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
                     <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
@@ -196,7 +196,7 @@
 
                 </template>
             </el-table-column>
-            <el-table-column align="center" width="100" prop="name" label="操作">
+            <el-table-column align="center" width="140" prop="name" label="操作">
                 <template slot-scope="scope">
                     <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
                     <el-button size="mini" type="danger" @click="deleteProject(scope.row,scope.$index)">删除

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -52,7 +52,7 @@
                     <tr v-for="(it,index) in item.project" :key="index">
                         <td>{{index+1}}</td>
                         <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
-                        <td>{{it.single_dose}}</td>
+                        <td>{{it.count}}</td>
                         <td>{{getUnit(it.unit)}}</td>
                         <td>{{it.price}}</td>
                         <td></td>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -8,13 +8,21 @@
       type="primary"
       >打印
     </el-button>
+   
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetal"
+      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,7 +48,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 +62,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -398,10 +406,10 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
-          var total_price = ""
-         
-        
+          var total_price = 0
+          console.log("收据3233232",response.data.data.list)
           for (let i = 0; i < response.data.data.list.length; i++) {
+            total_price += parseInt(response.data.data.list[i].warehousing_count) * response.data.data.list[i].price
             this.tableList.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
@@ -411,7 +419,7 @@ export default {
           this.cancelStockDate.push({
             warehousing_order: "合计",
             is_total: 1,
-            total: response.data.data.total_price,
+            total:total_price.toFixed(2),
             Warehousing: {
               warehousing_time: 0
             }
@@ -747,8 +755,6 @@ export default {
     
       exportList(){
   
-        console.log("hhhh",this.tableInfo)
-       
         for(let i=0;i<this.tableInfo.length;i++){
           this.tableInfo[i].index = i+1  
           this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2) 
@@ -769,6 +775,37 @@ export default {
             this.downloadLoading = false
         })
       },
+      exportListDetal(){
+        var obj = {index:"合计",total_price:0}
+        var total_price = 0
+        for(let i=0;i<this.cancelStockDate.length;i++){
+          this.cancelStockDate[i].index = i + 1
+          this.cancelStockDate[i].good_type_name = this.typeName(this.cancelStockDate[i].good_type_id)
+          this.cancelStockDate[i].good_name = this.typeNameOne(this.cancelStockDate[i].good_id)
+          this.cancelStockDate[i].specification_name = this.specificationName(this.cancelStockDate[i].good_id)
+          this.cancelStockDate[i].warehousing_time = this.getTime(this.cancelStockDate[i].Warehousing.warehousing_time)
+          this.cancelStockDate[i].user_name = this.getXuserName(this.cancelStockDate[i].Warehousing.creater)
+          this.cancelStockDate[i].total_price = (this.cancelStockDate[i].warehousing_count * this.cancelStockDate[i].price).toFixed(2)
+          total_price += this.cancelStockDate[i].warehousing_count * this.cancelStockDate[i].price
+        }
+        obj.total_price = total_price.toFixed(2)
+        this.cancelStockDate.push(obj)
+        import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
+        const filterVal = ['index','warehousing_count', 'good_type_name', 'good_name','specification_name','warehousing_time','user_name','price','warehousing_count','total_price']
+        console.log("hhhhhhhh",this.cancelStockDate)
+      
+        
+        const data = this.formatJson(filterVal, this.cancelStockDate)
+        console.log("data222222222",data)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材入库明细'
+          })
+            this.downloadLoading = false
+        })
+      },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

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">
@@ -307,10 +307,7 @@
               <span>序号</span>
             </template>
             <template slot-scope="scope">
-              <!-- <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
-              <span v-if="scope.row.is_total == 1">{{'合计'}}</span> -->
               {{scope.$index+1}}
-            
             </template>
           </el-table-column>
 
@@ -670,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)
 
@@ -941,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,
@@ -951,17 +948,34 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-          var outList = response.data.data.outList
-          for(let i=0;i<outList.length;i++){
-          if(outList[i].count_unit == outList[i].max_unit){
-              outList[i].count =outList[i].count * outList[i].min_number
-            }
-          }
-          this.outList = outList
+          console.log("list",list)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
-         this.drugFlowList = drugFlowList
+         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
+         }
+         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 = ""
@@ -983,11 +997,12 @@ export default {
        drug_id:val.drug_id,
        record_time:val.sys_record_time,
      }
+     console.log("使用明细",params)
      getAutoDrugDetail(params).then(response=>{
        if(response.data.state == 1){
         
         this.userList = response.data.data.list
-        
+        console.log("自动出库数据",this.userList)
         if(val.is_sys == 1){
         
           this.drugDialogVisible = true
@@ -1097,84 +1112,23 @@ export default {
              arr.push(this.drugFlowList[i])
           }
         }
-        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
-          }
-          if(arr[i].count_unit == min_unit){
-            arr[i].count = arr[i].count
-          }
-          total += arr[i].count
-        }
         var str = ""
         var min_str = ""
-        if(total >= min_number){
+        var total = 0
+        if(arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+             total +=arr[i].count
+          }
           if(parseInt(total/min_number)!=0){
-            str = parseInt(total/min_number)+ max_unit
+              str = parseInt(total/min_number)+ max_unit
           }
           if(total%min_number !=0){
             min_str =  total%min_number + min_unit
           }
         }
-        if (total < min_number){
-          str = ""
-          min_str = total + min_unit
-        }
         return str + min_str 
       },
-    //   getTotalCountOne(id,min_number,max_unit,min_unit){
-       
-    //     for(let i=0;i<this.outList.length;i++){
-    //       if(this.outList[i].count_unit == this.outList[i].max_unit){
-    //         this.outList[i].total_count = this.outList[i].count * this.outList[i].min_number
-    //       }
 
-    //      if(this.outList[i].count_unit == this.outList[i].min_unit){
-    //         this.outList[i].total_count = this.outList[i].count
-    //       }
-       
-    //     }
-    //     console.log("我的",this.outList)
-    //       let dataInfo = {};
-    //       this.outList.forEach((item, index) => {
-    //         let { drug_id } = item;
-    //         if (!dataInfo[drug_id]) {
-    //           dataInfo[drug_id] = {
-    //             drug_id,
-    //             child: [],
-    //             total:0,
-    //           };
-    //         }
-    //       });
-    //     let list = Object.values(dataInfo);
-    //     console.log("drug_id22222",list)
-    //     for(let i=0;i<list.length;i++){
-    //       for(let j=0;j<this.outList.length;j++){
-    //         if(list[i].drug_id == this.outList[j].drug_id){
-    //           list[i].child.push(this.outList[j])
-    //         }
-    //       }
-    //     }
-    //    var total = 0
-    //    for(let i=0;i<list.length;i++){
-    //     for(let j=0;j<list[i].child.length;j++){
-    //        if(id == list[i].child[j].drug_id){
-    //          total+= list[i].child[j].total_count
-    //        }
-    //     }
-    //    }
-      
-    //   var str = ""
-    //   var min_str = ""
-      
-    //   str = parseInt(total/min_number)+ max_unit
-    //   min_str =  total%min_number + min_unit
-
-    //  return str + min_str
-      
-       
-    //  },
       getAllPrice(drug_id,price,min_price){
          var strprice = 0
          var minstrprice = 0
@@ -1198,7 +1152,7 @@ export default {
          return  total_price
       },
       getDrugBatchNumber(drugid,count){
-        console.log("drug_id2323",drug_id)
+        console.log("drug_id2323",drugid)
         console.log("count",count)
         console.log("hhhhhhhhhhh",this.batchNumberList)
         var arr = []
@@ -1275,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/drugStockOutOrderAdd.vue

@@ -126,7 +126,7 @@
                       placeholder="请输入批号"
                       v-model="scope.row.batch_number"
                     ></el-input> -->
-                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
+                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" >
                       <el-option
                         v-for="(item,index) in numberList"
                         :key="index"
@@ -155,7 +155,7 @@
                     type="number"
                     v-model="scope.row.count"
                   ></el-input>
-                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px" @change="changeUnit(scope.row)">
                     <el-option
                       v-for="(option, index) in unitList"
                       :key="index"
@@ -686,8 +686,9 @@ export default {
             this.recordInfo.recordData[i].max_unit = val.max_unit
             this.recordInfo.recordData[i].min_number = val.min_number
             this.recordInfo.recordData[i].min_unit = val.min_unit
-          
+            this.recordInfo.recordData[i].min_price = val.min_price
             this.recordInfo.recordData[i].number = val.number
+            this.recordInfo.recordData[i].unit = val.max_unit
             if(val.retail_price == 0){
               this.recordInfo.recordData[i].price = ""
             }else{
@@ -719,6 +720,25 @@ export default {
              this.numberList = list
            }
         })
+      },
+      changeUnit(val){
+        console.log("val2323232322323",val,this.recordInfo.recordData)
+        this.getDrugBatchNumber(val.drug_id)
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.recordInfo.recordData[i].drug_id == val.drug_id){
+             if(this.recordInfo.recordData[i].unit == val.max_unit){
+                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price
+             }
+             if(this.recordInfo.recordData[i].min_unit == val.min_unit){
+               this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].min_price
+             }
+          }
+          for(let j=0;j<this.numberList.length;j++){
+            if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
+               this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
+            }
+          }
+        }
       }
   },
   created() {

src/xt_pages/stock/drugs/inventory.vue

@@ -111,7 +111,8 @@
         <el-dialog
         title="药品盘点"
         :visible.sync="dialogVisible"
-        width="1200px">
+        width="1200px"
+        class="addDrugsDialog">
             <el-form :model="form" class="modifyDialog" label-width="120px">
                 <el-form-item label="药品ID">
                     <el-input v-model="form.drug_id" :disabled="true"></el-input>
@@ -147,11 +148,19 @@
                 <el-form-item label="规格">
                     <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
-                <!-- <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
-                </el-form-item> -->
-                 <el-form-item prop="max_unit" label="单位">
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
+                <el-form-item label="进货价">
+                    <el-input v-model="form.last_price" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
+                </el-form-item>
+
+                <div style="width:100%;display:flex;">
+                    <el-form-item prop="dose" label="盘点数量" >
+                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="dose_unit" class="noMargin">
+                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位">
                       <el-option
                         v-for="(item,index) in getDataConfig('hemodialysis','units')"
                         :key="index"
@@ -159,16 +168,22 @@
                         :value="item.name">
                       </el-option>
                     </el-select>
-                </el-form-item>
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="盘点数量">
-                    <el-input v-model="form.count"></el-input>
-                </el-form-item>
+                    </el-form-item>
+                    <el-form-item prop="min_count" class="noMargin">
+                     <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="min_unit" class="noMargin">
+                     <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
+                    </el-form-item>
+                </div>
+
                 <el-form-item label="库存">
                     <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
@@ -572,6 +587,8 @@ export default {
                 expiry_date:"",
                 warehouse_info_id:"",
                 proof_count:"",
+                min_count:"",
+                min_unit:"",
             },
             total: 0,
             editdialogVisible:false,
@@ -1111,16 +1128,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 
           }
-          
          }
       })
      },
@@ -1140,4 +1154,18 @@ export default {
     mounted() {
     },
 };
-</script>
+</script>
+<style lang="scss">
+    .addDrugsDialog {
+
+      .el-dialog__body {
+          padding-top: 0px;
+      }
+      .noMargin{
+        .el-form-item__content{
+          margin-left: 0 !important;
+        }
+      }
+
+    }
+</style>

src/xt_pages/stock/drugs/query.vue

@@ -112,15 +112,20 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-              <span>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
-              <!-- <span v-else>{{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4">
+                <span v-if="scope.row.drug_warehouse_out.length > 0"></span> {{getDrugOutList(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+             </span>
+             <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
-               <!-- <span v-else>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4">
+                 {{getDrugChaCount(scope.row.drug_warehouse_info,scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
+               </span>
+               
+               <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
             </div>
            </template>
         </el-table-column>
@@ -173,7 +178,17 @@ import { min } from 'moment'
   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')
       this.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
@@ -237,7 +252,6 @@ import { min } from 'moment'
     methods: {
      //获取库存
       getlist(){
-      
         const params = {
           page: this.page,
           limit: this.limit,
@@ -260,6 +274,11 @@ import { min } from 'moment'
                     list[i].drug_warehouse_out[y].count = list[i].drug_warehouse_out[y].count * list[i].min_number
                   }
                }
+               for(let z=0;z<list[i].drug_cancel_stock_info.length;z++){
+                 if(list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit){
+                   list[i].drug_cancel_stock_info[z].count = list[i].drug_cancel_stock_info[z].count * list[i].min_number
+                 } 
+               }
              }
              console.log("列表list232323323232323223",list)
              this.tableList = list
@@ -354,8 +373,8 @@ import { min } from 'moment'
       },
   
     startTimeChange: function(val) {
+      window.sessionStorage.removeItem('start_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
-      
       if (time > 0) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
@@ -365,6 +384,7 @@ import { min } from 'moment'
       }
     },
     endTimeChange: function(val) {
+      window.sessionStorage.removeItem('end_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
@@ -453,6 +473,8 @@ import { min } from 'moment'
         this.getlist()
       },
       printOrder(){
+        window.sessionStorage.setItem('start_time',this.start_time)
+        window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push({
           name: "drugQueryPrint",
           query: {drug_type:this.drug_type,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time,page:this.page,limit:this.limit}
@@ -488,6 +510,8 @@ import { min } from 'moment'
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
         var overPlus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        window.sessionStorage.setItem('start_time',this.start_time)
+        window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+val.id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
       },
       handleBatch(val){
@@ -499,6 +523,8 @@ import { min } from 'moment'
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
         var overPlus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        window.sessionStorage.setItem('start_time',this.start_time)
+        window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
       },
       getDrugCountList(){
@@ -715,6 +741,54 @@ import { min } from 'moment'
          }
         return max_str + min_str
 
+      },
+
+      getDrugOutList(arr,max_unit,min_unit,min_number){
+        var str = ""
+        var str_min = ""
+        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){
+              str_min =  arr[i].count%min_number + min_unit
+            }
+          }
+        }
+        return str + str_min
+      },
+
+      getDrugChaCount(info,out_info,max_unit,min_unit,min_number,cancel_info){
+        var total_info = 0
+        var total_out = 0
+        var cha_count = 0
+        var cancel_count = 0
+        if(info.length > 0 ){
+          for(let i=0;i<info.length;i++){
+            total_info += info[i].warehousing_count * min_number
+          }
+        }
+        if(out_info.length>0){
+          for(let j=0;j<out_info.length;j++){
+            total_out += out_info[j].count
+          }
+        }
+        if(cancel_info.length >0){
+         for(let z=0;z<cancel_info.length;z++){
+            cancel_count +=cancel_info[z].count
+         }
+        }
+        cha_count = total_info - total_out + cancel_count
+        var str = ""
+        var str_min = ""
+        if(parseInt(cha_count/min_number)!=0){
+            str = parseInt(cha_count/min_number)+ max_unit
+         }
+         if(cha_count%min_number !=0){
+           str_min =  cha_count%min_number + min_unit
+         }
+         return str + str_min
       }
     }
   }

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/stockPrint.vue

@@ -42,11 +42,13 @@
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
                                    <td>
-                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info) - getOverplus(item.xt_warehouse_info) - getCancelInfo(item.cancel_stock_info)}}{{item.packing_unit}}</span>
+                                        {{getAutoCount(item.id) + getOutCount(item.id)}}
+                                       <!-- <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info) - getOverplus(item.xt_warehouse_info) - getCancelInfo(item.cancel_stock_info)}}{{item.packing_unit}}</span> -->
                                    </td>
                                   
                                    <td>
-                                     <span v-if="getOverplus(item.xt_warehouse_info)>0">{{getOverplus(item.xt_warehouse_info)}}{{item.packing_unit}}</span>  
+                                     <span v-if="getWareInfo(item.xt_warehouse_info) > 0">{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span> 
+                                     <!-- <span v-if="getOverplus(item.xt_warehouse_info)>0">{{getOverplus(item.xt_warehouse_info)}}{{item.packing_unit}}</span>   -->
                                    </td>
                                 </tr>
                             </tbody>
@@ -303,7 +305,7 @@ export default {
       this.limit = this.$route.query.limit
       this.getlist()
       this.GetAllGoodType()
-      // this.getStockDrugCount()
+      this.getStockDrugCount()
     }
 }
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -110,14 +110,12 @@
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
             {{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}}
-            <!-- <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info) - getOverplus(scope.row.xt_warehouse_info) - getCancelInfo(scope.row.cancel_stock_info)}}{{scope.row.packing_unit}}</span> -->
          </template>
        </el-table-column>
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
           <span v-if="getWareInfo(scope.row.xt_warehouse_info) > 0">{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
-           <!-- <span v-if="getOverplus(scope.row.xt_warehouse_info)>0">{{getOverplus(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span> -->
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -167,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;
@@ -333,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 = "";
@@ -346,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 = "";
@@ -434,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)
 
       },
@@ -504,6 +520,8 @@ export default {
        }
       specification_name = val.specification_name + "/" + val.packing_unit
       var overCount  = this.getOverplus(val.xt_warehouse_info)
+      window.sessionStorage.setItem('start_time',this.start_time)
+      window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     toClickOne(val){
@@ -515,7 +533,9 @@ export default {
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit
-       var overCount  = this.getOverplus(val.xt_warehouse_info)
+      var overCount  = this.getOverplus(val.xt_warehouse_info)
+      window.sessionStorage.setItem('start_time',this.start_time)
+      window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     getStockDrugCount(){