数据

src/api/drug/drug_stock.js

@@ -517,3 +517,51 @@ export function getDrugBatchNumber(params) {
     params: params
   })
 }
+
+export function exportDrugList(params) {
+  return request({
+    url: '/api/drug/exportdruglist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getExportOutOrderDrugList(params) {
+  return request({
+    url: '/api/drug/getexportoutorderdruglist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugFlow(params) {
+  return request({
+    url: '/api/drug/getdrugflow',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getCancelStockDetail(params) {
+  return request({
+    url: '/api/drug/getcancelstockdetail',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getCancelDrugOrderPrint(params) {
+  return request({
+    url: '/api/drug/getcanceldrugorderprint',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugCancelExportList(params) {
+  return request({
+    url: '/api/drug/drugcancelexportlist',
+    method: 'get',
+    params: params
+  })
+}

src/api/stock.js

@@ -697,3 +697,19 @@ export function getStockBatchNumber(params) {
     params: params
   })
 }
+
+export function getStockFlow(params) {
+  return request({
+    url: '/api/stock/getstockflow',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getCancelExportList(params) {
+  return request({
+    url: '/api/cancel/getcancelexportlist',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -156,7 +156,7 @@ export default {
     drugsQuery: '库存查询',
     drugsReportLoss: '药品报损',
     drugsAdjustPrice: '药品调价',
-    // drugsStockCancel: '退库单',
+    drugsStockCancel: '退库单',
     // drugsStockReturn:'退货单',
     drugsStockOut: '出库单',
     drugsStockIn: '入库单',
@@ -185,9 +185,9 @@ export default {
     stockOutDetail: '出库单详情',
     cancelStockDetail: '退库单详情',
     stockDetail: '明细查询',
-    stockModifyPrice:'耗材调价',
-    stockDamaged:'耗材报损',
-    stockWarning:'耗材预警',
+    stockModifyPrice: '耗材调价',
+    stockDamaged: '耗材报损',
+    stockWarning: '耗材预警',
 
     showconfig: '显示配置',
     user_detail: '使用明细',

src/router/modules/drugs.js

@@ -36,12 +36,12 @@ export default {
     //   name: 'drugsStockReturn',
     //   meta: { title: 'drugsStockReturn', noCache: true }
     // },
-    // {
-    //   path: '/stock/drugs/stock/cancel',
-    //   component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
-    //   name: 'drugsStockCancel',
-    //   meta: { title: 'drugsStockCancel', noCache: true }
-    // },
+    {
+      path: '/stock/drugs/stock/cancel',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
+      name: 'drugsStockCancel',
+      meta: { title: 'drugsStockCancel', noCache: true }
+    },
     {
       path: '/stock/drugs/stock/detail',
       component: () => import('@/xt_pages/stock/drugs/drugIndex'),
@@ -130,6 +130,14 @@ export default {
       is_menu: false,
       meta: { title: 'cancelDrugStockDetail', noCache: true }
     },
+    {
+      path: '/drugstock/cancel/edit',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderEdit'),
+      name: 'cancelDrugStockOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockOrderEdit', noCache: true }
+    },
     {
       path: '/drugstock/user/detail',
       component: () => import('@/xt_pages/stock/drugs/drugStockUserDetail'),
@@ -208,6 +216,15 @@ export default {
       is_menu: false,
       meta: { title: 'drugStockOutOrderEdit' }
 
+    },
+    {
+      path: '/drug/cancel/print',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugOrderPrint'),
+      name: 'cancelDrugOrderPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugOrderPrint' }
+
     }
 
   ]

src/router/modules/stock.js

@@ -68,7 +68,7 @@ export default {
       name: 'stockWarning',
       meta: { title: 'stockWarning', noCache: true }
     },
-    
+
     // {
     //   path: "/stock/",
     //   component: Layout,
@@ -234,7 +234,7 @@ export default {
       is_menu: false,
       name: 'stock_print',
       meta: {
-        title: '库存打印',
+        title: '退库打印',
         noCache: true
       }
     },
@@ -305,6 +305,18 @@ export default {
         title: '耗材退库打印',
         noCache: true
       }
+    },
+
+    {
+      path: '/stock/drugs/cancelstockorderprint',
+      component: () => import('@/xt_pages/stock/cancelStockOrderPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '退库打印',
+        noCache: true
+      }
     }
   ]
 }

src/xt_pages/stock/cancelStockOrder.vue

@@ -71,7 +71,8 @@
           >全选</el-checkbox
         >
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
-        <!-- <el-button size="small" type="primary" @click="toPrint">打印</el-button> -->
+        <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+        <el-button size="small" type="primary" @click="toExport">导出</el-button>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -189,6 +190,55 @@
               {{ scope.row.count}}{{scope.row.GoodInfo.packing_unit}}
             </template>
           </el-table-column>
+        
+          <el-table-column label="退库单价" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.price}}
+            </template>
+          </el-table-column>
+
+         <el-table-column label="批次" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.number}}
+            </template>
+          </el-table-column>
+
+         <el-table-column label="品名/注册证号(备案凭证号)" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.register_account}}
+            </template>
+          </el-table-column>
+
+         <el-table-column label="生产厂家" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.manufacturer}}
+            </template>
+          </el-table-column>
+
+         <el-table-column label="生产日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.product_date,"{y}-{h}-{d}")}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="有效期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.expiry_date,"{y}-{h}-{d}")}}
+            </template>
+          </el-table-column>
+
+         <el-table-column label="经销商" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.dealer}}
+            </template>
+          </el-table-column>
+
+         <el-table-column label="退库原因" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.remark}}
+            </template>
+          </el-table-column>
+
         </el-table>
       </div>
     </div>
@@ -203,7 +253,7 @@ import {
   GetAllConfig,
   getCancelStockList,
   getSingCancelOrder,
-  getCancelStockOrderPrint
+  getCancelExportList
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 
@@ -264,6 +314,7 @@ export default {
       tableList:[],
       showTable:false,
       order_id:"",
+      exportList:[]
     };
   },
   methods: {
@@ -457,21 +508,22 @@ export default {
         })
         .catch(() => {});
     },
-    changeAllSelected: function(val) {
-      var ids = []
-      for(let i=0;i<val.length;i++){
-         ids.push(val[i].id)
-      }
-      this.order_id = ids.join(",")
-
+    changeAllSelected(val) {
+     
       if (val) {
         this.$refs.multipleTable.toggleAllSelection();
       } else {
         this.$refs.multipleTable.clearSelection();
       }
     },
-    select(selection) {
-      this.selectedTableData = selection;
+    select(val) {
+      var ids = []
+      for(let i=0;i<val.length;i++){
+         ids.push(val[i].id)
+      }
+      this.order_id = ids.join(",")
+      this.selectedTableData = val;
+      this.getCancelExportList()
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -534,20 +586,73 @@ export default {
       if(this.order_id == ""){
         this.$message.error("请勾选退库单")
       }else{
-        this.getCancelStockOrderPrint()
+        console.log("232332332")
+        this.$router.push({path:'/stock/drugs/cancelstockorderprint?order_id='+this.order_id+"&start_time="+this.start_time+"&end_time="+this.end_time})
+      }
+    },
+    getTime(val) {
+      if(val < 0){
+        return ""
       }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
+    getCancelExportList(){
+       const Params = {
+        start_time: this.start_time,
+        end_time: this.end_time,
+        order_id:this.order_id,
+      };
+      console.log("params2323232",Params)
+     getCancelExportList(Params).then(response=>{
+        if(response.data.state == 1){
+          var list =  response.data.data.list
+          console.log("list2323232",list)
+          this.exportList = list
+        }
+     })
     },
-    getCancelStockOrderPrint(){
-       var params = {
-         id:this.order_id
-       }
-      getCancelStockOrderPrint(params).then(response=>{
-         if(response.data.state ==1){
-           var list =  response.data.data.list
-           console.log("list222",list)
-         }
+   
+    toExport(){
+      if(this.order_id == ""){
+        this.$message.error("请勾选退库单")
+        return
+      }
+     import('@/vendor/Export2Excel').then(excel => {
+      console.log("23232323",this.exportList)
+      for(let i=0;i<this.exportList.length;i++){
+        this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
+        this.exportList[i].good_name = this.exportList[i].GoodInfo.good_name
+        this.exportList[i].unit = this.exportList[i].GoodInfo.specification_name + "/" +this.exportList[i].packing_unit
+        if(this.exportList[i].dealer == 0){
+          this.exportList[i].dealer = ""
+        }
+        if(this.exportList[i].manufacturer == 0){
+          this.exportList[i].manufacturer = ""
+        }
+      
+        this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
+        this.exportList[i].expiry_date = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
+      }
+      const tHeader = ['耗材名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
+      const filterVal = ['good_name', 'unit','count','price','number','register_account','manufacturer','product_date','expiry_date','remark']
+      console.log("table",this.exportList)
+      
+      const data = this.formatJson(filterVal, this.exportList)
+      excel.export_json_to_excel({
+        header: tHeader,
+        data,
+        filename: '耗材退库单详情'
       })
-    }
+      this.downloadLoading = false
+     })
+    },
+    formatJson(filterVal, jsonData) {
+    return jsonData.map(v => filterVal.map(j => v[j]));
+   },
   }
 };
 </script>

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -62,7 +62,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
        
-          <el-table-column align="center" width="250">
+          <el-table-column align="center" width="230">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -72,7 +72,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)"
@@ -85,7 +85,7 @@
                  </el-autocomplete>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="300">
+          <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>
             </template>
@@ -98,7 +98,7 @@
             </template>
           </el-table-column>
         
-          <el-table-column width="300" align="center">
+          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>退库数量<span style="color: red">*</span></span>
             </template>
@@ -112,12 +112,136 @@
                   placeholder="请输入退库数量"
                   type="number"
                   v-model="scope.row.return_count"
-                ></el-input>
-                {{scope.row.packing_unit}}
+                ></el-input>      
               </el-form-item>
+              <!-- {{scope.row.packing_unit}} -->
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入退库数量"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>      
+              </el-form-item>
+              <!-- {{scope.row.packing_unit}} -->
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.return_count) }}
+            </template>
+          </el-table-column>
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>批次<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.return_count'"
+                style="padding-top: 17px"
+              >
+               <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-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>品名/注册证号(备案凭证号)<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.return_count'"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.register_account"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+           <el-table-column label="生产厂家" width="160" align="center">
+            <template slot-scope="scope">
+               <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.manufacturer_name">
+                </el-option>
+               </el-select>
+            </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.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 label="经销商" width="160" align="center">
+            <template slot-scope="scope">
+                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.dealer_name">
+                </el-option>
+                </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退库原因<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.remark'"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.remark"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="200" fixed="right">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
@@ -157,7 +281,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getCancelStockConfig, postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from "@/api/stock";
+import { getCancelStockConfig, postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
 
@@ -214,6 +338,7 @@ export default {
       dealer: [],
       goodType: [],
       goodInfo:[],
+      numberList:[]
     };
   },
   methods: {
@@ -233,6 +358,7 @@ export default {
             tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
             tempForm['good_id'] = val.selectedGoodInfo[i].id
             tempForm["return_count"] = "";
+
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
@@ -297,6 +423,13 @@ export default {
       tempObj["good_type_id"] = 0;
       tempObj["good_id"] = 0;
       tempObj["return_count"] = "";
+      tempObj["number"] = ""
+      tempObj["dealer"] = ""
+      tempObj["manufacturer"]= ""
+      tempObj["register_account"] = ""
+      tempObj["remark"] = ""
+      tempObj["price"] = ""
+      tempObj["total"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -393,14 +526,7 @@ export default {
           const array = this.recordInfo.recordData;
           let total = 0;
           for (let i = 0; i < array.length; i++) {
-            if (array[i].good_type_id == 0) {
-              this.$message.error("商品类型不能为空");
-              return;
-            }
-            if (array[i].good_id == 0) {
-              this.$message.error("规格名称不能为空");
-              return;
-            }
+            array[i].price = (array[i].price).toString()
             total = total + array[i].price * array[i].return_count;
           }
 
@@ -413,7 +539,7 @@ export default {
             cancelStock: this.recordInfo.recordData
           };
           console.log("params",params)
-         
+ 
           postCancelStock(
             params,
             this.return_time,
@@ -497,6 +623,8 @@ export default {
       this.currentIndex = val
     },
     handleSelect(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
@@ -523,7 +651,19 @@ export default {
           
         }
       }
-    }
+    },
+    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();
@@ -541,6 +681,13 @@ export default {
     tempObj["good_type_id"] = 0;
     tempObj["good_id"] = 0;
     tempObj["return_count"] = "";
+    tempObj["number"] = ""
+    tempObj["dealer"] = ""
+    tempObj["manufacturer"]= ""
+    tempObj["register_account"] = ""
+    tempObj["remark"] = ""
+    tempObj["price"] = ""
+    tempObj["total"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -28,7 +28,7 @@
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
              max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
 
-          <el-table-column align="center" width="300">
+          <el-table-column align="center" width="230">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -38,7 +38,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)"
@@ -53,7 +53,7 @@
           </el-table-column>
 
 
-         <el-table-column align="center" width="300">
+         <el-table-column align="center" width="200">
             
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>
@@ -68,7 +68,7 @@
         </el-table-column>
 
 
-          <el-table-column width="300" align="center">
+          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>退库数量<span style="color: red">*</span></span>
             </template>
@@ -76,14 +76,135 @@
               <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>
-                {{scope.row.packing_unit}}
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退库单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入退库数量"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>      
+              </el-form-item>
+              <!-- {{scope.row.packing_unit}} -->
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.count) }}
+            </template>
+          </el-table-column>
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>批次<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.return_count'"
+                style="padding-top: 17px"
+              >
+               <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-form-item>
+            </template>
+          </el-table-column>
+           <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>品名/注册证号(备案凭证号)<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.return_count'"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.register_account"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+           <el-table-column label="生产厂家" width="160" align="center">
+            <template slot-scope="scope">
+               <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.manufacturer_name">
+                </el-option>
+               </el-select>
+            </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.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 label="操作" align="center" min-width="20">
+        <el-table-column label="经销商" width="160" align="center">
+            <template slot-scope="scope">
+                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.dealer_name">
+                </el-option>
+                </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退库原因<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.remark'"
+                :rules="tableRules.return_count"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.remark"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" width="200" fixed="right">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -119,7 +240,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList  } from '@/api/stock'
+  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList,getStockBatchNumber  } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -190,6 +311,7 @@
         goodList:[],
         manufacturerList:[],
         dealerList:[],
+        numberList:[]
       }
     },
     methods: {
@@ -267,6 +389,12 @@
         tempObj['good_type_id'] = 0
         tempObj['good_id'] = 0
         tempObj['count'] = ''
+        tempObj["number"] = ""
+        tempObj["dealer"] = ""
+        tempObj["manufacturer"]= ""
+        tempObj["register_account"] = ""
+        tempObj["remark"] = ""
+        tempObj["price"] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -364,7 +492,8 @@
 
       back() {
         this.$router.go(-1)
-      }, submit() {
+      },
+      submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
@@ -377,11 +506,13 @@
                 this.$message.error('规格名称不能为空')
                 return
               }
+              array[i].price = array[i].price.toString()
             }
 
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
+            console.log("parasm23232",params)
             editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -406,18 +537,22 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-           
+            console.log("猎豹323c",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].good_name = response.data.data.list[i].GoodInfo.good_name
               response.data.data.list[i].name = response.data.data.list[i].GoodInfo.specification_name + "/" + response.data.data.list[i].GoodInfo.packing_unit
               response.data.data.list[i].packing_unit = response.data.data.list[i].GoodInfo.packing_unit
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{m}-{d}")
+              response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{m}-{d}")
+              response.data.data.list[i].return_count = response.data.data.list[i].count
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
             this.return_time = this.getTime(this.cancelStock.return_time, '{y}-{m}-{d}')
             this.form.manufacturer = this.cancelStock.manufacturer
             this.form.dealer = this.cancelStock.dealer
+          
           }
           if (this.recordInfo.recordData.length == 0) {
             const tempObj = {}
@@ -427,6 +562,11 @@
             tempObj['count'] = ''
             this.recordInfo.recordData.push(tempObj)
           }
+          this.manufacturerList = []
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = []
+          this.dealerList = response.data.data.dealerList
+
         })
       },changeManufacturer(val) {
         this.propForm.manufacturer = val
@@ -476,6 +616,8 @@
       },
       handleSelect(val){
         console.log("val",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
@@ -502,7 +644,25 @@
              
            }
          }
+      },
+     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
+        }
+      })
+     },
+     calculate: function(val) {
+      if (val == 0) {
+        return "";
       }
+      return Math.round(parseFloat(val) * 100) / 100;
+     },
     },
     created() {
       this.GetConfigInfo()

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <!--<bread-crumb :crumbs="crumbs"></bread-crumb>-->
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <el-button
         size="small"
@@ -71,9 +70,9 @@
           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
-          >删除</el-button
-        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+        <el-button size="small"  type="primary" @click="toPrint">打印</el-button>
+        <el-button size="small"  type="primary" @click="toExport">导出</el-button>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -83,6 +82,7 @@
           border
           highlight-current-row
           ref="multipleTable"
+          @current-change="handleCurrentChangeOne"
           @selection-change="select"
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
@@ -110,18 +110,6 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="厂家" align="center">
-            <template slot-scope="scope">
-              {{ getManufactuerName(scope.row.manufacturer) }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="经销商" align="center">
-            <template slot-scope="scope">
-              {{ getDealerName(scope.row.dealer) }}
-            </template>
-          </el-table-column>
-
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-tooltip
@@ -169,6 +157,98 @@
         </el-pagination>
       </el-row>
     </div>
+
+    <div v-show ="showTable" style="margin-top:10px">
+       <el-table
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTableOne"
+          @current-change="handleCurrentChangeOne"
+          @selection-change="select"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+        >
+
+          <el-table-column label="药品名称" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.BaseDrugLib.drug_name}}
+            </template>
+          </el-table-column>
+          
+         <el-table-column label="规格&单位" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
+            </template>
+          </el-table-column>
+         
+          <el-table-column label="退库数量" align="center">
+            <template slot-scope="scope">
+               {{ scope.row.count}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="退库单位" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.max_unit}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="退库单价" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.price}}
+            </template> 
+          </el-table-column>
+
+           <el-table-column label="批次" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.batch_number}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="品名/注册证号(备案凭证号)" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.register_account}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产厂家" align="center">
+            <template slot-scope="scope">
+              {{scope.row.manufacturer}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产日期" align="center">
+            <template slot-scope="scope">
+               {{scope.row.product_date}}
+            </template>
+          </el-table-column>
+
+         <el-table-column label="有效日期" align="center">
+            <template slot-scope="scope">
+              {{scope.row.expiry_date}}
+            </template>
+          </el-table-column>
+         
+          <el-table-column label="经销商" align="center">
+            <template slot-scope="scope">
+              {{scope.row.dealer}}
+            </template>
+          </el-table-column>
+         
+          <el-table-column label="退库原因" align="center">
+            <template slot-scope="scope">
+              {{scope.row.remark}}
+            </template>
+          </el-table-column>
+
+        
+        </el-table>
+    </div>
   </div>
 </template>
 
@@ -178,7 +258,9 @@ import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
   deleteDrugCancelStock,
   GetAllConfig,
-  getDrugCancelStockList
+  getDrugCancelStockList,
+  getCancelStockDetail,
+  getDrugCancelExportList
 } from "@/api/drug/drug_stock";
 import BreadCrumb from '../../components/bread-crumb'
 // import BreadCrumb from "../components/bread-crumb";
@@ -208,20 +290,6 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
    
-    // var date1 = new Date();
-    // var date2 = new Date(date1);
-
-    // //-30为30天前，+30可以获得30天后的日期
-    // date2.setDate(date1.getDate() - 30);
-
-    // //30天前（月份判断是否小于10，小于10的前面+0）
-    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
-      
-    // //当前日期
-    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
-
-    //  this.start_time = agoDay
-    //  console.log("333333332222",this.start_time)
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -250,7 +318,11 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
+      tableList:[],
+      showTable:false,
+      order_id:"",
+      exportList:[]
     };
   },
   methods: {
@@ -403,10 +475,8 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      this.$router.push({
-        name: "cancelDrugStockDetail",
-        query: { id: row.id, type: this.type }
-      });
+    
+      this.$router.push({path:"/drugstock/cancel/edit?id="+row.id+"&type="+this.type})
     },
     handleDelete: function(index, row) {
       const ids = [];
@@ -454,7 +524,13 @@ export default {
       }
     },
     select(selection) {
+      var ids= []
+      for(let i=0;i<selection.length;i++){
+         ids.push(selection[i].id)
+      }
+      this.order_id =  ids.join(",")
       this.selectedTableData = selection;
+      this.getDrugCancelExportList()
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -498,7 +574,93 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+    handleCurrentChangeOne(val) {
+      this.getCancelStockDetail(val.id)
+    },
+    getCancelStockDetail(id){
+        var params = {
+          id:id
+        }
+      getCancelStockDetail(params).then(response=>{
+       if(response.data.state == 1){
+         var list =  response.data.data.list
+         for(let i=0;i<list.length;i++){
+           list[i].product_date = this.getTime(list[i].product_date,"{y}-{h}-{d}")
+           list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{h}-{d}")
+         }
+         this.tableList = list
+         console.log("list23232",list)
+         this.showTable = true
+       }
+      })
+    },
+   getTime(val) {
+      if(val < 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
+    toPrint(){
+      if(this.order_id == ""){
+        this.$message.error("请勾选退库单")
+        return
+      }
+     this.$router.push({path:"/drug/cancel/print?order_id="+this.order_id+"&start_time="+this.start_time+"&end_time="+this.end_time})
+    },
+    getDrugCancelExportList(){
+      const params = {
+        order_id:this.order_id
+      }
+     getDrugCancelExportList(params).then(response=>{
+        if(response.data.state == 1){
+         var list = response.data.data.list
+         console.log("导出数据222",list)
+         this.exportList = list
+        }
+     })
+    },
+    toExport(){
+      if(this.order_id == ""){
+        this.$message.error("请勾选退库单")
+        return
+      }
+     import('@/vendor/Export2Excel').then(excel => {
+      console.log("23232323",this.exportList)
+      for(let i=0;i<this.exportList.length;i++){
+        this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
+        this.exportList[i].drug_name = this.exportList[i].BaseDrugLib.drug_name
+        this.exportList[i].unit = this.exportList[i].BaseDrugLib.dose + this.exportList[i].BaseDrugLib.dose_unit + "*" + this.exportList[i].BaseDrugLib.min_number +this.exportList[i].BaseDrugLib.min_unit + "/" +this.exportList[i].BaseDrugLib.max_unit
+        if(this.exportList[i].dealer == 0){
+          this.exportList[i].dealer = ""
+        }
+        if(this.exportList[i].manufacturer == 0){
+          this.exportList[i].manufacturer = ""
+        }
+      
+        this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
+        this.exportList[i].expiry_date = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
+      }
+      const tHeader = ['药品名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
+      const filterVal = ['drug_name', 'unit','count','price','batch_number','register_account','manufacturer','product_date','expiry_date','remark']
+      console.log("table",this.exportList)
+    
+      const data = this.formatJson(filterVal, this.exportList)
+      excel.export_json_to_excel({
+        header: tHeader,
+        data,
+        filename: '药品退库单详情'
+      })
+      this.downloadLoading = false
+     })
+    },
+    formatJson(filterVal, jsonData) {
+    return jsonData.map(v => filterVal.map(j => v[j]));
+   },
   }
 };
 </script>

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -26,13 +26,6 @@
 
     <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"
@@ -61,7 +54,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"
@@ -78,9 +71,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"
@@ -97,7 +90,7 @@
             >
             </el-option>
           </el-select>
-        </div>
+        </div> -->
       </div>
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
@@ -109,47 +102,82 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column min-width="35" align="center">
+          <el-table-column align="center" width="200">
             <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">
-              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
-              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
-
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
+                  <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    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 + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>
+              </el-form-item>
+            </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: 20px">
                 <el-input
-                  placeholder="请输入药品名称"
-                  v-model="scope.row.drug_id"
-                  :value="typeName(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="35" align="center">
+
+          <el-table-column width="200" 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 style="padding-top: 15px">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.return_count'"
+                :rules="tableRules.return_count"
+                style="padding-top: 17px"
+              >
+              <div style="display:flex;">
                 <el-input
-                  placeholder="请输入规格名称"
-                  v-model="scope.row.drug_id"
-                  :value="specificationName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
+                  style="width:100px"
+                  placeholder="请输入退库数量"
+                  type="number"
+                  v-model="scope.row.return_count"
                 ></el-input>
+                 <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                    <el-option
+                      v-for="(option, index) in unitList"
+                      :key="index"
+                      :label="option.name"
+                      :value="option.name">
+                    </el-option>
+                  </el-select>
+                </div>
               </el-form-item>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" width="150">
+         <el-table-column align="center" width="150">
             <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"
@@ -164,45 +192,114 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.return_count) }}
+            </template>
+          </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column width="200" 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 + '.return_count'"
-                :rules="tableRules.return_count"
                 style="padding-top: 17px"
               >
-                <el-input
-                  placeholder="请输入退库数量"
-                  type="number"
-                  v-model="scope.row.return_count"
-                ></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>
 
-          <el-table-column label="进价总价" align="center" width="150">
+           <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>品名/注册证号(备案凭证号)<span style="color: red"></span></span>
+            </template>
             <template slot-scope="scope">
-              {{ calculate(scope.row.price * scope.row.return_count) }}
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.register_account'"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.register_account"></el-input>
+              </el-form-item>
             </template>
           </el-table-column>
+           <el-table-column label="生产厂家" width="160" align="center">
+            <template slot-scope="scope">
+               <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.manufacturer_name">
+                </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">
+              <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">
-              {{ scope.row.retail_price }}
+              <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 label="零价总价" align="center" width="150">
+
+        <el-table-column label="经销商" width="160" align="center">
             <template slot-scope="scope">
-              {{ calculate(scope.row.retail_price * scope.row.return_count) }}
+                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.dealer_name">
+                </el-option>
+                </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退库原因<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.remark'"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.remark"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="200" fixed="right">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
@@ -242,10 +339,11 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import {  postDrugCancelStock,GetAllConfig,GetAllDrugInfoByID } from "@/api/drug/drug_stock";
+import {  postDrugCancelStock,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from './drugsStockDialog/index'
-
+import {postSearchDrugList } from "@/api/data"
+import { getDataConfig } from "@/utils/data";
 export default {
   components: { DrugsStockDialog, BreadCrumb },
   name: "salesReturnOrderAdd",
@@ -299,6 +397,10 @@ export default {
       dealer: [],
       goodType: [],
       goodInfo:[],
+      dealerList:[],
+      manufacturerList:[],
+      numberList:[],
+      unitList:[]
     };
   },
   methods: {
@@ -389,7 +491,13 @@ export default {
       tempObj["return_count"] = "";
       tempObj["price"] = "";
       tempObj["retail_price"] = "";
-
+      tempObj["register_account"] = ""
+      tempObj["dealer"] = ""
+      tempObj["manufacturer"] =""
+      tempObj["remark"] = ""
+      tempObj["product_date"] = ""
+      tempObj["expiry_date"] = ""
+      tempObj["batch_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -522,7 +630,88 @@ export default {
     },
     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
+             var dealerList = response.data.data.dealerList
+             this.dealerList = 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){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+               
+
+                for(let z=0;z<dealerList.length;z++){
+                  if(this.drugList[i].dealer == this.dealerList[z].id){
+                      this.drugList[i].dealer = this.dealerList[z].dealer_name
+                  }
+               
+                }
+             }
+             cb(this.drugList)
+          } else {
+            cb([])
+          }
+        })
+      },
+      changeDrugName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+         this.getDrugBatchNumber(val.id)
+         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].number =  val.number
+             this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
+             if(val.dealer == 0){
+               this.recordInfo.recordData[i].dealer = ""
+             }else{
+               this.recordInfo.recordData[i].dealer = val.dealer
+             }
+            
+           }
+        }
+        console.log("333333",this.recordInfo.recordData)
+      },
+      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
+           }
+        })
+      },
+      getDataConfig(module, filed_name){
+       return getDataConfig(module, filed_name)
+      },
   },
   created() {
     var nowDate = new Date();
@@ -537,13 +726,19 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
     const tempObj = {};
-    tempObj["good_type_id"] = 0;
-    tempObj["good_id"] = 0;
+    tempObj["drug_id"] = 0;
     tempObj["return_count"] = "";
     tempObj["price"] = "";
     tempObj["retail_price"] = "";
-
-
+    tempObj["register_account"] = ""
+    tempObj["dealer"] = ""
+    tempObj["manufacturer"] =""
+    tempObj["remark"] = ""
+    tempObj["product_date"] = ""
+    tempObj["expiry_date"] = ""
+    tempObj["batch_number"] = ""
+    this.unitList =  getDataConfig('hemodialysis','units')
+    console.log("单位",this.unitList)
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -9,12 +9,7 @@
       </div>
     </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"
         :visibility="isVisibility"
@@ -30,76 +25,85 @@
                         value-format="yyyy-MM-dd"></el-date-picker>
       </div>
 
-      <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
-            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" clearable  placeholder="请选择厂商" @change="changeManufacturer">
-          <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" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
-
-
-          <el-table-column min-width="35" align="center">
-
+             <el-table-column align="center" width="200">
             <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 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-form-item style="padding-top: 20px">
+                  <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    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 + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column min-width="35" align="center">
+          <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-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入药品规格名称" v-model="scope.row.drug_id"
-                          :value="specificationName(scope.row.drug_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              <el-form-item style="padding-top: 20px">
+                <el-input
+                  :disabled="true"
+                  placeholder="请输入规格&单位"
+                  v-model="scope.row.name"
+                ></el-input>
               </el-form-item>
+            </template>
+          </el-table-column>
 
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <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"
+              >
+              <div style="display:flex;">
+                <el-input
+                  style="width:100px"
+                  placeholder="请输入退库数量"
+                  type="number"
+                  v-model="scope.row.count"
+                ></el-input>
+                 <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                    <el-option
+                      v-for="(option, index) in unitList"
+                      :key="index"
+                      :label="option.name"
+                      :value="option.name">
+                    </el-option>
+                  </el-select>
+                </div>
+              </el-form-item>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" width="150">
+         <el-table-column align="center" width="150">
             <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"
@@ -114,63 +118,146 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.count) }}
+            </template>
+          </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column width="200" 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 + '.return_count'"
+                style="padding-top: 17px"
+              >
+               <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>
 
-          <el-table-column label="进价总价" align="center" width="150">
+           <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>品名/注册证号(备案凭证号)<span style="color: red"></span></span>
+            </template>
             <template slot-scope="scope">
-              {{ calculate(scope.row.price * scope.row.count) }}
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.register_account'"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.register_account"></el-input>
+              </el-form-item>
             </template>
           </el-table-column>
-
-
-          <el-table-column label="零价" align="center" width="150">
+           <el-table-column label="生产厂家" width="160" 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.manufacturer_name">
+                </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="操作" align="center" min-width="20">
+          <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+              <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 label="经销商" width="160" align="center">
+            <template slot-scope="scope">
+                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.dealer_name">
+                </el-option>
+                </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column width="200" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退库原因<span style="color: red"></span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.remark'"
+                style="padding-top: 17px"
+              >
+              <el-input v-model="scope.row.remark"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="200" fixed="right">
+            <template slot-scope="scope">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
                 <el-button
                   size="mini"
                   type="primary"
                   icon="el-icon-circle-plus-outline"
-                  @click="handleEdit(scope.$index, scope.row)">
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
                 </el-button>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
                 <el-button
                   size="mini"
                   type="danger"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)">
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
                 </el-button>
               </el-tooltip>
-
             </template>
           </el-table-column>
 
-
         </el-table>
       </el-form>
 
@@ -182,10 +269,10 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteDrugCancelStockInfo, editDrugCancelStockInfo, getDrugCancelStockConfig, getDrugCancelStockInfo,GetAllDrugInfoByID,GetAllConfig  } from '@/api/drug/drug_stock'
+  import { deleteDrugCancelStockInfo, editDrugCancelStockInfo, getDrugCancelStockConfig, getDrugCancelStockInfo,GetAllDrugInfoByID,GetAllConfig,getDrugBatchNumber  } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
-
+  import {postSearchDrugList} from "@/api/data"
   export default {
     components: { DrugsStockDialog, BreadCrumb },
     name: 'cancelStockOrderEdit',
@@ -250,6 +337,10 @@
         dealer: [],
         goodType: [],
         goodInfo:[],
+        manufacturerList:[],
+        dealerList:[],
+        numberList:[],
+        unitList:[],
       }
     },
     methods: {
@@ -465,10 +556,16 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log("list232323",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               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].product_date = this.getTime(response.data.data.list[i].product_date)
+              response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date)
+              response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name
+              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
+
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
@@ -490,7 +587,88 @@
         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
+             var dealerList = response.data.data.dealerList
+             this.dealerList = 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){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+               
+
+                for(let z=0;z<dealerList.length;z++){
+                  if(this.drugList[i].dealer == this.dealerList[z].id){
+                      this.drugList[i].dealer = this.dealerList[z].dealer_name
+                  }
+               
+                }
+             }
+             cb(this.drugList)
+          } else {
+            cb([])
+          }
+        })
+      },
+      changeDrugName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+         this.getDrugBatchNumber(val.id)
+         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].number =  val.number
+             this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
+             if(val.dealer == 0){
+               this.recordInfo.recordData[i].dealer = ""
+             }else{
+               this.recordInfo.recordData[i].dealer = val.dealer
+             }
+            
+           }
+        }
+        console.log("333333",this.recordInfo.recordData)
+      },
+      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
+           }
+        })
+      },
+      getDataConfig(module, filed_name){
+       return getDataConfig(module, filed_name)
+      },
     },
     created() {
       this.GetConfigInfo()

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -64,57 +64,51 @@
         </el-table-column>
         <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4">手动入库</span>
-             <span v-if="scope.row.drug_way == 2">自动出库</span>
-             <span v-if="scope.row.drug_way == 1">手动出库</span>
+             <span v-if="scope.row.consumable_type == 1">手动入库</span>
+             <span v-if="scope.row.consumable_type == 2">手动出库</span>
+             <span v-if="scope.row.consumable_type == 3">自动出库</span>
            </template>
         </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.warehouse_out_order_number}}</span>
-             <span v-if="scope.row.drug_way == 4">{{scope.row.warehousing_order}}</span>
-            
+             <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
+              <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
            <template slot-scope="scope">
-             {{getTime(scope.row.ctime)}}
+             {{getTime(scope.row.ctime,"{y}-{h}-{d}")}}
            </template>
         </el-table-column>
          <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.count_unit}}</span>
-           </template>
-        </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></span>
+             <span v-if="scope.row.consumable_type == 1">{{scope.row.count}}{{scope.row.max_unit}}</span>
+             <span v-if="scope.row.consumable_type == 2">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
+             <span v-if="scope.row.consumable_type == 3">{{scope.row.count}}{{scope.row.max_unit}}{{scope.row.min_unit}}</span>
+
+            
            </template>
         </el-table-column>
+       
         <el-table-column prop="drug_name" label="进/出货单价" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4"> {{scope.row.price}}</span>
-             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{scope.row.price}}</span>
+              <span>{{scope.row.price}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4"> {{getTime(scope.row.expiry_date,"{y}-{h}-{d}")}}</span>
-             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{getTime(scope.row.expiry_date,"{y}-{h}-{d}")}}</span>
+              {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
+            
            </template>
         </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.batch_number}}</span>
-             <span v-if="scope.row.drug_way == 4">{{scope.row.batch_number}}</span>
+             <span>{{scope.row.batch_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
-             <span v-if="scope.row.drug_way == 2 || scope.row.drug_way == 1">{{getManufacturer(scope.row.manufacturer)}}</span>
+             {{getManufacturer(scope.row.manufacturer)}}
            </template>
         </el-table-column>
        </el-table>
@@ -143,7 +137,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList } from '@/api/drug/drug_stock'
+  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -172,9 +166,11 @@
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-      this.getlist()
-      this.getOutList()
-      this.getDrugCountList()
+      // this.getlist()
+      // this.getOutList()
+      // this.getDrugCountList()
+
+      this.getDrugFlow()
     },
     components: {
       SettingDialog,
@@ -215,9 +211,10 @@
         list:[],
         stockType:[
           {id:0,name:"全部"},
-          {id:1,name:"手动出库"},
-          {id:2,name:"自动出库"},
-          {id:3,name:"手动入库"},
+          {id:1,name:"手动入库"},
+          {id:2,name:"手动出库"},
+          {id:3,name:"自动出库"},
+        
 
         ],
         outList:[],
@@ -285,13 +282,11 @@
        },
        handleSizeChange(val) {
         this.limit = val
-        this.getlist()
-        this.getOutList()
+        this.getDrugFlow()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.getlist()
-        this.getOutList()
+        this.getDrugFlow()
       },
         
     startTimeChange: function(val) {
@@ -301,7 +296,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.getlist();
+        this.getDrugFlow()
       }
     },
     endTimeChange: function(val) {
@@ -310,8 +305,7 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.getlist();
-        this.getOutList()
+        this.getDrugFlow()
       }
      },
      getManufacturer(id){
@@ -397,16 +391,7 @@
       },
       changeDrug(val){
        this.tableList = []
-        if(val == 0){
-         this.getlist()
-         this.getOutList()
-        }
-        if(val == 3){
-          this.getlist()
-        }
-        if(val ==1 || val == 2){
-           this.getOutList()
-        }
+       this.getDrugFlow()
        
       },
       getMinCount(id){
@@ -461,6 +446,29 @@
          str_min = count%min_number + min_unit
        }
        return str+str_min
+     },
+
+     getDrugFlow(){
+       var params = {
+          drug_id:this.$route.query.drug_id,
+          start_time:this.start_time,
+          end_time:this.end_time,
+          page:this.page,
+          limit:this.limit,
+          stock_type:this.stock_type,  
+        }
+       getDrugFlow(params).then(response=>{
+          if(response.data.state ==1){
+            var list = response.data.data.list
+            console.log("list232323232",list)
+            this.tableList = list
+            var total = response.data.data.total
+            console.log("total23232",total)
+            this.total =total
+            this.manufacturerList = response.data.data.manufacturerList
+            this.dealerList = response.data.data.dealerList
+          }
+       })
      }
     }
   }

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -72,6 +72,7 @@
         >
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="drugPrint()">打印</el-button>
+        <el-button size="small" type="primary" @click="toExport()">导出</el-button>
       </div>
 
       <el-table
@@ -349,7 +350,7 @@ import {
   GetAllConfig,
   getDrugWarehouseInfoList,
   getDrugWarehouseList,
- 
+  exportDrugList
 } from "@/api/drug/drug_stock";
 import {getAllDrugList}from "@/api/data"
  import {getDictionaryDataConfig } from "@/utils/data";
@@ -422,7 +423,8 @@ export default {
       drugTypeList:[],
       manufacturerList:[],
       order_id:"",
-      dealerList:[]
+      dealerList:[],
+      exportList:[],
     };
   },
   methods: {
@@ -681,14 +683,14 @@ export default {
       }
     },
     select(selection) {
-      // console.log("selection",selection)
-      // this.order_id = selection[0].id
+     
       var ids=[]
       for(let i=0;i<selection.length;i++){
          ids.push(selection[i].id)
       }
       this.order_id = ids.join(",")
       this.selectedTableData = selection;
+      this.exportDrugList()
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -793,7 +795,82 @@ export default {
         this.$router.push({path:"/stock/drugStockInOrderDetailPrint?id="+this.order_id})
       }
       
-    }
+    },
+    exportDrugList(){
+     
+      var params = {
+        order_id:this.order_id,
+      }
+      exportDrugList(params).then(response=>{
+         if(response.data.state == 1){
+          var list =  response.data.data.list
+          console.log("list23232323",list)
+          for(let i=0;i<list.length;i++){
+            list[i].product_date = this.getTime(list[i].product_date)
+            list[i].expiry_date = this.getTime(list[i].expiry_date)
+          }
+          this.exportList = list
+          var manufacturerList = response.data.data.manufacturerList
+          this.manufacturerList = manufacturerList
+          var dealerList = response.data.data.dealerList
+          console.log("经销是,",dealerList)
+          this.dealerList = dealerList
+         }
+      })
+    },
+
+    toExport(){
+      if(this.order_id == ""){
+        this.$message.error("请勾选入库单")
+      }
+      console.log("hhhh2323",this.exportList)
+      for(let i=0;i<this.exportList.length;i++){
+        this.exportList[i].unit = this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number + this.exportList[i].min_unit + "/"+this.exportList[i].max_unit
+
+        this.exportList[i].total_price = (this.exportList[i].warehousing_count * this.exportList[i].price).toFixed(2)
+         for(let j=0;j<this.manufacturerList.length;j++){
+           if(this.exportList[i].manufacturer == this.manufacturerList[j].id){
+             this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+           }
+         }
+
+         for(let z=0;z<this.dealerList.length;z++){
+           if(this.exportList[i].dealer == this.dealerList[z].id){
+              this.exportList[i].dealer = this.dealerList[z].dealer_name
+           }
+         }
+      }
+      
+      import('@/vendor/Export2Excel').then(excel => {
+        console.log("232323",this.drugTypeList)
+        console.log("hhh23",this.exportList)
+         for(let i=0;i<this.exportList.length;i++){
+           for(let j=0;j<this.drugTypeList.length;j++){
+             if(this.exportList[i].drug_type == this.drugTypeList[j].value){
+               this.exportList[i].drug_type = this.drugTypeList[j].name
+             }
+           }
+         }
+       
+       
+        const tHeader = ['药品名称','药品类型','规格&单位', '批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','批注文号','备注']
+        const filterVal = ['drug_name', 'drug_type','unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','batch_number','remark']
+         
+     
+        console.log("table",this.exportList)
+      
+        const data = this.formatJson(filterVal, this.exportList)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '药品入库单详情'
+        })
+        this.downloadLoading = false
+      })
+    },
+   formatJson(filterVal, jsonData) {
+    return jsonData.map(v => filterVal.map(j => v[j]));
+   },
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -63,7 +63,7 @@
                   >
                     <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 + "  "+item.manufacturer}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -218,7 +218,6 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
-                 :disabled="true"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>
@@ -849,8 +848,8 @@
       tempObj['manufacturer'] = ''
       tempObj['batch_number'] = ''
       tempObj['drug_type'] = ''
-      tempObj['batch_number'] = ''
       tempObj['dealer'] = ''
+      tempObj["number"] = ''
       this.recordInfo.recordData.push(tempObj)
       
       this.GetConfigInfo()

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -21,9 +21,10 @@
               <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
               <td style="line-height:18px;" width="100">规格<br>型号</td>
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
-              <td style="line-height:18px;" width="80">单位</td>
+            
               <td style="line-height:18px;" width="80">进货价</td>
               <td style="line-height:18px;" width="80">入库<br>数量</td>
+              <td style="line-height:18px;" width="80">单位</td>
               <td style="line-height:18px;" width="60">总价</td>
               <td style="line-height:18px;" width="80">批号</td>
               <td style="line-height:18px;" width="120">生产日期</td>
@@ -36,21 +37,20 @@
               <td style="line-height: 18px">
                  <span v-if="item.drug_id != 0">{{item.drug_name}}</span>
               </td>
-              <td style="line-height: 18px">{{ item.number }}</td>
+              <td style="line-height: 18px">{{ item.batch_number }}</td>
               <td style="line-height: 18px">
                  <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
-              <td style="line-height: 18px">
-                <span>{{item.max_unit}}</span>
-              </td>
               <td style="line-height:18px">
                   {{item.price}}
               </td>
               <td style="line-height: 18px">
                    <span>{{ item.warehousing_count }}</span>
               </td>
-
+              <td style="line-height: 18px">
+                <span>{{item.max_unit}}</span>
+              </td>
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -128,7 +128,7 @@
                   >
                     <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 + " "+item.manufacturer}}</div>
+                    <div class="name">{{ item.drug_name + item.dose +  item.dose_unit +"*" +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -285,7 +285,6 @@
             <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

@@ -70,6 +70,7 @@
         >
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+        <el-button size="small" type="primary" @click="toExport">导出</el-button>
       </div>
 
       <el-table
@@ -431,7 +432,8 @@ import {
   getDrugAutoMaticList,
   getSinleOrderDetail,
   getAutoDrugDetail,
-  getDrugCountList
+  getDrugCountList,
+  getExportOutOrderDrugList
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import { getInitializtion } from '@/api/stock'
@@ -462,6 +464,7 @@ export default {
     this.GetWarehouseOut();
     this.fetchAllAdminUsers();
     this.getDrugCountList()
+    this.getInitializtion()
   },
   data() {
     return {
@@ -516,6 +519,7 @@ export default {
       drugOutList:[],
       outList:[],
       userListOne:[],
+      exportList:[]
     };
   },
   methods: {
@@ -721,6 +725,7 @@ export default {
       }
       this.order_id =  ids.join(",")
       this.selectedTableData = selection;
+      this.getExportOutOrderDrugList()
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -949,9 +954,7 @@ export default {
              }
           }
           this.outList = outList
-       
-          // console.log("list",list)
-          // console.log("outList222",outList)
+         console.log("outList222",outList)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          for(let i=0;i<list.length;i++){
@@ -977,13 +980,43 @@ export default {
      this.userList = []
      getAutoDrugDetail(params).then(response=>{
        if(response.data.state == 1){
+        console.log("list23232323232",response.data.data.list)
       
         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 = this.getTotalCount(response.data.data.list[i].drug_id)
+          var str = 0
+          var max_unit = ""
+          var min_unit = ""
+          var number = 0
+          var min_str = 0
+         for(let i=0;i<response.data.data.list.length;i++){
+             min_str = response.data.data.list[0].drug.min_str
+             max_unit = response.data.data.list[0].drug.max_unit
+             min_unit = response.data.data.list[0].drug.min_unit
+             number = response.data.data.list[0].drug.min_number
+           if(response.data.data.list[i].count_unit == response.data.data.list[i].drug.max_unit){
+              response.data.data.list[i].count = response.data.data.list[i].count * response.data.data.list[i].drug.min_number
+           }
+         }
+         var total_count = 0
+         for(let i=0;i<response.data.data.list.length;i++){
+            total_count += response.data.data.list[i].count 
+         }
+         console.log("总规格2323232",total_count,number)
+         
+        if(parseInt(total_count)!=0){
+          str = parseInt(total_count/number)
+         }
+        if(parseInt(total_count)!=0){
+          min_str =  parseInt(total_count)%number
+        }
+        
+        total = str + max_unit + min_str + min_unit
+        console.log("h2hh2h323",str,min_str)
+ 
         }
         this.userList.push({
           is_total: 1,
@@ -1092,8 +1125,7 @@ export default {
          }
          strprice = str * price 
          minstrprice = min_str * min_price 
-        //  console.log("strprice3",strprice)
-        //  console.log("minstrprice",minstrprice)
+       
          total_price = strprice + minstrprice
          return  total_price
       },
@@ -1114,8 +1146,75 @@ export default {
           }
         }
         return batchNumber.join(",")
-      }
+      },
     
+      getExportOutOrderDrugList(){
+
+         var params = {
+           order_id:this.order_id
+         }
+        getExportOutOrderDrugList(params).then(response=>{
+           if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list22222",list)
+            this.exportList = list
+            this.manufacturerList  = response.data.data.manufacturerList
+            this.dealerList = response.data.data.dealerList
+           }
+        })
+      },
+      toExport(){
+        if(this.order_id == ""){
+          this.$message.error("请勾选出库单")
+          return
+        }
+        for(let i=0;i<this.exportList.length;i++){
+          this.exportList[i].unit = this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number + this.exportList[i].min_unit + "/"+this.exportList[i].max_unit
+
+          this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2)
+          this.exportList[i].expire_date  = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
+           this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
+          for(let j=0;j<this.manufacturerList.length;j++){
+            if(this.exportList[i].manufacturer == this.manufacturerList[j].id){
+              this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+            }
+          }
+
+          for(let z=0;z<this.dealerList.length;z++){
+            if(this.exportList[i].dealer == this.dealerList[z].id){
+                this.exportList[i].dealer = this.dealerList[z].dealer_name
+            }
+          }
+         
+        }
+        console.log("23232323",this.exportList)
+         console.log("了下23",this.drugTypeList)
+      
+       import('@/vendor/Export2Excel').then(excel => {
+        for(let i=0;i<this.exportList.length;i++){
+          for(let j=0;j<this.drugTypeList.length;j++){
+            if(this.exportList[i].drug_type == this.drugTypeList[j].value){
+              this.exportList[i].drug_type = this.drugTypeList[j].name
+            }
+          }
+        }
+        const tHeader = ['药品名称','药品类型','规格&单位', '批号','出库数量','出货单价','拆零零售价','总价','生产厂家','生产日期','有效日期','经销商','批准文号','备注']
+        const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','min_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
+
+        console.log("table",this.exportList)
+         
+        const data = this.formatJson(filterVal, this.exportList)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '药品出库单详情'
+        })
+        this.downloadLoading = false
+      })
+      },
+     formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]));
+     },
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -81,7 +81,7 @@
                   >
                     <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 + " " + item.manufacturer}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + " " + item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -137,7 +137,7 @@
                   </el-form-item>
               </template>
           </el-table-column>
-          <el-table-column width="120" align="center">
+          <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
             </template>
@@ -149,20 +149,22 @@
               >
                 <div style="display:flex;">
                   <el-input
+                    style="width:80px"
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
                   ></el-input>
+                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                    <el-option
+                      v-for="(option, index) in unitList"
+                      :key="index"
+                      :label="option.name"
+                      :value="option.name">
+                    </el-option>
+                  </el-select>
                 </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>
@@ -237,7 +239,6 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px" :disabled="true">
                 <el-input
-                  :disabled="true"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>
@@ -737,6 +738,7 @@ export default {
     tempObj['dose_unit'] = ""
     tempObj["min_number"] = ""
     tempObj["dealer"] = ""
+    tempObj["number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -19,8 +19,8 @@
             <tr>
               <td style="line-height: 50px" width="230">药品名称</td>
               <td style="line-height: 50px" width="230">规格型号</td>
-              <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">出货数量</td>
+              <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height:50px" width="80">出库价格</td>
               <td style="line-height: 50px" width="">总价</td>
               <td style="line-height: 50px" width="">批号</td>
@@ -36,11 +36,10 @@
                   <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.max_unit}}</span>
+                  {{item.count}}
               </td>
-
               <td style="line-height: 50px">
-                  {{item.count}}
+                <span>{{item.count_unit}}</span>
               </td>
               <td style="line-height:50px">
                   {{item.last_price}}
@@ -48,9 +47,9 @@
              <td  style="line-height:50px">
                 {{(item.count * item.last_price).toFixed(2)}}
              </td>
-             <td>{{getNumber(item.drug_id)}}</td>
-             <td>{{getProductDate(item.drug_id)}}</td>
-             <td>{{getExpiryDate(item.drug_id)}}</td>
+             <td>{{item.batch_number}}</td>
+             <td>{{(getTime(item.product_date))}}</td>
+             <td>{{(getTime(item.expiry_date))}}</td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -49,7 +49,7 @@
                   >
                     <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 + " "+item.manufacturer}}</div>
+                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -98,7 +98,7 @@
                   </el-form-item>
               </template>
           </el-table-column>
-           <el-table-column width="120" align="center">
+           <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
             </template>
@@ -110,12 +110,20 @@
               >
                 <div style="display:flex;">
                   <el-input
+                   style="width:100px"
                    :disabled="drug_show"
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
                   ></el-input>
-                  {{scope.row.count_unit}}
+                  <el-select v-model="scope.row.count_unit" filterable placeholder="请选择单位" style="width:80px" :disabled="unitShow">
+                    <el-option
+                      v-for="(option, index) in unitList"
+                      :key="index"
+                      :label="option.name"
+                      :value="option.name">
+                    </el-option>
+                  </el-select>
                 </div>
               </el-form-item>
               
@@ -202,7 +210,6 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px" :disabled="true">
                 <el-input
-                 :disabled="drug_show"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>
@@ -254,7 +261,7 @@
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList } from "@/api/data"
-  import { getDictionaryDataConfig } from "@/utils/data";
+  import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
   export default {
     components: { DrugsStockDialog, BreadCrumb},
     name: 'salesReturnEdit',
@@ -320,7 +327,9 @@
         goodInfo:[],
         drugTypeList:[],
         manufacturerList:[],
-        drug_show:false
+        drug_show:false,
+        unitList:[],
+        unitShow:true
       }
     },
     methods: {
@@ -415,6 +424,7 @@
         return name;
       },
        handleEdit: function(index, row) {
+        this.unitShow = false
         if(this.drug_show == true){
           this.$message.error("自动出库数据不能编辑")
           return
@@ -701,6 +711,9 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
+     getDataConfig(module, filed_name){
+       return getDataConfig(module, filed_name)
+     },
     },
     created() {
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
@@ -715,6 +728,8 @@
       if(sys == 1){
         this.drug_show = true
       }
+     this.unitList =  getDataConfig('hemodialysis','units')
+      console.log("单位",this.unitList)
     }
 
   }

src/xt_pages/stock/stockBatchNumber.vue

@@ -6,7 +6,8 @@
     <div class="app-container ">
       <div class="cell clearfix">
         耗材名称:{{this.$route.query.good_name}} &nbsp;
-        库存: {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit}}&nbsp;
+        <!-- 库存: {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit}}&nbsp; -->
+         {{getStockCount(this.$route.query.id)}}
         规格:{{this.$route.query.specification_name}} &nbsp;
         厂家:{{this.$route.query.manufacturer}} 
       </div>
@@ -307,29 +308,39 @@
       return new Date(time).getTime() / 1000;
      },
     getStockDrugCount(){
-        var params ={
-          keywords: this.keywords,
-          start_time:this.start_time,
-          end_time:this.end_time,
+          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
+            var totalCount = response.data.data.totalCount
+            console.log("totalcount",totalCount)
+            this.cancelCountList = totalCount
+          }
+        })
+      },
+      getStockCount(id){
+        var stock_count = 0
+        for(let i=0;i<this.countList.length;i++){
+          if(id == this.countList[i].good_id){
+            stock_count = this.countList[i].stock_count
+          }
         }
-      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
-           var totalCount = response.data.data.totalCount
-           console.log("totalcount",totalCount)
-           this.cancelCountList = totalCount
-         }
-      })
-    },
+       return stock_count
+      }
+      
 
     }
   }

src/xt_pages/stock/stockFlow.vue

@@ -6,7 +6,8 @@
     <div class="app-container ">
       <div class="cell clearfix">
        耗材名称:{{this.$route.query.good_name}} &nbsp;
-       库存:  {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit }} &nbsp;
+       <!-- 库存:  {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit }} &nbsp; -->
+       库存: {{getStockCount(this.$route.query.id)}}{{this.$route.query.packing_unit }}
        规格:{{this.$route.query.specification_name}} &nbsp;
        厂家:{{this.$route.query.manufacturer}} 
       </div>
@@ -48,8 +49,6 @@
               :value="item.id">
             </el-option>
         </el-select>
-        
-        
       </div>
       
        <el-table
@@ -63,16 +62,15 @@
         </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 == 3">手动出库</span>
-             <span v-if="scope.row.stock_way == 2">自动出库</span>
+             <span v-if="scope.row.consumable_type == 1">手动入库</span>
+             <span v-if="scope.row.consumable_type == 2">手动出库</span>
+             <span v-if="scope.row.consumable_type == 3">自动出库</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 == 2 || scope.row.stock_way == 3"> {{scope.row.warehouse_out_order_number}}</span>
-             <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
-            
+            <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
+            <span v-if="scope.row.consumable_type == 2">{{scope.row.warehouse_out_order_number}}</span>  
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -80,46 +78,44 @@
              {{getTime(scope.row.ctime)}}
            </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.warehousing_count!=0"> {{scope.row.warehousing_count}}{{packing_unit}}</span>
-             <span v-if="(scope.row.stock_way == 2 || scope.row.stock_way == 3) && scope.row.count!=0">{{scope.row.count}}{{packing_unit}}</span>
+             <span>{{scope.row.count}}{{packing_unit}}</span>
            </template>
         </el-table-column>
-       <el-table-column label="退库数量" align="center">
+     
+       <el-table-column label="是否退库" align="center">
          <template slot-scope="scope">
-           <span>{{getCancelCount(scope.row.good_id)}}{{packing_unit}}</span>
+           <span v-if="scope.row.is_edit == 2">是</span>
+           <span v-if="scope.row.is_edit ==1">否</span>   
+         </template>
+       </el-table-column>
 
+       <el-table-column label="批次" align="center">
+         <template slot-scope="scope">
+           <span>{{scope.row.number}}</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> -->
-              {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}{{packing_unit}}
-           </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.price}}</span>
-             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{scope.row.price}}</span>
+             <span>{{scope.row.price}}</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"> {{getTime(scope.row.expiry_date)}}</span>
-             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{getTime(scope.row.expiry_date)}}</span>
+             <span>{{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="批号" align="center">
+        <el-table-column prop="drug_name" label="批准文号" align="center">
            <template slot-scope="scope" >
-             <span v-if="scope.row.stock_way == 2"> {{scope.row.number}}</span>
-             <span v-if="scope.row.stock_way == 4 || scope.row.stock_way == 3">{{scope.row.number}}</span>
+             <span>{{scope.row.license_number}}</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"> {{getManufacturer(scope.row.manufacturer)}}</span>
-             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{getManufacturer(scope.row.manufacturer)}}</span>
+             <span > {{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -142,8 +138,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
-  import {getStockDrugCount} from "@/api/stock"
+  import {getStockDrugCount,getStockFlow} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
@@ -167,9 +162,11 @@
         (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
         "-" +
         (nowDay < 10 ? "0" + nowDay : nowDay);
-      this.getlist()
+      // this.getlist()
+      // this.getStockOutList()
       this.getStockDrugCount()
-      this.getStockOutList()
+    
+      this.getStockFlow()
       this.packing_unit = this.$route.query.packing_unit
     },
     components: {
@@ -209,9 +206,9 @@
         manufacturerList:[],
         stockType:[
           {id:0,name:"全部"},
-          {id:3,name:"手动出库"},
-          {id:2,name:"自动出库"},
-          {id:4,name:"手动入库"},
+          {id:1,name:"手动入库"},
+          {id:2,name:"手动出库"},
+          {id:3,name:"自动出库"},
         ],
         countList:[],
         outCountList:[],
@@ -223,17 +220,13 @@
       }
     },
     methods:{
-    
-     
-       handleSizeChange(val) {
+     handleSizeChange(val) {
         this.limit = val
-        this.getlist()
-        this.getStockOutList()
+        this.getStockFlow()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.getlist()
-        this.getStockOutList()
+        this.getStockFlow()
       },
         
     startTimeChange: function(val) {
@@ -244,9 +237,9 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        
-        this.getlist()
-        this.getStockOutList()
+         
+         this.getStockFlow()
+     
       }
     },
     endTimeChange: function(val) {
@@ -256,8 +249,7 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-       this.getlist()
-       this.getStockOutList()
+        this.getStockFlow()
       }
      },
      getManufacturer(id){
@@ -280,58 +272,58 @@
       }
      },
      //入库详情
-     getlist(){
-        var params= {
-          limit:this.limit,
-          page:this.page,
-          id:this.$route.query.id,
-          start_time:this.start_time,
-          end_time:this.end_time,
-          is_sys:this.stockType 
-        } 
-      getStockInList(params).then(response=>{
-         if(response.data.state == 1){
-           var list = response.data.data.list
-           for(let i=0;i<list.length;i++){
-             list[i].stock_way = 4
-             this.tableList.push(list[i])
-           }
-           var total = response.data.data.total
-           this.total = total
-          //  console.log("入库数据",this.tableList)
-           var manufacturerList = response.data.data.manufacturerList
-           this.manufacturerList = manufacturerList
-         }
-      })
-     },
-    getStockOutList(){
-       var params= {
-          limit:this.limit,
-          page:this.page,
-          id:this.$route.query.id,
-          start_time:this.start_time,
-          end_time:this.end_time, 
-          is_sys:this.stock_type 
-        } 
-      getStockOutList(params).then(response=>{
-        if(response.data.state == 1){
-          var outList = response.data.data.outList
-          console.log("outList990-0000990",outList)
-           for(let i=0;i<outList.length;i++){
-             if(outList[i].is_sys == 0){
-                outList[i].stock_way = 3
-             }
-             if(outList[i].is_sys == 1){
-                outList[i].stock_way = 2
-             }
-             this.tableList.push(outList[i])
-           }
-          console.log("hhhhhhhhhh",this.tableList)
-          var total = response.data.data.total
-          this.total = total
-        }  
-      })
-    },
+    //  getlist(){
+    //     var params= {
+    //       limit:this.limit,
+    //       page:this.page,
+    //       id:this.$route.query.id,
+    //       start_time:this.start_time,
+    //       end_time:this.end_time,
+    //       is_sys:this.stockType 
+    //     } 
+    //   getStockInList(params).then(response=>{
+    //      if(response.data.state == 1){
+    //        var list = response.data.data.list
+    //        for(let i=0;i<list.length;i++){
+    //          list[i].stock_way = 4
+    //          this.tableList.push(list[i])
+    //        }
+    //        var total = response.data.data.total
+    //        this.total = total
+    //       //  console.log("入库数据",this.tableList)
+    //        var manufacturerList = response.data.data.manufacturerList
+    //        this.manufacturerList = manufacturerList
+    //      }
+    //   })
+    //  },
+    // getStockOutList(){
+    //    var params= {
+    //       limit:this.limit,
+    //       page:this.page,
+    //       id:this.$route.query.id,
+    //       start_time:this.start_time,
+    //       end_time:this.end_time, 
+    //       is_sys:this.stock_type 
+    //     } 
+    //   getStockOutList(params).then(response=>{
+    //     if(response.data.state == 1){
+    //       var outList = response.data.data.outList
+    //       console.log("outList990-0000990",outList)
+    //        for(let i=0;i<outList.length;i++){
+    //          if(outList[i].is_sys == 0){
+    //             outList[i].stock_way = 3
+    //          }
+    //          if(outList[i].is_sys == 1){
+    //             outList[i].stock_way = 2
+    //          }
+    //          this.tableList.push(outList[i])
+    //        }
+    //       console.log("hhhhhhhhhh",this.tableList)
+    //       var total = response.data.data.total
+    //       this.total = total
+    //     }  
+    //   })
+    // },
     getStockDrugCount(){
         var params ={
           keywords: this.keywords,
@@ -384,15 +376,15 @@
         }
         return count
       },
-    getCancelCount(id){
-      var count = 0
-      for(let i=0;i<this.cancelCountList.length;i++){
-        if(id == this.cancelCountList[i].good_id){
-            count = this.cancelCountList[i].count
+      getCancelCount(id){
+        var count = 0
+        for(let i=0;i<this.cancelCountList.length;i++){
+          if(id == this.cancelCountList[i].good_id){
+              count = this.cancelCountList[i].count
+          }
         }
-      }
-      return count
-    },
+        return count
+      },
      getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
@@ -405,6 +397,38 @@
        if(val == 2 || val == 3 || val == 0){
         this.getStockOutList()
        }
+     },
+     getStockCount(id){
+      var stock_count = 0
+      for(let i=0;i<this.countList.length;i++){
+        if(id == this.countList[i].good_id){
+          stock_count = this.countList[i].stock_count
+        }
+      }
+      return stock_count
+     },
+
+     getStockFlow(){
+        var params= {
+          limit:this.limit,
+          page:this.page,
+          good_id:this.$route.query.id,
+          start_time:this.start_time,
+          end_time:this.end_time,
+          is_sys:this.stockType 
+        } 
+       getStockFlow(params).then(response=>{
+          if(response.data.state == 1){
+            var list =  response.data.data.list
+            console.log("list2323",list)
+            var total = response.data.data.total
+            console.log("total",total)
+            this.tableList = list
+            this.total = total
+           var manufacturerList = response.data.data.manufacturerList
+           this.manufacturerList = manufacturerList
+          }
+       })
      }
     }
   }

src/xt_pages/stock/stockInOrder.vue

@@ -1473,7 +1473,7 @@ export default {
              }
            }
           for(let i=0;i<list.length;i++){
-            list[i].unit = list[i].specification_name + list[i].packing_unit
+            list[i].unit = list[i].specification_name +"/"+ list[i].packing_unit
             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}")
@@ -1501,12 +1501,27 @@ export default {
         return
       }
       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','dealer']
+        console.log(this.goodType)
+        console.log(this.exportList)
+      for(let i=0;i<this.exportList.length;i++){
+        for(let j=0;j<this.goodType.length;j++){
+           if(this.exportList[i].good_type_id == this.goodType[j].id){
+             this.exportList[i].good_type_id = this.goodType[j].type_name
+           }
+        }
+        if(this.exportList[i].dealer == 0){
+           this.exportList[i].dealer = ""
+        }
+        if(this.exportList[i].manufacturer == 0){
+           this.exportList[i].manufacturer = ""
+        }
+      }
+    
+      const tHeader = ['耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']
+      const filterVal = ['good_name', 'good_type_id', 'unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','license_number','remark']
 
       console.log("table",this.exportList)
-      
+     
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
         header: tHeader,

src/xt_pages/stock/stockOutOrder.vue

@@ -1098,16 +1098,31 @@ export default {
             if(response.data.state == 1){
               this.tableShow = true
               var list = response.data.data.list
-              console.log("list22222222",list)
+              // console.log("list22222222",list)
+              // for(let i=0;i<list.length;i++){
+              //   if(list[i].dealer == 0){
+              //     list[i].dealer = ""
+              //   }
+              //   if(list[i].manufacturer == 0){
+              //     list[i].manufacturer = ""
+              //   }
+              //   this.tableList.push(list[i])
+              // }
+              var list = response.data.data.info
+              console.log("info2232323",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 = ""
-                }
+                }  
+                list[i].good_name = list[i].info.good_name
+                list[i].specification_name = list[i].info.specification_name
+                list[i].packing_unit = list[i].info.packing_unit
                 this.tableList.push(list[i])
               }
+             
             }
         })
       },
@@ -1576,7 +1591,7 @@ export default {
             var outCount = response.data.data.outCount
             console.log("outCount",outCount)
             for(let i=0;i<list.length;i++){
-               list[i].unit = list[i].specification_name + list[i].packing_unit
+               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].expiry_date = this.getTime(list[i].expiry_date,"{y}-{m}-{d}")
                list[i].product_date = this.getTime(list[i].product_date,"{y}-{m}-{d}") 
@@ -1607,12 +1622,28 @@ export default {
          return
         }
         import('@/vendor/Export2Excel').then(excel => {
+          console.log("23232323",this.exportList)
         for(let i=0;i<this.exportList.length;i++){
           this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
+          for(let j=0;j<this.goodType.length;j++){
+            if(this.exportList[i].good_type_id == this.goodType[j].id){
+               this.exportList[i].good_type_id = this.goodType[j].type_name
+            }
+          }
+          if(this.exportList[i].dealer == 0){
+            this.exportList[i].dealer = ""
+          }
+          if(this.exportList[i].manufacturer == 0){
+            this.exportList[i].manufacturer = ""
+          }
         }
-        const tHeader = ['耗材名称', '规格型号', '单位','出库数量','出库价格','总价','批号','生产日期','有效日期']
-        const filterVal = ['good_name', 'specification_name', 'packing_unit','count','price','total_price','number','product_date','expiry_date']
+        console.log("hhhh323223",this.goodType)
+       
+      
+        const tHeader = ['耗材名称', '耗材类型', '规格&单位','出库数量','出货价','总价','生产厂商','经销商','生产日期','有效期','备注']
+        const filterVal = ['good_name', 'good_type_id', 'unit','count','price','total_price','manufacturer','dealer','product_date','expiry_date','remark']
         console.log("table",this.exportList)
+       
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
           header: tHeader,

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -602,7 +602,7 @@ export default {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
- 
+          
           postWarehouseOut(
             params,
             this.warehouse_out_time,

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -563,15 +563,26 @@
               'stockOut': this.recordInfo.recordData
             }
            
-            console.log("stockout",params)
+            console.log("stockout",params,this.$route.query.id)
             
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$message.success('保存成功')
-                this.$router.back(-1)
+                if(response.data.data.msg == 1){
+                  this.$message.success('保存成功')
+                  this.$router.back(-1)
+                }
+
+                if(response.data.data.msg == 5){
+                  this.$message.error("该耗材无库存,请入库")
+                }
+
+                if(response.data.data.msg == 6){
+                  this.$message.error("该耗材的退库数量大于入库数量,无法出库,请新增出库另一个批次")
+                }
+                
               }
             })
           } else {

src/xt_pages/stock/stockQuery.vue

@@ -108,8 +108,9 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-           <span>{{getOutCount(scope.row.good_id) + getAutoCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span>
+           <!-- <span>{{getOutCount(scope.row.good_id) + getAutoCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span> -->
 
+           {{getInCount(scope.row.good_id) - getStockCount(scope.row.good_id)}}{{scope.row.packing_unit}}
          </template>
        </el-table-column>
 
@@ -122,7 +123,10 @@
       
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-           {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id) + getCancelCount(scope.row.good_id)}} {{scope.row.packing_unit}}
+           <!-- {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id) + getCancelCount(scope.row.good_id)}} {{scope.row.packing_unit}} -->
+           
+           {{getStockCount(scope.row.good_id)}} {{scope.row.packing_unit}} 
+
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -570,6 +574,15 @@ export default {
        }
      }
      return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
    }
   }
 };