数据

src/api/stock.js

@@ -673,3 +673,19 @@ export function getOutExportList(params) {
     params: params
   })
 }
+
+export function getSingCancelOrder(params) {
+  return request({
+    url: '/api/stock/getsinglecancelorder',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getCancelStockOrderPrint(params) {
+  return request({
+    url: '/api/stock/getcancelstockorderprint',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -61,10 +61,10 @@ export default {
     theme: '换肤',
     clipboardDemo: 'Clipboard',
     i18n: '国际化',
-    medicalScheduling:'医护排班',
-    medicalSchedulingIndex:'排班管理',
-    class:'班种列表',
-    schedulingStatistics:'排班统计',
+    medicalScheduling: '医护排班',
+    medicalSchedulingIndex: '排班管理',
+    class: '班种列表',
+    schedulingStatistics: '排班统计',
     permissionManage: '权限管理',
     adminManage: '员工管理',
     roleManage: '权限管理',
@@ -150,32 +150,32 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
-    otherManagement:'其他管理',
-    drugsExpiryDate:'药品有效期预警',
-    drugsSurplus:'药品剩余预警',
-    drugsQuery:'库存查询',
-    drugsReportLoss:'药品报损',
-    drugsAdjustPrice:'药品调价',
-    drugsStockCancel:'退库单',
-    drugsStockReturn:'退货单',
-    drugsStockOut:'出库单',
-    drugsStockIn:'入库单',
-    stockDrugs:'药品管理',
-    selfPreparedMedicineInfo:'自备药信息',
-    selfPreparedMedicineQuery:'自备药查询',
-    selfPreparedMedicineIndex:'自备药管理',
-    selfPreparedMedicine:'自备药管理',
-    consumablesManagement:'耗材管理',
+    otherManagement: '其他管理',
+    drugsExpiryDate: '药品有效期预警',
+    drugsSurplus: '药品剩余预警',
+    drugsQuery: '库存查询',
+    drugsReportLoss: '药品报损',
+    drugsAdjustPrice: '药品调价',
+    // drugsStockCancel: '退库单',
+    // drugsStockReturn:'退货单',
+    drugsStockOut: '出库单',
+    drugsStockIn: '入库单',
+    stockDrugs: '药品管理',
+    selfPreparedMedicineInfo: '自备药信息',
+    selfPreparedMedicineQuery: '自备药查询',
+    selfPreparedMedicineIndex: '自备药管理',
+    selfPreparedMedicine: '自备药管理',
+    consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
     warehouseReceiptOther: '出入库',
     stockInOrder: '入库单',
-    salesReturnOrder: '退货单',
+    // salesReturnOrder: '退货单',
     stockOutOrder: '出库单',
     cancelStockOrder: '退库单',
     otherStockInOrder: '入库单',
-    otherSalesReturnOrder: '退货单',
+    // otherSalesReturnOrder: '退货单',
     otherStockOutOrder: '出库单',
-    otherCancelStockOrder: '退库单',
+    // otherCancelStockOrder: '退库单',
     stockInOrderAdd: '新增入库单',
     salesReturnOrderAdd: '新增退货单',
     stockOutOrderAdd: '新增出库单',
@@ -199,55 +199,54 @@ export default {
     system_prescription: '透析方案模版',
     integration_config: '集成配置',
     his_config: 'HIS集成配置',
-    medical_template:'门诊模版',
+    medical_template: '门诊模版',
     slow: '慢病管理',
     scrm: 'SCRM',
     shop: '分销商城',
 
-    costComparison:'医保费用对照',
-    incomeStatistics:'收入统计',
-    outpatientRegistration:'门诊挂号',
-    outpatientRegistrationIndex:'门诊挂号',
-    hospitalIndex:'住院登记',
-    hospitalChargesManagement:"住院收费管理",
-    outpatientRegistrationRegistrationHistory:'挂号历史',
-    outpatientDoctorStation:"门诊医生站",
-    outpatientDoctorStationDoctorDesk:'医生工作台',
-    outpatientDoctorStationPastInquiries:'既往查询',
-    outpatientDoctorStationTemplateManagement:'模板管理',
-    outpatientCharges:'门诊收费',
-    outpatientChargesManagement:'门诊收费管理',
-    outpatientInvoice:'门诊发票',
-    outpatientRecord:'住院工作站',
-    advancePayment:'预交金',
-    labelPrinting:'标签打印',
-    summary:'项目消费明细汇总',
-    outpatientPharmacy:'门诊药房',
-    pharmacyFormula:'药房配发药',
-    prescriptionDrugReturn:'处方退药',
-    dispensingInquiry:'处方发药查询',
-    drugReturnInquiry:'处方退药查询',
-    signIndex:'签到排队',
-    signIn:'签到窗口',
-    lineUp:'排队窗口',
-    calling:'排队叫号',
-    bedManagement:'床位管理',
-    dictionaryManagement:'字典管理',
-    templateManagement:'模板管理',
-    drugStockUserDetail:"出库人明细",
-    DepartManage:"科室管理",
-    basicConfig:'基础配置',
+    costComparison: '医保费用对照',
+    incomeStatistics: '收入统计',
+    outpatientRegistration: '门诊挂号',
+    outpatientRegistrationIndex: '门诊挂号',
+    hospitalIndex: '住院登记',
+    hospitalChargesManagement: '住院收费管理',
+    outpatientRegistrationRegistrationHistory: '挂号历史',
+    outpatientDoctorStation: '门诊医生站',
+    outpatientDoctorStationDoctorDesk: '医生工作台',
+    outpatientDoctorStationPastInquiries: '既往查询',
+    outpatientDoctorStationTemplateManagement: '模板管理',
+    outpatientCharges: '门诊收费',
+    outpatientChargesManagement: '门诊收费管理',
+    outpatientInvoice: '门诊发票',
+    outpatientRecord: '住院工作站',
+    advancePayment: '预交金',
+    labelPrinting: '标签打印',
+    summary: '项目消费明细汇总',
+    outpatientPharmacy: '门诊药房',
+    pharmacyFormula: '药房配发药',
+    prescriptionDrugReturn: '处方退药',
+    dispensingInquiry: '处方发药查询',
+    drugReturnInquiry: '处方退药查询',
+    signIndex: '签到排队',
+    signIn: '签到窗口',
+    lineUp: '排队窗口',
+    calling: '排队叫号',
+    bedManagement: '床位管理',
+    dictionaryManagement: '字典管理',
+    templateManagement: '模板管理',
+    drugStockUserDetail: '出库人明细',
+    DepartManage: '科室管理',
+    basicConfig: '基础配置',
 
-    histemplate:'处方模版',
-    outpatientSickRecord:"人员定点病种备案",
-    airDisinfect:'空气消毒',
-    objectTableDisinfect:'物表消毒',
+    histemplate: '处方模版',
+    outpatientSickRecord: '人员定点病种备案',
+    airDisinfect: '空气消毒',
+    objectTableDisinfect: '物表消毒',
 
+    hospitalStation: '住院工作站',
+    pastInquiries: '既往查询',
 
-    hospitalStation:"住院工作站",
-    pastInquiries:"既往查询",
-
-    prescriptionTemplate:"处方模版",
+    prescriptionTemplate: '处方模版'
 
   },
   navbar: {

src/router/index_路由未分离前.js

@@ -784,12 +784,14 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/otherStockInOrder'),
         name: 'otherStockInOrder',
         meta: { title: 'otherStockInOrder', noCache: true }
-      }, {
-        path: '/stock/return',
-        component: () => import('@/xt_pages/stock/salesReturnOrder'),
-        name: 'salesReturnOrder',
-        meta: { title: 'salesReturnOrder', noCache: true }
-      }, {
+      },
+      // {
+      //   path: '/stock/return',
+      //   component: () => import('@/xt_pages/stock/salesReturnOrder'),
+      //   name: 'salesReturnOrder',
+      //   meta: { title: 'salesReturnOrder', noCache: true }
+      // },
+      {
         path: '/stock/return/other',
         component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
         name: 'otherSalesReturnOrder',
@@ -820,12 +822,14 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/stockQuery'),
         name: 'stockQuery',
         meta: { title: 'stockQuery' }
-      }, {
+      },
+      {
         path: '/stock/detail',
         component: () => import('@/xt_pages/stock/stockDetailIndex'),
         name: 'stockDetail',
         meta: { title: 'stockDetail' }
-      }, {
+      },
+      {
         path: '/stock/in/add',
         component: () => import('@/xt_pages/stock/stockInOrderAdd'),
         name: 'stockInOrderAdd',

src/router/modules/drugs.js

@@ -30,18 +30,18 @@ export default {
       name: 'drugsStockOut',
       meta: { title: 'drugsStockOut', noCache: true }
     },
-    {
-      path: '/stock/drugs/stock/return',
-      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
-      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/return',
+    //   component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
+    //   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/detail',
       component: () => import('@/xt_pages/stock/drugs/drugIndex'),

src/router/modules/stock.js

@@ -24,12 +24,12 @@ export default {
       name: 'stockInOrder',
       meta: { title: 'stockInOrder', noCache: true }
     },
-    {
-      path: '/stock/return',
-      component: () => import('@/xt_pages/stock/salesReturnOrder'),
-      name: 'salesReturnOrder',
-      meta: { title: 'salesReturnOrder', noCache: true }
-    },
+    // {
+    //   path: '/stock/return',
+    //   component: () => import('@/xt_pages/stock/salesReturnOrder'),
+    //   name: 'salesReturnOrder',
+    //   meta: { title: 'salesReturnOrder', noCache: true }
+    // },
     {
       path: '/stock/out',
       component: () => import('@/xt_pages/stock/stockOutOrder'),
@@ -42,7 +42,7 @@ export default {
       name: 'cancelStockOrder',
       meta: { title: 'cancelStockOrder', noCache: true }
     },
-    
+
     // {
     //   path: "/stock/",
     //   component: Layout,
@@ -93,7 +93,7 @@ export default {
     //     }
     //   ]
     // },
-    
+
     {
       path: '/stock/detail',
       component: () => import('@/xt_pages/stock/stockDetailIndex'),
@@ -202,8 +202,8 @@ export default {
       }
     },
     {
-      path:"/stock/drugcancelprint",
-      component:()=>import('@/xt_pages/stock/drugs/drugCancelOurderPrint'),
+      path: '/stock/drugcancelprint',
+      component: () => import('@/xt_pages/stock/drugs/drugCancelOurderPrint'),
       hidden: true,
       is_menu: false,
       name: 'stock_print',
@@ -213,8 +213,8 @@ export default {
       }
     },
     {
-      path:"/stock/drugoutorderprint",
-      component:()=>import('@/xt_pages/stock/drugs/drugOutOrderPrint'),
+      path: '/stock/drugoutorderprint',
+      component: () => import('@/xt_pages/stock/drugs/drugOutOrderPrint'),
       hidden: true,
       is_menu: false,
       name: 'stock_print',
@@ -224,8 +224,8 @@ export default {
       }
     },
     {
-      path:"/stock/drugcanceldetaiprint",
-      component:()=>import('@/xt_pages/stock/drugs/drugCancelDetailPrint'),
+      path: '/stock/drugcanceldetaiprint',
+      component: () => import('@/xt_pages/stock/drugs/drugCancelDetailPrint'),
       hidden: true,
       is_menu: false,
       name: 'stock_print',
@@ -269,5 +269,16 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/stock/cancel/cancelstockorderedit',
+      component: () => import('@/xt_pages/stock/cancelStockOrderEdit'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugQueryPrint',
+      meta: {
+        title: '耗材退库打印',
+        noCache: true
+      }
+    }
   ]
 }

src/xt_pages/data/components/addDrugs.vue

@@ -112,7 +112,7 @@
                                       maxlength="30"></el-input>
                           <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
                                 <el-option
-                                        v-for="(item,index) in unitList"
+                                        v-for="(item,index) in  getDataConfig('hemodialysis','units')"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -236,7 +236,7 @@
               预设脱水
               <div class="inline_block under_line" style="width:100px;">
                   {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : ' ' }}
-              </div>kg
+              </div>L
           </div>
       </div>
       <div class="row">
@@ -259,7 +259,7 @@
               实际脱水
               <div class="inline_block under_line" style="width:100px;">
                   {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : " " }}
-              </div>kg
+              </div>L
           </div>
       </div>
       <div class="row">

src/xt_pages/stock/cancelStockOrder.vue

@@ -70,14 +70,14 @@
           @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> -->
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
         <el-table
           :data="cancelStockDate"
+          @current-change='currentChange' 
           :class="signAndWeighBoxPatients"
           border
           highlight-current-row
@@ -109,18 +109,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
@@ -167,6 +155,42 @@
         >
         </el-pagination>
       </el-row>
+
+     <div   v-show="showTable" style="margin-top:10px">
+       <el-table
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTableOne"
+          @selection-change="select"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+        >
+          <el-table-column type="selection" width="55"> </el-table-column>
+
+          <el-table-column label="耗材名称" align="center">
+            <template slot-scope="scope">
+              {{scope.row.GoodInfo.good_name}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="规格&单位" align="center">
+            <template slot-scope="scope">
+              {{scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="退库数量" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.count}}{{scope.row.GoodInfo.packing_unit}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </div>
   </div>
 </template>
@@ -177,7 +201,9 @@ import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
   deleteCancelStock,
   GetAllConfig,
-  getCancelStockList
+  getCancelStockList,
+  getSingCancelOrder,
+  getCancelStockOrderPrint
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 
@@ -205,20 +231,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (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();
@@ -247,7 +260,10 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
+      tableList:[],
+      showTable:false,
+      order_id:"",
     };
   },
   methods: {
@@ -400,10 +416,8 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      this.$router.push({
-        name: "cancelStockDetail",
-        query: { id: row.id, type: this.type }
-      });
+      console.log("row22222",row.id)
+      this.$router.push({"path":"/stock/cancel/cancelstockorderedit?id="+row.id})
     },
     handleDelete: function(index, row) {
       const ids = [];
@@ -444,6 +458,12 @@ 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(",")
+
       if (val) {
         this.$refs.multipleTable.toggleAllSelection();
       } else {
@@ -495,6 +515,38 @@ export default {
           });
         })
         .catch(() => {});
+    },
+    currentChange(val){
+        var params ={
+          id:val.id
+        }
+      getSingCancelOrder(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("list0000000000",list)
+          this.tableList = list
+          this.showTable = true
+        }
+      }) 
+    },
+    toPrint(){
+      console.log("22222",this.order_id)
+      if(this.order_id == ""){
+        this.$message.error("请勾选退库单")
+      }else{
+        this.getCancelStockOrderPrint()
+      }
+    },
+    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)
+         }
+      })
     }
   }
 };

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -50,44 +50,6 @@
             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"
-            filterable
-            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"
-            filterable
-            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>
       </div>
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
@@ -99,42 +61,44 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>商品类型<span style="color: red">*</span></span>
+       
+          <el-table-column align="center" width="250">
+             <template slot="header" slot-scope="scope">
+              <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-input
-                  placeholder="请输入商品类型"
-                  v-model="scope.row.good_type_id"
-                  :value="typeName(scope.row.good_type_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
-              </el-form-item>
+                <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.good_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入耗材名称"
+                    @select="handleSelect"
+                    @input="changeGoodName(scope.$index)"
+                    style="width:200px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                  </template>
+                 </el-autocomplete>
             </template>
           </el-table-column>
-          <el-table-column min-width="35" align="center">
+          <el-table-column align="center" width="300">
             <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.good_id"
-                  :value="specificationName(scope.row.good_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
               </el-form-item>
+
             </template>
           </el-table-column>
-
-          <el-table-column min-width="23" align="center">
+        
+          <el-table-column width="300" align="center">
             <template slot="header" slot-scope="scope">
               <span>退库数量<span style="color: red">*</span></span>
             </template>
@@ -149,6 +113,7 @@
                   type="number"
                   v-model="scope.row.return_count"
                 ></el-input>
+                {{scope.row.packing_unit}}
               </el-form-item>
             </template>
           </el-table-column>
@@ -192,7 +157,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getCancelStockConfig, postCancelStock,GetAllConfig,GetAllGoodInfoByID } from "@/api/stock";
+import { getCancelStockConfig, postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
 
@@ -447,6 +412,8 @@ export default {
           const params = {
             cancelStock: this.recordInfo.recordData
           };
+          console.log("params",params)
+         
           postCancelStock(
             params,
             this.return_time,
@@ -478,6 +445,74 @@ export default {
     },
     changeDealer(val) {
       this.propForm.dealer = val;
+    },
+    querySearchAsync(keyword, cb) {
+      let key = '';
+      if (keyword != undefined) {
+        key = keyword
+      }
+    postSearchGoodList(key).then(response => {
+        if (response.data.state == 1) {
+          
+            var list = response.data.data.list
+            
+            this.goodList = list
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            var dealer =  response.data.data.dealerList
+            this.dealerList = dealer
+            for(let i=0;i<this.goodList.length;i++){
+              for(let j=0;j<this.manufacturerList.length;j++){
+                if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                }
+              }
+            }
+
+            for(let i=0;i<this.goodList.length;i++){
+              for(let j=0;j<this.dealerList.length;j++){
+                if(this.goodList[i].dealer == this.dealerList[j].id){
+                  this.goodList[i].dealer = this.dealerList[j].dealer_name
+                }
+              }
+            }
+          
+            cb(this.goodList)
+        } else {
+          cb([])
+        }
+      })
+    },
+    changeGoodName(val){
+      this.currentIndex = val
+    },
+    handleSelect(val){
+      for(let i=0;i<this.recordInfo.recordData.length;i++){
+        if(this.currentIndex == i){
+          this.recordInfo.recordData[i].good_type_id = val.id
+          this.recordInfo.recordData[i].good_name = val.good_name
+          this.recordInfo.recordData[i].good_type_id = val.good_type_id
+          this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
+          this.recordInfo.recordData[i].number =  val.number
+          this.recordInfo.recordData[i].manufacturer = val.manufacturer
+          this.recordInfo.recordData[i].remark = val.remark
+          if(val.buy_price == 0){
+            this.recordInfo.recordData[i].price = ""
+          }else{
+            this.recordInfo.recordData[i].price = val.buy_price
+          }
+          
+          this.recordInfo.recordData[i].specification_name = val.specification_name
+          this.recordInfo.recordData[i].good_id = val.id
+          this.recordInfo.recordData[i].packing_unit = val.packing_unit
+          if(val.dealer == 0){
+            this.recordInfo.recordData[i].dealer = ""
+          }else{
+            this.recordInfo.recordData[i].dealer = val.dealer
+          }
+          
+        }
+      }
     }
   },
   created() {

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -200,7 +200,8 @@
           })
         }).catch(() => {
         })
-      }, editRecord: function() {
+      }, 
+      editRecord: function() {
         this.$emit('edit-record')
       }
     }

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -23,72 +23,52 @@
                         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)'}"
-        >
-
+             max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
 
-          <el-table-column min-width="35" align="center">
-
-            <template slot="header" slot-scope="scope">
-              <span>商品类型<span style="color: red">*</span></span>
+          <el-table-column align="center" width="300">
+             <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
             </template>
-
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
-                          :value="typeName(scope.row.good_type_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
-              </el-form-item>
+                <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.good_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入耗材名称"
+                    @select="handleSelect"
+                    @input="changeGoodName(scope.$index)"
+                    style="width:200px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                  </template>
+                 </el-autocomplete>
             </template>
           </el-table-column>
-          <el-table-column min-width="35" align="center">
+
+
+         <el-table-column align="center" width="300">
+            
             <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.good_id"
-                          :value="specificationName(scope.row.good_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
               </el-form-item>
 
             </template>
-          </el-table-column>
+        </el-table-column>
 
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column width="300" align="center">
             <template slot="header" slot-scope="scope">
               <span>退库数量<span style="color: red">*</span></span>
             </template>
@@ -96,10 +76,13 @@
               <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 label="操作" align="center" min-width="20">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
@@ -136,7 +119,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig  } from '@/api/stock'
+  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList  } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -204,6 +187,9 @@
         dealer: [],
         goodType: [],
         goodInfo:[],
+        goodList:[],
+        manufacturerList:[],
+        dealerList:[],
       }
     },
     methods: {
@@ -410,7 +396,8 @@
             return false
           }
         })
-      }, GetOrderDetail: function(order_id) {
+      }, 
+      GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
@@ -419,7 +406,11 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+           
             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()
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
@@ -441,6 +432,76 @@
         this.propForm.manufacturer = val
       },changeDealer(val){
         this.propForm.dealer = val
+      },
+
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        postSearchGoodList(key).then(response => {
+          if (response.data.state == 1) {
+           
+             var list = response.data.data.list
+             
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+           
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+      },
+      changeGoodName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+        console.log("val",val)
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(this.currentIndex == i){
+              this.recordInfo.recordData[i].good_type_id = val.id
+              this.recordInfo.recordData[i].good_name = val.good_name
+              this.recordInfo.recordData[i].good_type_id = val.good_type_id
+              this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
+              this.recordInfo.recordData[i].number =  val.number
+              this.recordInfo.recordData[i].manufacturer = val.manufacturer
+              this.recordInfo.recordData[i].remark = val.remark
+              if(val.buy_price == 0){
+               this.recordInfo.recordData[i].price = ""
+              }else{
+                this.recordInfo.recordData[i].price = val.buy_price
+              }
+              
+              this.recordInfo.recordData[i].specification_name = val.specification_name
+              this.recordInfo.recordData[i].good_id = val.id
+              this.recordInfo.recordData[i].packing_unit = val.packing_unit
+              if(val.dealer == 0){
+                this.recordInfo.recordData[i].dealer = ""
+              }else{
+                this.recordInfo.recordData[i].dealer = val.dealer
+              }
+             
+           }
+         }
       }
     },
     created() {

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -11,7 +11,6 @@
     <el-button
       style="float: right;margin-right:10px"
       size="small"
-      icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
@@ -65,7 +64,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"
@@ -82,9 +81,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"
@@ -101,7 +100,7 @@
         >
         </el-option>
       </el-select>
-    </div>
+    </div> -->
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
@@ -563,11 +562,12 @@ export default {
           this.tableList[i].drug_spec =  this.specificationName(this.tableList[i].good_id)
           this.tableList[i].min_unit = this.getUnit(this.tableList[i].GoodInfo.good_unit)
           this.tableList[i].remark = this.tableList[i].GoodInfo.remark
+          this.tableList[i].packing_unit = this.tableList[i].packing_unit
          
         }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','remark']
+       const filterVal = ['index','drug_name', 'drug_spec', 'packing_unit','count','remark']
        
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)

src/xt_pages/stock/detail/print.vue

@@ -26,9 +26,7 @@
               <td style="line-height: 50px" width="250">耗材名称</td>
               <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
-              <!-- <td style="line-height: 50px" width="250">耗材类型</td> -->
-
-
+            
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80" v-if="type == 1">进货价</td>
               <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
@@ -47,11 +45,9 @@
                 <span v-if="stock">{{stock.specification_name}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{getUnit(stock.good_unit)}}</span>
+                <span>{{stock.packing_unit}}</span>
               </td>
-              <!-- <td style="line-height: 50px">
-                <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
-              </td> -->
+            
               <td style="line-height: 50px">
                 <span v-if="type == 3">
                   <span v-if="org_id == 10090">{{getWareOut(stock.id)}}</span>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -12,7 +12,6 @@
     <el-button
       style="float: right;margin-right:10px"
       size="small"
-      icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
@@ -67,7 +66,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"
@@ -84,9 +83,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"
@@ -103,7 +102,7 @@
         >
         </el-option>
       </el-select>
-    </div>
+    </div> -->
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
@@ -143,11 +142,11 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="单据类型" align="center">
+        <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             {{ getTypeName(scope.row) }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
@@ -742,9 +741,10 @@ export default {
           this.tableList[i].total = this.calTotal(this.tableList[i])
           this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
           this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
-
+          this.tableList[i].packing_unit = this.tableList[i].packing_unit
         }
-        console.log("总共条数",this.tableList)
+        console.log("总共条数555",this.tableList)
+         
         if(this.org_id == 10024){
           var arr = this.uniqueOne(this.tableList)
           this.tableList = arr
@@ -753,9 +753,10 @@ export default {
         
           import('@/vendor/Export2Excel').then(excel => {
           const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-          const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+          const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
           
           const data = this.formatJson(filterVal, this.tableList)
+
           console.log("data222222222",data)
             excel.export_json_to_excel({
               header: tHeader,
@@ -773,7 +774,7 @@ export default {
           
             import('@/vendor/Export2Excel').then(excel => {
             const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-            const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+            const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
             
             const data = this.formatJson(filterVal, this.tableList)
             console.log("data222222222",data)

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -11,7 +11,6 @@
      <el-button
       style="float: right;margin-right:10px"
       size="small"
-      icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
@@ -65,7 +64,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"
@@ -82,9 +81,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"
@@ -101,7 +100,7 @@
         >
         </el-option>
       </el-select>
-    </div>
+    </div> -->
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
@@ -756,6 +755,7 @@ export default {
          }
       }
       console.log('合并后',this.tableList)
+      
       var obj = {index:"合计",total:0}
        obj.total = this.getTotalPrice()
        for(let i=0;i<this.tableList.length;i++){
@@ -764,6 +764,7 @@ export default {
         this.tableList[i].count = this.getStockCount(this.tableList[i].id)
         this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
+        this.tableList[i].packing_unit = this.tableList[i].packing_unit
        }
        var arr = this.unique(this.tableList)
      
@@ -771,7 +772,7 @@ export default {
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','buy_price','total','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','buy_price','total','remark']
 
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)

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

@@ -12,7 +12,6 @@
      <el-button
       style="float: right;margin-right:10px"
       size="small"
-      icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
@@ -24,7 +23,7 @@
         style="width: 400px;"
         class="filter-item"
         v-model.trim="searchKey"
-        placeholder="单据编码/制单人/规格名称"
+        placeholder="单据编码/制单人/药品名称"
       />
       <el-button
         size="small"
@@ -67,7 +66,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"
@@ -84,9 +83,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"
@@ -103,7 +102,7 @@
         >
         </el-option>
       </el-select>
-    </div>
+    </div> -->
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
@@ -141,16 +140,17 @@
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
-           {{scope.row.drug_spec}}
+           <!-- {{scope.row.drug_spec}} -->
+           {{scope.row.dose}}{{scope.row.dose_unit}} * {{scope.row.min_number}}{{scope.row.min_unit}} / {{scope.row.max_unit}}
           </template>
         </el-table-column>
 
-        <el-table-column label="单据类型" align="center">
+        <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.type == 1">药品入库单</span>
             <span v-if="scope.row.type == 2">其他</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
@@ -379,7 +379,11 @@ export default {
                  warehousing_count:0,
                  price:item.price,
                  remark:item.remark,
-                 total_price:0
+                 total_price:0,
+                 dose:item.dose,
+                 dose_unit:item.dose_unit,
+                 min_number:item.min_number,
+                 max_unit:item.max_unit
                }
              }
           })
@@ -429,10 +433,12 @@ export default {
      exportList(){
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
+          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*" + this.tableList[i].min_number +this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
         }
+        
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','warehousing_count','price','total_price','remark']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','warehousing_count','price','total_price','remark']
        console.log("表格22222222",this.tableList)
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tableList.length;i++){

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

@@ -11,7 +11,6 @@
      <el-button
       style="float: right;margin-right:10px"
       size="small"
-      icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
@@ -22,7 +21,7 @@
         style="width: 400px;"
         class="filter-item"
         v-model.trim="searchKey"
-        placeholder="单据编码/制单人/规格名称"
+        placeholder="单据编码/制单人/药品名称"
       />
       <el-button
         size="small"
@@ -65,7 +64,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"
@@ -82,9 +81,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"
@@ -101,7 +100,7 @@
         >
         </el-option>
       </el-select>
-    </div>
+    </div> -->
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
@@ -139,16 +138,17 @@
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
-           {{scope.row.drug_spec}}
+           <!-- {{scope.row.drug_spec}} -->
+           {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
           </template>
         </el-table-column>
 
-        <el-table-column label="单据类型" align="center">
+        <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.type == 1">药品出库单</span>
             <span v-if="scope.row.type == 2">其他</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
@@ -405,11 +405,15 @@ export default {
                  price:item.price,
                  remark:item.remark,
                  total_price:0,
+                 dose:item.dose,
+                 dose_unit:item.dose_unit,
+                 min_number:item.min_number,
+                 max_unit:item.max_unit
                }
              }
           })
           let list = Object.values(objInfo);
-          console.log("list2334444",list)
+          
           for(let i=0;i<order.length;i++){
             list.map(item=>{
               if(order[i].drug_id == item.drug_id){
@@ -418,7 +422,7 @@ export default {
             })
           }
           
-          console.log("list22333333",list)
+         
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].child.length;j++){
               if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
@@ -429,7 +433,7 @@ export default {
           for(let i=0;i<list.length;i++){
              list[i].total_price = list[i].count * list[i].price
           }
-          console.log("list666666666",list)
+         
           this.tableList = list
           var total = response.data.data.total
           this.total = total
@@ -464,12 +468,13 @@ export default {
         }
         for(let i=0;i<this.tableList.length;i++){
            this.tableList[i].total_price = this.tableList[i].last_price * this.tableList[i].count
+           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*" + this.tableList[i].min_number +this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
         }
        console.log("列表数据333333333",this.tableList)
       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','last_price','total_price','remark']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','last_price','total_price','remark']
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tableList.length;i++){
          obj.total_price += (this.tableList[i].last_price * this.tableList[i].count)

src/xt_pages/stock/drugs/drugIndex.vue

@@ -9,15 +9,15 @@
           <el-tab-pane label="入库明细" name="first">
             <drug-in-order></drug-in-order>
           </el-tab-pane>
-          <el-tab-pane label="退货明细">
+          <!-- <el-tab-pane label="退货明细">
             <drug-cancel-order></drug-cancel-order>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="出库明细">
             <drug-out-detail></drug-out-detail>
           </el-tab-pane>
-          <el-tab-pane label="退库明细">
+          <!-- <el-tab-pane label="退库明细">
             <drug-cancel-detail></drug-cancel-detail>
-          </el-tab-pane>
+          </el-tab-pane> -->
 
         </el-tabs>
       </div>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -34,7 +34,7 @@
                 <span>{{item.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.drug_spec}}</span>
+                <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
                 <span>{{item.min_unit}}</span>
@@ -187,6 +187,10 @@
                  price:item.price,
                  remark:item.remark,
                  total_price:"",
+                 dose:item.dose,
+                 dose_unit:item.dose_unit,
+                 min_number:item.min_number,
+                 max_unit:item.max_unit
                }
              }
           })

src/xt_pages/stock/drugs/drugPrint.vue

@@ -34,7 +34,8 @@
                 <span>{{item.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.drug_spec}}</span>
+                <!-- <span>{{item.drug_spec}}</span> -->
+                <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
                 <span>{{item.min_unit}}</span>
@@ -182,6 +183,10 @@
                  warehousing_count:0,
                  price:item.price,
                  remark:item.remark,
+                 dose:item.dose,
+                 dose_unit:item.dose_unit,
+                 min_number:item.min_number,
+                 max_unit:item.max_unit
                }
              }
           })

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -64,7 +64,7 @@
         </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 == 4">手动入库</span>
              <span v-if="scope.row.drug_way == 2">自动出库</span>
              <span v-if="scope.row.drug_way == 1">手动出库</span>
            </template>
@@ -89,6 +89,7 @@
         </el-table-column>
          <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
+             <!-- {{getCountTwo(this.$route.query.drug_id,this.$route.query.min_number,this.$route.query.max_unit,this.$route.query.min_unit)}} -->
                {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
               <!-- {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}} -->
              <span></span>
@@ -218,7 +219,7 @@
           {id:0,name:"全部"},
           {id:1,name:"手动出库"},
           {id:2,name:"自动出库"},
-          {id:3,name:"采购入库"},
+          {id:3,name:"手动入库"},
 
         ],
         outList:[],

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -20,7 +20,7 @@
           style="width: 400px;"
           v-model.trim="searchKey"
           class="filter-item"
-          placeholder="单据编码/制单人/厂商"
+          placeholder="单据编码/制单人/药品名称"
         />
         <el-button
           size="small"
@@ -111,36 +111,9 @@
           </template>
         </el-table-column>
 
-        <!-- <el-table-column label="厂家" align="center">
-          <template slot-scope="scope">
-            {{scope.row.manufacturers ? scope.row.manufacturers.manufacturer_name:''}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="经销商" align="center">
-          <template slot-scope="scope">
-            {{scope.row.dealers ? scope.row.dealers.dealer_name:''}}
-          </template>
-        </el-table-column> -->
-
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
 
-             <!-- <el-tooltip
-              class="item"
-              effect="dark"
-              content="详情"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="warning"
-                icon="el-icon-document"
-                @click="handleSearch(scope.row.id)"
-              >
-              </el-button>
-            </el-tooltip> -->
-            
             <el-tooltip
               class="item"
               effect="dark"
@@ -217,12 +190,12 @@
         </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">
-            {{scope.row.number}}
+            {{scope.row.batch_number}}
           </template>
         </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            {{scope.row.warehousing_count}}
+            {{scope.row.warehousing_count}}{{scope.row.drug.max_unit}}
           </template>
         </el-table-column>
         <el-table-column label="进货价" align="center">
@@ -249,6 +222,11 @@
           <template slot-scope="scope">
             {{getTime(scope.row.expiry_date)}}
           </template>
+        </el-table-column>
+         <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealer(scope.row.dealer)}}
+          </template>
         </el-table-column>
         <el-table-column label="批准文号" align="center">
           <template slot-scope="scope">
@@ -443,7 +421,8 @@ export default {
       showOne:false,
       drugTypeList:[],
       manufacturerList:[],
-      order_id:""
+      order_id:"",
+      dealerList:[]
     };
   },
   methods: {
@@ -456,6 +435,7 @@ export default {
         type: this.type,
         keywords: this.searchKey
       };
+      console.log("parasm2222222",Params)
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then(response => {
         if (response.data.state == 0) {
@@ -478,9 +458,9 @@ export default {
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
-        type: this.type
+        type: this.type,
+        keywords:this.searchKey,
       };
-      console.log("params",Params)
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then(response => {
         if (response.data.state == 0) {
@@ -493,7 +473,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
-          console.log("列表",this.warehouse.warehouseDate)
+          console.log("列表999988888",this.warehouse.warehouseDate)
         }
       });
     },
@@ -781,6 +761,7 @@ export default {
           if(response.data.state == 1){
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
+            this.dealerList = response.data.data.dealerList
           }
        })
      },
@@ -793,6 +774,15 @@ export default {
         }
         return name
      },
+     getDealer(id){
+       var name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+             name = this.dealerList[i].dealer_name
+          }
+       }
+      return name
+     },
      getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -31,31 +31,7 @@
          <!-- <div class="titleOne">当前进货价合计:</div> -->
       </div>
      
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
-          <el-option
-            v-for="(option, index) in dealer"
-            :key="index"
-            :label="option.dealer_name"
-            :value="option.id">
-          </el-option>
-        </el-select>
-      </div> -->
-
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
-
-        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商"
-                   @change="changeManufacturer">
-          <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
@@ -130,7 +106,7 @@
                 <el-form-item style="padding-top: 20px">
                   <el-input
                     placeholder="请输入批号"
-                    v-model="scope.row.lot_number"
+                    v-model="scope.row.batch_number"
                   ></el-input>
                 </el-form-item>
               </template>
@@ -223,13 +199,27 @@
               ></el-date-picker>
             </template>
           </el-table-column>
+
+
+      <el-table-column label="经销商" width="140" 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.id">
+              </el-option>
+              </el-select>
+          </template>
+        </el-table-column>
         
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入批准文号"
-                  v-model="scope.row.batch_number"
+                  v-model="scope.row.number"
                 ></el-input>
               </el-form-item>
             </template>
@@ -405,6 +395,7 @@
         goodInfo:[],
         drugList:[],
         manufacturerList:[],
+        dealerList:[],
         showOne:true,
         showTwo:false,
         drugTypeList:[],
@@ -550,6 +541,7 @@
         tempObj['batch_number'] = ''
         tempObj['dose']= ''
         tempObj['dose_unit']=''
+        tempObj['dealer'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -676,7 +668,24 @@
               return
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+             if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
                this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+             if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
+              for(let j=0;j<this.manufacturerList.length;j++){
+                 if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+                      this.recordInfo.recordData[i].manufacturer =  this.manufacturerList[j].id
+                 }
+              }
+
+              for(let z=0;z<this.dealerList.length;z++){
+                if(this.recordInfo.recordData[i].dealer == this.dealerList[z].dealer_name){
+                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
+                }
+              }
             }
             const params = {
               'stockIn': this.recordInfo.recordData
@@ -753,6 +762,8 @@
              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++){
@@ -760,7 +771,17 @@
                      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 {
@@ -780,9 +801,15 @@
              this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
              this.recordInfo.recordData[i].last_price = val.last_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
-             this.recordInfo.recordData[i].batch_number = val.number
+             this.recordInfo.recordData[i].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)
@@ -822,7 +849,7 @@
       tempObj['batch_number'] = ''
       tempObj['drug_type'] = ''
       tempObj['batch_number'] = ''
-      
+      tempObj['dealer'] = ''
       this.recordInfo.recordData.push(tempObj)
       
       this.GetConfigInfo()

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -36,7 +36,7 @@
               <td style="line-height: 18px">
                  <span v-if="item.drug_id != 0">{{item.drug_name}}</span>
               </td>
-              <td style="line-height: 18px">{{ item.remark }}</td>
+              <td style="line-height: 18px">{{ item.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>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -171,7 +171,7 @@
                   <el-form-item style="padding-top: 20px">
                     <el-input
                       placeholder="请输入批号"
-                      v-model="scope.row.lot_number"
+                      v-model="scope.row.batch_number"
                     ></el-input>
                   </el-form-item>
                 </template>
@@ -266,6 +266,31 @@
               ></el-date-picker>
             </template>
           </el-table-column>
+
+          <el-table-column label="经销商" width="140" 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.id">
+                </el-option>
+                </el-select>
+            </template>
+          </el-table-column>
+
+          
+        <el-table-column align="center" width="150" label="批准文号">
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input
+                  placeholder="请输入批准文号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
  
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
@@ -402,6 +427,7 @@ export default {
       goodInfo:[],
       drugList:[],
       manufacturerList:[],
+      dealerList:[],
     };
   },
   methods: {
@@ -637,6 +663,12 @@ export default {
                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
                }
             }
+
+            for(let z=0;z<this.dealerList.length;z++){
+              if(this.recordInfo.recordData[i].dealer == this.dealerList[z].dealer_name){
+                  this.recordInfo.recordData[i].dealer = this.dealerList[z].id
+              }
+            }
             
           }
           const params = {
@@ -678,6 +710,9 @@ export default {
        
           var manufacturerList = response.data.data.manufacturerList
           console.log("000000000000",response.data.data.info)
+          this.manufacturerList = manufacturerList
+          var dealerList  = response.data.data.dealerList
+          this.dealerList = dealerList
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
@@ -708,6 +743,10 @@ export default {
            if(response.data.data.info[i].manufacturer == 0){
                response.data.data.info[i].manufacturer = ""
             }
+
+           if(response.data.data.info[i].dealer == 0){
+               response.data.data.info[i].dealer = ""
+            }
           
             this.recordInfo.recordData.push(response.data.data.info[i]);
            
@@ -716,13 +755,19 @@ export default {
                  response.data.data.info[i].manufacturer = manufacturerList[j].manufacturer_name
                }
             }
+
+            for(let z=0;z<dealerList.length;z++){
+               if(response.data.data.info[i].dealer == dealerList[z].id){
+                 response.data.data.info[i].dealer = dealerList[z].dealer_name
+               }
+            }
           }
           console.log("列表详情",this.recordInfo.recordData)
 
 
           this.warehouse = response.data.data.warehousing;
-          this.form.manufacturer = this.warehouse.manufacturer;
-          this.form.dealer = this.warehouse.dealer;
+          // this.form.manufacturer = this.warehouse.manufacturer;
+          // this.form.dealer = this.warehouse.dealer;
 
           this.warehousing_time = this.getTime(
             this.warehouse.warehousing_time,
@@ -751,6 +796,9 @@ export default {
              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++){
@@ -759,6 +807,13 @@ export default {
 
                   }
                 }
+
+               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 {
@@ -778,11 +833,22 @@ export default {
              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
+             if(val.last_price == 0){
+               this.recordInfo.recordData[i].last_price =""
+             }else{
+               this.recordInfo.recordData[i].last_price = val.last_price
+             }
+           
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
-             this.recordInfo.recordData[i].batch_number = val.number
+             this.recordInfo.recordData[i].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
+             }
+            
            }
         }
       },

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -223,24 +223,25 @@
               {{scope.row.dose}} {{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="批号" align="center">
+          <el-table-column label="批号" align="center">
             <template slot-scope="scope">
-            {{scope.row.number}}
+              <span v-if="scope.row.batch_number!=''">{{scope.row.batch_number}}</span> 
+             <span v-if="scope.row.batch_number == '0'"></span> 
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              {{scope.row.count}}
+              {{scope.row.count}}{{scope.row.max_unit}}
             </template>
           </el-table-column>
           <el-table-column label="进货价" align="center">
             <template slot-scope="scope">
-              {{scope.row.last_price}}
+              {{scope.row.price}}
             </template>
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              {{scope.row.count * scope.row.last_price}}
+              {{(scope.row.count * scope.row.price).toFixed(2)}}
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -258,11 +259,17 @@
               {{getTime(scope.row.expiry_date)}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="批准文号" align="center">
+          <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">
-              {{scope.row.number}}
+             <span v-if="scope.row.number!=''">{{scope.row.number}}</span> 
+             <span v-if="scope.row.number == '0'"></span>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
               {{scope.row.remark}}
@@ -303,7 +310,7 @@
             </template>
             <template slot-scope="scope">
               <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
-              <span v-if="scope.row.is_total == 1"></span>
+              <span  v-if="scope.row.is_total == 1"></span>
             </template>
           </el-table-column>
           <el-table-column min-width="35" align="center">
@@ -311,7 +318,8 @@
               <span>使用数量</span>
             </template>
             <template slot-scope="scope">
-              <span >{{scope.row.count}}</span>
+              <span >{{scope.row.count}}{{scope.row.count_unit}}</span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}}</span>
             </template>
           </el-table-column>
 
@@ -321,7 +329,6 @@
             </template>
             <template slot-scope="scope">
               <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
-              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
             </template>
           </el-table-column>
 
@@ -376,8 +383,8 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetWarehouseOut();
-    this.GetConfigInfo();
-    // this.fetchAllAdminUsers();
+    // this.GetConfigInfo();
+    this.fetchAllAdminUsers();
   },
   data() {
     return {
@@ -421,6 +428,7 @@ export default {
       manufacturerList:[],
       drugDialogVisible:false,
       order_id:0,
+      dealerList:[]
     };
   },
   methods: {
@@ -433,6 +441,7 @@ export default {
         type: this.type,
         keywords: this.searchKey
       };
+      console.log("paras22222222",Params)
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
@@ -458,7 +467,8 @@ export default {
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
-        type: this.type
+        type: this.type,
+        keywords: this.searchKey
       };
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then(response => {
@@ -561,53 +571,18 @@ export default {
     },
 
     handleEdit: function(index, row) {
-      // this.$router.push({
-      //   name: "drugStockOutDetail",
-      //   query: { id: row.id, type: this.type }
-      // });
-      this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type})
+      console.log("row2222222",row)
+      this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
     },
-    // handleSearch(id,time,warehouse_out_order_number){
-    //   this.warehousingOutInfo.warehousingOutData = []
-    //   this.GetOrderDetail(id)
-    //   this.list = []
-    //   this.getDrugAutoMaticList(id,time,warehouse_out_order_number)
-    //   this.dialogVisible = true
-    // },
     handleSearch(val){
-       console.log("val2222222222",val)
+      
        this.getInitializtion()
        this.getSinleOrderDetail(val.id)
        this.list = []
       //  this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
 
     },
-    GetOrderDetail(order_id) {
-        const params = {
-          'id': order_id
-        }
-        getDrugWarehouseOutInfo(params).then(response => {
-          if (response.data.state == 0) {
-
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.tableShow = true
-            this.warehousingOutInfo.warehousingOutData=[]
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-              this.tableList.push(response.data.data.list[i])
 
-            }
-            console.log("详情222",this.tableList)
-            this.warehousingOutInfo.info = response.data.data.info
-            var manulist = response.data.data.manulist
-            this.manufacturerList = manulist
-            console.log("厂家列表",this.manufacturerList)
-            this.handleSpanTempArr()
-          }
-        })
-      },
     handleDelete: function(index, row) {
       const ids = [];
       ids.push(row.id);
@@ -864,6 +839,15 @@ export default {
      }
      return name
    },
+   getDealerName(id){
+      var name = ""
+     for(let i=0;i<this.dealerList.length;i++){
+       if(id == this.dealerList[i].id){
+         name = this.dealerList[i].dealer_name
+       }
+     }
+     return name
+   },
    getSinleOrderDetail(id){
        var params = {
          id:id,
@@ -874,6 +858,17 @@ export default {
           this.tableList = []
           var list =  response.data.data.list
           console.log("list",list)
+         this.manufacturerList = response.data.data.manufacturerList
+         this.dealerList = response.data.data.dealerList
+         for(let i=0;i<list.length;i++){
+           if(list[i].batch_number == "0" || list[i].batch_number == 0){
+              list[i].batch_number = ""
+           }
+
+           if(list[i].number == "0" || list[i].number == 0){
+              list[i].number = ""
+           }
+         }
           this.tableList = list
         }
      })
@@ -896,6 +891,7 @@ export default {
           this.userList.push(obj)
           total = total + response.data.data.list[i].count
         }
+        console.log("出库数据222222222",this.userList)
         this.userList.push({
           is_total: 1,
           total: total,

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -51,46 +51,7 @@
         ></el-date-picker>
       </div>
 
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select
-          size="small"
-          v-model="form.dealer"
-          filterable
-          placeholder="请选择经销商"
-          @change="changeDealer"
-          style="width: 200px;"
-        >
-          <el-option
-            v-for="(option, index) in dealer"
-            :key="index"
-            :label="option.dealer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div> -->
-
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
-        <el-select
-          size="small"
-          v-model="form.manufacturer"
-          filterable
-          placeholder="请选择厂商"
-          @change="changeManufacturer"
-          style="width: 200px;"
-        >
-          <el-option
-            v-for="(option, index) in manufacturer"
-            :key="index"
-            :label="option.manufacturer_name"
-            :value="option.id"
-          >
-          </el-option>
-        </el-select>
-      </div> -->
-
+    
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
           :data="recordInfo.recordData"
@@ -155,7 +116,7 @@
               </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>
               </template>
@@ -167,7 +128,7 @@
                     ></el-input>
                   </el-form-item>
               </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -197,14 +158,14 @@
             <template slot-scope="scope">
             
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.last_price'"
-                :rules="tableRules.last_price"
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
                 style="padding-top: 20px"
               >
                 <el-input
                   placeholder="请输入出货价"
                   type="number"
-                  v-model="scope.row.last_price"
+                  v-model="scope.row.price"
                 ></el-input>
               </el-form-item>
             </template>
@@ -212,7 +173,7 @@
 
           <el-table-column label="总价" width="80" align="center">
             <template slot-scope="scope">
-              {{ calculate(scope.row.last_price * scope.row.count) }}
+              {{ calculate(scope.row.price * scope.row.count) }}
             </template>
           </el-table-column>
    
@@ -256,7 +217,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-<!--         
+        
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
@@ -266,7 +227,20 @@
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column> -->
+        </el-table-column>
+
+         <el-table-column label="经销商" width="140" 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"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 
           <el-table-column label="备注" width="120" align="center">
             <template slot-scope="scope">
@@ -374,6 +348,7 @@ export default {
       goodInfo:[],
       drugList:[],
       manufacturerList:[],
+      dealerList:[],
       showOne:true,
       showTwo:false,
       drugTypeList:[],
@@ -381,65 +356,35 @@ export default {
     };
   },
   methods: {
-    comfirm: function(val) {
-      this.propForm.goodType = []
-      this.propForm.goods = []
-
-      this.$refs.dialog.hide()
-
-      if (val.selectedGoodInfo.length > 0) {
-        for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
-          if (i == 0) {
-            this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
-            this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
-            this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-            this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit.toString()
-          } else {
-            const tempForm = {}
-            tempForm['drug_id'] = val.selectedGoodInfo[i].id
-            tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
-            tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
-            tempForm['count'] = ''
-            tempForm['remark'] = ''
-            tempForm['min_unit'] = val.selectedGoodInfo[i].min_unit
-            this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
-          }
-        }
-      }
-
-      this.currentIndex = -1
-
-      // this.$refs.dialog.hide();
-      // this.propForm.goodType = [];
-      // if (val.selectedGoodInfo.length > 0) {
-      //   for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
-      //     if (i == 0) {
-      //       this.recordInfo.recordData[this.currentIndex].good_type_id =
-      //         val.selectedGoodInfo[i].good_type_id;
-      //       this.recordInfo.recordData[this.currentIndex].good_id =
-      //         val.selectedGoodInfo[i].id;
-      //       this.recordInfo.recordData[
-      //         this.currentIndex
-      //       ].price = val.selectedGoodInfo[i].buy_price.toString();
-      //     } else {
-      //       console.log(val.selectedGoodInfo[i].buy_price.toString());
-      //       const tempForm = {};
-      //       tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
-      //       tempForm["good_id"] = val.selectedGoodInfo[i].id;
-      //       tempForm["count"] = "";
-      //       tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
-      //       tempForm["remark"] = "";
-      //       this.recordInfo.recordData.splice(
-      //         this.currentIndex + 1,
-      //         0,
-      //         tempForm
-      //       );
-      //     }
-      //   }
-      // }
-      //
-      // this.currentIndex = -1;
-    },
+    // comfirm: function(val) {
+    //   this.propForm.goodType = []
+    //   this.propForm.goods = []
+
+    //   this.$refs.dialog.hide()
+
+    //   if (val.selectedGoodInfo.length > 0) {
+    //     for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
+    //       if (i == 0) {
+    //         this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+    //         this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
+    //         this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
+    //         this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit.toString()
+    //       } else {
+    //         const tempForm = {}
+    //         tempForm['drug_id'] = val.selectedGoodInfo[i].id
+    //         tempForm['retail_price'] = val.selectedGoodInfo[i].retail_price.toString()
+    //         tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
+    //         tempForm['count'] = ''
+    //         tempForm['remark'] = ''
+    //         tempForm['min_unit'] = val.selectedGoodInfo[i].min_unit
+    //         this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+    //       }
+    //     }
+    //   }
+
+    //   this.currentIndex = -1
+
+    // },
     cancle: function() {
       this.$refs.dialog.hide();
     },
@@ -508,6 +453,8 @@ export default {
       tempObj['dose'] = ""
       tempObj['dose_unit'] = ""
       tempObj["min_number"] = ""
+      tempObj["number"] = ""
+      tempObj["batch_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -610,13 +557,28 @@ export default {
             return;
           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
-            this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+
+            for(let j=0;j<this.manufacturerList.length;j++){
+              if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+                  this.recordInfo.recordData[i].manufacturer =  this.manufacturerList[j].id
+              }
+              
+            }
+             if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
+            for(let z=0;z<this.dealerList.length;z++){
+              if(this.recordInfo.recordData[i].dealer == this.dealerList[z].dealer_name){
+                  this.recordInfo.recordData[i].dealer = this.dealerList[z].id
+              }
+            }
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
           console.log("params222222",params)
-          
+         
           postDrugWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -625,12 +587,27 @@ export default {
             this.type
           ).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
+              this.$message.error("库存不足");
               return false;
             } else {
-              this.$message.success("出库成功");
-              this.recordInfo.recordData = [];
-              this.$router.back(-1);
+              var msg = response.data.data.msg
+              var drug_name =  response.data.data.drug_name
+              var dose = response.data.data.dose
+              var dose_unit = response.data.data.dose_unit
+              var min_number = response.data.data.min_number
+              var min_unit =  response.data.data.min_unit
+              var max_unit =  response.data.data.max_unit
+
+              var str = drug_name + "" + dose + dose_unit * min_number + min_unit+"/"+max_unit
+              console.log("str22222222",str)
+              if(msg == 1){
+                this.$message.error(str + "库存不足,请入库")
+              }else{
+                this.$message.success("出库成功");
+                this.recordInfo.recordData = [];
+                this.$router.back(-1);
+              }
+              
             }
           });
         } else {
@@ -665,13 +642,22 @@ export default {
              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([])
@@ -682,6 +668,7 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
+        console.log("val2222222",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].drug_id = val.id
@@ -694,72 +681,23 @@ export default {
             this.recordInfo.recordData[i].min_unit = val.min_unit
          
             this.recordInfo.recordData[i].number = val.number
-            this.recordInfo.recordData[i].last_price = val.last_price
+            if(val.retail_price == 0){
+              this.recordInfo.recordData[i].price = ""
+            }else{
+              this.recordInfo.recordData[i].price = val.retail_price
+            }
+           
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dose + this.recordInfo.recordData[i].dose_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].max_unit
+          
+            if(val.dealer == 0){
+               this.recordInfo.recordData[i].dealer = ""
+            }else{
+               this.recordInfo.recordData[i].dealer = val.dealer
+            }
           }
         }
       }, 
-      // handleSelect(val){
-      //     console.log("val222222",val)
-      //    if(this.recordInfo.recordData.length == 1){
-      //       this.recordInfo.recordData[0].drug_id = val.id
-      //       this.recordInfo.recordData[0].drug_name = val.drug_name
-      //       this.recordInfo.recordData[0].drug_type = val.drug_type
-      //       this.recordInfo.recordData[0].dose = val.dose
-      //       this.recordInfo.recordData[0].dose_unit = val.dose_unit
-      //       this.recordInfo.recordData[0].max_unit = val.max_unit
-      //       this.recordInfo.recordData[0].min_number = val.min_number
-      //       this.recordInfo.recordData[0].min_unit = val.min_unit
-      //       this.recordInfo.recordData[0].packing_unit = val.packing_unit
-      //       this.recordInfo.recordData[0].number = val.number
-      //       this.recordInfo.recordData[0].last_price = val.last_price
-      //       this.recordInfo.recordData[0].manufacturer = val.manufacturer
-      //    for(let i=0;i<this.recordInfo.recordData.length;i++){       
-      //      this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dose + this.recordInfo.recordData[i].dose_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].max_unit
-      //      this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
-      //      for(let j=0;j<this.drugTypeList.length;j++){
-      //          if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
-      //             this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
-      //          } 
-      //      }
-      //    }
-      //    }else{
-      //       var arr = []
-      //       for(let i=0;i<this.recordInfo.recordData.length;i++){ 
-      //         if(this.recordInfo.recordData[i].drug_id> 0){
-      //            arr.push(this.recordInfo.recordData[i])
-      //         }
-      //       } 
-      //       this.recordInfo.recordData = arr
-      //       const tempObj = {}
-      //       tempObj['drug_name'] = val.drug_name
-      //       tempObj['drug_id'] = val.id
-      //       tempObj['number'] = ''
-      //       tempObj['product_date'] = ''
-      //       tempObj['expiry_date'] = ''
-      //       tempObj['warehousing_count'] = ''
-      //       tempObj['retail_price'] = ''
-      //       tempObj['price'] = ''
-      //       tempObj['remark'] = ''
-      //       tempObj['dealer'] = ''
-      //       tempObj['manufacturer'] = ''
-      //       tempObj['min_unit'] = ''
-      //       tempObj['batch_number'] = ''
-      //       tempObj['drug_type'] = ''
-      //       this.recordInfo.recordData.push(tempObj) 
-      //    }
-
-      //   for(let i=0;i<this.recordInfo.recordData.length;i++){       
-      //     this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].unval + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
-      //     this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
-      //     for(let j=0;j<this.drugTypeList.length;j++){
-      //        if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
-      //           this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
-      //         } 
-      //      }
-      //   }
-      // },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
@@ -789,7 +727,7 @@ export default {
     tempObj['dose'] = ""
     tempObj['dose_unit'] = ""
     tempObj["min_number"] = ""
-    
+    tempObj["dealer"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -13,22 +13,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>-->
-      <!--<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"
@@ -38,40 +22,6 @@
       >
       </drugs-stock-dialog>
 
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">出库时间</span> : </label>
-        <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false"
-                        style="width: 196px;"
-                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd"></el-date-picker>
-      </div> -->
-
-
-      <!-- <div 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
@@ -94,7 +44,8 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
-                    style="width:160px;"
+                    style="width:120px;"
+                    :disabled="drug_show"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -109,7 +60,7 @@
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商"  :disabled="drug_show">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"
@@ -133,19 +84,20 @@
               </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>
               </template>
                 <template slot-scope="scope">
                   <el-form-item style="padding-top: 20px">
                     <el-input
+                     :disabled="drug_show"
                       placeholder="请输入批号"
                       v-model="scope.row.batch_number"
                     ></el-input>
                   </el-form-item>
               </template>
-          </el-table-column> -->
+          </el-table-column>
            <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -158,6 +110,7 @@
               >
                 <div style="display:flex;">
                   <el-input
+                   :disabled="drug_show"
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
@@ -175,14 +128,15 @@
             <template slot-scope="scope">
             
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.last_price'"
-                :rules="tableRules.last_price"
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
                 style="padding-top: 20px"
               >
                 <el-input
+                 :disabled="drug_show"
                   placeholder="请输入出货价"
                   type="number"
-                  v-model="scope.row.last_price"
+                  v-model="scope.row.price"
                 ></el-input>
               </el-form-item>
             </template>
@@ -194,7 +148,7 @@
           </el-table-column>
           <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled="drug_show">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -207,6 +161,7 @@
             <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
+               :disabled="drug_show"
                 prefix-icon="el-icon-date"
                 style="width: 145px"
                 v-model="scope.row.product_date"
@@ -220,6 +175,7 @@
           <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
+               :disabled="drug_show"
                 prefix-icon="el-icon-date"
                 style="width: 145px"
                 v-model="scope.row.expiry_date"
@@ -230,20 +186,33 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-           <!-- <el-table-column align="center" width="150" label="批准文号">
+          <el-table-column label="经销商" width="140" align="center">
+            <template slot-scope="scope">
+               <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商"  :disabled="drug_show">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+           <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
+                 :disabled="drug_show"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column>
 
           <el-table-column label="备注" width="120" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark"  :disabled="drug_show"></el-input>
             </template>
           </el-table-column>
 
@@ -350,7 +319,8 @@
         goodType: [],
         goodInfo:[],
         drugTypeList:[],
-        manufacturerList:[]
+        manufacturerList:[],
+        drug_show:false
       }
     },
     methods: {
@@ -396,7 +366,8 @@
         this.propForm.goods = [];
 
         this.propForm.goodType = [];
-      }, GetConfigInfo: function() {
+      }, 
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: "Loading",
@@ -442,7 +413,12 @@
           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      },
+       handleEdit: function(index, row) {
+        if(this.drug_show == true){
+          this.$message.error("自动出库数据不能编辑")
+          return
+        }
         const tempObj = {}
         tempObj['id'] = 0
         tempObj['drug_id'] = 0
@@ -451,8 +427,14 @@
         tempObj['count'] = ''
         tempObj['price'] = ''
         tempObj['remark'] = ''
+        tempObj['batch_number'] = ''
+        tempObj['number'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
+        if(this.drug_show == true){
+          this.$message.error("自动出库数据不能编辑")
+          return
+        }
         if (row.id == 0) {
           this.recordInfo.recordData.splice(index, 1)
         } else {
@@ -544,12 +526,21 @@
                 return;
               }
             }
+            console.log("经销商",this.dealerList)
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+              if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+              }
                for(let j=0;j<this.manufacturerList.length;j++){
-                 if(this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].manufacturer_name){
+                 if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                     this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
                  }
                }
+               for(let z=0;z<this.dealerList.length;z++){
+                 if(this.recordInfo.recordData[i].dealer == this.dealerList[z].dealer_name){
+                    this.recordInfo.recordData[i].dealer = this.dealerList[z].id
+                 }
+               }
             }
             const params = {
               'stockOut': this.recordInfo.recordData
@@ -578,18 +569,39 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-             console.log("list222222",response.data.data.list)
+             console.log("出库详情",response.data.data.list)
             var manulist = response.data.data.manulist
+            this.manufacturerList = manulist
+            this.dealerList =  response.data.data.dealerList
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name,
               response.data.data.list[i].drug_type = response.data.data.list[i].drug.drug_type
               response.data.data.list[i].name = response.data.data.list[i].drug.dose + response.data.data.list[i].drug.dose_unit +"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit + "/" + response.data.data.list[i].drug.max_unit
-              response.data.data.list[i].last_price = response.data.data.list[i].drug.last_price.toString()
-              response.data.data.list[i].number = response.data.data.list[i].drug.number
-              response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
+              if(response.data.data.list[i].number == "0" || response.data.data.list[i].number == 0){
+                  response.data.data.list[i].number = ""
+              }else{
+                response.data.data.list[i].number = response.data.data.list[i].number
+              }
+              
+              if(response.data.data.list[i].manufacturer == "0" || response.data.data.list[i].manufacturer == 0){
+                response.data.data.list[i].manufacturer = ""
+              }else{
+                response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
+              }
+              
+             
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              if(response.data.data.list[i].dealer == "0" || response.data.data.list[i].dealer == 0){
+                  response.data.data.list[i].dealer = ""
+              }else{
+                response.data.data.list[i].dealer = response.data.data.list[i].dealer
+              }
+             
+              response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{h}-{d}")
+              response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{h}-{d}")
+              
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
              for(let j=0;j<this.recordInfo.recordData.length;j++){
@@ -598,12 +610,16 @@
                      this.recordInfo.recordData[j].manufacturer = manulist[i].manufacturer_name
                   }
                }
+               for(let z=0;z<this.dealerList.length;z++){
+                 if(this.recordInfo.recordData[j].dealer == this.dealerList[z].id){
+                    this.recordInfo.recordData[j].dealer = this.dealerList[z].dealer_name
+                 }
+               }
               }
 
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
-            this.form.manufacturer = this.warehouseOut.manufacturer
-            this.form.dealer = this.warehouseOut.dealer
+          
 
           }
 
@@ -671,11 +687,12 @@
              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].last_price = val.retail_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
-             this.recordInfo.recordData[i].batch_number = val.number
+             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
+           
            }
         }
         console.log("333333",this.recordInfo.recordData)
@@ -690,6 +707,13 @@
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id
       this.GetOrderDetail(order_id)
+      var sys = this.$route.query.is_sys
+      if(sys == 0){
+        this.drug_show = false
+      }
+      if(sys == 1){
+        this.drug_show = true
+      }
     }
 
   }

src/xt_pages/stock/drugs/query.vue

@@ -123,7 +123,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-            <!-- {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}} -->
+           
             {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
            </template>
         </el-table-column>
@@ -451,7 +451,7 @@ import { min } from 'moment'
            this.tableList[i].overplusCount = this.getCountTwo(this.tableList[i].drug_id,this.tableList[i].min_number,this.tableList[i].max_unit,this.tableList[i].min_unit)
          }
        
-         console.log("2322323232",this.tableList)
+         console.log("hhhhhhhadhfadf 列表",this.tableList)
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
          const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']

src/xt_pages/stock/stockBatchNumber.vue

@@ -6,7 +6,7 @@
     <div class="app-container ">
       <div class="cell clearfix">
         耗材名称:{{this.$route.query.good_name}} &nbsp;
-        库存:{{getInCount(this.$route.query.id)}} &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;
         规格:{{this.$route.query.specification_name}} &nbsp;
         厂家:{{this.$route.query.manufacturer}} 
       </div>
@@ -187,7 +187,8 @@
         outCountList:[],
         autoCountList:[],
         keywords:"",
-        packing_unit:""
+        packing_unit:"",
+        cancelCountList:[],
       }
     },
     methods:{
@@ -273,6 +274,34 @@
         }
         return count
      },
+     getOutCount(id){
+        console.log("id222",id)
+        var count = ""
+        for(let i=0;i<this.outCountList.length;i++){
+          if(id == this.outCountList[i].good_id){
+            count = this.outCountList[i].count
+          }
+        }
+        return count
+      },
+      getAutoCount(id){
+        var count= ""
+        for(let i=0;i<this.autoCountList.length;i++){
+          if(id == this.autoCountList[i].good_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        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
+        }
+      }
+      return count
+    },
      getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
@@ -295,6 +324,9 @@
            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
          }
       })
     },

src/xt_pages/stock/stockDetailIndex.vue

@@ -9,10 +9,10 @@
           <el-tab-pane label="入库明细" name="first">
             <stock-in-detail></stock-in-detail>
           </el-tab-pane>
-          <el-tab-pane label="退货明细">
+          <!-- <el-tab-pane label="退货明细">
             <sales-return-detail></sales-return-detail>
 
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="出库明细">
             <stock-out-detail></stock-out-detail>
 

src/xt_pages/stock/stockFlow.vue

@@ -6,7 +6,7 @@
     <div class="app-container ">
       <div class="cell clearfix">
        耗材名称:{{this.$route.query.good_name}} &nbsp;
-       库存:{{getInCount(this.$route.query.id)}} &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;
        规格:{{this.$route.query.specification_name}} &nbsp;
        厂家:{{this.$route.query.manufacturer}} 
       </div>
@@ -212,7 +212,8 @@
         autoCountList:[],
         keywords:"",
         obj:{},
-        packing_unit:""
+        packing_unit:"",
+        cancelCountList:[]
       }
     },
     methods:{
@@ -342,6 +343,9 @@
            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
          }
       })
     },
@@ -373,6 +377,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
+        }
+      }
+      return count
+    },
      getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
@@ -385,8 +398,6 @@
        if(val == 2 || val == 3 || val == 0){
         this.getStockOutList()
        }
-      
-      
      }
     }
   }

src/xt_pages/stock/stockInOrder.vue

@@ -189,7 +189,7 @@
         </el-table-column>
         <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-            {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
+            {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
           </template>
         </el-table-column>
         <el-table-column label="批号" align="center">
@@ -199,7 +199,7 @@
         </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.warehousing_count}}
+            {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
           </template>
         </el-table-column>
         <el-table-column label="进货价" align="center">
@@ -227,6 +227,11 @@
             {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
           </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">
             {{ scope.row.license_number}}
@@ -545,6 +550,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
+          
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -1093,6 +1099,7 @@ export default {
       for(let i=0;i<selection.length;i++){
         ids.push(selection[i].id)
       }
+      this.exportList = []
       var str = ids.join(",")
       this.order_id = str
       this.selectedTableData = selection;
@@ -1457,7 +1464,7 @@ export default {
       getExportStockList(params).then(response=>{
         if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("l类型",this.manufacturer)
+           console.log("数据导出222222",list)
            for(let i=0;i<this.goodType.length;i++){
              for(let j=0;j<list.length;j++){
                if(this.goodType[i].id == list[j].good_type_id){
@@ -1482,19 +1489,23 @@ export default {
                }
             }
           }
-         
+          console.log("表格2222222",this.exportList)
           this.exportList = list
         }
       })
     },
     toExport(){
-       console.log("列表22222222222",this.exportList)
+     if(this.order_id == ""){
+        this.$message.error("请勾选入库单")
+        return
+      }
       import('@/vendor/Export2Excel').then(excel => {
 
-      const tHeader = ['耗材类型', '耗材名称', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','备注']
-      const filterVal = ['good_type_name', 'good_name', 'unit','number','total_count','price','total_price','manufacturer','product_date','expiry_date','dealer','remark']
+      const tHeader = ['耗材名称','注册证号/批准文号/备案凭证号', '规格型号','生产厂家','单位','进货价','入库数量','总价','批号','生产日期','有效日期']
+      const filterVal = ['good_name', 'license_number', 'unit','manufacturer','packing_unit','price','warehousing_count','total_price','number','product_date','expiry_date']
 
       console.log("table",this.exportList)
+      
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
         header: tHeader,

src/xt_pages/stock/stockInOrderAdd.vue

@@ -26,33 +26,7 @@
                         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" filterable 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" filterable 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 id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border
                   style="width: 100%"
@@ -672,6 +646,9 @@
               return
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+             if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
               for(let j=0;j<this.manufacturerList.length;j++){
                  if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                
@@ -768,11 +745,21 @@
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
-              this.recordInfo.recordData[i].price = val.buy_price
+              if(val.buy_price == 0){
+               this.recordInfo.recordData[i].price = ""
+              }else{
+                this.recordInfo.recordData[i].price = val.buy_price
+              }
+              
               this.recordInfo.recordData[i].specification_name = val.specification_name
               this.recordInfo.recordData[i].good_id = val.id
               this.recordInfo.recordData[i].packing_unit = val.packing_unit
-              this.recordInfo.recordData[i].dealer = val.dealer
+              if(val.dealer == 0){
+                this.recordInfo.recordData[i].dealer = ""
+              }else{
+                this.recordInfo.recordData[i].dealer = val.dealer
+              }
+             
            }
          }
       }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -651,12 +651,19 @@ export default {
          
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
-            
-          for(let j=0;j<this.manufacturerList.length;j++){
+             if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
+            for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                   this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
-                 }
+                  }
               }
+             for(let z=0;z<this.dealerList.length;z++){
+               if(this.recordInfo.recordData[i].dealer == this.dealerList[z].dealer_name){
+                  this.recordInfo.recordData[i].dealer = this.dealerList[z].id
+               }
+             }
           }
          
           const params = {
@@ -713,6 +720,12 @@ export default {
             response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "/"+response.data.data.info[i].GoodInfo.packing_unit
             response.data.data.info[i].packing_unit = response.data.data.info[i].GoodInfo.packing_unit
             
+            if(response.data.data.info[i].manufacturer == 0){
+              response.data.data.manufacturer = ""
+            }
+            if(response.data.data.info[i].dealer == 0){
+              response.data.data.info[i].dealer = ""
+            }
            
             this.recordInfo.recordData.push(response.data.data.info[i]);
            
@@ -758,7 +771,7 @@ export default {
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
-            // this.dealerList = response.data.data.dealerList
+            this.dealerList = response.data.data.dealerList
             for(let i=0;i<this.goodList.length;i++){
                 for(let j=0;j<manufacturerList.length;j++){
                   if(this.goodList[i].manufacturer == manufacturerList[j].id){
@@ -766,13 +779,13 @@ export default {
                   }
                 }
             }
-            // for(let i=0;i<this.goodList.length;i++){
-            //    for(let j=0;j<this.dealerList.length;j++){
-            //       if(this.goodList[i].dealer == this.dealerList[j].id){
-            //         this.goodList[i].dealer = this.dealerList[j].dealer_name
-            //       }
-            //    }
-            //  }
+            for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
             cb(this.goodList)
           } else {
             cb([])
@@ -793,11 +806,21 @@ export default {
             this.recordInfo.recordData[i].number =  val.number
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
-            this.recordInfo.recordData[i].price = val.buy_price
+            if(val.buy_price == 0){
+               this.recordInfo.recordData[i].price= ""
+            }else{
+               this.recordInfo.recordData[i].price = val.buy_price
+            }
+          
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
             this.recordInfo.recordData[i].packing_unit = val.packing_unit
-            this.recordInfo.recordData[i].dealer = val.dealer
+            if(val.dealer == 0){
+              this.recordInfo.recordData[i].dealer
+            }else{
+              this.recordInfo.recordData[i].dealer = val.dealer
+            }
+          
           }
          
          if(val.xt_warehouse_info.length > 0){

src/xt_pages/stock/stockOutOrder.vue

@@ -191,7 +191,7 @@
           </el-table-column>
           <el-table-column label="规格&单位" align="center">
             <template slot-scope="scope">
-              {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
+              {{ scope.row.specification_name}} / {{scope.row.packing_unit}}
             </template>
           </el-table-column>
           <el-table-column label="批号" align="center">
@@ -201,8 +201,8 @@
           </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
-              <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
+              <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}{{scope.row.packing_unit}}</span> 
+              <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span> 
             </template>
           </el-table-column>
           <el-table-column label="出货价" align="center">
@@ -227,12 +227,17 @@
           </el-table-column>
           <el-table-column label="生产日期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.product_date,"{y}-{h}-{d}")}}
+              {{ getTime(scope.row.product_date,"{y}-{m}-{d}")}}
             </template>
           </el-table-column>
           <el-table-column label="有效期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.expiry_date,"{y}-{h}-{d}")}}
+              {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
+            </template>
+          </el-table-column>
+          <el-table-column label="批准文号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.license_number}}
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center">
@@ -406,8 +411,8 @@
               <span>使用数量</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.count}}</span>
-              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
+              <span v-if="scope.row.is_total == 0">{{scope.row.count}}{{scope.row.info.packing_unit}}</span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}}{{scope.row.info.packing_unit}} </span>
 
             </template>
           </el-table-column>
@@ -609,7 +614,7 @@
               <span>使用数量</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.count}}</span>
+              <span v-if="scope.row.is_total == 0">{{scope.row.count}}{{scope.row.info.packing_unit}}</span>
               <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
 
             </template>
@@ -1004,10 +1009,12 @@ export default {
         ids.push(selection[i].id)
       }
       console.log("ids",ids)
+      this.exportList = []
       this.order_id = ids.join(",")
       this.warehouse_out_time = selection[0].warehouse_out_time
       this.selectedTableData = selection;
       this.getlist()
+
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -1519,6 +1526,10 @@ 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].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}") 
               for(let j=0;j<this.manufacturer.length;j++){
                 if(list[i].manufacturer == this.manufacturer[j].id){
                   list[i].manufacturer = this.manufacturer[j].manufacturer_name
@@ -1541,7 +1552,10 @@ export default {
         })
       },
       toExport(){
-       console.log("列表22222222222",this.exportList)
+        if(this.order_id == ""){
+         this.$message.error("请勾选出库单")
+         return
+        }
         import('@/vendor/Export2Excel').then(excel => {
         for(let i=0;i<this.exportList.length;i++){
           this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -33,8 +33,6 @@
         v-on:dialog-comfirm="comfirm"
         v-on:dialog-cancle="cancle"
       >
-
-
       </stock-in-dialog>
 
 
@@ -263,6 +261,15 @@
             </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-input placeholder="请输入批准文号" v-model="scope.row.license_number"></el-input>
+          </template>
+        </el-table-column>
+
 
           <el-table-column label="经销商"  width="150" align="center">
             <template slot-scope="scope">
@@ -490,6 +497,7 @@ export default {
       tempObj["number"] = ""
       tempObj["expiry_date"] = ""
       tempObj["product_date"] = ""
+      tempObj["license_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -605,6 +613,9 @@ export default {
           }
        
           for(let i=0;i<this.recordInfo.recordData.length;i++){
+             if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
             if(this.recordInfo.recordData[i].expiry_date == "" || this.recordInfo.recordData[i].expiry_date == undefined){
               this.recordInfo.recordData[i].expiry_date = ""
             } 
@@ -630,7 +641,7 @@ export default {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
-         
+ 
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -712,7 +723,6 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-      console.log("val",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].good_type_id = val.id
@@ -721,10 +731,20 @@ export default {
             this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
-            this.recordInfo.recordData[i].price = val.buy_price
+            if(val.packing_price == 0){
+              this.recordInfo.recordData[i].price =""
+            }else{
+              this.recordInfo.recordData[i].price = val.packing_price
+            }
+           
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
-            this.recordInfo.recordData[i].dealer = val.dealer
+            if(val.dealer == 0){
+             this.recordInfo.recordData[i].dealer = ""
+            }else{
+             this.recordInfo.recordData[i].dealer = val.dealer
+            }
+           
          }
       }
 
@@ -759,6 +779,8 @@ export default {
     tempObj["number"] = ""
     tempObj["specification_name"] = ""
     tempObj["number"] = ""
+    tempObj["dealer"] = ""
+    tempObj["license_number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -46,7 +46,7 @@
                                     <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td>
                                     <td>{{item.price}}</td>
                                     <td>{{((getOutStockCount(item.good_id) +getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id))*item.price).toFixed(2)}}</td>
-                                    <td>{{getNumber(item.good_id)}}</td>
+                                    <td>{{item.number}}</td>
                                     <td>{{getTime(item.product_date)}}</td>
                                     <td>{{getTime(item.expiry_date)}}</td>
                                 </tr>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -190,7 +190,15 @@
               ></el-date-picker>
             </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-input placeholder="请输入批准文号" v-model="scope.row.license_number"></el-input>
+          </template>
+        </el-table-column>
 
           <el-table-column label="经销商"  width="150" align="center">
             <template slot-scope="scope">
@@ -404,6 +412,9 @@
         tempObj['price'] = ''
         tempObj['remark'] = ''
         tempObj['number'] = ""
+        tempObj['license_number'] = ""
+        tempObj['dealer'] = ""
+        tempObj['manufacturer'] = ""
         this.recordInfo.recordData.push(tempObj)
       }, 
       handleDelete: function(index, row) {
@@ -524,6 +535,9 @@
               }
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+               if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
               if(this.recordInfo.recordData[i].expiry_date == "" || this.recordInfo.recordData[i].expiry_date == undefined){
                 this.recordInfo.recordData[i].expiry_date = ""
               } 
@@ -618,10 +632,21 @@
             this.recordInfo.recordData[i].name = val.specification_name  +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
-            this.recordInfo.recordData[i].price = val.buy_price
+            this.recordInfo.recordData[i].license_number = ""
+            if(val.packing_price == 0){
+               this.recordInfo.recordData[i].price = ""
+            }else{
+               this.recordInfo.recordData[i].price = val.packing_price
+            }
+           
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
-             this.recordInfo.recordData[i].dealer = val.dealer
+             if(val.dealer == 0){
+               this.recordInfo.recordData[i].dealer = ""
+             }else{
+               this.recordInfo.recordData[i].dealer = val.dealer
+             }
+           
          }
       }
       // if(val.xt_warehouse_info.length > 0){
@@ -634,6 +659,13 @@
       // }
     },
      getSingleOutOrderDetail(order_id){
+
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
        const params = {
           'id': order_id
         }
@@ -656,10 +688,15 @@
             response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{m}-{d}")
             response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{m}-{d}")
             response.data.data.list[i].remark = response.data.data.list[i].remark
-            // this.numberList.push(response.data.data.list[i])
+            if(response.data.data.list[i].dealer == 0){
+               response.data.data.list[i].dealer = ""
+            }
+            if(response.data.data.list[i].manufacturer ==0 ){
+               response.data.data.list[i].manufacturer = ""
+            }
             this.recordInfo.recordData.push(response.data.data.list[i])
           }
-         
+          loading.close();
         }
       })
     }

src/xt_pages/stock/stockQuery.vue

@@ -112,10 +112,17 @@
 
          </template>
        </el-table-column>
+
+       <el-table-column label="退库数量" align="center">
+         <template slot-scope="scope">
+           <span>{{getCancelCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span>
+
+         </template>
+       </el-table-column>
       
        <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)}}{{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}}
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -222,6 +229,7 @@ export default {
       countList:[],
       outCountList:[],
       autoCountList:[],
+      cancelCountList:[]
     };
   },
   methods: {
@@ -401,7 +409,7 @@ export default {
            this.tableList[i].type_name = this.getGoodType(this.tableList[i].good_type_id)
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
-           this.tableList[i].inCount =  this.getOutCount(this.tableList[i].good_id) + this.getAutoCount(this.tableList[i].good_id)
+           this.tableList[i].inCount =  this.getInCount(this.tableList[i].good_id)
            this.tableList[i].outCount = this.getOutCount(this.tableList[i].good_id) + this.getAutoCount(this.tableList[i].good_id)
            this.tableList[i].overplus =this.getInCount(this.tableList[i].good_id)- this.getOutCount(this.tableList[i].good_id) - this.getAutoCount(this.tableList[i].good_id)
          }
@@ -521,6 +529,9 @@ export default {
            var autoCount = response.data.data.autoCount
            console.log("autoCount",autoCount)
            this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           console.log("totalcount",totalCount)
+           this.cancelCountList = totalCount
          }
       })
     },
@@ -550,6 +561,15 @@ export default {
        }
      }
      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
+       }
+     }
+     return count
    }
   }
 };