数据

src/api/drug/drug_stock.js

@@ -509,3 +509,11 @@ export function getDrugOutOrderDetailPrint(params) {
     params: params
   })
 }
+
+export function getDrugBatchNumber(params) {
+  return request({
+    url: '/api/drug/getdrugbatchnumber',
+    method: 'Get',
+    params: params
+  })
+}

src/api/stock.js

@@ -689,3 +689,11 @@ export function getCancelStockOrderPrint(params) {
     params: params
   })
 }
+
+export function getStockBatchNumber(params) {
+  return request({
+    url: '/api/stock/getstockbatchnumber',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/consumables.vue

@@ -105,7 +105,7 @@
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
       </el-table-column> -->
-      <el-table-column label="包装零售价" width="100" align="center">
+      <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.packing_price }}
         </template>

src/xt_pages/data/druguseTemplate.vue

@@ -347,6 +347,7 @@
                           :fetch-suggestions="querySearch"
                           placeholder="请输入内容"
                           @input="changeDrugName"
+                          @select="hangleSelectChange"
                       ></el-autocomplete>
                     </el-form-item>
                   </el-col>
@@ -549,6 +550,7 @@
                           :fetch-suggestions="querySearch"
                           placeholder="请输入内容"
                           @input="changeDrugNameTwo"
+                          @select="hangdleSelectTwo"
                          ></el-autocomplete>
                     </el-form-item>
                   </el-col>
@@ -1685,6 +1687,7 @@
         let name = encodeURIComponent(this.form.name)
         console.log("params",params)
         let sort = this.form.sort
+        
         postAdviceTemplate(params, name,sort, this.form.advice_type).then(response => {
 
           if (response.data.state == 0) {
@@ -1821,10 +1824,10 @@
       },
       submitTemplate(formName) {
 
-        if(this.src_type == ""){
-            this.templateForm.way = 0
-            this.templateForm.drug_id = 0
-        }
+        // if(this.src_type == ""){
+        //     this.templateForm.way = 0
+        //     this.templateForm.drug_id = 0
+        // }
 
         if(this.src_type == 2){ //自备药
             var arr = this.templateForm.advice_name.split("(自备药)")
@@ -2198,13 +2201,13 @@
       //编辑医嘱
       submitEditTemplate(formName) {
 
-         var drug_id = 0
-         for(let i=0;i<this.all_drug.length;i++){
-           if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
-              drug_id = this.all_drug[i].id
-           }
-         }
-        this.templateFormEdit.drug_id = drug_id
+        //  var drug_id = 0
+        //  for(let i=0;i<this.all_drug.length;i++){
+        //    if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
+        //       drug_id = this.all_drug[i].id
+        //    }
+        //  }
+        // this.templateFormEdit.drug_id = drug_id
 
         console.log("编辑子药",this.templateFormEdit)
 
@@ -2896,6 +2899,11 @@
             }
         }
       },
+      hangdleSelectTwo(val){
+        console.log("我的223232",val)
+
+        this.templateFormEdit.drug_id = val.id
+      },
       changeDrugDescTwo(name) {
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
@@ -2913,6 +2921,8 @@
       },
 
 
+
+
      querySearch(queryString, cb) {
         console.log('queryString',queryString)
         var restaurants = this.all_drug;
@@ -2945,7 +2955,11 @@
       },
      sortData(a, b) {
        return a.sort - b.sort
-     }
+     },
+     hangleSelectChange(val){
+      this.templateForm.way = 1
+      this.templateForm.drug_id = val.id
+    }
     }
   }
 </script>

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

@@ -1275,7 +1275,6 @@
               this.exceLoading = false
               return false
             } else {
-
               this.$notify({
                 title: '成功',
                 message: '执行医嘱成功',
@@ -1283,10 +1282,15 @@
                 duration: 2000
               })
               var msg = response.data.data.msg
-              if(msg == "ok"){
-                 this.$message.error("请入库,库存不足")
+              if(msg == 1){
+                this.$message.error("无库存,请入库")
+                return
+              }
+
+              if(msg == 2){
+                this.$message.error("库存不足,请入库")
+                return
               }
-            
               var exid = response.data.data.advice.id
               if (response.data.data.advice.parent_id > 0) {
                 exid = response.data.data.advice.parent_id

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

@@ -695,8 +695,9 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id,
             id:this.groupForm.id,
-          };
          
+          };
+          console.log("hhhhh",this.drug_id,this.nameForm.way)
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
@@ -733,7 +734,7 @@ export default {
              }
           }
           console.log("2222",submitForm)
-  
+         
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -857,8 +858,8 @@ export default {
     submitNameForm(formName) {
       
        if(this.src_type == ""){
-          this.nameForm.way = 0
-          this.nameForm.drug_id = 0
+          this.nameForm.way = 1
+          this.nameForm.drug_id = this.drug_id
           this.nameForm.drug_name_id = 0
        }
 
@@ -1559,6 +1560,7 @@ export default {
                 obj.type = 2
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = medicalList[i].drug_specs
+                obj.id = medicalList[i].id
                 this.all_drug.push(obj)
               }
             }
@@ -1594,6 +1596,7 @@ export default {
                 obj.type = 1
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
+                obj.id = base_drug_list[i].id
                 this.all_drug.push(obj)
 
               }
@@ -1614,8 +1617,10 @@ export default {
             this.drugSpec = this.all_drug[i].drug_specs
           }
        }
+     
     },
     changeDrugDesc(name) {
+      
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -1673,8 +1678,12 @@ export default {
         cb(results);
       },
 
-      handleSelect(){
-
+      handleSelect(val){
+        console.log("22222",val)
+        this.drug_id = val.id
+        this.nameForm.way = 1 
+        console.log("hhhh23",this.drug_id) 
+        console.log("hhhhhh",this.nameForm.way)
       },
       handleSelect1(){
 

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -82,7 +82,7 @@
                 </el-option>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="包装零售价 : " prop="retail_price">
+            <el-form-item label="零售价 : " prop="retail_price">
               <el-input v-model="form.packing_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <!-- <el-form-item label="拆零零售价 : " prop="retail_price">

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -425,7 +425,16 @@ export default {
               this.$message.error(response.data.msg);
               return false;
             } else {
-              this.$notify({
+             var msg =  response.data.data.msg
+             if (msg == 1){
+                this.$message.error("该耗材无出库记录")
+                return
+             }
+             if(msg == 2){
+               this.$message.error("退库数量大于出库数量")
+             }
+             if(msg == 3){
+               this.$notify({
                 title: "成功",
                 message: "退库成功",
                 type: "success",
@@ -433,6 +442,7 @@ export default {
               });
               this.recordInfo.recordData = [];
               this.$router.back(-1);
+             }        
             }
           });
         } else {

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -140,11 +140,11 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="单据类型" align="center">
+        <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             {{ getTypeName(scope.row) }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/detail/stockInDetail.vue

@@ -341,10 +341,12 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          
           this.total = response.data.data.total;
+          console.log("hhhhhhshsss",response.data.data.list)
+          var total_price = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
+            total_price += response.data.data.list[i].price * response.data.data.list[i].warehousing_count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
           }
@@ -352,7 +354,7 @@ export default {
           this.cancelStockDate.push({
             warehousing_order: "合计",
             is_total: 1,
-            total: response.data.data.total_price,
+            total: total_price,
             Warehousing: {
               warehousing_time: 0
             }
@@ -391,6 +393,7 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
+          var total_price = ""
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -140,11 +140,11 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="单据类型" align="center">
+        <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             {{ getTypeName(scope.row) }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
@@ -377,12 +377,12 @@ export default {
         } else {
 
           this.total = response.data.data.total;
-
+          console.log("详情23233323",response.data.data.list)
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-
+            
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -84,14 +84,12 @@
          <el-table-column prop="drug_name" label="出入库数量" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.drug_way == 4"> {{scope.row.warehousing_count}}{{scope.row.max_unit}}</span>
-             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{scope.row.count}}{{scope.row.max_unit}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{scope.row.count}}{{scope.row.count_unit}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-             <!-- {{getCountTwo(this.$route.query.drug_id,this.$route.query.min_number,this.$route.query.max_unit,this.$route.query.min_unit)}} -->
                {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
-              <!-- {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}} -->
              <span></span>
            </template>
         </el-table-column>
@@ -109,8 +107,8 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way ==1"> {{scope.row.number}}</span>
-             <span v-if="scope.row.drug_way == 4">{{scope.row.number}}</span>
+             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way ==1"> {{scope.row.batch_number}}</span>
+             <span v-if="scope.row.drug_way == 4">{{scope.row.batch_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="生产商" align="center">
@@ -240,11 +238,9 @@
              limit:this.limit,
              stock_type:this.stock_type,  
            }
-          console.log("params",params)
          getDrugStockFlow(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("入库数据0000",list)
             for(let i=0;i<list.length;i++){
                list[i].drug_way = 4
                this.tableList.push(list[i])
@@ -266,18 +262,18 @@
              limit:this.limit,
              stock_type:this.stock_type,  
            }
-          console.log("出库数据",params)
-
          getOutDrugStockFlow(params).then(response=>{
             if(response.data.state == 1){
                var outList = response.data.data.outList
                console.log("outlist",outList)
 
               for(let i=0;i<outList.length;i++){
+               
                 if(outList[i].is_sys == 1){
                   outList[i].drug_way = 2
                 }
-                if(outList.is_sys == 0){
+                if(outList[i].is_sys == 0){
+                  console.log("进来22222")
                   outList[i].drug_way = 1
                 }
                 this.tableList.push(outList[i])
@@ -346,16 +342,16 @@
       getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
             var countlist =  response.data.data.countList
-            console.log("入库数据",countlist)
+            // console.log("入库数据",countlist)
             this.countList = countlist
             var outcountlist = response.data.data.outCountList
-            console.log("出库数据",outcountlist)
+            // console.log("出库数据",outcountlist)
             this.outCountList = outcountlist
             var aucountlist = response.data.data.auCountList
-            console.log("自动数据",aucountlist)
+            // console.log("自动数据",aucountlist)
             this.autoCountList = aucountlist
              var minCount = response.data.data.minCount
-            console.log("minCount",minCount)
+            // console.log("minCount",minCount)
             this.minCount = minCount
             var info = response.data.data.info
             for(let i=0;i<info.length;i++){
@@ -363,7 +359,7 @@
                  info[i].count = info[i].count * info[i].min_number
               }
             }
-            console.log("info2222222",info)
+            // console.log("info2222222",info)
             this.drugOutList = info
           }
         })

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -55,7 +55,7 @@
                     popper-class="my-autocomplete"
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
+                    :trigger-on-focus="true"
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
@@ -218,6 +218,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
+                 :disabled="true"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -55,8 +55,8 @@
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>
               <td style="line-height:18px">{{ item.number }}</td>
-              <td style="line-height:18px">{{ getTime(item.product_date)}}</td>
-              <td style="line-height:18px">{{ getTime(item.expiry_date)}}</td>
+              <td style="line-height:18px">{{ getTime(item.product_date,'{y}-{m}-{d}')}}</td>
+              <td style="line-height:18px">{{ getTime(item.expiry_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">正常<br>入库</td>
               <td style="line-height:18px">合格</td>
             </tr>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -120,7 +120,7 @@
                     popper-class="my-autocomplete"
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
+                    :trigger-on-focus="true"
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
@@ -285,6 +285,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
+                  :disabled="true"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -231,17 +231,22 @@
           </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              {{scope.row.count}}{{scope.row.max_unit}}
+              {{getTotalCount(scope.row.drug_id)}}
             </template>
           </el-table-column>
-          <el-table-column label="进货价" align="center">
+          <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.min_price}}
+            </template>
+          </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              {{(scope.row.count * scope.row.price).toFixed(2)}}
+              <span>{{getAllPrice(scope.row.drug_id,scope.row.price,scope.row.min_price).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -277,7 +282,7 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
-              <span style="color: #589ff8" v-if="scope.row.is_sys == 1" @click="toDetail(scope.row)">使用明细</span>
+              <span style="color: #589ff8"  @click="toDetail(scope.row)">使用明细</span>
             </template>
           </el-table-column>
         </el-table>
@@ -332,6 +337,16 @@
             </template>
           </el-table-column>
 
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>批次号</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{getDrugBatchNumber(scope.row.id)}}</span>
+            </template>
+          </el-table-column>
+
         </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -339,6 +354,68 @@
         <el-button type="primary" @click="drugDialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
+
+
+
+    <el-dialog
+      title="提示"
+      :visible.sync="drugDialogVisibleTwo"
+      width="90%">
+      <span>
+        <el-table :data="userListOne" :class="signAndWeighBoxPatients" style="width: 50%"
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>序号</span>
+            </template>
+            <template slot-scope="scope">
+              {{scope.$index+1}}
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用人</span>
+            </template>
+            <template slot-scope="scope">
+              <span>系统</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用数量</span>
+            </template>
+            <template slot-scope="scope">
+               {{scope.row.count}}
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用时间</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+            </template>
+          </el-table-column>
+
+         <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.batch_number}} </span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="drugDialogVisibleTwo = false">取 消</el-button>
+        <el-button type="primary" @click="drugDialogVisibleTwo = false">确 定</el-button>
+      </span>
+    </el-dialog>
    </div>
 </template>
 
@@ -350,11 +427,11 @@ import {
   deleteDrugWarehouseOut,
   GetAllConfig,
   getDrugWarehouseOutList,
-  getDrugWarehouseOutInfo,
   getDrugWarehouseOutUser,
   getDrugAutoMaticList,
   getSinleOrderDetail,
-  getAutoDrugDetail
+  getAutoDrugDetail,
+  getDrugCountList
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import { getInitializtion } from '@/api/stock'
@@ -383,8 +460,8 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetWarehouseOut();
-    // this.GetConfigInfo();
     this.fetchAllAdminUsers();
+    this.getDrugCountList()
   },
   data() {
     return {
@@ -427,8 +504,18 @@ export default {
       tableShow:false,
       manufacturerList:[],
       drugDialogVisible:false,
+      drugDialogVisibleTwo:false,
       order_id:0,
-      dealerList:[]
+      dealerList:[],
+      countList:[],
+      outCountList:[],
+      autoCountList:[],
+      keyword:"",
+      drug_type:0,
+      minCount:[],
+      drugOutList:[],
+      outList:[],
+      userListOne:[],
     };
   },
   methods: {
@@ -441,7 +528,6 @@ export default {
         type: this.type,
         keywords: this.searchKey
       };
-      console.log("paras22222222",Params)
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
@@ -480,7 +566,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
-          console.log("列表22222",this.warehouseOutDate)
+         
         }
       });
     },
@@ -509,7 +595,6 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -571,7 +656,7 @@ export default {
     },
 
     handleEdit: function(index, row) {
-      console.log("row2222222",row)
+   
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
     },
     handleSearch(val){
@@ -644,18 +729,19 @@ export default {
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+        if(this.selectedTableData[i].is_sys == 0){
+          ids.push(this.selectedTableData[i].id);
+        }
       }
       const idStr = ids.join(",");
       const params = {
         ids: idStr
       };
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+      this.$confirm("确认删除出库单记录?", "删除出库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      })
-        .then(() => {
+      }).then(() => {
           deleteDrugWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -699,7 +785,7 @@ export default {
           } else {
             this.userList=[]
             var total = 0
-            console.log("888888888888",response.data.data.list)
+
             for (let i = 0; i < response.data.data.list.length; i++) {
               var obj = response.data.data.list[i]
               obj['is_total'] = 0
@@ -770,13 +856,11 @@ export default {
       getDrugAutoMaticList(params).then(response=>{
          if(response.data.state ==1){
            var list =   response.data.data.list
-           console.log("list222222",list)
            this.list = list
            var drugConfig =  response.data.data.drugConfig
-           console.log("drugconfig",drugConfig)
+         
            this.drugConfig = drugConfig
            var drugList = response.data.data.drugList
-           console.log("药品列表",drugList)
            this.drugList = drugList
            var manulist = response.data.data.manufacturerList
            this.manufacturerList = manulist
@@ -816,7 +900,7 @@ export default {
       getInitializtion().then(response=>{
           if(response.data.state ==1){
             var drugTypeList = response.data.data.drugTypeList
-            console.log("hhhhhhh",drugTypeList)
+
             this.drugTypeList = drugTypeList
           }
       })
@@ -857,7 +941,17 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-          console.log("list",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].min_number * outList[i].count 
+             }
+          }
+          this.outList = outList
+       
+          // console.log("list",list)
+          // console.log("outList222",outList)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          for(let i=0;i<list.length;i++){
@@ -874,28 +968,36 @@ export default {
      })
    },
    toDetail(val){
-    
      console.log("val",val)
      var params = {
+       warehouse_out_id:val.warehouse_out_id,
        drug_id:val.drug_id,
        record_time:val.sys_record_time,
      }
      this.userList = []
      getAutoDrugDetail(params).then(response=>{
        if(response.data.state == 1){
-        this.drugDialogVisible = true
+      
         var total = 0
         for (let i = 0; i < response.data.data.list.length; i++) {
           var obj = response.data.data.list[i]
           obj['is_total'] = 0
           this.userList.push(obj)
-          total = total + response.data.data.list[i].count
+         total = this.getTotalCount(response.data.data.list[i].drug_id)
         }
-        console.log("出库数据222222222",this.userList)
         this.userList.push({
           is_total: 1,
           total: total,
         })
+        if(val.is_sys == 1){
+          this.drugDialogVisible = true
+        }
+        if(val.is_sys == 0){
+          this.drugDialogVisibleTwo = true
+        }
+         var userListOne = response.data.data.outList
+         console.log("手动出库2232332",userListOne)
+         this.userListOne = userListOne
        }
      })
    },
@@ -905,7 +1007,114 @@ export default {
      }else{
        this.$router.push({path:"/stock/drugStockOutOrderDetailPrint?id="+this.order_id})
      }
-   }
+   },
+
+    getDrugCountList(){
+         var params = {
+          keyword: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+         console.log("paramsw2ww",params)
+        getDrugCountList(params).then(response=>{
+          if(response.data.state == 1){
+            var countlist =  response.data.data.countList
+            // console.log("入库数据",countlist)
+            this.countList = countlist
+            var outcountlist = response.data.data.outCountList
+            // console.log("出库数据",outcountlist)
+            this.outCountList = outcountlist
+            var aucountlist = response.data.data.auCountList
+            // console.log("自动数据",aucountlist)
+            this.autoCountList = aucountlist
+            var minCount = response.data.data.minCount
+            // console.log("minCount",minCount)
+            this.minCount = minCount
+            var info = response.data.data.info
+            for(let i=0;i<info.length;i++){
+              if(info[i].count_unit == info[i].max_unit){
+                 info[i].count = info[i].count * info[i].min_number
+              }
+            }
+            // console.log("info2222222",info)
+            this.drugOutList = info
+          }
+        })
+      },
+    
+      getCount(drug_id,min_number,max_unit,min_unit){
+        var count= 0
+        var str = ""
+        var min_str = ""
+        for(let i=0;i<this.drugOutList.length;i++){
+          if(drug_id == this.drugOutList[i].drug_id){
+             count += parseInt(this.drugOutList[i].count)
+          }
+        }
+        if(parseInt(count/min_number)!=0){
+          str = parseInt(count/min_number)+ max_unit
+        }
+        if((count%min_number)!=0){
+          min_str =  count%min_number + min_unit
+        }
+        return str + min_str
+      },
+      getTotalCount(drug_id){
+         var str = ""
+         var min_str = ""
+         for(let i=0;i<this.outList.length;i++){
+           if(this.outList[i].drug_id == drug_id){
+            if(parseInt(this.outList[i].count/this.outList[i].min_number)!=0){
+              str = parseInt(this.outList[i].count/this.outList[i].min_number)+ this.outList[i].max_unit
+            }
+            if((this.outList[i].count%this.outList[i].min_number)!=0){
+              min_str =  this.outList[i].count%this.outList[i].min_number + this.outList[i].min_unit
+            }
+           }
+         }
+         return str + min_str
+      },
+      getAllPrice(drug_id,price,min_price){
+         var strprice = 0
+         var minstrprice = 0
+         var str = ""
+         var min_str = ""
+         var total_price = 0
+         for(let i=0;i<this.outList.length;i++){
+           if(this.outList[i].drug_id == drug_id){
+            if(parseInt(this.outList[i].count/this.outList[i].min_number)!=0){
+              str = parseInt(this.outList[i].count/this.outList[i].min_number)
+            }
+            if((this.outList[i].count%this.outList[i].min_number)!=0){
+              min_str =  this.outList[i].count%this.outList[i].min_number
+            }
+           }
+         }
+         strprice = str * price 
+         minstrprice = min_str * min_price 
+        //  console.log("strprice3",strprice)
+        //  console.log("minstrprice",minstrprice)
+         total_price = strprice + minstrprice
+         return  total_price
+      },
+
+      getDrugBatchNumber(id){
+        
+        var arr= []
+        var batchNumber =[]
+        
+        for(let i=0;i<this.userList.length;i++){
+           if(id == this.userList[i].id){
+            arr.push(this.userList[i].drugwarehouseoutinfo)
+           }
+        }
+        if(batchNumber.length > 0 ){
+         for(let j=0;j<arr.length;j++){
+           batchNumber.push(arr[j].batch_number)
+          }
+        }
+        return batchNumber.join(",")
+      }
     
   }
 };

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -27,12 +27,12 @@
     <div class="app-container">
   
 
-      <drugs-stock-dialog
+      <!-- <drugs-stock-dialog
         ref="dialog" :propForm="propForm"
         :visibility="isVisibility"
         v-on:dialog-comfirm="comfirm"
         v-on:dialog-cancle="cancle"
-      ></drugs-stock-dialog>
+      ></drugs-stock-dialog> -->
 
 
       <div class="cell clearfix">
@@ -73,7 +73,7 @@
                     popper-class="my-autocomplete"
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
+                    :trigger-on-focus="true"
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
@@ -122,10 +122,18 @@
               </template>
                 <template slot-scope="scope">
                   <el-form-item style="padding-top: 20px">
-                    <el-input
+                    <!-- <el-input
                       placeholder="请输入批号"
                       v-model="scope.row.batch_number"
-                    ></el-input>
+                    ></el-input> -->
+                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.batch_number"
+                        :value="item.batch_number">
+                      </el-option>
+                    </el-select>
                   </el-form-item>
               </template>
           </el-table-column>
@@ -145,11 +153,18 @@
                     type="number"
                     v-model="scope.row.count"
                   ></el-input>
-                  {{scope.row.packing_unit}}
                 </div>
               </el-form-item>
-              
+              <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位">
+                <el-option
+                  v-for="(option, index) in unitList"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.name">
+                </el-option>
+               </el-select>
             </template>
+
           </el-table-column>
           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
@@ -220,8 +235,9 @@
         
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 20px">
+              <el-form-item style="padding-top: 20px" :disabled="true">
                 <el-input
+                  :disabled="true"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>
@@ -235,7 +251,7 @@
                 <el-option
                   v-for="(option, index) in dealerList"
                   :key="index"
-                  :label="option.dealer"
+                  :label="option.dealer_name"
                   :value="option.id">
                 </el-option>
                </el-select>
@@ -288,7 +304,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import {  postDrugWarehouseOut,GetAllConfig,GetAllDrugInfoByID } from "@/api/drug/drug_stock";
+import {  postDrugWarehouseOut,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from "@/api/drug/drug_stock";
 
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from './drugsStockDialog/index'
@@ -353,38 +369,12 @@ export default {
       showTwo:false,
       drugTypeList:[],
       totalPrice:0,
+      unitList:[],
+      numberList:[]
     };
   },
   methods: {
-    // comfirm: function(val) {
-    //   this.propForm.goodType = []
-    //   this.propForm.goods = []
-
-    //   this.$refs.dialog.hide()
-
-    //   if (val.selectedGoodInfo.length > 0) {
-    //     for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
-    //       if (i == 0) {
-    //         this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
-    //         this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
-    //         this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-    //         this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit.toString()
-    //       } else {
-    //         const tempForm = {}
-    //         tempForm['drug_id'] = val.selectedGoodInfo[i].id
-    //         tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
-    //         tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
-    //         tempForm['count'] = ''
-    //         tempForm['remark'] = ''
-    //         tempForm['min_unit'] = val.selectedGoodInfo[i].min_unit
-    //         this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
-    //       }
-    //     }
-    //   }
-
-    //   this.currentIndex = -1
-
-    // },
+    
     cancle: function() {
       this.$refs.dialog.hide();
     },
@@ -455,6 +445,7 @@ export default {
       tempObj["min_number"] = ""
       tempObj["number"] = ""
       tempObj["batch_number"] = ""
+      tempObj["max_unit"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -592,13 +583,18 @@ export default {
             } else {
               var msg = response.data.data.msg
               var drug_name =  response.data.data.drug_name
+              console.log("drug_name",drug_name)
               var dose = response.data.data.dose
+              console.log("dose",dose)
               var dose_unit = response.data.data.dose_unit
+              console.log("dose_unit",dose_unit)
               var min_number = response.data.data.min_number
+              console.log("min_number",min_number)
               var min_unit =  response.data.data.min_unit
+              console.log("min_unit",min_unit)
               var max_unit =  response.data.data.max_unit
-
-              var str = drug_name + "" + dose + dose_unit * min_number + min_unit+"/"+max_unit
+              console.log("max_unit",max_unit)
+              var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
               console.log("str22222222",str)
               if(msg == 1){
                 this.$message.error(str + "库存不足,请入库")
@@ -636,7 +632,6 @@ export default {
         postSearchDrugList(key).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
-            
              var list = response.data.data.list
              console.log("list99999999",list)
              this.drugList = list
@@ -644,6 +639,7 @@ export default {
              this.manufacturerList = manufacturerList
              var dealerList = response.data.data.dealerList
              this.dealerList = dealerList
+             console.log("经销商",this.dealerList)
              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){
@@ -669,6 +665,7 @@ export default {
       },
       handleSelect(val){
         console.log("val2222222",val)
+         this.getDrugBatchNumber(val.id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].drug_id = val.id
@@ -701,6 +698,18 @@ export default {
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
+      getDrugBatchNumber(id){
+          var params = {
+            id:id
+          }
+        getDrugBatchNumber(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list2222",list)
+             this.numberList = list
+           }
+        })
+      }
   },
   created() {
     this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
@@ -731,6 +740,8 @@ export default {
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
+    this.unitList =  getDataConfig('hemodialysis','units')
+    console.log("单位",this.unitList)
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -40,7 +40,7 @@
                     popper-class="my-autocomplete"
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
+                    :trigger-on-focus="true"
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
@@ -115,7 +115,7 @@
                     type="number"
                     v-model="scope.row.count"
                   ></el-input>
-                  {{scope.row.packing_unit}}
+                  {{scope.row.count_unit}}
                 </div>
               </el-form-item>
               
@@ -143,7 +143,7 @@
           </el-table-column>
            <el-table-column label="总价" width="80" align="center">
             <template slot-scope="scope">
-              {{ calculate(scope.row.last_price * scope.row.count) }}
+              {{ calculate(scope.row.price * scope.row.count) }}
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" width="140" align="center">
@@ -200,7 +200,7 @@
           </el-table-column>
            <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 20px">
+              <el-form-item style="padding-top: 20px" :disabled="true">
                 <el-input
                  :disabled="drug_show"
                   placeholder="请输入批准文号"
@@ -570,6 +570,7 @@
             return false
           } else {
              console.log("出库详情",response.data.data.list)
+
             var manulist = response.data.data.manulist
             this.manufacturerList = manulist
             this.dealerList =  response.data.data.dealerList
@@ -591,7 +592,7 @@
               
              
               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].retail_price = response.data.data.list[i].price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               if(response.data.data.list[i].dealer == "0" || response.data.data.list[i].dealer == 0){
                   response.data.data.list[i].dealer = ""

src/xt_pages/stock/drugs/query.vue

@@ -123,8 +123,8 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-           
-            {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
+             <span v-if="getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)!=''">{{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
+              <span v-if="getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit) ==''">0{{scope.row.max_unit}}0{{scope.row.min_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center" width="200px">
@@ -647,20 +647,26 @@ import { min } from 'moment'
         return count
       },
      getCountTwo(drug_id,min_number,max_unit,min_unit){
+      
        var total_count = 0
        var out_count = 0
        var count = 0
        var str = ""
        var str_min = ""
        total_count = this.getInCount(drug_id) * min_number
+
        out_count = this.getCountOne(drug_id)
        count = total_count-out_count
+
        if(parseInt(count/min_number)!=0){
          str = parseInt(count/min_number) + max_unit
        }
+       console.log("str2222",str)
        if((count%min_number)!=0){
          str_min = count%min_number + min_unit
        }
+
+       console.log("str0000000",str,str_min)
        return str+str_min
      }
     }

src/xt_pages/stock/stockFlow.vue

@@ -63,7 +63,7 @@
         </el-table-column>
         <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4">采购入库</span>
+             <span v-if="scope.row.stock_way == 4">手动入库</span>
              <span v-if="scope.row.stock_way == 3">手动出库</span>
              <span v-if="scope.row.stock_way == 2">自动出库</span>
            </template>
@@ -86,6 +86,12 @@
              <span v-if="(scope.row.stock_way == 2 || scope.row.stock_way == 3) && scope.row.count!=0">{{scope.row.count}}{{packing_unit}}</span>
            </template>
         </el-table-column>
+       <el-table-column label="退库数量" align="center">
+         <template slot-scope="scope">
+           <span>{{getCancelCount(scope.row.good_id)}}{{packing_unit}}</span>
+
+         </template>
+       </el-table-column>
          <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> -->
@@ -205,7 +211,7 @@
           {id:0,name:"全部"},
           {id:3,name:"手动出库"},
           {id:2,name:"自动出库"},
-          {id:4,name:"采购入库"},
+          {id:4,name:"手动入库"},
         ],
         countList:[],
         outCountList:[],
@@ -292,7 +298,7 @@
            }
            var total = response.data.data.total
            this.total = total
-           console.log("入库数据",this.tableList)
+          //  console.log("入库数据",this.tableList)
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
          }
@@ -320,6 +326,7 @@
              }
              this.tableList.push(outList[i])
            }
+          console.log("hhhhhhhhhh",this.tableList)
           var total = response.data.data.total
           this.total = total
         }  
@@ -334,17 +341,17 @@
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var count = response.data.data.count
-           console.log("详情入库统计",count)
+          //  console.log("详情入库统计",count)
            this.countList = count
            var outlist = response.data.data.outList
-           console.log("详情出库数量",outlist)
+          //  console.log("详情出库数量",outlist)
           
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-           console.log("详情自动出库",autoCount)
+          //  console.log("详情自动出库",autoCount)
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-           console.log("totalcount",totalCount)
+          //  console.log("totalcount",totalCount)
            this.cancelCountList = totalCount
          }
       })

src/xt_pages/stock/stockInOrder.vue

@@ -1474,7 +1474,7 @@ export default {
            }
           for(let i=0;i<list.length;i++){
             list[i].unit = list[i].specification_name + list[i].packing_unit
-            list[i].total_price = (list[i].total_count * list[i].price).toFixed(2)
+            list[i].total_price = (list[i].warehousing_count * list[i].price).toFixed(2)
             list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{m}-{d}")
             list[i].product_date = this.getTime(list[i].product_date,"{y}-{m}-{d}")
             for(let j=0;j<this.manufacturer.length;j++){
@@ -1482,14 +1482,15 @@ export default {
                   list[i].manufacturer = this.manufacturer[j].manufacturer_name
                }
             }
-
+           console.log("经销⬆商",this.dealer)
            for(let z=0;z<this.dealer.length;z++){
-               if(list[i].dealer = this.dealer[z].id){
+               if(list[i].dealer == this.dealer[z].id){
                  list[i].dealer = this.dealer[z].dealer_name
                }
             }
           }
           console.log("表格2222222",this.exportList)
+          
           this.exportList = list
         }
       })
@@ -1501,8 +1502,8 @@ export default {
       }
       import('@/vendor/Export2Excel').then(excel => {
 
-      const tHeader = ['耗材名称','注册证号/批准文号/备案凭证号', '规格型号','生产厂家','单位','进货价','入库数量','总价','批号','生产日期','有效日期']
-      const filterVal = ['good_name', 'license_number', 'unit','manufacturer','packing_unit','price','warehousing_count','total_price','number','product_date','expiry_date']
+      const tHeader = ['耗材名称','注册证号/批准文号/备案凭证号', '规格型号','生产厂家','单位','进货价','入库数量','总价','批号','生产日期','有效日期','经销商']
+      const filterVal = ['good_name', 'license_number', 'unit','manufacturer','packing_unit','price','warehousing_count','total_price','number','product_date','expiry_date','dealer']
 
       console.log("table",this.exportList)
       

src/xt_pages/stock/stockInOrderAdd.vue

@@ -42,7 +42,7 @@
                     popper-class="my-autocomplete"
                     v-model="scope.row.good_name"
                     :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
+                    :trigger-on-focus="true"
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
@@ -167,7 +167,7 @@
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
-                <el-input placeholder="请输入批号" v-model="scope.row.license_number"></el-input>
+                <el-input placeholder="请输入批号" v-model="scope.row.license_number" ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -732,10 +732,10 @@
         })
       },
       changeGoodName(val){
+        console.log("val",val)
         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("val",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id

src/xt_pages/stock/stockInOrderEdit.vue

@@ -109,7 +109,7 @@
                     popper-class="my-autocomplete"
                     v-model="scope.row.good_name"
                     :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
+                    :trigger-on-focus="true"
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
@@ -273,6 +273,7 @@
                 <el-input
                   placeholder="请输入批号"
                   v-model="scope.row.license_number"
+                  
                 ></el-input>
               </el-form-item>
             </template>

src/xt_pages/stock/stockOutOrder.vue

@@ -194,11 +194,11 @@
               {{ scope.row.specification_name}} / {{scope.row.packing_unit}}
             </template>
           </el-table-column>
-          <el-table-column label="批号" align="center">
+          <!-- <el-table-column label="批号" align="center">
             <template slot-scope="scope">
               {{ scope.row.number}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}{{scope.row.packing_unit}}</span> 
@@ -212,7 +212,8 @@
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              {{ (scope.row.count * scope.row.price).toFixed(2)}}
+             <span v-if="scope.row.is_sys == 0">{{ (scope.row.count * scope.row.price).toFixed(2)}}</span> 
+             <span v-if="scope.row.is_sys == 1">{{(getOutStockCount(scope.row.good_id)*scope.row.price).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -235,11 +236,11 @@
               {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
             </template>
           </el-table-column>
-          <el-table-column label="批准文号" align="center">
+          <!-- <el-table-column label="批准文号" align="center">
             <template slot-scope="scope">
               {{ scope.row.license_number}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
               {{ scope.row.remark }}
@@ -247,7 +248,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="GetOrderDetailById(scope.row)">使用明细</span>
+              <span style="color: #589ff8" @click="GetOrderDetailById(scope.row)">使用明细</span>
             </template>
           </el-table-column>
         </el-table>
@@ -384,7 +385,7 @@
       </div>
      
        <el-row :gutter="12" style="margin-top: 10px">
-        <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 80%"
+        <el-table :data="infoList" :class="signAndWeighBoxPatients" style="width: 80%"
                   border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
           <el-table-column min-width="35" align="center">
@@ -392,8 +393,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>
 
@@ -402,8 +402,7 @@
               <span>使用人</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
-              <span v-if="scope.row.is_total == 1"></span>
+              系统
             </template>
           </el-table-column>
           <el-table-column min-width="35" align="center">
@@ -411,9 +410,15 @@
               <span>使用数量</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.count}}{{scope.row.info.packing_unit}}</span>
-              <span  v-if="scope.row.is_total == 1">{{scope.row.total}}{{scope.row.info.packing_unit}} </span>
-
+             {{scope.row.count}}
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>批次号</span>
+            </template>
+            <template slot-scope="scope">
+               {{scope.row.number}}
             </template>
           </el-table-column>
           <el-table-column min-width="35" align="center">
@@ -422,7 +427,6 @@
             </template>
             <template slot-scope="scope">
               <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
-
             </template>
           </el-table-column>
 
@@ -430,8 +434,8 @@
       </el-row>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="editdialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      <el-button @click="editdialogVisibleTwo = false">取 消</el-button>
+      <el-button type="primary" @click="editdialogVisibleTwo = false">确 定</el-button>
     </span>
   </el-dialog>
   
@@ -574,7 +578,7 @@
     <el-dialog
       title="出库明细"
       :visible.sync="editdialogVisibleThree"
-      width="60%">
+      width="70%">
       <span>
          <div class="app-container">
 
@@ -582,11 +586,6 @@
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
       </div>
 
-       <!-- <div class="cell clearfix">
-        <span style="width: 300px;color: #606266">商品类型: {{userList[0].type.type_name}} </span>
-        <span style="width: 300px;color: #606266">规格名称: {{userList[0].info.specification_name}}</span>
-      </div> -->
-
       <el-row :gutter="12" style="margin-top: 10px">
       <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
               border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
@@ -619,7 +618,7 @@
 
             </template>
           </el-table-column>
-          <el-table-column min-width="35" align="center">
+          <el-table-column min-width="60" align="center">
             <template slot="header" slot-scope="scope">
               <span>使用时间</span>
             </template>
@@ -628,7 +627,23 @@
 
             </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">{{getNumber(scope.row.id)}}</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>
@@ -788,7 +803,9 @@ export default {
       editdialogVisibleThree:false,
       order_id:"",
       warehouse_out_time:"",
-      exportList:[]
+      exportList:[],
+      is_sys:0,
+      infoList:[]
     };
   },
   methods: {
@@ -933,8 +950,8 @@ export default {
           this.dealer = response.data.data.dealer;
           this.goodInfo = response.data.data.goodInfo
           this.goodType = response.data.data.goodType
-          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           this.getlist()
         }
       });
@@ -1004,6 +1021,7 @@ export default {
       }
     },
     select(selection) {
+      
       var ids = []
       for(let i=0;i<selection.length;i++){
         ids.push(selection[i].id)
@@ -1017,19 +1035,22 @@ export default {
 
     },
     batchDelete() {
+    
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
         return;
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+         if(this.selectedTableData[i].is_sys == 0){
+           ids.push(this.selectedTableData[i].id);
+         }
       }
       const idStr = ids.join(",");
       const params = {
         ids: idStr
       };
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+      this.$confirm("确认删除出库单记录?", "删除出库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -1060,10 +1081,6 @@ export default {
         .catch(() => {});
     },
 
- 
-
-    
-  
 
     handleSearch(val){
       this.tableList = []
@@ -1083,6 +1100,12 @@ export default {
               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])
               }
             }
@@ -1479,8 +1502,10 @@ export default {
       }, 
      
       GetOrderDetailById(val){
+        console.log("val",val)
          this.userList =[]
          var params = {
+           id:val.warehouse_out_id,
            good_id:val.good_id,
            record_time:val.sys_record_time,
           }
@@ -1489,6 +1514,9 @@ export default {
               var total = 0
               var list = response.data.data.list
               var arrList =  this.unique(list)
+              var info = response.data.data.info
+              this.infoList = info
+              console.log("info列表22222222",info)
               for (let i = 0; i < arrList.length; i++) {
                 var obj = arrList[i]
                 obj['is_total'] = 0
@@ -1499,18 +1527,40 @@ export default {
                 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
+              if(val.is_sys == 1){
+                this.editdialogVisibleThree = true
+              }
+              if(val.is_sys == 0){
+                this.editdialogVisibleTwo = true
+              }  
             }
          })
       },
+      getNumber(id){
+        var str = ""
+        var arr = []
+        var ids = []
+        for(let i=0;i<this.userList.length;i++){
+          if(id == this.userList[i].id){
+            arr.push(...this.userList[i].warehouseOutInfo)
+          }
+        }
+        console.log("arr",arr)
+        if(arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+              ids.push(arr[i].number)
+          }
+        }
+        str = ids.join(",")
+        return str
+      },
       toPrint(){
         if(this.order_id == ""){
           this.$message.error("请选择出库单")
         }else{
-            this.$router.push({path:"/stock/out/detail/print?id="+this.order_id+"&warehouse_out_time="+this.warehouse_out_time})
+            this.$router.push({path:"/stock/out/detail/print?id="+this.order_id+"&warehouse_out_time="+this.warehouse_out_time+"&keyword="+this.searchKey+"&start_time="+this.start_time+"&end_time="+this.end_time})
         }
       },
       getlist(){

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -52,46 +52,7 @@
         ></el-date-picker>
       </div>
 
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select
-          size="small"
-          v-model="form.dealer"
-          filterable
-          placeholder="请选择经销商"
-          @change="changeDealer"
-          style="width: 200px;"
-        >
-          <el-option
-            v-for="(option, index) in dealer"
-            :key="index"
-            :label="option.dealer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div> -->
-
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
-        <el-select
-          size="small"
-          v-model="form.manufacturer"
-          filterable
-          placeholder="请选择厂商"
-          @change="changeManufacturer"
-          style="width: 200px;"
-        >
-          <el-option
-            v-for="(option, index) in manufacturer"
-            :key="index"
-            :label="option.manufacturer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div> -->
-
+    
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
           :data="recordInfo.recordData"
@@ -113,7 +74,7 @@
                     popper-class="my-autocomplete"
                     v-model="scope.row.good_name"
                     :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
+                    :trigger-on-focus="true"
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
@@ -162,15 +123,15 @@
               <span>批号<span style="color: red"></span></span>
             </template>
             <template slot-scope="scope">
-               <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
-                <!-- <el-select v-model="scope.row.number" filterable placeholder="请选择">
+               <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input> -->
+                <el-select v-model="scope.row.number" filterable placeholder="请选择">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
                     :value="item.number">
                   </el-option>
-                </el-select> -->
+                </el-select>
             </template>
           </el-table-column>
 
@@ -263,10 +224,10 @@
          
           <el-table-column  width="150" 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 placeholder="请输入批准文号" v-model="scope.row.license_number"></el-input>
+              <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
           </template>
         </el-table-column>
 
@@ -332,11 +293,11 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getSalesReturnConfig, postWarehouseOut,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from "@/api/stock";
+import { getSalesReturnConfig, postWarehouseOut,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
 
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
-
+import { getDataConfig } from '@/utils/data'
 export default {
   components: { StockInDialog,  BreadCrumb },
   name: "salesReturnOrderAdd",
@@ -690,7 +651,6 @@ export default {
       console.log("keyrowrd",key)
       postSearchGoodList(key).then(response => {
         if (response.data.state == 1) {
-          
             var list = response.data.data.list
             console.log("33334445555",list)
             this.goodList = list
@@ -723,6 +683,9 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
+       console.log("val2222222222",val)
+        //获取当前耗材的批号
+        this.getStockBatchNumber(val.id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].good_type_id = val.id
@@ -744,19 +707,29 @@ export default {
             }else{
              this.recordInfo.recordData[i].dealer = val.dealer
             }
-           
          }
+
+       
       }
 
-       if(val.xt_warehouse_info.length > 0){
-           var obj = {id:"",name:""}
-          for(let j=0;j<val.xt_warehouse_info.length;j++){
-            this.numberList.push(val.xt_warehouse_info[j])
-          }
-          
+       
+    },
+
+    getStockBatchNumber(id){
+       var params = {
+         id:id
+       }
+      getStockBatchNumber(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("list2243444",list)
+          this.numberList = list
         }
-        console.log("9999999",this.numberList)
-    }
+     })
+    },
+    getDataConfig(module, filed_name) {
+      return getDataConfig(module, filed_name)
+    },
   },
   created() {
     var nowDate = new Date();
@@ -784,6 +757,8 @@ export default {
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
+    this.unitList =  getDataConfig('hemodialysis','units')
+    console.log("单位",this.unitList)
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -82,7 +82,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList,getOrderDetailByOrderId } from "@/api/stock";
+import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList,getOrderDetailByOrderId,getStockDrugCount } from "@/api/stock";
 import print from 'print-js'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
@@ -125,7 +125,11 @@ export default {
             orgName:'',
             orderInList:[],
             tableList:[],
-            orderList:[]
+            orderList:[],
+            countList:[],
+            outCountList:[],
+            autoCountList:[],
+            cancelCountList:[]
         }
     },
     methods:{
@@ -337,8 +341,60 @@ export default {
           }
         }
         return total_price
+      },
+
+     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",autoCount)
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           console.log("totalcount",totalCount)
+           this.cancelCountList = totalCount
+         }
+      })
+    },
+     stockInCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_warehousing_info.length; i++) {
+        total = total + row.query_warehousing_info[i].warehousing_count;
+      }
+      return total;
+    },
+    salesReturnCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_sales_return_info.length; i++) {
+        total = total + row.query_sales_return_info[i].count;
       }
+      return total;
+    },
+    stockOutCount: function(row) {
 
+      let total = 0;
+      for (let i = 0; i < row.query_warehouseout_info.length; i++) {
+        total = total + row.query_warehouseout_info[i].count;
+      }
+      return total;
+    },
+    cancelStockCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_cancel_stock_info.length; i++) {
+        total = total + row.query_cancel_stock_info[i].count;
+      }
+      return total;
+    },
     },
     created(){
       this.orgName = this.$store.getters.xt_user.org.org_name;
@@ -346,9 +402,10 @@ export default {
       const order_id = this.$route.query.id;
       const warehouse_out_time = this.$route.query.warehouse_out_time;
       this.GetConfigInfo();
-      this.GetTotalCount(warehouse_out_time);
+      // this.GetTotalCount(warehouse_out_time);
       this.GetOrderDetailOne(order_id)
       this.getList()
+      this.getStockDrugCount()
     }
 }
 </script>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -54,7 +54,7 @@
                       popper-class="my-autocomplete"
                       v-model="scope.row.good_name"
                       :fetch-suggestions="querySearchAsync"
-                      :trigger-on-focus="false"
+                      :trigger-on-focus="true"
                       placeholder="请输入耗材名称"
                       @select="handleSelect"
                       @input="changeGoodName(scope.$index)"
@@ -104,15 +104,15 @@
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
-                <el-input placeholder="请输入批号" v-model="scope.row.number"  :disabled="stockShow"></el-input>
-               <!-- <el-select v-model="scope.row.number" filterable placeholder="请选择">
+                <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"  :disabled="stockShow"></el-input> -->
+               <el-select v-model="scope.row.number" filterable placeholder="请选择" :disabled="stockTrue">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
                     :value="item.number">
                   </el-option>
-                </el-select> -->
+                </el-select>
               </el-form-item>
             </template>
           </el-table-column>
@@ -196,7 +196,7 @@
             <span>批准文号<span style="color: red"></span></span>
           </template>
           <template slot-scope="scope">
-              <el-input placeholder="请输入批准文号" v-model="scope.row.license_number"></el-input>
+              <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
           </template>
         </el-table-column>
 
@@ -252,7 +252,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail,getStockBatchNumber } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -320,7 +320,8 @@
         goodType: [],
         goodInfo:[],
         numberList:[],
-        stockShow:false
+        stockShow:false,
+        stockTrue:true,
       }
     },
     methods: {
@@ -400,6 +401,7 @@
         return name;
       }, 
       handleEdit: function(index, row) {
+        this.stockTrue = false
         if(this.stockShow == true){
          this.$message.error("自动出库数据无法编辑")
          return
@@ -624,6 +626,7 @@
     },
     handleSelect(val){
        console.log("val22222",val)
+        this.getStockBatchNumber(val.id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].good_type_id = val.id
@@ -649,14 +652,6 @@
            
          }
       }
-      // if(val.xt_warehouse_info.length > 0){
-      //     for(let j=0;j<val.xt_warehouse_info.length;j++){
-      //       this.numberList.push(val.xt_warehouse_info[j])
-      //     }
-      //    this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
-      // }else{
-      //   this.recordInfo.recordData[i].number = ""
-      // }
     },
      getSingleOutOrderDetail(order_id){
 
@@ -699,7 +694,19 @@
           loading.close();
         }
       })
-    }
+    },
+      getStockBatchNumber(id){
+        var params = {
+          id:id
+        }
+        getStockBatchNumber(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list2243444",list)
+            this.numberList = list
+          }
+      })
+      }
     },
     created() {
       var nowDate = new Date();
@@ -722,6 +729,7 @@
       if(is_sys == 1){
         this.stockShow = true
       }
+      
     }
 
   }

src/xt_pages/stock/stockQuery.vue

@@ -514,9 +514,9 @@ export default {
     },
     getStockDrugCount(){
         var params ={
-          keywords: this.keywords,
-          start_time:this.start_time,
-          end_time:this.end_time,
+          keywords: this.$route.query.keywords,
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time,
         }
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){