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

src/api/stock.js

@@ -641,3 +641,11 @@ export function getOrderDetailByOrderId(params) {
     params: params
   })
 }
+
+export function getOrderDetailById(params) {
+  return request({
+    url: '/api/good/getorderdetaibyid',
+    method: 'Get',
+    params: params
+  })
+}

src/router/modules/drugs.js

@@ -199,6 +199,15 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockBatchNumber' }
+    },
+    {
+      path: '/drug/out/drugstockoutorderedit',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderEdit'),
+      name: 'drugStockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderEdit' }
+
     }
 
   ]

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -24,33 +24,7 @@
       </div>
 
 
-      <!--<el-table-->
-      <!--:header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"-->
-      <!--:data="other_doctor_advices"-->
-      <!--border-->
-      <!--style="width: 100%"-->
-      <!--ref="advices_list"-->
-      <!--@row-click="cellMouseEnter"-->
-      <!--:row-class-name="tableRowClassName"-->
-      <!--:span-method="objectSpanMethod"-->
-      <!--:cell-class-name="adviceNameShow"-->
-      <!--:modal-append-to-body="false"-->
-      <!--highlight-current-row-->
-      <!--@current-change="handleCurrentChange"-->
-      <!--&gt;-->
-
-      <!--<el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">-->
-      <!--<template slot-scope="scope">-->
-      <!--<span class="el-dropdown-link">-->
-      <!--{{ getAdviceContent(scope.row, 1)-->
-      <!--}}-->
-      <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-      <!--</span>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-
-
-      <!--</el-table>-->
+      
       <el-form
         ref="adForm"
         :rules="adRules"

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -693,13 +693,17 @@ export default {
             adviceNames: [],
             advice_doctor: this.groupForm.advice_doctor,
             remark: this.groupForm.remark,
-            parent_id: this.groupForm.parent_id
+            parent_id: this.groupForm.parent_id,
+            id:this.groupForm.id,
           };
          
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
           }
+          for(let i=0;i<adviceNames.length;i++){
+            adviceNames[i].template_id = "888888888"
+          }
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
@@ -729,7 +733,7 @@ export default {
              }
           }
           console.log("2222",submitForm)
-          
+  
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -1684,6 +1688,7 @@ export default {
   created(){
     //获取自备药
     this.getSelfMedicalList()
+    console.log("模板数据",this.adviceTemplates)
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -98,7 +98,7 @@
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请输入药品类型">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -667,10 +667,11 @@ export default {
     },
 
     handleEdit: function(index, row) {
-      this.$router.push({
-        name: "drugStockOutDetail",
-        query: { id: row.id, type: this.type }
-      });
+      // this.$router.push({
+      //   name: "drugStockOutDetail",
+      //   query: { id: row.id, type: this.type }
+      // });
+      this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type})
     },
     // handleSearch(id,time,warehouse_out_order_number){
     //   this.warehousingOutInfo.warehousingOutData = []

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -25,13 +25,7 @@
     </div>
 
     <div class="app-container">
-    <!---->
-      <!--<stock-in-dialog-->
-        <!--ref="dialog" :propForm="propForm"-->
-        <!--:visibility="isVisibility"-->
-        <!--v-on:dialog-comfirm="comfirm"-->
-        <!--v-on:dialog-cancle="cancle"-->
-      <!--&gt;</stock-in-dialog>-->
+  
 
       <drugs-stock-dialog
         ref="dialog" :propForm="propForm"
@@ -57,7 +51,7 @@
         ></el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select
           size="small"
@@ -75,9 +69,9 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
         <el-select
           size="small"
@@ -95,7 +89,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -216,47 +210,12 @@
             </template>
           </el-table-column>
 
-        
-         
-          
-          <!-- <el-table-column width="80" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>单位<span style="color: red">*</span></span>
-            </template>
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.min_unit" style="width:100px;" placeholder="请选择">
-                <el-option
-                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.name">
-                </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          -->
-
-          
-
           <el-table-column label="总价" width="80" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.last_price * scope.row.count) }}
             </template>
           </el-table-column>
-
-
-          <!-- <el-table-column label="零售价" align="center" width="150">
-            <template slot-scope="scope">
-              {{ scope.row.retail_price }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="零价总价" align="center" width="150">
-            <template slot-scope="scope">
-              {{ calculate(scope.row.retail_price * scope.row.count) }}
-            </template>
-          </el-table-column> -->
-          
+   
           <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
                <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -38,16 +38,16 @@
       >
       </drugs-stock-dialog>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
         <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false"
                         style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
-      </div>
+      </div> -->
 
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
           <el-option
@@ -57,9 +57,9 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
-
+      </div> -->
 
+<!-- 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
@@ -71,7 +71,7 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
@@ -85,84 +85,168 @@
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入药品名称"
-                  v-model="scope.row.drug_id"
-                  :value="typeName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+                 <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    @input="changeDrugName(scope.$index)"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                  </template>
+                 </el-autocomplete>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>药品类型</span>
+            </template>
+             <template slot-scope="scope">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in drugTypeList"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="140">
+            <template slot="header" slot-scope="scope">
+              <span>规格&单位</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                 <el-input
-                  placeholder="请输入规格名称"
-                  v-model="scope.row.drug_id"
-                  :value="specificationName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
+                  :disabled="true"
+                  placeholder="请输入规格&单位"
+                  v-model="scope.row.name"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-
-
-          <el-table-column min-width="23" align="center">
+         <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope" >
+                  <span>批号</span>
+              </template>
+                <template slot-scope="scope">
+                  <el-form-item style="padding-top: 20px">
+                    <el-input
+                      placeholder="请输入批号"
+                      v-model="scope.row.batch_number"
+                    ></el-input>
+                  </el-form-item>
+              </template>
+          </el-table-column>
+           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
-              <span>进价<span style="color: red">*</span></span>
+              <span>出库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
-                            style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.price"></el-input>
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.count'"
+                :rules="tableRules.count"
+                style="padding-top: 20px"
+              >
+                <div style="display:flex;">
+                  <el-input
+                    placeholder="请输入出库数量"
+                    type="number"
+                    v-model="scope.row.count"
+                  ></el-input>
+                  {{scope.row.packing_unit}}
+                </div>
               </el-form-item>
-
-
+              
             </template>
           </el-table-column>
-
-          <el-table-column min-width="23" align="center">
+         <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
-              <span>出库数量<span style="color: red">*</span></span>
+              <span>出货价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
-                            style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"></el-input>
+            
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.last_price'"
+                :rules="tableRules.last_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                  placeholder="请输入出货价"
+                  type="number"
+                  v-model="scope.row.last_price"
+                ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-
-          <el-table-column label="进价总价" min-width="20" align="center">
+           <el-table-column label="总价" width="80" align="center">
             <template slot-scope="scope">
-              {{calculate(scope.row.price*scope.row.count)}}
+              {{ calculate(scope.row.last_price * scope.row.count) }}
             </template>
           </el-table-column>
-
-
-          <el-table-column label="零价" align="center" width="150">
+          <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-              {{ scope.row.retail_price }}
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
             </template>
           </el-table-column>
-
-          <el-table-column label="零价总价" align="center" width="150">
+            <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
-              {{ calculate(scope.row.retail_price * scope.row.count) }}
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" width="180" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+           <el-table-column align="center" width="150" label="批准文号">
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input
+                  placeholder="请输入批准文号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
             </template>
           </el-table-column>
 
-
-          <el-table-column label="备注" min-width="20" align="center">
+          <el-table-column label="备注" width="120" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
             </template>
           </el-table-column>
+
           <el-table-column label="操作" align="center" min-width="20">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
@@ -200,7 +284,8 @@
   import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugSalesReturnConfig, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
-
+  import {postSearchDrugList } from "@/api/data"
+  import { getDictionaryDataConfig } from "@/utils/data";
   export default {
     components: { DrugsStockDialog, BreadCrumb},
     name: 'salesReturnEdit',
@@ -264,6 +349,8 @@
         dealer: [],
         goodType: [],
         goodInfo:[],
+        drugTypeList:[],
+        manufacturerList:[]
       }
     },
     methods: {
@@ -474,7 +561,8 @@
             return false
           }
         })
-      }, GetOrderDetail: function(order_id) {
+      }, 
+      GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
@@ -483,12 +571,28 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+             console.log("list222222",response.data.data.list)
+            var manulist = response.data.data.manulist
             for (let i = 0; i < response.data.data.list.length; i++) {
+              response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name,
+              response.data.data.list[i].drug_type = response.data.data.list[i].drug.drug_type
+              response.data.data.list[i].name = response.data.data.list[i].drug.dose + response.data.data.list[i].drug.dose_unit +"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit + "/" + response.data.data.list[i].drug.max_unit
+              response.data.data.list[i].last_price = response.data.data.list[i].drug.last_price.toString()
+              response.data.data.list[i].number = response.data.data.list[i].drug.number
+              response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
+             for(let j=0;j<this.recordInfo.recordData.length;j++){
+               for(let i=0;i<manulist.length;i++){
+                  if(this.recordInfo.recordData[j].manufacturer == manulist[i].id){
+                     this.recordInfo.recordData[j].manufacturer = manulist[i].manufacturer_name
+                  }
+               }
+              }
+
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
             this.form.manufacturer = this.warehouseOut.manufacturer
@@ -517,9 +621,63 @@
         this.propForm.manufacturer = val
       }, changeDealer(val) {
         this.propForm.dealer = val
-      }
+      },
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = [];
+        postSearchDrugList(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.list;
+            
+             var list = response.data.data.list
+             console.log("猎豹22222222222",list)
+
+             this.drugList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             for(let i=0;i<this.drugList.length;i++){
+             
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+           
+             cb(this.drugList)
+          } else {
+            cb([])
+          }
+        })
+      },
+     changeDrugName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(i == this.currentIndex){
+             this.recordInfo.recordData[i].drug_id  = val.id
+             this.recordInfo.recordData[i].drug_name = val.drug_name
+             this.recordInfo.recordData[i].drug_type = val.drug_type
+             this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
+             this.recordInfo.recordData[i].last_price = val.last_price
+             this.recordInfo.recordData[i].manufacturer =  val.manufacturer
+             this.recordInfo.recordData[i].batch_number = val.number
+             this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
+           }
+        }
+        console.log("333333",this.recordInfo.recordData)
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
     },
     created() {
+      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id

src/xt_pages/stock/stockBatchNumber.vue

@@ -166,15 +166,13 @@
       }
     },
     methods:{
-    
-     
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
@@ -184,7 +182,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -193,7 +191,7 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+       this.getlist()
       }
      },
      changeDrug(){},
@@ -238,26 +236,10 @@
          }
       })
      },
-    //  getOutList(){
-    //   var params= {
-    //       limit:this.limit,
-    //       page:this.page,
-    //       id:this.$route.query.id,
-    //       start_time:this.start_time,
-    //       end_time:this.end_time, 
-    //     } 
-    //    getStockOutList(params).then(response=>{
-    //       if(response.data.state == 1){
-    //          var outlist = response.data.data.outList
-    //          console.log("出库数据",outlist)
-    //          for(let i=0;i<outlist.length;i++){
-    //            outlist[i].stock_way = 2
-    //            this.tableList.push(outlist[i])
-    //          }
-    //          console.log("hhhhhhhhhhh",this.tableList)
-    //       }
-    //    })  
-    //  }
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+     },
     }
   }
 </script>

src/xt_pages/stock/stockFlow.vue

@@ -6,8 +6,9 @@
     <div class="app-container ">
       <div class="cell clearfix">
        耗材名称:{{this.$route.query.good_name}}
-       <!-- 库存:
-       厂家: -->
+       库存:{{getInCount(this.$route.query.id)}}
+       <!-- 厂家:{{this.$route.query.manufacturer}}
+       规格: -->
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -38,15 +39,15 @@
               @change="endTimeChange"
           ></el-date-picker>
 
-        <span>出入库方式:</span>
-        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+        <!-- <span>出入库方式:</span> -->
+        <!-- <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
               v-for="(item,index) in stockType"
               :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
-        </el-select>
+        </el-select> -->
         
         
       </div>
@@ -84,9 +85,10 @@
              <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</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 v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
+             <!-- <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span> -->
+              {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进/出货单价"  align="center">
@@ -133,15 +135,15 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
+  import {getStockInList} from "@/api/drug/drug_stock";
+  import {getStockDrugCount} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
-    //   var drugCategory = getDictionaryDataConfig('system','drug_category')
-    //   this.drugCategory.push(...drugCategory)
-    //   this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+     
       this.getlist()
-      this.getOutList()
+      this.getStockDrugCount()
+
     },
     components: {
       BreadCrumb
@@ -184,7 +186,11 @@
           {id:2,name:"自动出库"},
           {id:3,name:"入库"},
         ],
-      
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        keywords:"",
+        obj:{},
       }
     },
     methods:{
@@ -192,11 +198,11 @@
      
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
@@ -206,7 +212,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -215,10 +221,9 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+       this.getlist()
       }
      },
-     changeDrug(){},
      getManufacturer(id){
        var name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
@@ -262,26 +267,58 @@
          }
       })
      },
-    //  getOutList(){
-    //   var params= {
-    //       limit:this.limit,
-    //       page:this.page,
-    //       id:this.$route.query.id,
-    //       start_time:this.start_time,
-    //       end_time:this.end_time, 
-    //     } 
-    //    getStockOutList(params).then(response=>{
-    //       if(response.data.state == 1){
-    //          var outlist = response.data.data.outList
-    //          console.log("出库数据",outlist)
-    //          for(let i=0;i<outlist.length;i++){
-    //            outlist[i].stock_way = 2
-    //            this.tableList.push(outlist[i])
-    //          }
-    //          console.log("hhhhhhhhhhh",this.tableList)
-    //       }
-    //    })  
-    //  }
+    getStockDrugCount(){
+        var params ={
+          keywords: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var count = response.data.data.count
+           console.log("详情入库统计",count)
+           this.countList = count
+           var outlist = response.data.data.outList
+           console.log("详情出库数量",outlist)
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           console.log("详情自动出库",autoCount)
+           this.autoCountList = autoCount
+         }
+      })
+    },
+    getInCount(id){
+      var count= ""
+      for(let i=0;i<this.countList.length;i++){
+          if(id == this.countList[i].good_id){
+              count = this.countList[i].count
+          }
+        }
+        return count
+        },
+      getOutCount(id){
+        console.log("id222",id)
+        var count = ""
+        for(let i=0;i<this.outCountList.length;i++){
+          if(id == this.outCountList[i].good_id){
+            count = this.outCountList[i].count
+          }
+        }
+        return count
+      },
+      getAutoCount(id){
+        var count= ""
+        for(let i=0;i<this.autoCountList.length;i++){
+          if(id == this.autoCountList[i].good_id){
+            count = this.outCountList[i].count
+          }
+        }
+        return count
+      },
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+     },
     }
   }
 </script>

src/xt_pages/stock/stockOutOrder.vue

@@ -232,7 +232,8 @@
         
         <el-table-column label="出库数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.count}}
+           <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
+           <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
           </template>
         </el-table-column>
 
@@ -277,7 +278,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetail(scope.row.id)">使用明细</span>
+            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetailById(scope.row)">使用明细</span>
           </template>
         </el-table-column>
       </el-table>  
@@ -697,7 +698,8 @@ import {
   deleteWarehouseOutInfo,
   GetAllGoodInfoByID,
   editWarehouseoutInfo,
-  getOrderDetailByOrderId
+  getOrderDetailByOrderId,
+  getOrderDetailById
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -1521,8 +1523,35 @@ export default {
         })
       }, 
      
-     
-
+      GetOrderDetailById(val){
+         this.userList =[]
+         var params = {
+           good_id:val.good_id,
+           record_time:val.sys_record_time,
+          }
+         getOrderDetailById(params).then(response=>{
+            if(response.data.state == 1){
+              var total = 0
+              var list = response.data.data.list
+              var arrList =  this.unique(list)
+              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,
+              })
+              // this.type_name = this.userList[0].type.type_name
+              // this.specification_name = this.userList[0].info.specification_name
+              console.log("详情数据区",this.userList)
+              this.editdialogVisibleThree = true
+            }
+         })
+      },
+    
   }
 };
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -108,7 +108,7 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-           <span>{{getOutCount(scope.row.good_id)+getAutoCount(scope.row.good_id)}}</span>
+           <span>{{getOutCount(scope.row.good_id) + getAutoCount(scope.row.good_id)}}</span>
 
          </template>
        </el-table-column>
@@ -261,7 +261,7 @@ export default {
 
          }
 
-        console.log("数据2222222",this.WarehouseInfo.warehouseInfoDate)
+       
       });
     },
 
@@ -455,7 +455,14 @@ export default {
        return name
     },
     toClick(val){
-      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name})
+       var manufacturer_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+          }
+       }
+      console.log("厂家22222",manufacturer_name)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name})
     },
     toClickOne(val){
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})