Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/data.js

@@ -107,3 +107,63 @@ export function updateDictionaryTemplate(params) {
     data: params
   })
 }
+
+
+export function createBaseDrugLib(params) {
+  return request({
+    url: '/api/basedruglib/create',
+    method: 'post',
+    params: params
+  })
+}
+
+
+export function editBaseDrugLib(params) {
+  return request({
+    url: '/api/basedruglib/edit',
+    method: 'post',
+    params: params
+  })
+}
+
+
+export function getBaseDrugLib(params) {
+  return request({
+    url: '/api/basedruglib/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+export function getBaseDrugLibList(params) {
+  return request({
+    url: '/api/basedruglib/list',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
+export function createMedicineInsurancePercent(params) {
+  return request({
+    url: '/api/medicineinsurancepercent/create',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function createDrugUnitSafeguard(params) {
+  return request({
+    url: '/api/drugunitsafeguard/create',
+    method: 'post',
+    data: params
+  })
+}
+
+
+

src/api/drug/drug_stock.js

@@ -0,0 +1,364 @@
+import request from '@/utils/request'
+
+export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
+  return request({
+    url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getDrugWarehouseList(params) {
+  return request({
+    url: '/api/drugwarehouse/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugWarehouseInfoList(params) {
+  return request({
+    url: '/api/drugwarehouseinfo/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function postDrugSalesReturn(params, salesReturnTime, salesReturnTotal, dealer_id, manufacturer_id, type) {
+  return request({
+    url: '/api/drugsalesreturn/create?time=' + salesReturnTime + '&total=' + salesReturnTotal + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getDrugWarehouseInfo(params) {
+  return request({
+    url: '/api/info/get',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugSalesReturnList(params) {
+  return request({
+    url: '/api/salesreturn/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugSalesReturnInfoList(params) {
+  return request({
+    url: '/api/return/info',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllDrugWarehouseInfo(params) {
+  return request({
+    url: '/api/warehouseinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugWarehouseOutInfoList(params) {
+  return request({
+    url: '/api/stock/out/info',
+    method: 'get',
+    params: params
+  })
+}
+
+export function postDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type) {
+  return request({
+    url: '/api/drugwarehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getDrugWarehouseInfoCountByGoodId(params) {
+  return request({
+    url: '/api/info/count',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugWarehouseInfoByGoodTypeId(params) {
+  return request({
+    url: '/api/warehouse/type',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugCancelStockInfoList(params) {
+  return request({
+    url: '/api/cancel/info',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllDrugStockOutList(params) {
+  return request({
+    url: '/api/out/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllDrugStockQueryList(params) {
+  return request({
+    url: '/api/stock/query',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugWarehouseInfoByOrdeNumber(params) {
+  return request({
+    url: '/api/stock/warehouse/get',
+    method: 'get',
+    params: params
+  })
+}
+
+export function modifyDrugWarehouseInfo(params) {
+  return request({
+    url: '/api/drugwarehouse/edit',
+    method: 'post',
+    params: params
+  })
+}
+
+export function deleteDrugWarehouseInfo(params) {
+  return request({
+    url: '/api/drugwarehouse/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getDrugWarehouseOutInfoByOrdeNumber(params) {
+  return request({
+    url: '/api/stock/out/get',
+    method: 'get',
+    params: params
+  })
+}
+
+export function modifyDrugWarehouseOutInfo(params) {
+  return request({
+    url: '/api/stock/out/edit',
+    method: 'post',
+    params: params
+  })
+}
+
+export function GetAllConfig() {
+  return request({
+    url: '/api/drugstock/config',
+    method: 'get'
+  })
+}
+
+export function GetAllDrugInfoByID(params) {
+  return request({
+    url: '/api/drugstock/get',
+    method: 'get',
+    params: params
+
+  })
+}
+
+export function DeleteDrugWarehouseInfoItem(params) {
+  return request({
+    url: '/api/drugwarehouseinfo/delete',
+    method: 'post',
+    params: params
+
+  })
+}
+
+export function EditDrugWarehouse(params, warehousing_time, id,type,manufacturer_id,dealer_id) {
+  return request({
+    url: '/api/drugwarehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getDrugSalesReturnConfig(params) {
+  return request({
+    url: '/api/return/config',
+    method: 'get',
+    params: params
+
+  })
+}
+
+export function deleteDrugSalesReturn(params) {
+  return request({
+    url: '/api/drugsalesreturn/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getDrugSaleReturnInfoList(params) {
+  return request({
+    url: '/api/stock/drugsalesReturn/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugReturnList(params) {
+  return request({
+    url: '/api/drugsalesreturninfo/list',
+    method: 'get',
+    params: params
+  })
+}
+export function deleteDrugSalesReturnInfo(params) {
+  return request({
+    url: '/api/drugsalesreturninfo/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function editDrugSalesReturnInfo(params, return_time, id,type,manufacturer_id,dealer_id) {
+  return request({
+    url: '/api/drugsalesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    method: 'post',
+    data: params
+  })
+}
+
+export function deleteDrugWarehouseOut(params) {
+  return request({
+    url: '/api/drugwarehouseout/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function deleteDrugWarehouseOutInfo(params) {
+  return request({
+    url: '/api/drugwarehouseoutinfo/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getDrugWarehouseOutList(params) {
+  return request({
+    url: '/api/drugwarehouseout/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugWarehouseOutInfo(params) {
+  return request({
+    url: '/api/drugwarehouseout/info',
+    method: 'get',
+    params: params
+  })
+}
+
+export function editDrugWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id,dealer_id) {
+  return request({
+    url: '/api/drugwarehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getDrugCancelStockList(params) {
+  return request({
+    url: '/api/drugcancelstock/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function editDrugCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id,dealer_id) {
+  return request({
+    url: '/api/drugcancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id=" + dealer_id,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getDrugCancelStockInfo(params) {
+  return request({
+    url: '/api/drugcancelstock/info',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteDrugCancelStock(params) {
+  return request({
+    url: '/api/drugcancelstock/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function deleteDrugCancelStockInfo(params) {
+  return request({
+    url: '/api/drugcancelstockinfo/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function postDrugCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type) {
+  return request({
+    url: '/api/drugcancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    method: 'post',
+    data: params
+  })
+}
+export function getDrugCancelStockConfig(params) {
+  return request({
+    url: '/api/drugcancelstockinfo/config',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getStockDetail(params) {
+  return request({
+    url: '/api/drugstock/detail',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+export function getPrintStockGood(params) {
+  return request({
+    url: '/api/print/stock',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function getWarehouseOutUser(params) {
+  return request({
+    url: '/api/drugwarehouseout/user',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/stock.js

@@ -171,6 +171,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockInOrderAdd', noCache: true }
+    },  {
+      path: '/drugstock/in/add',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderAdd'),
+      name: 'drugStockInOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInOrderAdd', noCache: true }
     },
     {
       path: '/stock/in/detail',
@@ -179,6 +186,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockInDetail', noCache: true }
+    }, {
+      path: '/drugstock/in/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
+      name: 'drugStockInDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInDetail', noCache: true }
     },
     {
       path: '/stock/return/detail',
@@ -195,6 +209,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'salesReturnOrderAdd', noCache: true }
+    }, {
+      path: '/drugstock/return/add',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrderAdd'),
+      name: 'drugSalesReturnOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnOrderAdd', noCache: true }
     },
     {
       path: '/stock/out/add',
@@ -203,6 +224,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockOutOrderAdd', noCache: true }
+    }, {
+      path: '/drugstock/out/add',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderAdd'),
+      name: 'drugStockOutOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderAdd', noCache: true }
     },
     {
       path: '/stock/out/detail',
@@ -211,6 +239,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockOutDetail', noCache: true }
+    }, {
+      path: '/drugstock/out/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutDetail'),
+      name: 'drugStockOutDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutDetail', noCache: true }
     },
     {
       path: '/stock/cancel/add',
@@ -219,6 +254,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelStockOrderAdd', noCache: true }
+    }, {
+      path: '/drugstock/cancel/add',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderAdd'),
+      name: 'cancelDrugStockOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
     },
     {
       path: '/stock/cancel/detail',
@@ -227,6 +269,13 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelStockDetail', noCache: true }
+    },  {
+      path: '/drugstock/cancel/detail',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
+      name: 'cancelDrugStockDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockDetail', noCache: true }
     },
     {
       path: '/stock/config',
@@ -317,7 +366,7 @@ export default {
     },
     {
       path: '/stock/drugs/stock/in',
-      component: () => import('@/xt_pages/stock/drugs/stockIn'),
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
       name: 'drugsStockIn',
       hidden: true,
       is_menu: false,
@@ -326,7 +375,7 @@ export default {
     },
     {
       path: '/stock/drugs/stock/out',
-      component: () => import('@/xt_pages/stock/drugs/stockOut'),
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
       name: 'drugsStockOut',
       hidden: true,
       is_menu: false,
@@ -335,7 +384,7 @@ export default {
     },
     {
       path: '/stock/drugs/stock/return',
-      component: () => import('@/xt_pages/stock/drugs/stockReturn'),
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
       name: 'drugsStockReturn',
       hidden: true,
       is_menu: false,
@@ -344,12 +393,12 @@ export default {
     },
     {
       path: '/stock/drugs/stock/cancel',
-      component: () => import('@/xt_pages/stock/drugs/stockCancel'),
-      name: 'drugsStockCancel',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
+      name: 'cancelDrugStockOrder',
       hidden: true,
       is_menu: false,
       num: 3,
-      meta: { title: 'drugsStockCancel', noCache: true }
+      meta: { title: 'cancelDrugStockOrder', noCache: true }
     },
     {
       path: '/stock/drugs/stock/adjustPrice',

src/xt_pages/data/components/addConsumable.vue

@@ -10,16 +10,16 @@
                 <div>
                     <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                         <el-form-item label="耗材名称 : " prop="name" style="width:100%">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="拼音 : " prop="name" style="width:50%">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="五笔 : " prop="name" style="width:50%">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="耗材种类 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                            <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -29,7 +29,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="耗材类型 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                            <el-select v-model="form.good_type_id" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -39,7 +39,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="医保等级 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                            <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -49,10 +49,10 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="规格型号 : " prop="name" style="width:100%">
-                            <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="生产厂商 : " prop="name" style="width:100%">
-                            <el-select v-model="value" style="width:100%" placeholder="请选择">
+                            <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -62,7 +62,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="单位 : " prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                            <el-select v-model="form.good_unit" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -72,19 +72,19 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="零价 : " prop="name">
-                            <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="最新进价 : " prop="name">
-                            <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.buy_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="库存警戒 : " prop="name">
-                            <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.stock_warn_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="医保编码 : " prop="name">
-                            <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                            <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="是否特病目录:" prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                            <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -94,7 +94,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="是否备案:" prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                            <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -104,7 +104,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="统计分类:" prop="name">
-                            <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                            <el-select v-model="from.statistics_category" style="width:160px;" placeholder="请选择">
                                 <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -114,40 +114,40 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="代理商 : " prop="name" style="visibility: hidden;">
-                            <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
+                            <el-input style="width:160px;" v-model="from.agent" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
 
 
-                        
+
                         <el-form-item label="状态 : " prop="name">
-                            <el-radio-group v-model="radio">
+                            <el-radio-group v-model="from.good_status">
                                 <el-radio :label="1">停用</el-radio>
                                 <el-radio :label="2">收费</el-radio>
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="备注 : " prop="name" style="width:100%;">
-                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea"></el-input>
+                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="from.remark"></el-input>
                         </el-form-item>
                     </el-form>
                 </div>
             </el-tab-pane>
             <el-tab-pane label="扩展数据" name="second">
                 <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                    <el-form-item label="耗材类型 : " prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
-                            <el-option
-                            v-for="item in options"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                    <!--<el-form-item label="耗材类型 : " prop="name">-->
+                        <!--<el-select v-model="value" style="width:160px;" placeholder="请选择">-->
+                            <!--<el-option-->
+                            <!--v-for="item in options"-->
+                            <!--:key="item.value"-->
+                            <!--:label="item.label"-->
+                            <!--:value="item.value">-->
+                            <!--</el-option>-->
+                        <!--</el-select>-->
+                    <!--</el-form-item>-->
                     <el-form-item label="默认使用数量:" prop="name">
-                        <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        <el-input v-model="form.default_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
                     <el-form-item label="标签:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-select v-model="from.sign" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -157,7 +157,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="是否默认:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-select v-model="from.is_default" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -167,7 +167,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="是否收费常用项:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-select v-model="from.is_charge_use" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -177,7 +177,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="是否收费预估项:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-select v-model="from.is_charge_predict" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -187,7 +187,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="是否统计工作量:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-select v-model="from.is_statistics_work" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -197,10 +197,10 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="收费项目排序:" prop="name">
-                        <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        <el-input v-model="form.sort" style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
                     <el-form-item label="是否常用医嘱:" prop="name">
-                        <el-select v-model="value" style="width:160px;" placeholder="请选择">
+                        <el-select v-model="from.is_use_doctor_advice" style="width:160px;" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -210,15 +210,15 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="代理商:" prop="name">
-                        <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                    </el-form-item>
-                    <el-form-item label="耗材编码:" prop="name">
-                        <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
+                    <!--<el-form-item label="耗材编码:" prop="name">-->
+                        <!--<el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>-->
+                    <!--</el-form-item>-->
                     <el-form-item label="耗材编号:" prop="name">
-                        <el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
-                        
+
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -226,7 +226,7 @@
 
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+            <el-button type="primary"  @click="submitAction()">保 存</el-button>
         </div>
   </el-dialog>
 </template>

src/xt_pages/data/components/addDrugs.vue

@@ -1,423 +1,575 @@
 <template>
-    <el-dialog
-        :title="formTitle"
-        width="900px"
-        :visible.sync="visible"
-        :before-close="_close"
-    >
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="基础数据" name="first">
-                <div>
-                    <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                        <el-form-item label="药品名称 : " prop="drug_name" required="drug_name">
-                            <el-input v-model="form.drug_name" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="拼音 : " prop="ping_yin" required="ping_yin">
-                            <el-input v-model="form.ping_yin" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="五笔 : " prop="five_input" required="five_input">
-                            <el-input v-model="form.five_input" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="药品别名 : " prop="name">
-                            <el-input v-model="form.drug_alias" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="别名拼音 : " prop="name">
-                            <el-input v-model="form.pingyin_alias" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="别名五笔 : " prop="name">
-                            <el-input v-model="form.fiveinput_alias" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="药品类别 : " prop="drug_category" required="drug_category">
-                            <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="药品规格 : " prop="drug_rules" required="drug_rules">
-                            <el-input v-model="form.drug_rules" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                         <el-form-item label="药品类型 : " prop="drug_type" required="drug_type">
-                            <el-input v-model="form.drug_type" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                         <el-form-item label="库存警戒:" prop="stock_warn" required="stock_warn">
-                            <el-input v-model="form.stock_warn" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                         <el-form-item label="产地:" prop="place_origin" required="place_origin">
-                            <el-input v-model="form.place_origin" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                         <el-form-item label="药品剂型 : " prop="drug_formulation" required="drug_formulation">
-                            <el-input v-model="form.drug_formulation" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="医保等级 : " prop="medical_coverage" required="medical_coverage">
-                            <el-select v-model="form.medical_coverage" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="最大单位 : " prop="max_units" required="max_units">
-                            <el-select v-model="form.max_units" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="最小单位 : " prop="min_units" required="min_units">
-                            <el-select v-model="form.min_untis" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="单位换算 : " prop="unit_conversion" required="unit_conversion">
-                            <el-input v-model="form.unit_conversion" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="零售价(元) : " prop="retail_price" required="retail_price">
-                            <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="上次进价(元) : " prop="last_entry" required="last_entry">
-                            <el-input v-model="form.last_entry" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="开药控制 : " prop="drug_control">
-                            <el-select v-model="form.drug_control" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="批准文号 : " prop="name">
-                            <el-input v-model="form.license_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="药物分类 : " prop="drug_class" required="drug_class">
-                            <el-select v-model="form.drug_class" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="剂量 : " prop="drug_dose" required="drug_dose">
-                            <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder="" maxlength="30"></el-input>
-                            <el-select v-model="value" style="width:80px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="医保编码 : " prop="name">
-                            <el-input v-model="form.medical_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="生产厂商 : " prop="vendor" required="vendor">
-                            <el-select v-model="form.vendor" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="药理分类 : " prop="name">
-                            <el-select v-model="form.pharmacological_classification" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="统计分类 : " prop="name">
-                            <el-select v-model="form.statistical_classification" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="本位码 : " prop="name">
-                            <el-input v-model="form.standard_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="是否特病目录:" prop="name">
-                            <el-select v-model="form.special_disease_directory" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="是否备案 : " prop="name">
-                            <el-select v-model="form.recorded" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="代理商 : " prop="name">
-                            <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="" prop="name" style="visibility: hidden;">
-                            <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="状态 : " prop="name">
-                            <el-radio-group v-model="form.drug_status">
-                                <el-radio :label="1">停用</el-radio>
-                                <el-radio :label="2">贵重</el-radio>
-                                <el-radio :label="3">收费</el-radio>
-                                <el-radio :label="4">库存管理</el-radio>
-                                <el-radio :label="5">默认用药途径收费</el-radio>
-                                <el-radio :label="6">注射类</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="限制说明 : " prop="name" style="width:100%;">
-                            <el-input type="form.restrictions" :rows="2" placeholder="请输入内容" v-model="form.restrictions"></el-input>
-                        </el-form-item>
-                    </el-form>
-                </div>
-            </el-tab-pane>
-            <el-tab-pane label="扩展数据" name="second">
-                <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                        <el-form-item label="默认给药途径:" prop="name">
-                            <el-select v-model="form.default_delivery_route" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="默认执行频率:" prop="name">
-                            <el-select v-model="form.default_frequency" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="默认单次用量:" prop="name">
-                            <el-input v-model="form.default_single_dose" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="默认开药数量:" prop="name">
-                            <el-input v-model="form.default_prescribing_quantity" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="标签:" prop="name">
-                            <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="收费项目排序:" prop="name">
-                            <el-input v-model="form.ranking_charge_items" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="是否常用医嘱:" prop="name">
-                            <el-select v-model="form.is_doctor_advice" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="是否默认:" prop="name">
-                            <el-select v-model="form.is_default" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="是否收费预估项:" prop="name">
-                            <el-select v-model="form.is_charge_estimate" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="是否统计工作量:" prop="name">
-                            <el-select v-model="form.statistical_workload" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="是否收费常用项:" prop="name">
-                            <el-select v-model="form.is_common_charge" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                         <el-form-item label="" prop="name" style="visibility: hidden;">
-                            <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
-                </el-form>
-            </el-tab-pane>
-        </el-tabs>
+  <el-dialog
+    :title="formTitle"
+    width="900px"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-tabs v-model="activeName" >
+      <el-tab-pane label="基础数据" name="first">
+        <div>
+          <el-form :model="form" :rules="rules" ref="form" label-width="100px"
+                   style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form-item label="药品名称 : " prop="drug_name" >
+              <el-input v-model="form.drug_name" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="拼音 : " prop="pinyin" >
+              <el-input v-model="form.pinyin" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="五笔 : " prop="wubi">
+              <el-input v-model="form.wubi" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="药品别名 : " prop="drug_alias">
+              <el-input v-model="form.drug_alias" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="别名拼音 : " prop="drug_alias_pinyin">
+              <el-input v-model="form.drug_alias_pinyin" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="别名五笔 : " prop="drug_alias_wubi">
+              <el-input v-model="form.drug_alias_wubi" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="药品类别 : " prop="drug_category" >
+              <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','drug_category')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="药品规格 : " prop="drug_spec" >
+              <el-input v-model="form.drug_spec" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="药品类型 : " prop="drug_type">
+              <el-input v-model="form.drug_type" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="库存警戒:" prop="drug_stock_limit" >
+              <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="产地:" prop="drug_origin_place" >
+              <el-input v-model="form.drug_origin_place" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="药品剂型 : " prop="drug_dosage_form" >
+              <el-input v-model="form.drug_dosage_form" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="医保等级 : " prop="medical_insurance_level" >
+              <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','medical_insurance_level')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="最大单位 : " prop="max_unit" >
+              <el-select v-model="form.max_unit" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDataConfig('hemodialysis','units')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="最小单位 : " prop="min_unit" >
+              <el-select v-model="form.min_unit" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDataConfig('hemodialysis','units')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="单位换算 : " prop="unit_matrixing" >
+              <el-input v-model="form.unit_matrixing" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="零售价(元) : " prop="retail_price" >
+              <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="上次进价(元) : " prop="last_price" >
+              <el-input v-model="form.last_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="开药控制 : " prop="drug_control">
+              <el-select v-model="form.drug_control" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','drug_control')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="批准文号 : " prop="number">
+              <el-input v-model="form.number" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="药物分类 : " prop="drug_classify" >
+              <el-select v-model="form.drug_classify" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item, index in getDictionaryDataConfig('system','drug_classify')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="剂量 : " prop="drug_dose" >
+              <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
+                        maxlength="30"></el-input>
+              <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDataConfig('hemodialysis','units')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="医保编码 : " prop="medical_insurance_number">
+              <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="生产厂商 : " prop="manufacturer" >
+              <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in manufacturers"
+                  :key="index"
+                  :label="item.manufacturer_name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="药理分类 : " prop="pharmacology_category">
+              <el-select v-model="form.pharmacology_category" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index  in getDictionaryDataConfig('system','pharmacology_category')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="统计分类 : " prop="statistics_category">
+              <el-select v-model="form.statistics_category" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index  in getDictionaryDataConfig('system','statistics_category')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="本位码 : " prop="code">
+              <el-input v-model="form.code" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="是否特病目录:" prop="is_special_diseases">
+              <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in options"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否备案 : " prop="is_record">
+              <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in options"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="代理商 : " prop="agent">
+              <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label=""  style="visibility: hidden;">
+              <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="状态 : " prop="drug_status">
+              <el-checkbox-group v-model="drug_status">
+                <el-checkbox label="停用">停用</el-checkbox>
+                <el-checkbox label="贵重">贵重</el-checkbox>
+                <el-checkbox label="收费">收费</el-checkbox>
+                <el-checkbox label="库存管理" >库存管理</el-checkbox>
+                <el-checkbox label="默认用药途径收费" >默认用药途径收费</el-checkbox>
+                <el-checkbox label="注射类" >注射类</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="限制说明 : " prop="limit_remark" style="width:100%;">
+              <el-input type="form.restrictions" :rows="2" placeholder="请输入内容" v-model="form.limit_remark"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="扩展数据" name="second">
+        <el-form :model="form" label-width="120px"
+                 style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+          <el-form-item label="默认给药途径:" prop="delivery_way">
+            <el-select v-model="form.delivery_way" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item, index in deliveryWayOptions"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="默认执行频率:" prop="execution_frequency">
+            <el-select v-model="form.execution_frequency" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in executionFrequencyOptions"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="默认单次用量:" prop="single_dose">
+            <el-input v-model="form.single_dose" style="width:160px;" placeholder="" maxlength="30"></el-input>
+          </el-form-item>
+          <el-form-item label="默认开药数量:" prop="prescribing_number">
+            <el-input v-model="form.prescribing_number" style="width:160px;" placeholder=""
+                      maxlength="30"></el-input>
+          </el-form-item>
+          <el-form-item label="标签:" prop="label">
+            <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in getDictionaryDataConfig('system','sign')"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="收费项目排序:" prop="sort">
+            <el-input v-model="form.sort" style="width:160px;" placeholder="" maxlength="30"></el-input>
+          </el-form-item>
+          <el-form-item label="是否常用医嘱:" prop="is_use_doctor_advice">
+            <el-select v-model="form.is_use_doctor_advice" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in options"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否默认:" prop="is_default">
+            <el-select v-model="form.is_default" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in options"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否收费预估项:" prop="is_charge_predict">
+            <el-select v-model="form.is_charge_predict" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in options"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否统计工作量:" prop="is_statistics_work">
+            <el-select v-model="form.is_statistics_work" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in options"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否收费常用项:" prop="is_charge_use">
+            <el-select v-model="form.is_charge_use" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in options"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" style="visibility: hidden;">
+            <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
 
 
-        <div slot="footer" class="dialog-footer">
-            <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
-        </div>
+    <span slot="footer" class="dialog-footer">
+    <el-button  @click="cancle('form')">取 消</el-button>
+    <el-button type="primary" @click="comfirm('form')">保 存</el-button>
+  </span>
   </el-dialog>
 </template>
 
 <script>
-export default {
-    data(){
-        return{
-            visible:false,
-            formTitle:'',
-            activeName:'first',
-            form:{
-                name:''
-            },
-            drugCategorys:[
-            {id:1,name:'中药'},
-            {id:2,name:'西药'},
-            {id:3,name:"草药"},
-            {id:4,name:"其他"}],
-            options: [],
-            value: '',
-            radio:'1',
-            form:{
-              drug_name:"",//药品名称
-              ping_yin:"",//拼音
-              five_input:"",//五笔输入法
-              drug_alias:"",//药品别名
-              pingyin_alias:"",//别名拼音
-              fiveinput_alias:"",//别名五笔  
-              drug_category:"",//药品类别
-              drug_rules:"",//药品规格
-              drug_type:"",//药品类型
-              stock_warn:"",//库存警戒
-              place_origin:"",//产地
-              drug_formulation:"",//药品剂型
-              medical_coverage:"",//医保等级
-              max_units:"",//最大单位
-              min_untis:"",//最小单位
-              unit_conversion:"",//单位换算
-              retail_price:"",//零售价
-              last_entry:"",//上次进价
-              drug_control:"",//开药控制
-              license_number:"",//批准文号
-              drug_class:"",//药物分类
-              drug_dose:"",//药品剂量
-              medical_number:"",//医保编号
-              vendor:"",//生产产商
-              pharmacological_classification:"",//药理分类
-              statistical_classification:"",//统计分类
-              standard_code:"",//本位码
-              special_disease_directory:"",//是否特病目录
-              recorded:"",//是否备案
-              agent:"",// 代理商
-              drug_status:"",// 状态
-              restrictions:"",//限制说明
+  import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
+  import {
+    getAdviceConfig,
+  } from '@/api/advice'
+  export default {
+    data() {
+      return {
+        visible: false,
+        formTitle: '',
+        activeName: 'first',
+        manufacturers:[],
+        drugCategorys: [
+          { id: 1, name: '中药' },
+          { id: 2, name: '西药' },
+          { id: 3, name: '草药' },
+          { id: 4, name: '其他' }],
+        options: [{
+          value: '1',
+          label: '是'
+        }, {
+          value: '2',
+          label: '否'
+        }],
+        deliveryWayOptions:[],
+        executionFrequencyOptions:[],
+        value: '',
+        radio: '1',
+        drug_status:[],
+        form: {
+          drug_name: '',//药品名称
+          pinyin: '',//拼音
+          wubi: '',//五笔输入法
+          drug_alias: '',//药品别名
+          drug_alias_pinyin: '',//别名拼音
+          drug_alias_wubi: '',//别名五笔
+          drug_category: '',//药品类别
+          drug_spec: '',//药品规格
+          drug_type: '',//药品类型
+          drug_stock_limit: '',//库存警戒
+          drug_origin_place: '',//产地
+          drug_dosage_form: '',//药品剂型
+          medical_insurance_level: '',//医保等级
+          max_unit: '',//最大单位
+          min_unit: '',//最小单位
+          unit_matrixing: '',//单位换算
+          retail_price: '',//零售价
+          last_price: '',//上次进价
+          drug_control: '',//开药控制
+          number: '',//批准文号
+          drug_classify: '',//药物分类
+          drug_dose: '',//药品剂量
+          drug_dose_unit:'',
+          medical_insurance_number: '',//医保编号
+          manufacturer:'', //生产产商
+          pharmacology_category: '',//药理分类
+          statistics_category: '',//统计分类
+          code: '',//本位码
+          is_special_diseases: '',//是否特病目录
+          is_record: '',//是否备案
+          agent: '',// 代理商
+          drug_status: '',// 状态
+          limit_remark: '',//限制说明
+          delivery_way: '',//默认给药途径
+          execution_frequency: '',//默认执行频率
+          single_dose: '',//默认单次用量
+          prescribing_number: '',//默认开药数量
+          label: '',//标签
+          sort: '',//收费项目排序
+          is_use_doctor_advice: '',//是否常用医嘱
+          is_default: '',//是否默认
+          is_charge_predict: '',//是否收费预估项
+          is_statistics_work: '',//是否统计工作量
+          is_charge_use: '',//是否收费常用项
+          drug_code:'',
+        },
 
-              default_delivery_route:"",//默认给药途径
-              default_frequency:"",//默认执行频率
-              default_single_dose:"",//默认单次用量
-              default_prescribing_quantity:"",//默认开药数量
-              label:"",//标签
-              ranking_charge_items:"",//收费项目排序
-              is_doctor_advice:"",//是否常用医嘱
-              is_default:"",//是否默认
-              is_charge_estimate:"",//是否收费预估项
-              statistical_workload:"",//是否统计工作量
-              is_common_charge:"",//是否收费常用项
-            },
-          rules: {
-            drug_name:[{ required: true, message: '请填写药品名称' }],
-            ping_yin:[{required:true,message:"请填写拼音"}],
-            five_input:[{required:true,message:"请填写五笔"}],
-            drug_category:[{required:true,message:"请填写药品类别"}],
-            drug_rules:[{required:true,message:"请填写药品规格"}], 
-            drug_type:[{required:true,message:"请填写药品类型"}],
-            stock_warn:[{required:true,message:"请填写库存警戒"}],
-            place_origin:[{required:true,message:"请填写产地"}],
-            drug_formulation:[{required:true,message:"请填写药品剂型"}],
-            medical_coverage:[{required:true,message:"请填写医保等级"}],
-            max_units:[{required:true,message:"请填写最大单位"}],
-            min_untis:[{required:true,message:"请填写最小单位"}],
-            unit_conversion:[{required:true,message:"请填写单位换算"}],
-            retail_price:[{required:true,message:"请填写零售价"}],
-            last_entry:[{required:true,message:"请填写上次进价"}],
-            drug_class:[{required:true,message:"请填写药物分类"}],
-            drug_dose:[{required:true,message:"请填写剂量"}],
-            vendor:[{required:true,message:"请填写生产产商"}]
-          },
+        rules: {
+          drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur'  }],
+          pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+          wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+          drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
+          drug_spec: [{ required: true, message: '请填写药品规格',trigger: 'blur' }],
+          drug_type: [{ required: true, message: '请填写药品类型',trigger: 'blur' }],
+          drug_stock_limit: [{ required: true, message: '请填写库存警戒',trigger: 'blur'  }],
+          drug_origin_place: [{ required: true, message: '请填写产地',trigger: 'blur' }],
+          drug_dosage_form: [{ required: true, message: '请填写药品剂型',trigger: 'blur' }],
+          medical_insurance_level: [{ required: true, message: '请选择医保等级',trigger: 'change' }],
+          max_unit: [{ required: true, message: '请填写最大单位',trigger: 'change' }],
+          min_unit: [{ required: true, message: '请填写最小单位',trigger: 'change' }],
+          unit_matrixing: [{ required: true, message: '请填写单位换算',trigger: 'blur' }],
+          retail_price: [{ required: true, message: '请填写零售价',trigger: 'blur'  }],
+          last_price: [{ required: true, message: '请填写上次进价',trigger: 'blur'  }],
+          drug_classify: [{ required: true, message: '请选择药物分类',trigger: 'change'  }],
+          drug_dose: [{ required: true, message: '请填写剂量',trigger: 'blur'  }],
+          manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }]
         }
+      }
     },
-    methods:{
-        _close: function(done) {
-            // this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show(id) {
-            // this.clear()
-            this.visible = true
-            if(id == 0){
-                this.formTitle = '新增'
-            }else{
-                this.formTitle = '编辑'
+    props: {
+      manufacturers:{
+        type:Array
+      },
+      titles: {
+        type: String,
+        default: ''
+      },
+      formValue: {
+        type: Object
+      },
+      isCreated: {
+        type: Number,
+        default: 1
+      }
+
+    },
+    methods: {
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+      },
+      comfirm: function(formName) {
+        this.$refs[formName].validate((valid) => {
+          console.log(valid)
+          if (valid) {
+            console.log( this.getValue())
+            this.$emit('dialog-comfirm', this.getValue())
+          }
+        })
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+
+      },getDataConfig(module, filed_name){
+        return getDataConfig(module, filed_name)
+
+      },
+      _close: function(done) {
+        // this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show(id,obj) {
+        // this.clear()
+        this.visible = true
+        if (id == 0) {
+          this.formTitle = '新增'
+          this.form['id'] = 0
+          for(let key in obj){
+            this.form[key] = obj[key]
+          }
+
+        } else {
+          for(let key in obj){
+            this.form[key] = obj[key]
+          }
+
+          this.form.drug_classify = parseInt(this.form.drug_classify)
+          this.form.max_unit = parseInt(this.form.max_unit)
+          this.form.min_unit = parseInt(this.form.min_unit)
+
+          this.form['id'] = id
+
+          console.log(this.form.drug_status.length)
+          this.drug_status = []
+          if(this.form.drug_status.length > 0){
+            for (let i = 0; i <  this.form.drug_status.split(",").length; i++){
+                this.drug_status.push(this.form.drug_status.split(",")[i])
             }
-        },
-        hide() {
-            // this.clear()
-            this.visible = false
-        },
+            console.log(this.drug_status)
+          }
+
+          this.formTitle = '编辑'
+
+
+        }
+        this.getAdviceConfig()
+
+      },getAdviceConfig() {
+        getAdviceConfig().then(response => {
+          if (response.data.state == 1) {
+            this.deliveryWayOptions =
+              response.data.data.drugways === null
+                ? []
+                : response.data.data.drugways
+
+            this.executionFrequencyOptions =
+              response.data.data.efs === null ? [] : response.data.data.efs
+          }
+        })
+
+      }
+      ,
+      hide() {
+        // this.clear()
+        this.visible = false
+      },getValue: function() {
+        const form = {}
+        form['id'] = this.form.id
+        form['drug_name'] = this.form.drug_name
+        form['pinyin'] = this.form.pinyin
+        form['wubi'] = this.form.wubi
+        form['drug_alias'] = this.form.drug_alias
+        form['drug_alias_pinyin'] = this.form.drug_alias_pinyin
+        form['drug_alias_wubi'] = this.form.drug_alias_wubi
+        form['drug_category'] = this.form.drug_category
+        form['drug_spec'] = this.form.drug_spec
+        form['drug_type'] = this.form.drug_type
+        form['drug_stock_limit'] = this.form.drug_stock_limit
+        form['drug_origin_place'] = this.form.drug_origin_place
+        form['drug_dosage_form'] = this.form.drug_dosage_form
+        form['medical_insurance_level'] = this.form.medical_insurance_level
+        form['max_unit'] = this.form.max_unit
+        form['min_unit'] = this.form.min_unit
+        form['unit_matrixing'] = this.form.unit_matrixing
+        form['retail_price'] = this.form.retail_price
+        form['last_price'] = this.form.last_price
+        form['drug_control'] = this.form.drug_control
+        form['number'] = this.form.number
+        form['drug_dose'] = this.form.drug_dose
+        form['drug_dose_unit'] = this.form.drug_dose_unit
+        form['medical_insurance_number'] = this.form.medical_insurance_number
+        form['manufacturer'] = this.form.manufacturer
+        form['pharmacology_category'] = this.form.pharmacology_category
+        form['statistics_category'] = this.form.statistics_category
+        form['code'] = this.form.code
+        form['is_special_diseases'] = this.form.is_special_diseases
+        form['is_record'] = this.form.is_record
+        form['agent'] = this.form.agent
+        form['drug_status'] = this.drug_status.join(",")
+        form['limit_remark'] = this.form.limit_remark
+        form['delivery_way'] = this.form.delivery_way
+        form['execution_frequency'] = this.form.execution_frequency
+        form['single_dose'] = this.form.single_dose
+        form['prescribing_number'] = this.form.prescribing_number
+        form['label'] = this.form.label
+        form['sort'] = this.form.sort
+        form['is_use_doctor_advice'] = this.form.is_use_doctor_advice
+        form['is_default'] = this.form.is_default
+        form['is_charge_predict'] = this.form.is_charge_predict
+        form['is_statistics_work'] = this.form.is_statistics_work
+        form['is_charge_use'] = this.form.is_charge_use
+        form['drug_code'] = this.form.drug_code
+        form['drug_classify'] = this.form.drug_classify
+
+
+
+        return form
+      },
+    }, watch: {
+      visible(val) {
+        // this.form = this.formValue
+
+      }
     }
-}
+  }
 </script>

src/xt_pages/data/components/consumables.vue

@@ -1,108 +1,712 @@
 <template>
-    <div class="page_consumables">
-        <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
-            <div class="cell clearfix" style="margin-bottom:0;">
-                <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
-                <label class="title"><span class="name">是否启用</span> : </label>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-                <label class="title"><span class="name">是否收费</span> : </label>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-                <span style="color: #909399;font-size:14px;">耗材种类 : &nbsp;</span>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </div>
-            <el-button type="primary" @click="openForm(0)">新增</el-button>
-        </div>
-        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-            <el-table-column prop="date" label="自编码" width="80" align="center"></el-table-column>
-            <el-table-column prop="date" label="名称" align="center"></el-table-column>
-            <el-table-column prop="date" label="规格型号" align="center"></el-table-column>
-            <el-table-column prop="date" label="耗材种类" width="140" align="center"></el-table-column>
-            <el-table-column label="耗材编码" width="140" align="center"></el-table-column>
-            <el-table-column label="最小单位" width="60" align="center"></el-table-column>
-            <el-table-column label="零售价" width="60" align="center"></el-table-column>
-            <el-table-column label="状态" width="60" align="center"></el-table-column>
-            <el-table-column prop="date" label="操作" width="300" align="center">
-                <template slot-scope="scope">
-                    <el-button @click="openForm(scope.row)" type="primary" size="small">编辑</el-button>
-                    <el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>
-                    <el-button type="danger" size="small">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <add-consumable ref="addConsumable"></add-consumable>
+  <div class="page_consumables">
+    <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
+      <div class="cell clearfix" style="margin-bottom:0;">
+        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                  class="filter-item"/>
+        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
+                   @click="searchAction">搜索
+        </el-button>
+        <label class="title"><span class="name">是否启用</span> : </label>
+        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+        <label class="title"><span class="name">是否收费</span> : </label>
+        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+        <span style="color: #909399;font-size:14px;">耗材种类 : &nbsp;</span>
+        <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择">
+          <el-option
+            v-for="item,index in  getDictionaryDataConfig('system','good_kind')"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+      <el-button type="primary" @click="openForm()">新增</el-button>
     </div>
+    <el-table
+      border style="width: 100%" :row-style="{ color: '#303133' }"
+      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
+      :data="goodInfo.goodInfoData"
+      v-loading="goodInfo.loading"
+    >
+      <el-table-column label="商品编码" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.good_code }}
+        </template>
+      </el-table-column>
+      <el-table-column label="名称" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.specification_name }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="规格型号" align="center">
+
+      </el-table-column>
+      <el-table-column prop="date" label="耗材种类" width="140" align="center">
+
+      </el-table-column>
+      <el-table-column label="耗材编码" width="140" align="center">
+
+      </el-table-column>
+
+      <el-table-column label="最小单位" width="60" align="center">
+
+      </el-table-column>
+      <el-table-column label="零售价" width="60" align="center">
+
+      </el-table-column>
+      <el-table-column label="状态" width="60" align="center">
+
+      </el-table-column>
+
+      <el-table-column prop="date" label="操作" width="300" align="center">
+        <template slot-scope="scope">
+          <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
+          <!--<el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>-->
+          <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[10, 50, 100]"
+      :page-size="10"
+      background
+      align="right"
+      style="margin-top:20px;"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+    >
+    </el-pagination>
+
+    <!--<add-consumable ref="addConsumable"></add-consumable>-->
+    <good-info-dailog ref="addConsumable"
+                      :titles="goodInfo.goodInfoDialog.goodInfoTitle"
+                      :formValue="goodInfo.goodInfoDialog.formValue"
+                      :visibility="goodInfo.goodInfoDialog.isVisibility"
+                      :isCreated="goodInfo.goodInfoDialog.isCreated"
+                      v-on:dialog-comfirm="goodInfoDialogComfirm"
+                      v-on:dialog-cancle="goodInfoDialogCancle"
+    ></good-info-dailog>
+  </div>
 </template>
 
 <script>
-import addConsumable from './addConsumable'
-export default {
-    components:{
-        addConsumable
+  import GoodInfoDailog from '../../stock/Dialog/goodInfoDailog'
+  import { getDictionaryDataConfig } from "@/utils/data";
+
+  import {
+    createGoodInfo,
+    deleteGoodInfo,
+    GetAllDeals,
+    GetAllGoodType,
+    GetAllManufacturer,
+    GetGoodInfo,
+    GetGoodInfoByGoodId,
+    getGoodInfoList,
+    modifyGoodInfo
+  } from '@/api/stock'
+  export default {
+    components: {
+      GoodInfoDailog,
     },
-    data(){
-        return{
-            search_input:'',
-            options: [{
-            value: '1',
-            label: '是'
-            }, {
-            value: '2',
-            label: '否'
-            },],
-            value: '',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }]
-            
+    data() {
+      return {
+        good_kind:'',
+        is_use:'',
+        is_charge:'',
+        search_input: '',
+        options: [{
+          value: '1',
+          label: '是'
+        }, {
+          value: '2',
+          label: '否'
+        }],
+        value: '',
+
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        page: 1,
+        limit: 10,
+        keywords: '',
+        goodInfo: {
+          loading: false,
+          goodInfoData: [],
+          good_code: '',
+          editGoodId: '',
+          editGoodIndex: '',
+          goodInfoDialog: {
+            goodInfoTitle: '新增商品信息',
+            isCreated: 1, //1.创建 2.编辑 3.查看详情
+            formValue: {
+              good_id: '',
+              specification_name: '',
+              buy_price: '',
+              sell_price: '',
+              remark: '',
+              manufacturer: '',
+              good_type_id: '',
+              dealer: '',
+              expiry_date_warn_day_count: '',
+              stock_warn_count: '',
+              is_reuse: '2',
+              dealers: [],
+              manufacturers: [],
+              goodType: [],
+              goodUnit: [],
+              good_name:'',
+              pinyin:"",
+              wubi:"",
+              good_kind:'',
+              medical_insurance_level:'',
+              good_unit:'',
+              retail_price:'',
+              medical_insurance_number:'',
+              is_special_diseases:'',
+              is_record:'',
+              statistics_category:'',
+              agent:'',
+              good_status:'',
+              default_count:'',
+              sign:'',
+              is_default:'',
+              is_charge_use:'',
+              is_charge_predict:'',
+              is_statistics_work:'',
+              sort:'',
+              is_doctor_use:'',
+              good_number:'',
+
+            },
+
+            isVisibility: false
+          }
         }
+      }
     },
-    methods:{
-        searchAction(){},
-        clickSelfPayment(){
-            this.$refs.selfPayment.show();
-        },
-        clickMainTain(){
-            // this.$refs.maintain.show();
-        },
-        openForm(id){
-            this.$refs.addConsumable.show(id);
+    methods: {
+      getDictionaryDataConfig(module,filed_name){
+        return getDictionaryDataConfig(module,filed_name)
+
+      },
+      search: function() {
+        this.getList()
+      },
+      handleGoodInfoEdit: function(index, row) {
+        this.getAllDealer()
+        this.getAllManufacturer()
+        this.getAllGoodType()
+        this.goodInfo.editGoodId = row.id
+        this.goodInfo.editGoodIndex = index
+
+        let params = {
+          id: row.id
+        }
+        GetGoodInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            if (response.data.data.goodInfo.good_unit <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.good_unit = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.good_unit =
+                response.data.data.goodInfo.good_unit
+            }
+
+            if (response.data.data.goodInfo.manufacturer <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.manufacturer =
+                response.data.data.goodInfo.manufacturer
+            }
+
+            if (response.data.data.goodInfo.dealer <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.dealer = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.dealer =
+                response.data.data.goodInfo.dealer
+            }
+
+            this.goodInfo.goodInfoDialog.formValue.specification_name =
+              response.data.data.goodInfo.specification_name
+            this.goodInfo.goodInfoDialog.formValue.buy_price =
+              response.data.data.goodInfo.buy_price
+            this.goodInfo.goodInfoDialog.formValue.sell_price =
+              response.data.data.goodInfo.sell_price
+            this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count =
+              response.data.data.goodInfo.expiry_date_warn_day_count
+            this.goodInfo.goodInfoDialog.formValue.stock_warn_count =
+              response.data.data.goodInfo.stock_warn_count
+            this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString()
+            this.goodInfo.goodInfoDialog.formValue.remark =
+              response.data.data.goodInfo.remark
+            this.goodInfo.goodInfoDialog.isCreated = 2
+            this.goodInfo.good_code = response.data.data.goodInfo.good_code
+            this.goodInfo.goodInfoDialog.formValue.good_type_id =
+              response.data.data.goodInfo.good_type_id
+
+
+
+
+            this.goodInfo.goodInfoDialog.formValue.good_name =
+              response.data.data.goodInfo.good_name
+
+
+            this.goodInfo.goodInfoDialog.formValue.pinyin =
+              response.data.data.goodInfo.pinyin
+
+            this.goodInfo.goodInfoDialog.formValue.wubi =
+              response.data.data.goodInfo.wubi
+
+
+
+            if (response.data.data.goodInfo.good_kind <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.good_kind = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.good_kind =
+                response.data.data.goodInfo.good_kind
+            }
+
+
+
+            if (response.data.data.goodInfo.medical_insurance_level <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.medical_insurance_level =
+                response.data.data.goodInfo.medical_insurance_level
+            }
+
+
+            this.goodInfo.goodInfoDialog.formValue.retail_price =
+              response.data.data.goodInfo.retail_price
+
+
+            this.goodInfo.goodInfoDialog.formValue.medical_insurance_number =
+              response.data.data.goodInfo.medical_insurance_number
+
+
+            if (response.data.data.goodInfo.is_special_diseases <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_special_diseases = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_special_diseases =
+                response.data.data.goodInfo.is_special_diseases.toString()
+            }
+
+            if (response.data.data.goodInfo.is_record <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_record = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_record =
+                response.data.data.goodInfo.is_record.toString()
+            }
+
+            if (response.data.data.goodInfo.statistics_category <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.statistics_category = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.statistics_category =
+                response.data.data.goodInfo.statistics_category
+            }
+
+
+            if (response.data.data.goodInfo.good_status <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.good_status = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.good_status =
+                response.data.data.goodInfo.good_status
+            }
+
+
+            if (response.data.data.goodInfo.default_count <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.default_count = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.default_count =
+                response.data.data.goodInfo.default_count
+            }
+
+
+
+
+            if (response.data.data.goodInfo.sign <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.sign = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.sign =
+                response.data.data.goodInfo.sign
+            }
+
+
+
+            if (response.data.data.goodInfo.is_default <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_default = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_default =
+                response.data.data.goodInfo.is_default.toString()
+            }
+
+            if (response.data.data.goodInfo.is_charge_use <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_use = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_use =
+                response.data.data.goodInfo.is_charge_use.toString()
+            }
+
+
+            if (response.data.data.goodInfo.is_charge_predict <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_predict = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_predict =
+                response.data.data.goodInfo.is_charge_predict.toString()
+            }
+
+
+            if (response.data.data.goodInfo.is_statistics_work <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_statistics_work = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_statistics_work =
+                response.data.data.goodInfo.is_statistics_work.toString()
+            }
+
+
+            if (response.data.data.goodInfo.sort <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.sort = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.sort =
+                response.data.data.goodInfo.sort.toString()
+            }
+
+
+            if (response.data.data.goodInfo.is_doctor_use <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_doctor_use = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_doctor_use =
+                response.data.data.goodInfo.is_doctor_use.toString()
+            }
+
+            this.goodInfo.goodInfoDialog.formValue.agent =
+              response.data.data.goodInfo.agent
+
+            this.goodInfo.goodInfoDialog.formValue.good_number =
+              response.data.data.goodInfo.good_number
+
+
+
+            this.$refs.addConsumable.show()
+          }
+        })
+      },
+      handleGoodInfoDelete: function(index, row) {
+        this.$confirm('确认删除这条商品信息?', '删除商品信息', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
+
+            deleteGoodInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.goodInfo.goodInfoData.splice(index, 1)
+                this.$message.success('删除成功')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+      getList() {
+        this.goodInfo.loading = true
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use:this.is_use,
+          good_kind:this.good_kind,
+          is_charge: this.is_charge,
+        }
+        getGoodInfoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.goodInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.goodInfo.loading = false
+            this.total = response.data.data.total
+            this.goodInfo.goodInfoData = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.goodInfo.goodInfoData.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      tableRowClassName({ row, rowIndex }) {
+        //把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClick(row, event, column) {
+        this.goodInfo.goodInfoData = []
+        this.goodType.tableCurrentIndex = row.index
+        this.goodInfo.goodInfoDialog.formValue.good_id = row.id
+        let params = {
+          id: row.id
         }
+        this.goodInfo.loading = true
+        GetGoodInfoByGoodId(params).then(response => {
+          if (response.data.state == 0) {
+            this.goodInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.goodInfo.loading = false
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.goodInfo.goodInfoData.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      goodInfoDialogComfirm: function(val) {
+        if (val.isCreated == 2) {
+          //修改
+          val['id'] = this.goodInfo.editGoodId
+          val['good_code'] = this.goodInfo.good_code
+
+          modifyGoodInfo(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$refs.addConsumable.hide()
+
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].specification_name =
+                response.data.data.goodInfo.specification_name
+              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit =
+                response.data.data.goodInfo.good_unit
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].buy_price = response.data.data.goodInfo.buy_price.toString()
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].sell_price = response.data.data.goodInfo.sell_price.toString()
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
+              this.goodInfo.goodInfoData[
+                this.goodInfo.editGoodIndex
+                ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
+
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createGoodInfo(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$refs.addConsumable.hide()
+
+              this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
+
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      goodInfoDialogCancle: function() {
+        this.$refs.addConsumable.hide()
+      },
+      showInfoDialog: function() {
+        this.$refs.addConsumable.show()
+        this.getAllDealer()
+        this.getAllManufacturer()
+        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              if (response.data.data.goodType[i].type == 1) {
+                response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
+              }
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(
+                response.data.data.goodType[i]
+              )
+            }
+            if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
+              this.$message.error('请先新增商品类型')
+              return
+            } else {
+              this.goodInfo.goodInfoDialog.isVisibility = true
+              this.goodInfo.goodInfoDialog.isCreated = 1
+            }
+          }
+        })
+        this.goodInfo.goodInfoDialog.formValue.good_id = ''
+        this.goodInfo.goodInfoDialog.formValue.specification_name = ''
+        this.goodInfo.goodInfoDialog.formValue.buy_price = ''
+        this.goodInfo.goodInfoDialog.formValue.sell_price = ''
+        this.goodInfo.goodInfoDialog.formValue.remark = ''
+        this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
+        this.goodInfo.goodInfoDialog.formValue.good_type_id = ''
+        this.goodInfo.goodInfoDialog.formValue.dealer = ''
+        this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
+        this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
+        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
+      },
+      getAllDealer: function() {
+        this.goodInfo.goodInfoDialog.formValue.dealers = []
+        GetAllDeals().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.dealer.length; i++) {
+              this.goodInfo.goodInfoDialog.formValue.dealers.push(
+                response.data.data.dealer[i]
+              )
+            }
+          }
+        })
+      },
+      getAllManufacturer: function() {
+        this.goodInfo.goodInfoDialog.formValue.manufacturers = []
+        GetAllManufacturer().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.manufacturer.length; i++) {
+              this.goodInfo.goodInfoDialog.formValue.manufacturers.push(
+                response.data.data.manufacturer[i]
+              )
+            }
+          }
+        })
+      },
+      getAllGoodType: function() {
+        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              if (response.data.data.goodType[i].type == 1) {
+                response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
+              }
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(
+                response.data.data.goodType[i]
+              )
+            }
+          }
+        })
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
+      searchAction() {
+      },clickSelfPayment(){
+
+      },
+      openForm() {
+
+        this.getAllDealer()
+        this.getAllManufacturer()
+        this.goodInfo.goodInfoDialog.formValue.goodType = []
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              if (response.data.data.goodType[i].type == 1) {
+                response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
+              }
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(
+                response.data.data.goodType[i]
+              )
+            }
+            if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
+              this.$message.error('请先新增商品类型')
+              return
+            } else {
+              this.goodInfo.goodInfoDialog.isVisibility = true
+              this.goodInfo.goodInfoDialog.isCreated = 1
+            }
+          }
+        })
+        this.goodInfo.goodInfoDialog.formValue.good_id = ''
+        this.goodInfo.goodInfoDialog.formValue.specification_name = ''
+        this.goodInfo.goodInfoDialog.formValue.buy_price = ''
+        this.goodInfo.goodInfoDialog.formValue.sell_price = ''
+        this.goodInfo.goodInfoDialog.formValue.remark = ''
+        this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
+        this.goodInfo.goodInfoDialog.formValue.good_type_id = ''
+        this.goodInfo.goodInfoDialog.formValue.dealer = ''
+        this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
+        this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
+        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
+        this.goodInfo.goodInfoDialog.formValue.good_name = ''
+        this.goodInfo.goodInfoDialog.formValue.pinyin = ''
+        this.goodInfo.goodInfoDialog.formValue.wubi = ''
+        this.goodInfo.goodInfoDialog.formValue.good_kind = ''
+        this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = ''
+        this.goodInfo.goodInfoDialog.formValue.retail_price = ''
+        this.goodInfo.goodInfoDialog.formValue.medical_insurance_number = ''
+        this.goodInfo.goodInfoDialog.formValue.is_special_diseases = ''
+        this.goodInfo.goodInfoDialog.formValue.is_record = ''
+        this.goodInfo.goodInfoDialog.formValue.statistics_category = ''
+        this.goodInfo.goodInfoDialog.formValue.good_status = ''
+        this.goodInfo.goodInfoDialog.formValue.default_count = ''
+        this.goodInfo.goodInfoDialog.formValue.sign = ''
+        this.goodInfo.goodInfoDialog.formValue.is_default = ''
+        this.goodInfo.goodInfoDialog.formValue.is_charge_use = ''
+        this.goodInfo.goodInfoDialog.formValue.is_charge_predict = ''
+        this.goodInfo.goodInfoDialog.formValue.is_statistics_work = ''
+        this.goodInfo.goodInfoDialog.formValue.sort = ''
+        this.goodInfo.goodInfoDialog.formValue.is_doctor_use = ''
+        this.goodInfo.goodInfoDialog.formValue.agent = ''
+        this.goodInfo.goodInfoDialog.formValue.good_number = ''
+
+        this.$refs.addConsumable.show()
+      }
+    }, created() {
+      this.getList()
+      this.getAllDealer()
+      this.getAllManufacturer()
+      this.getAllGoodType()
+      this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit
     }
-}
+  }
 </script>

src/xt_pages/data/components/drugs.vue

@@ -1,114 +1,408 @@
 <template>
-    <div class="page_drugs">
-        <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
-            <div class="cell clearfix" style="margin-bottom:0;">
-                <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
-                <label class="title"><span class="name">是否启用</span> : </label>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-                <label class="title"><span class="name">是否收费</span> : </label>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-                <span style="color: #909399;font-size:14px;">是否注射类别 : &nbsp;</span>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </div>
-            <el-button type="primary" @click="openForm(0)">新增</el-button>
-        </div>
-        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-            <el-table-column prop="date" label="药品编码" width="80" align="center"></el-table-column>
-            <el-table-column prop="date" label="药品名称" align="center"></el-table-column>
-            <el-table-column prop="date" label="生产厂商" align="center"></el-table-column>
-            <el-table-column prop="date" label="规格" width="140" align="center"></el-table-column>
-            <el-table-column label="单位" width="60" align="center"></el-table-column>
-            <el-table-column label="单价" width="60" align="center"></el-table-column>
-            <el-table-column label="状态" width="60" align="center"></el-table-column>
-            <el-table-column prop="date" label="操作" width="400" align="center">
-                <template slot-scope="scope">
-                    <el-button @click="openForm(scope.row)" type="primary" size="small">编辑</el-button>
-                    <el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>
-                    <el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>
-                    <el-button type="danger" size="small">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <self-payment ref='selfPayment'></self-payment>
-        <add-drugs ref='addDrugs'></add-drugs>
-        <!-- <maintain ref='maintain'></maintain> -->
+  <div class="page_drugs">
+    <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
+      <div class="cell clearfix" style="margin-bottom:0;">
+        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                  class="filter-item" v-model="keywords"/>
+        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
+                   @click="searchAction">搜索
+        </el-button>
+        <label class="title"><span class="name">是否启用</span> : </label>
+        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+        <label class="title"><span class="name">是否收费</span> : </label>
+        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+        <span style="color: #909399;font-size:14px;">是否注射类别 : &nbsp;</span>
+        <el-select v-model="is_inject" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeInject">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+      <el-button type="primary" @click="openForm(0)">新增</el-button>
     </div>
+    <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
+      <el-table-column prop="date" label="药品编码" width="80" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.drug_code}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="药品名称" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.drug_name}}</div>
+        </template>
+
+      </el-table-column>
+      <el-table-column prop="date" label="生产厂商" align="center">
+        <template slot-scope="scope">
+          <div>{{getName(scope.row.manufacturer)}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="规格" width="140" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.drug_spec}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" width="60" align="center">
+
+        <template slot-scope="scope">
+          <div>{{scope.row.min_unit}}</div>
+        </template>
+
+      </el-table-column>
+      <el-table-column label="单价" width="60" align="center">
+        <template slot-scope="scope">
+          <!--<div>{{scope.row.drug_spec}}</div>-->
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" width="60" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.drug_status}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="操作" width="400" align="center">
+        <template slot-scope="scope">
+          <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
+          <!--<el-button type="primary" size="small" @click="clickSelfPayment">自付比例</el-button>-->
+          <!--<el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>-->
+          <!--<el-button type="danger" size="small">删除</el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <self-payment ref='selfPayment'></self-payment>
+    <add-drugs ref='addDrugs'
+               :titles="title"
+               :formValue="formValue"
+               :isCreated="isCreated"
+               :manufacturers="manufacturers"
+               v-on:dialog-comfirm="goodInfoDialogComfirm"
+               v-on:dialog-cancle="goodInfoDialogCancle"
+
+    ></add-drugs>
+    <!-- <maintain ref='maintain'></maintain> -->
+  </div>
 </template>
 
 <script>
-import selfPayment from './selfPayment'
-import maintain from './maintain'
-import addDrugs from './addDrugs'
-export default {
-    components:{
-        selfPayment,
-        maintain,
-        addDrugs
-    },
-    data(){
-        return{
-            search_input:'',
-            options: [{
-            value: '1',
-            label: '是'
-            }, {
-            value: '2',
-            label: '否'
-            },],
-            value: '',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }]
-            
-        }
+  import selfPayment from './selfPayment'
+  import maintain from './maintain'
+  import addDrugs from './addDrugs'
+  import {
+    GetAllManufacturer,
+  } from '@/api/stock'
+
+  import {
+    createBaseDrugLib,
+    getBaseDrugLib,
+    getBaseDrugLibList,
+    createMedicineInsurancePercent,
+    createDrugUnitSafeguard,
+    editBaseDrugLib
+  } from '@/api/data'
+
+
+  export default {
+    components: {
+      selfPayment,
+      maintain,
+      addDrugs
     },
-    methods:{
-        searchAction(){},
-        clickSelfPayment(){
-            this.$refs.selfPayment.show();
+    data() {
+      return {
+        page:0,
+        limit:10,
+        keywords:"",
+        is_use:'',
+        is_charge:'',
+        is_inject:'',
+        list:[],
+
+        isCreated:1,
+        manufacturers:[],
+        title: '',
+        formValue: {
+          drug_name: '',//药品名称
+          pinyin: '',//拼音
+          wubi: '',//五笔输入法
+          drug_alias: '',//药品别名
+          drug_alias_pinyin: '',//别名拼音
+          drug_alias_wubi: '',//别名五笔
+          drug_category: '',//药品类别
+          drug_spec: '',//药品规格
+          drug_type: '',//药品类型
+          drug_stock_limit: '',//库存警戒
+          drug_origin_place: '',//产地
+          drug_dosage_form: '',//药品剂型
+          medical_insurance_level: '',//医保等级
+          max_unit: '',//最大单位
+          min_unit: '',//最小单位
+          unit_matrixing: '',//单位换算
+          retail_price: '',//零售价
+          last_price: '',//上次进价
+          drug_control: '',//开药控制
+          number: '',//批准文号
+          drug_classify: '',//药物分类
+          drug_dose: '',//药品剂量
+          drug_dose_unit:'',
+          medical_insurance_number: '',//医保编号
+          manufacturer:'', //生产产商
+          pharmacology_category: '',//药理分类
+          statistics_category: '',//统计分类
+          code: '',//本位码
+          is_special_diseases: '',//是否特病目录
+          is_record: '',//是否备案
+          agent: '',// 代理商
+          drug_status: '',// 状态
+          limit_remark: '',//限制说明
+          delivery_way: '',//默认给药途径
+          execution_frequency: '',//默认执行频率
+          single_dose: '',//默认单次用量
+          prescribing_number: '',//默认开药数量
+          label: '',//标签
+          sort: '',//收费项目排序
+          is_use_doctor_advice: '',//是否常用医嘱
+          is_default: '',//是否默认
+          is_charge_predict: '',//是否收费预估项
+          is_statistics_work: '',//是否统计工作量
+          is_charge_use: '',//是否收费常用项
+          drug_code:"",
+
         },
-        clickMainTain(){
-            // this.$refs.maintain.show();
+        tempFormValue: {
+          drug_name: '',//药品名称
+          pinyin: '',//拼音
+          wubi: '',//五笔输入法
+          drug_alias: '',//药品别名
+          drug_alias_pinyin: '',//别名拼音
+          drug_alias_wubi: '',//别名五笔
+          drug_category: '',//药品类别
+          drug_spec: '',//药品规格
+          drug_type: '',//药品类型
+          drug_stock_limit: '',//库存警戒
+          drug_origin_place: '',//产地
+          drug_dosage_form: '',//药品剂型
+          medical_insurance_level: '',//医保等级
+          max_unit: '',//最大单位
+          min_unit: '',//最小单位
+          unit_matrixing: '',//单位换算
+          retail_price: '',//零售价
+          last_price: '',//上次进价
+          drug_control: '',//开药控制
+          number: '',//批准文号
+          drug_classify: '',//药物分类
+          drug_dose: '',//药品剂量
+          drug_dose_unit:'',
+          medical_insurance_number: '',//医保编号
+          manufacturer:'', //生产产商
+          pharmacology_category: '',//药理分类
+          statistics_category: '',//统计分类
+          code: '',//本位码
+          is_special_diseases: '',//是否特病目录
+          is_record: '',//是否备案
+          agent: '',// 代理商
+          drug_status: '',// 状态
+          limit_remark: '',//限制说明
+          delivery_way: '',//默认给药途径
+          execution_frequency: '',//默认执行频率
+          single_dose: '',//默认单次用量
+          prescribing_number: '',//默认开药数量
+          label: '',//标签
+          sort: '',//收费项目排序
+          is_use_doctor_advice: '',//是否常用医嘱
+          is_default: '',//是否默认
+          is_charge_predict: '',//是否收费预估项
+          is_statistics_work: '',//是否统计工作量
+          is_charge_use: '',//是否收费常用项
+          drug_code:"",
+
         },
-        openForm(id){
-            this.$refs.addDrugs.show(id);
+
+        current_id:0,
+
+        search_input: '',
+        options: [{
+          value: '1',
+          label: '是'
+        }, {
+          value: '2',
+          label: '否'
+        }],
+        value: '',
+        tableData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }]
+
+      }
+    },
+    methods: {
+      changeInject(val){
+        this.getList()
+
+      },
+      changeCharge(val){
+        this.getList()
+
+      },
+      changeUser(val){
+        this.getList()
+
+
+      },
+      getName(id){
+
+      for (let i =0; i < this.manufacturers.length;i++){
+        if(this.manufacturers[i].id == id){
+          return this.manufacturers[i].manufacturer_name
         }
+        return ""
+      }
+
+      },
+      goodInfoDialogComfirm: function(val) {
+
+        if (val.id > 0) {
+          //修改
+          val['id'] = this.current_id
+          editBaseDrugLib(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$refs.addDrugs.hide()
+              this.getList()
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.id == 0) {
+          //新增
+          createBaseDrugLib(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$refs.addDrugs.hide()
+              this.getList()
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      goodInfoDialogCancle: function() {
+        this.$refs.addDrugs.hide()
+      },
+      getAllManufacturer: function() {
+        this.manufacturers = []
+        GetAllManufacturer().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.manufacturer.length; i++) {
+              this.manufacturers.push(
+                response.data.data.manufacturer[i]
+              )
+            }
+          }
+        })
+      },
+      searchAction() {
+        this.getList()
+      },
+      clickSelfPayment() {
+        this.$refs.selfPayment.show()
+      },
+      clickMainTain() {
+        // this.$refs.maintain.show();
+      },
+      openForm(id) {
+        this.getAllManufacturer()
+        if (id > 0){
+          this.current_id = id
+          let params = {
+            id: this.current_id
+          }
+          getBaseDrugLib(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              for(let key in response.data.data.drug){
+                this.formValue[key] = response.data.data.drug[key]
+              }
+              this.formValue.is_special_diseases = this.formValue.is_special_diseases.toString()
+              this.formValue.is_record = this.formValue.is_record.toString()
+              this.formValue.is_use_doctor_advice = this.formValue.is_use_doctor_advice.toString()
+              this.formValue.is_default = this.formValue.is_default.toString()
+              this.formValue.is_charge_predict = this.formValue.is_charge_predict.toString()
+              this.formValue.is_statistics_work = this.formValue.is_statistics_work.toString()
+              this.formValue.is_charge_use = this.formValue.is_charge_use.toString()
+              this.$refs.addDrugs.show(id,this.formValue)
+
+            }
+          })
+        }else{
+          for(let key in this.tempFormValue){
+            this.formValue[key] = this.tempFormValue[key]
+          }
+          this.$refs.addDrugs.show(0,this.formValue)
+        }
+      },  getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use:this.is_use,
+          is_charge:this.is_charge,
+          is_inject:this.is_inject
+        }
+        getBaseDrugLibList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            this.list = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.list.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+
+    },created() {
+      this.getList()
+      this.getAllManufacturer()
     }
-}
+  }
 </script>

src/xt_pages/data/specialDictionary.vue

@@ -1,67 +1,69 @@
 <template>
-    <div class="main-contain">
-        <div class="position">
-            <bread-crumb :crumbs="crumbs"></bread-crumb>
-        </div>
-        <div class="app-container">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="药品" name="1">
-                    <drugs></drugs>
-                </el-tab-pane>
-                <el-tab-pane label="耗材" name="2">
-                    <consumables></consumables>
-                </el-tab-pane>
-                <!--<el-tab-pane label="项目" name="3">-->
-                    <!--<project></project>-->
-                <!--</el-tab-pane>-->
-                <!--<el-tab-pane label="检验检查项目" name="4">-->
-                    <!--<inspection></inspection>-->
-                <!--</el-tab-pane>-->
-                <el-tab-pane label="生产厂商" name="5">
-                    <!--<manufacturer></manufacturer>-->
-                  <manufacturer> </manufacturer>
-                </el-tab-pane>
-                <el-tab-pane label="供应商" name="6">
-                    <!--<supplier></supplier>-->
-                  <dealer></dealer>
-                </el-tab-pane>
-                <el-tab-pane label="配置项字典" name="7">
-                    <configure></configure>
-                </el-tab-pane>
-            </el-tabs>
-        </div>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
+    <div class="app-container">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="药品" name="1">
+          <drugs></drugs>
+        </el-tab-pane>
+        <el-tab-pane label="耗材" name="2">
+          <consumables></consumables>
+        </el-tab-pane>
+        <!--<el-tab-pane label="项目" name="3">-->
+        <!--<project></project>-->
+        <!--</el-tab-pane>-->
+        <!--<el-tab-pane label="检验检查项目" name="4">-->
+        <!--<inspection></inspection>-->
+        <!--</el-tab-pane>-->
+        <el-tab-pane label="生产厂商" name="5">
+          <!--<manufacturer></manufacturer>-->
+          <manufacturer></manufacturer>
+        </el-tab-pane>
+        <el-tab-pane label="供应商" name="6">
+          <!--<supplier></supplier>-->
+          <dealer></dealer>
+        </el-tab-pane>
+        <el-tab-pane label="配置项字典" name="7">
+          <configure></configure>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
 </template>
 
 
 <script>
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import drugs from './components/drugs'
-import consumables from './components/consumables'
-import project from './components/project'
-import inspection from './components/inspection'
-import manufacturer from '../stock/config/manufacturer'
-import configure from './compone，nts/configure'
-import Dealer from '../stock/config/dealer'
-export default {
-    components:{
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import drugs from './components/drugs'
+  import consumables from './components/consumables'
+  import project from './components/project'
+  import inspection from './components/inspection'
+  import manufacturer from '../stock/config/manufacturer'
+  import configure from './components/configure'
+  import Dealer from '../stock/config/dealer'
+
+  export default {
+    name: 'specialDictionary',
+    components: {
       Dealer,
-        BreadCrumb,
-        drugs,
-        consumables,
-        project,
-        inspection,
-        manufacturer,
-        configure
+      BreadCrumb,
+      drugs,
+      consumables,
+      project,
+      inspection,
+      manufacturer,
+      configure
     },
-    data(){
-        return{
-            crumbs: [
-                { path: false, name: "管理中心" },
-                { path: "/data/specialDictionary", name: "专项字典" }
-            ],
-            activeName: "1"
-        }
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '管理中心' },
+          { path: '/data/specialDictionary', name: '专项字典' }
+        ],
+        activeName: '1'
+      }
     }
-}
+  }
 </script>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -1,133 +1,248 @@
 <template>
-  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="854px"
+             :title="titles"
+             :visible.sync="visible"
+             :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
-    <el-form class="demo-form-inline" style="height: 300px"
-             :rules="rules" :model="form" ref="form"
-             label-width="140px">
-      <el-col :span="size">
-        <el-form-item label="物品类型:" prop="good_id">
-          <el-select v-model="form.good_id" placeholder="请选择"
-          >
-            <el-option
-              v-for="item in form.goodType"
-              :key="item.id"
-              :label="item.type_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="规格名称:" prop="specification_name">
-          <el-input v-model="form.specification_name"></el-input>
-        </el-form-item>
-      </el-col>
-
-
-      <el-col :span="size">
-        <el-form-item label="单位:" prop="good_unit">
-
-          <el-select v-model="good_unit" @change="changeSelected" placeholder="请选择">
-            <el-option
-              v-for="item in form.goodUnit"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="生产厂家:" prop="dealer">
-          <el-select v-model="form.manufacturer" placeholder="请选择">
-            <el-option
-              v-for="item in form.manufacturers"
-              :key="item.id"
-              :label="item.manufacturer_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="经销商:" prop="manufacturer">
-          <el-select v-model="form.dealer" placeholder="请选择">
-            <el-option
-              v-for="item in form.dealers"
-              :key="item.id"
-              :label="item.dealer_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-
-      <el-col :span="size">
-        <el-form-item label="进货价:" prop="buy_price">
-          <el-input type="number" v-model="form.buy_price"></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="出货价:" prop="sell_price">
-          <el-input type="number" v-model="form.sell_price"></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="有效期预警天数:" prop="expiry_date_warn_day_count">
-          <el-input type="number" v-model="form.expiry_date_warn_day_count"></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="库存预警数量:" prop="stock_warn_count">
-          <el-input type="number" v-model="form.stock_warn_count"></el-input>
-        </el-form-item>
-      </el-col>
-
-
-      <el-col :span="size">
-        <el-form-item label="是否可复用:" prop="is_reuse">
-          <el-radio v-model="form.is_reuse" label="1">可以</el-radio>
-          <el-radio v-model="form.is_reuse" label="2">不可以</el-radio>
-        </el-form-item>
-      </el-col>
-
-
-      <el-col>
-        <el-form-item label="备注 : " prop="remark">
-          <el-input type="textarea" :row="5" v-model="form.remark"
-                    placeholder="请输入内容">
-          </el-input>
-        </el-form-item>
-      </el-col>
-
-    </el-form>
+    <el-tabs v-model="activeName" >
+      <el-tab-pane label="基础数据" name="first">
+        <div>
+          <!--:rules="rules"-->
+          <el-form :model="form"  ref="form" :rules="rules" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
+              <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
+              <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="五笔 : " prop="wubi" style="width:50%">
+              <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="耗材种类 : " prop="good_kind">
+              <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','good_kind')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="耗材类型 : " prop="good_type_id">
+              <el-select v-model="form.good_type_id" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in form.goodType"
+                  :key="index"
+                  :label="item.type_name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="医保等级 : " prop="medical_insurance_level">
+              <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item, index in getDictionaryDataConfig('system','medical_insurance_level')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="规格型号 : " prop="specification_name" style="width:100%">
+              <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="生产厂商 : " prop="manufacturer"  style="width:100%">
+              <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
+                <el-option
+                  v-for="item,index in form.manufacturers"
+                  :key="index"
+                  :label="item.manufacturer_name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="单位 : " prop="good_unit">
+              <el-select v-model="form.good_unit" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in form.goodUnit"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="零价 : " prop="retail_price">
+              <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="最新进价 : " prop="buy_price">
+              <el-input v-model="form.buy_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="库存警戒 : " prop="stock_warn_count">
+              <el-input v-model="form.stock_warn_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="医保编码 : " prop="medical_insurance_number">
+              <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="是否特病目录:" prop="is_special_diseases">
+              <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否备案:" prop="is_record">
+              <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="统计分类:" prop="statistics_category">
+              <el-select v-model="form.statistics_category" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','statistics_category')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <!--<el-form-item label="代理商 : " prop="name" style="visibility: hidden;">-->
+              <!--<el-input style="width:160px;" v-model="form.agent" placeholder="" maxlength="30"></el-input>-->
+            <!--</el-form-item>-->
+
+
+
+            <el-form-item label="状态 : " prop="good_status">
+              <el-radio-group v-model="form.good_status">
+                <el-radio :label="1">停用</el-radio>
+                <el-radio :label="2">收费</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="备注 : " prop="name" style="width:100%;">
+              <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="扩展数据" name="second">
+        <el-form :model="form"    label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+          <el-form-item label="默认使用数量:" prop="name">
+            <el-input v-model="form.default_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
+          </el-form-item>
+          <el-form-item label="标签:" prop="sign">
+            <el-select v-model="form.sign" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item,index in getDictionaryDataConfig('system','sign')"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否默认:" prop="is_default">
+            <el-select v-model="form.is_default" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否收费常用项:" prop="is_charge_use">
+            <el-select v-model="form.is_charge_use" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否收费预估项:" prop="is_charge_predict">
+            <el-select v-model="form.is_charge_predict" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否统计工作量:" prop="is_statistics_work">
+            <el-select v-model="form.is_statistics_work" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="收费项目排序:" prop="sort">
+            <el-input v-model="form.sort" style="width:160px;" placeholder="" maxlength="30"></el-input>
+          </el-form-item>
+          <el-form-item label="是否常用医嘱:" prop="is_doctor_use">
+            <el-select v-model="form.is_doctor_use" style="width:160px;" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="代理商:" prop="agent">
+            <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
+          </el-form-item>
+          <!--<el-form-item label="耗材编码:" prop="name">-->
+          <!--<el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>-->
+          <!--</el-form-item>-->
+          <el-form-item label="耗材编号:" prop="good_number">
+            <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
+          </el-form-item>
+
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
 
 
 
 
     <span slot="footer" class="dialog-footer">
-    <el-button v-if="isCreated == 3" @click="cancle('form')">取 消</el-button>
-    <el-button v-if="isCreated != 3 " @click="cancle('form')">取 消</el-button>
-    <el-button v-if="isCreated != 3" type="primary" @click="comfirm('form')">保 存</el-button>
+    <el-button  @click="cancle('form')">取 消</el-button>
+    <el-button type="primary" @click="comfirm('form')">保 存</el-button>
   </span>
   </el-dialog>
 
 </template>
 
+
 <script>
+  import { getDictionaryDataConfig } from "@/utils/data";
+
   export default {
     name: 'goodInfoDailog',
     data() {
       return {
+        visible:false,
+        formTitle:'',
+        activeName:'first',
+        options: [{
+          value: '1',
+          label: '是'
+        }, {
+          value: '2',
+          label: '否'
+        }],
         good_unit: '',
         isClose: false,
         size: 11,
@@ -139,20 +254,69 @@
           sell_price: '',
           remark: '',
           manufacturer: '',
+          good_type_id: '',
           dealer: '',
           expiry_date_warn_day_count: '',
           stock_warn_count: '',
-          is_reuse: '2'
+          is_reuse: '2',
+          good_name:'',
+          pinyin:"",
+          wubi:"",
+          good_kind:'',
+          medical_insurance_level:'',
+          good_unit:'',
+          retail_price:'',
+          medical_insurance_number:'',
+          is_special_diseases:'',
+          is_record:'',
+          statistics_category:'',
+          agent:'',
+          good_status:'',
+          default_count:'',
+          sign:'',
+          is_default:'',
+          is_charge_use:'',
+          is_charge_predict:'',
+          is_statistics_work:'',
+          sort:'',
+          is_doctor_use:'',
+          good_number:'',
         },
 
         rules: {
           specification_name: [
-            { required: true, message: '请输入规格名称', trigger: 'blur' }
+            { required: true, message: '请输入规格型号', trigger: 'blur' }
           ],
-          good_id: [
+          good_type_id: [
             { required: true, message: '请选择商品类型', trigger: 'change' }
+          ],
+          good_name: [
+            { required: true, message: '请输入耗材名称', trigger: 'blur' }
+          ],
+          pinyin: [
+            { required: true, message: '请输入拼音', trigger: 'blur' }
+          ],
+          wubi: [
+            { required: true, message: '请输入五笔', trigger: 'blur' }
+          ],
+          good_kind: [
+            { required: true, message: '请选择耗材种类', trigger: 'change' }
+          ],
+          medical_insurance_level: [
+            { required: true, message: '请输入医保等级', trigger: 'blur' }
+          ],
+          manufacturer:[
+            { required: true, message: '请选择生产厂商', trigger: 'blur' }
+          ],good_unit:[
+            { required: true, message: '请选择单位', trigger: 'blur' }
+          ],retail_price:[
+            { required: true, message: '请输入零价', trigger: 'blur' }
+          ],stock_warn_count:[
+            { required: true, message: '请输入库存警戒', trigger: 'blur' }
           ]
 
+
+
         }
       }
     },
@@ -173,11 +337,16 @@
 
     },
     methods: {
-      show:function(){
-        this.visibility = true
+      getDictionaryDataConfig(module,filed_name){
+       return getDictionaryDataConfig(module,filed_name)
+
+      },
+      show() {
+        this.visible = true
+        console.log(this.getDictionaryDataConfig("system","drug_type"))
 
-      },hide:function(){
-        this.visibility = false
+      },  hide() {
+        this.visible = false
       },
       cancle: function(formName) {
         this.$emit('dialog-cancle', this.getValue())
@@ -192,7 +361,7 @@
       getValue: function() {
         const form = {}
         form['specification_name'] = this.form.specification_name
-        form['good_unit'] = this.good_unit
+        form['good_unit'] = this.form.good_unit
         form['buy_price'] = this.form.buy_price
         form['sell_price'] = this.form.sell_price
         form['remark'] = this.form.remark
@@ -202,16 +371,41 @@
         form['stock_warn_count'] = this.form.stock_warn_count
         form['is_reuse'] = this.form.is_reuse
         form['isCreated'] = this.isCreated
-        form['good_id'] = this.form.good_id
+        form['good_id'] = this.form.good_type_id
+        form['good_name'] = this.form.good_name
+        form['pinyin'] = this.form.pinyin
+        form['wubi'] = this.form.wubi
+        form['good_kind'] = this.form.good_kind
+        form['medical_insurance_level'] = this.form.medical_insurance_level
+        form['manufacturer'] = this.form.manufacturer
+        form['retail_price'] = this.form.retail_price
+        form['medical_insurance_number'] = this.form.medical_insurance_number
+        form['is_special_diseases'] = this.form.is_special_diseases
+        form['is_record'] = this.form.is_record
+        form['statistics_category'] = this.form.statistics_category
+        form['good_status'] = this.form.good_status
+        form['default_count'] = this.form.default_count
+        form['sign'] = this.form.sign
+        form['is_default'] = this.form.is_default
+        form['is_charge_use'] = this.form.is_charge_use
+        form['is_charge_predict'] = this.form.is_charge_predict
+        form['is_statistics_work'] = this.form.is_statistics_work
+        form['sort'] = this.form.sort
+        form['is_doctor_use'] = this.form.is_doctor_use
+        form['agent'] = this.form.agent
+        form['good_number'] = this.form.good_number
+
+
+
+
         return form
       }, changeSelected: function(val) {
         console.log(val)
       }
     },
     watch: {
-      visibility(val) {
+      visible(val) {
         this.form = this.formValue
-        console.log(this.form)
         this.good_unit = this.formValue.good_unit
         if (this.isCreated == 1) {
           this.good_unit = ''

src/xt_pages/stock/config/goodInfo.vue

@@ -187,7 +187,30 @@
               dealers: [],
               manufacturers: [],
               goodType: [],
-              goodUnit: []
+              goodUnit: [],
+              good_name:'',
+              pinyin:"",
+              wubi:"",
+              good_kind:'',
+              medical_insurance_level:'',
+              good_unit:'',
+              retail_price:'',
+              medical_insurance_number:'',
+              is_special_diseases:'',
+              is_record:'',
+              statistics_category:'',
+              agent:'',
+              good_status:'',
+              default_count:'',
+              sign:'',
+              is_default:'',
+              is_charge_use:'',
+              is_charge_predict:'',
+              is_statistics_work:'',
+              sort:'',
+              is_use_doctor_advice:'',
+              good_number:'',
+
             },
 
             isVisibility: false
@@ -237,6 +260,10 @@
                 response.data.data.goodInfo.dealer
             }
 
+
+
+
+
             this.goodInfo.goodInfoDialog.formValue.specification_name =
               response.data.data.goodInfo.specification_name
             this.goodInfo.goodInfoDialog.formValue.buy_price =
@@ -254,6 +281,152 @@
             this.goodInfo.good_code = response.data.data.goodInfo.good_code
             this.goodInfo.goodInfoDialog.formValue.good_id =
               response.data.data.goodInfo.good_type_id
+
+
+            this.goodInfo.goodInfoDialog.formValue.good_name =
+              response.data.data.goodInfo.good_name
+
+
+            this.goodInfo.goodInfoDialog.formValue.pinyin =
+              response.data.data.goodInfo.pinyin
+
+            this.goodInfo.goodInfoDialog.formValue.wubi =
+              response.data.data.goodInfo.wubi
+
+
+
+            if (response.data.data.goodInfo.good_kind <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.good_kind = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.good_kind =
+                response.data.data.goodInfo.good_kind
+            }
+
+
+
+            if (response.data.data.goodInfo.medical_insurance_level <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.medical_insurance_level =
+                response.data.data.goodInfo.medical_insurance_level
+            }
+
+
+              this.goodInfo.goodInfoDialog.formValue.retail_price =
+                response.data.data.goodInfo.retail_price
+
+
+              this.goodInfo.goodInfoDialog.formValue.medical_insurance_number =
+                response.data.data.goodInfo.medical_insurance_number
+
+
+            if (response.data.data.goodInfo.is_special_diseases <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_special_diseases = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_special_diseases =
+                response.data.data.goodInfo.is_special_diseases
+            }
+
+            if (response.data.data.goodInfo.is_record <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_record = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_record =
+                response.data.data.goodInfo.is_record
+            }
+
+
+            if (response.data.data.goodInfo.statistics_category <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.statistics_category = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.statistics_category =
+                response.data.data.goodInfo.is_special_diseases
+            }
+
+
+            if (response.data.data.goodInfo.good_status <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.good_status = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.good_status =
+                response.data.data.goodInfo.good_status
+            }
+
+
+            if (response.data.data.goodInfo.default_count <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.default_count = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.default_count =
+                response.data.data.goodInfo.default_count
+            }
+
+
+
+
+            if (response.data.data.goodInfo.sign <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.sign = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.sign =
+                response.data.data.goodInfo.sign
+            }
+
+
+
+            if (response.data.data.goodInfo.is_defalut <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_defalut = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_defalut =
+                response.data.data.goodInfo.is_defalut
+            }
+
+            if (response.data.data.goodInfo.is_charge_use <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_use = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_use =
+                response.data.data.goodInfo.is_charge_use
+            }
+
+
+            if (response.data.data.goodInfo.is_charge_predict <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_predict = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_charge_predict =
+                response.data.data.goodInfo.is_charge_predict
+            }
+
+
+            if (response.data.data.goodInfo.is_statistics_work <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_statistics_work = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_statistics_work =
+                response.data.data.goodInfo.is_statistics_work
+            }
+
+
+            if (response.data.data.goodInfo.sort <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.sort = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.sort =
+                response.data.data.goodInfo.sort
+            }
+
+
+            if (response.data.data.goodInfo.is_doctor_use <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_doctor_use = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_doctor_use =
+                response.data.data.goodInfo.is_doctor_use
+            }
+
+
+            this.goodInfo.goodInfoDialog.formValue.agent =
+              response.data.data.goodInfo.agent
+
+
+
+            this.goodInfo.goodInfoDialog.formValue.good_number =
+              response.data.data.goodInfo.agent
+
+
+
             this.$refs.dialog.show()
           }
         })

src/xt_pages/stock/drugs/cancelDrugStockDetail.vue

@@ -0,0 +1,23 @@
+<template>
+  <cancel-stock-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></cancel-stock-order-detail>
+  <cancel-stock-order-edit v-else></cancel-stock-order-edit>
+</template>
+
+<script>
+  import CancelStockOrderDetail from './cancelDrugStockOrderDetail'
+  import CancelStockOrderEdit from './cancelDrugStockOrderEdit'
+  export default {
+    name: 'cancelStockDetail',
+    components: { CancelStockOrderEdit, CancelStockOrderDetail },
+    data() {
+      return {
+        isEdit: 0
+      }
+    },
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -0,0 +1,533 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <!--<bread-crumb :crumbs="crumbs"></bread-crumb>-->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        @click="AddNewOrder"
+        class="filter-item"
+        style="float:right;"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        >新增
+      </el-button>
+    </div>
+
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input
+          size="small"
+          style="width: 400px;"
+          class="filter-item"
+          v-model.trim="searchKey"
+          placeholder="单据编码/制单人/厂商"
+        />
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">退库时间</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_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"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+      <div class="filter-container" style="margin-top: 10px">
+        <el-checkbox
+          style="width: 70px"
+          v-model="checked"
+          @change="changeAllSelected"
+          >全选</el-checkbox
+        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @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.return_time | parseTime("{y}-{m}-{d}") }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.order_number }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{ getXuserName(scope.row.creater) }}
+            </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
+                class="item"
+                effect="dark"
+                content="编辑"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit-outline"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import {
+  deleteDrugCancelStock,
+  GetAllConfig,
+  getDrugCancelStockList
+} from "@/api/drug/drug_stock";
+import BreadCrumb from '../../components/bread-crumb'
+// import BreadCrumb from "../components/bread-crumb";
+
+export default {
+  name: "salesReturnOrder",
+  components: { BreadCrumb  },
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+
+    this.GetCancelStock();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "出库退库单" }
+      ],
+      searchKey: "",
+      type: 1,
+      page: 1,
+      limit: 10,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      cancelStockDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: []
+    };
+  },
+  methods: {
+    search: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords: this.searchKey
+      };
+      this.cancelStockDate = [];
+      getDrugCancelStockList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.cancelStockDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    AddNewOrder: function() {
+      this.$router.push({
+        name: "cancelStockOrderAdd",
+        query: { type: this.type }
+      });
+    },
+    GetCancelStock: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.cancelStockDate = [];
+      getDrugCancelStockList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.cancelStockDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
+            }
+          }
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetCancelStock();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetCancelStock();
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+      this.GetCancelStock();
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+        }
+      });
+    },
+    getManufactuerName: function(manufacturer_id) {
+      for (let i = 0; i < this.manufacturer.length; i++) {
+        if (this.manufacturer[i].id == manufacturer_id) {
+          return this.manufacturer[i].manufacturer_name;
+        }
+      }
+    },
+    getDealerName: function(dealer_id) {
+      for (let i = 0; i < this.dealer.length; i++) {
+        if (this.dealer[i].id == dealer_id) {
+          return this.dealer[i].dealer_name;
+        }
+      }
+    },
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "cancelStockDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -0,0 +1,531 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb
+        v-if="this.$route.query.type == 1"
+        :crumbs="crumbs"
+      ></bread-crumb>
+      <bread-crumb
+        v-if="this.$route.query.type == 2"
+        :crumbs="crumbs2"
+      ></bread-crumb>
+
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item"
+          >取 消</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          @click="submit()"
+          class="filter-item"
+          >保 存</el-button
+        >
+      </div>
+    </div>
+
+    <div class="app-container">
+
+      <!--<stock-in-dialog-->
+        <!--ref="dialog"-->
+        <!--:propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+      <drugs-stock-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      >
+
+      </drugs-stock-dialog>
+
+      <div class="filter-container">
+        <div class="cell clearfix">
+          <label class="title"><span class="name">退库时间</span> : </label>
+
+          <el-date-picker
+            size="small"
+            v-model="return_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>
+      </div>
+
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table
+          :data="recordInfo.recordData"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          max-height="450"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+              <el-form-item style="padding-top: 15px">
+                <el-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>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <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>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.return_count'"
+                :rules="tableRules.return_count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入退库数量"
+                  type="number"
+                  v-model="scope.row.return_count"
+                ></el-input>
+              </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"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import {  postDrugCancelStock,GetAllConfig,GetAllDrugInfoByID } from "@/api/drug/drug_stock";
+import BreadCrumb from "../../components/bread-crumb";
+import DrugsStockDialog from './drugsStockDialog/index'
+
+export default {
+  components: { DrugsStockDialog, BreadCrumb },
+  name: "salesReturnOrderAdd",
+
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "耗材退库单" },
+        { path: false, name: "新增退库单" }
+      ],
+      crumbs2: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "其他退库单" },
+        { path: false, name: "新增退库单" }
+      ],
+
+      type: this.$route.query.type,
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      return_time: "",
+      currentIndex: 0,
+      recordInfo: {
+        recordData: []
+      },
+      tableRules: {
+        return_count: [
+          { required: true, message: "数量不能为空", trigge: "blur" }
+        ]
+      },
+      ruleForm: {
+        manufacturer: [
+          { required: true, message: "请选择厂商", trigger: "change" }
+        ]
+      },
+      // prop
+      isVisibility: false,
+      propForm: {
+        goods: [],
+        goodType: [],
+        goodInfo: [],
+        goodUnit: [],
+        manufacturer: 0,
+        dealer: 0
+      },
+      form: {
+        manufacturer: 0,
+        dealer: 0
+      },
+      warehouseOutInfoList: [],
+      manufacturer: [],
+      dealer: [],
+      goodType: [],
+      goodInfo:[],
+    };
+  },
+  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].good_type_id = val.selectedGoodInfo[i].good_type_id
+            this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+
+          } else {
+            const tempForm = {}
+            tempForm['drug_id'] = val.selectedGoodInfo[i].id
+            tempForm["return_count"] = "";
+            this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+          }
+        }
+      }
+      this.currentIndex = -1
+
+    },
+
+    cancle: function() {
+      this.$refs.dialog.hide();
+    },
+    GetConfigInfo: function() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          for(let i = 0; i<  response.data.data.drugs.length;i++){
+            this.goodType.push(response.data.data.drugs[i])
+            if(response.data.data.drugs[i].drug_specs != null) {
+              for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+              }
+            }
+          }
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+
+          this.form.manufacturer = 0
+          this.form.dealer = 0
+        }
+        loading.close()
+      })
+
+    },
+
+    typeName: function(good_type_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == drug_id) {
+          name = this.goodInfo[i].drug_name;
+
+        }
+      }
+      return name;
+    },
+    specificationName: function(good_info_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == drug_id) {
+          name = this.goodInfo[i].drug_spec;
+        }
+      }
+      return name;
+    },
+    handleEdit: function(index, row) {
+      const tempObj = {};
+      tempObj["drug_id"] = 0;
+      tempObj["return_count"] = "";
+      this.recordInfo.recordData.push(tempObj);
+    },
+    handleDelete: function(index, row) {
+      if (this.recordInfo.recordData.length <= 1) {
+        this.$message.error("只有一条记录的时候无法删除");
+        return;
+      } else {
+        this.recordInfo.recordData.splice(index, 1);
+      }
+    },
+    calculate: function(val) {
+      if (val == 0) {
+        return "";
+      }
+
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    getTime(val, temp) {
+      if (val != 0) {
+        return uParseTime(val, temp);
+      } else {
+        return "";
+      }
+    },
+    showDialog(index, row) {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.currentIndex = index
+      this.isVisibility = true
+      const params = {
+        manufacturer_id: this.form.manufacturer,
+        dealer_id: this.form.dealer
+      }
+      GetAllDrugInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+            loading.close()
+
+          } else {
+            loading.close()
+
+            if (response.data.data.drugs.length <= 0) {
+              this.$message.error('该厂商或经销商没有药品信息')
+              return
+            }
+            this.$refs.dialog.show()
+            for (let i = 0; i < response.data.data.drugs.length; i++) {
+              this.propForm.goods.push(
+                response.data.data.drugs[i]
+              );
+            }
+            const obj = {};
+            this.propForm.goods = this.propForm.goods.reduce(
+              (cur, next) => {
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                return cur;
+              },
+              []
+            ); // 设置cur默认类型为数组，并且初始值为空的数组
+          }
+
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+            var respObj = this.propForm.goods[i].drug_specs[a];
+            respObj["isSelected"] = false;
+          }
+        }
+        }
+      )
+    },
+
+    back() {
+      this.$router.go(-1);
+    },
+    submit() {
+      this.$refs["tableForm"].validate(valid => {
+        if (valid) {
+          const array = this.recordInfo.recordData;
+          let total = 0;
+          for (let i = 0; i < array.length; i++) {
+
+            if (array[i].drug_id == 0) {
+              this.$message.error("药品名称或者药品规格名称不能为空");
+              return;
+            }
+            total = total + array[i].price * array[i].return_count;
+          }
+
+          if (this.recordInfo.recordData.length <= 0) {
+            this.$message.success("请添加退库商品");
+            return;
+          }
+
+          const params = {
+            cancelStock: this.recordInfo.recordData
+          };
+          postDrugCancelStock(
+            params,
+            this.return_time,
+            this.form.manufacturer,
+            this.form.dealer,
+            this.type
+          ).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "退库成功",
+                type: "success",
+                duration: 2000
+              });
+              this.recordInfo.recordData = [];
+              this.$router.back(-1);
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    changeManufacturer(val) {
+      this.propForm.manufacturer = val;
+    },
+    changeDealer(val) {
+      this.propForm.dealer = val;
+    }
+  },
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.return_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+
+    const tempObj = {};
+    tempObj["good_type_id"] = 0;
+    tempObj["good_id"] = 0;
+    tempObj["return_count"] = "";
+    this.recordInfo.recordData.push(tempObj);
+    this.GetConfigInfo();
+    this.propForm.goodUnit = this.$store.getters.good_unit;
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+</style>

src/xt_pages/stock/drugs/cancelDrugStockOrderDetail.vue

@@ -0,0 +1,249 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
+    </div>
+  <div class="app-container">
+
+    <div class="filter-container">
+      <span style="font-size: 20px;color: #606266">退库单详情</span>
+      <el-row style="float:right;">
+        <span style="color: #606266">{{CancelStockInfo.cancelStock.order_number}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="cell clearfix">
+      <span style="width: 300px;color: #606266">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
+      <span style="width: 300px;color: #606266">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="CancelStockInfo.cancelStockInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>药品名称</span>
+          </template>
+
+          <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug.drug_name
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug?scope.row.drug.drug_spec:''
+              }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>退库数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.count}}</span>
+
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+    </el-row>
+  </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig, getDrugCancelStockInfo, deleteDrugCancelStock } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
+
+  export default {
+    name: 'cancelStockOrderDetail',
+    components: { BreadCrumb },
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材退库单' },
+          { path: false, name: '退库单详情' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退库单' },
+          { path: false, name: '退库单详情' }
+        ],
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        CancelStockInfo: {
+          loading: false,
+          cancelStockInfoData: [],
+          cancelStock: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getDrugCancelStockInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.CancelStockInfo.cancelStockInfoData.push(response.data.data.list[i])
+            }
+            this.CancelStockInfo.cancelStock = response.data.data.info
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.CancelStockInfo.cancelStock.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteDrugCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -0,0 +1,478 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
+      </div>
+    </div>
+    <div class="app-container">
+      <!--<stock-in-dialog-->
+        <!--ref="dialog" :propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+      <drugs-stock-dialog
+        ref="dialog" :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      >
+      </drugs-stock-dialog>
+      <div class="cell clearfix">
+
+        <label class="title"><span class="name">退库时间</span> : </label>
+        <el-date-picker size="small" v-model="return_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
+                  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>
+            </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>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <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>
+
+            </template>
+          </el-table-column>
+
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.count"></el-input>
+              </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">
+
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+
+
+        </el-table>
+      </el-form>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import { deleteDrugCancelStockInfo, editDrugCancelStockInfo, getDrugCancelStockConfig, getDrugCancelStockInfo,GetAllDrugInfoByID,GetAllConfig  } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
+  import DrugsStockDialog from './drugsStockDialog/index'
+
+  export default {
+    components: { DrugsStockDialog, BreadCrumb },
+    name: 'cancelStockOrderEdit',
+
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材退库单' },
+          { path: false, name: '编辑退库单' }
+        ],
+
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退库单' },
+          { path: false, name: '编辑退库单' }
+        ],
+
+
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        return_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goods: [],
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          manufacturer: 0,
+          dealer: 0
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+        warehouseOutInfoList:[],
+        cancelStock: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: [],
+        goodInfo:[],
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.$refs.dialog.hide()
+
+        if (val.selectedGoodInfo.length > 0) {
+          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+            if (i == 0) {
+              this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
+            } else {
+              const tempForm = {}
+              tempForm['id'] = 0
+              tempForm['drug_id'] = val.selectedGoodInfo[i].id
+              tempForm['count'] = ''
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.$refs.dialog.hide()
+      },
+      GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            for(let i = 0; i<  response.data.data.drugs.length;i++){
+              this.goodType.push(response.data.data.drugs[i])
+              if(response.data.data.drugs[i].drug_specs != null) {
+                for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                  this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+                }
+              }
+            }
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          }
+          loading.close()
+        })
+
+      },
+
+      typeName: function(good_type_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_name;
+
+          }
+        }
+        return name;
+      },  specificationName: function(good_info_id) {
+        console.log(this.goodInfo)
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_spec;
+          }
+        }
+        return name;
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['drug_id'] = 0
+        tempObj['count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退库商品信息记录?', '删除退库商品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteDrugCancelStockInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      showDialog(index, row) {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        this.currentIndex = index
+        this.isVisibility = true
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        }
+        GetAllDrugInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+              loading.close()
+
+            } else {
+              loading.close()
+              if (response.data.data.drugs.length <= 0) {
+                this.$message.error("该厂商或经销商没有药品信息");
+                return;
+              }
+              this.$refs.dialog.show();
+              for (let i = 0; i < response.data.data.drugs.length; i++) {
+                this.propForm.goods.push(
+                  response.data.data.drugs[i]
+                );
+              }
+              const obj = {};
+              this.propForm.goods = this.propForm.goods.reduce(
+                (cur, next) => {
+                  obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                  return cur;
+                },
+                []
+              ); // 设置cur默认类型为数组，并且初始值为空的数组
+            }
+          for (let i = 0; i < this.propForm.goods.length; i++) {
+            for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+              var respObj = this.propForm.goods[i].drug_specs[a];
+              respObj["isSelected"] = false;
+            }
+          }
+          loading.close();
+          }
+        )
+      },
+
+      back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].drug_id == 0) {
+                this.$message.error('药品名称或者药品规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'cancelStock': this.recordInfo.recordData
+            }
+            editDrugCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('退库成功')
+
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getDrugCancelStockInfo(params).then(response => {
+          if (response.data.state == 0) {
+            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].count = response.data.data.list[i].count.toString()
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.cancelStock = response.data.data.info
+            this.return_time = this.getTime(this.cancelStock.return_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.cancelStock.manufacturer
+            this.form.dealer = this.cancelStock.dealer
+          }
+          if (this.recordInfo.recordData.length == 0) {
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['drug_id'] = 0
+            tempObj['count'] = ''
+            this.recordInfo.recordData.push(tempObj)
+          }
+        })
+      },changeManufacturer(val) {
+        this.propForm.manufacturer = val
+      },changeDealer(val){
+        this.propForm.dealer = val
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/drugs/drguStockQuery.vue

@@ -0,0 +1,340 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container ">
+      <div class="cell clearfix">
+        <el-input
+          size="small"
+          style="width: 400px;"
+          class="filter-item"
+          v-model.trim="keywords"
+          placeholder="商品编码/商品名称/规格名称"
+        />
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+      </div>
+
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :data="WarehouseInfo.warehouseInfoDate"
+        :class="signAndWeighBoxPatients"
+        border
+        v-loading="WarehouseInfo.loading"
+      >
+        <el-table-column label="商品编码" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.good_code }}
+          </template>
+        </el-table-column>
+        <el-table-column label="商品类型" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type.type_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.specification_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="入库数量" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showStockInDetailDialog(scope.row.good_id)"
+              >{{ stockInCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="入库退货" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showSaleReturnDetailDialog(scope.row)"
+              >{{ salesReturnCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="实际入库" align="center">
+          <template slot-scope="scope">
+            {{ stockInCount(scope.row) - salesReturnCount(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="出库数量" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showStockOutDetailDialog(scope.row.good_id)"
+              >{{ stockOutCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="出库退库" align="center">
+          <template slot-scope="scope">
+            <span
+              @click="showCancelStockDetailDialog(scope.row)"
+              >{{ cancelStockCount(scope.row) }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="实际出库" align="center">
+          <template slot-scope="scope">
+            {{ stockOutCount(scope.row) - cancelStockCount(scope.row) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="剩余库存" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              stockInCount(scope.row) -
+                salesReturnCount(scope.row) -
+                stockOutCount(scope.row) +
+                cancelStockCount(scope.row)
+            }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  GetAllGoodInfo,
+  GetAllGoodType,
+  getAllStockQueryList
+} from "@/api/stock";
+
+export default {
+  name: "stockIn",
+  created() {
+    this.GetAllStockQuery();
+    this.GetAllGoodInfo();
+    this.GetAllGoodType();
+  },
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/query", name: "库存查询" }
+      ],
+      keywords: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      page: 1,
+      limit: 10,
+      goodType: [],
+      goodInfo: [],
+      WarehouseInfo: {
+        loading: false,
+        warehouseInfoDate: []
+      }
+    };
+  },
+  methods: {
+    GetAllStockQuery: function() {
+      console.log(this.keywords);
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        keyword: this.keywords
+      };
+      this.WarehouseInfo.loading = true;
+      this.WarehouseInfo.warehouseInfoDate = [];
+      getAllStockQueryList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.WarehouseInfo.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.WarehouseInfo.loading = false;
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+
+              this.WarehouseInfo.warehouseInfoDate.push(
+                response.data.data.list[i]
+              );
+          }
+        }
+      });
+    },
+    getSpecificationName: function(id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == id) {
+          name = this.goodInfo[i].specification_name;
+        }
+      }
+      return name;
+    },
+    getTypeName: function(id) {
+      let name = "";
+      for (let i = 0; i < this.goodType.length; i++) {
+        if (this.goodType[i].id == id) {
+          name = this.goodType[i].type_name;
+        }
+      }
+      return name;
+    },
+    GetAllGoodType: function() {
+      GetAllGoodType().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          for (let i = 0; i < response.data.data.goodType.length; i++) {
+            this.goodType.push(response.data.data.goodType[i]);
+          }
+        }
+      });
+    },
+    GetAllGoodInfo: function() {
+      GetAllGoodInfo().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+            this.goodInfo.push(response.data.data.goodInfo[i]);
+          }
+        }
+      });
+    },
+    handleBack: function() {
+      this.$router.go(-1);
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetAllStockQuery();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetAllStockQuery();
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    startTimeChange: function() {
+      this.GetAllStockQuery();
+    },
+    endTimeChange: function() {
+      this.GetAllStockQuery();
+    },
+    stockInCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_warehousing_info.length; i++) {
+        total = total + row.query_warehousing_info[i].warehousing_count;
+      }
+      return total;
+    },
+    salesReturnCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_sales_return_info.length; i++) {
+        total = total + row.query_sales_return_info[i].count;
+      }
+      return total;
+    },
+    stockOutCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_warehouseout_info.length; i++) {
+        total = total + row.query_warehouseout_info[i].count;
+      }
+      return total;
+    },
+    cancelStockCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_cancel_stock_info.length; i++) {
+        total = total + row.query_cancel_stock_info[i].count;
+      }
+      return total;
+    },
+    showStockInDetailDialog: function(val) {},
+    showSaleReturnDetailDialog: function() {},
+    showStockOutDetailDialog: function() {},
+    showCancelStockDetailDialog: function() {},
+    search: function() {
+      this.GetAllStockQuery();
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/drugs/drugSalesReturnDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <sales-return-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></sales-return-order-detail>
+  <sales-return-edit v-else></sales-return-edit>
+</template>
+
+<script>
+  import SalesReturnEdit from './drugSalesReturnEdit'
+  import SalesReturnOrderDetail from './drugSalesReturnOrderDetail'
+  export default {
+    name: 'stockInDeatail',
+    components: { SalesReturnOrderDetail, SalesReturnEdit },
+    data() {
+      return {
+        isEdit: 0
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/drugs/drugSalesReturnEdit.vue

@@ -0,0 +1,486 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
+      </div>
+    </div>
+
+  <div class="app-container">
+
+    <!--<sales-return-dialog ref="dialog" :propForm="propForm"-->
+                     <!--:visibility="isVisibility"-->
+                     <!--v-on:dialog-comfirm="comfirm"-->
+                     <!--v-on:dialog-cancle="cancle"></sales-return-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"
+      :visibility="isVisibility"
+      v-on:dialog-comfirm="comfirm"
+      v-on:dialog-cancle="cancle"
+    ></drugs-stock-dialog>
+
+    <div class="cell clearfix">
+            <label class="title"><span class="name">退货时间</span> : </label>
+            <el-date-picker size="small" v-model="return_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
+                    max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+          >
+
+
+
+            <el-table-column align="center" width="200">
+              <template slot="header" slot-scope="scope">
+                <span>药品名称<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input
+                    placeholder="请输入药品名称"
+                    v-model="scope.row.drug_id"
+                    :value="typeName(scope.row.drug_id)"
+                    @focus="showDialog(scope.$index, scope.row)"
+                  ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" width="200">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input
+                    placeholder="请输入规格名称"
+                    v-model="scope.row.drug_id"
+                    :value="specificationName(scope.row.drug_id)"
+                    @focus="showDialog(scope.$index, scope.row)"
+                  ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+
+            <el-table-column min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退货数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                              style="padding-top: 17px">
+                  <el-input  placeholder="请输入退货数量" type="number" v-model="scope.row.count"></el-input>
+                </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">
+
+                  <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-circle-plus-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+
+
+          </el-table>
+        </el-form>
+  </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    GetAllConfig,
+    deleteDrugSalesReturnInfo,
+    getDrugReturnList,
+    getDrugSalesReturnConfig,
+    editDrugSalesReturnInfo,
+    GetAllDrugInfoByID
+  } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
+  // import StockInDialog from './Dialog/stockInDialog'
+  import DrugsStockDialog from './drugsStockDialog/index'
+
+  export default {
+    components: { DrugsStockDialog, BreadCrumb },
+    name: 'salesReturnEdit',
+
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/return', name: '退货单' },
+          { path: '/stock/in/detail', name: '编辑退货单' }
+        ],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        return_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ]
+
+        },
+
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goods:[],
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库',
+          manufacturer:0,
+          dealer:0,
+        },
+
+        form: {
+          manufacturer: 0,
+          dealer: 0,
+        },
+        warehouseInfoList:[],
+        salesReturn: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: [],
+        goodInfo:[]
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        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
+            } else {
+              const tempForm = {}
+              tempForm['id'] = 0
+              tempForm['drug_id'] = val.selectedGoodInfo[i].id
+              tempForm['return_count'] = ''
+              tempForm['price'] = ''
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+            }
+          }
+        }
+        this.propForm.goodType = []
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.$refs.dialog.hide()
+
+      },
+      GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            for(let i = 0; i<  response.data.data.drugs.length;i++){
+              this.goodType.push(response.data.data.drugs[i])
+              if(response.data.data.drugs[i].drug_specs != null) {
+                for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                  this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+                }
+              }
+            }
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          }
+          loading.close();
+        });
+      },
+      typeName: function(drug_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_name;
+
+          }
+        }
+        return name;
+      },
+      specificationName: function(drug_id) {
+        console.log(this.goodInfo)
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_spec;
+          }
+        }
+        return name;
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['drug_id'] = 0
+        tempObj['count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        console.log(row.id)
+        if (row.id == undefined || row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退货商品信息记录?', '删除退货商品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteDrugSalesReturnInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      showDialog(index, row) {
+        this.currentIndex = index;
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        };
+        GetAllDrugInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.drugs.length <= 0) {
+              this.$message.error("该厂商或经销商没有药品信息");
+              return;
+            }
+            this.$refs.dialog.show();
+            for (let i = 0; i < response.data.data.drugs.length; i++) {
+              this.propForm.goods.push(
+                response.data.data.drugs[i]
+              );
+            }
+            const obj = {};
+            this.propForm.goods = this.propForm.goods.reduce(
+              (cur, next) => {
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                return cur;
+              },
+              []
+            ); // 设置cur默认类型为数组，并且初始值为空的数组
+          }
+
+
+          for (let i = 0; i < this.propForm.goods.length; i++) {
+            for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+              var respObj = this.propForm.goods[i].drug_specs[a];
+              respObj["isSelected"] = false;
+            }
+          }
+          loading.close();
+        });
+      },
+      back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+
+              if (array[i].drug_id == 0) {
+                this.$message.error('药品名称或者药品规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'salesReturn': this.recordInfo.recordData
+            }
+            editDrugSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('退货成功')
+
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getDrugReturnList(params).then(response => {
+          if (response.data.state == 0) {
+            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].count = response.data.data.list[i].count.toString()
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.salesReturn = response.data.data.salesReturn
+            this.return_time = this.getTime(this.salesReturn.return_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.salesReturn.manufacturer
+            this.form.dealer = this.salesReturn.dealer
+          }
+
+          if (this.recordInfo.recordData.length == 0) {
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['drug_id'] = 0
+            tempObj['count'] = ''
+            this.recordInfo.recordData.push(tempObj)
+          }
+        })
+      },changeManufacturer(val) {
+        this.propForm.manufacturer = val
+        console.log(val)
+      },changeDealer(val){
+        this.propForm.dealer = val
+        console.log(val)
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/drugs/drugSalesReturnOrder.vue

@@ -0,0 +1,533 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        @click="AddNewOrder"
+        class="filter-item"
+        style="float:right;"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        >新增
+      </el-button>
+    </div>
+
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input
+          style="width: 400px;"
+          class="filter-item"
+          v-model.trim="searchKey"
+          placeholder="单据编码/制单人/厂商"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">退货时间</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_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"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+      <div class="cell clearfix" style="margin-top: 10px">
+        <el-checkbox
+          style="width: 70px"
+          v-model="checked"
+          @change="changeAllSelected"
+          >全选</el-checkbox
+        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
+      </div>
+
+      <el-table
+        :data="saleReturnDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @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.opera_time | parseTime("{y}-{m}-{d}") }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.order_number }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{ getXuserName(scope.row.creater) }}
+          </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">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleEdit(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import {
+  deleteDrugSalesReturn,
+  GetAllConfig,
+  getDrugSalesReturnList,
+  getDrugWarehouseInfoList,
+  getDrugWarehouseList
+} from "@/api/drug/drug_stock";
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+  name: "salesReturnOrder",
+  components: { BreadCrumb },
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+
+    this.GetSalesReturn();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      searchKey: "",
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "退货单" }
+      ],
+      type: 1,
+      page: 1,
+      limit: 10,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      saleReturnDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: []
+    };
+  },
+  methods: {
+    search: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords: this.searchKey
+      };
+      this.saleReturnDate = [];
+      getDrugSalesReturnList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.saleReturnDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    AddNewOrder: function() {
+      this.$router.push({
+        name: "salesReturnOrderAdd",
+        query: { type: this.type }
+      });
+    },
+    GetSalesReturn: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.saleReturnDate = [];
+      getDrugSalesReturnList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.saleReturnDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
+            }
+          }
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetSalesReturn();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetSalesReturn();
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetSalesReturn();
+      }
+      this.GetSalesReturn();
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+      this.GetSalesReturn();
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+        }
+      });
+    },
+    getManufactuerName: function(manufacturer_id) {
+      for (let i = 0; i < this.manufacturer.length; i++) {
+        if (this.manufacturer[i].id == manufacturer_id) {
+          return this.manufacturer[i].manufacturer_name;
+        }
+      }
+    },
+    getDealerName: function(dealer_id) {
+      for (let i = 0; i < this.dealer.length; i++) {
+        if (this.dealer[i].id == dealer_id) {
+          return this.dealer[i].dealer_name;
+        }
+      }
+    },
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "salesReturnDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.saleReturnDate.length; y++) {
+                  if (ids[i] == this.saleReturnDate[y].id) {
+                    this.saleReturnDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.saleReturnDate.length; y++) {
+                  if (ids[i] == this.saleReturnDate[y].id) {
+                    this.saleReturnDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.cell {
+  text-align: center;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/drugs/drugSalesReturnOrderAdd.vue

@@ -0,0 +1,452 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
+
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+      </div>
+    </div>
+
+    <div class="app-container">
+      <!--<stock-in-dialog-->
+        <!--ref="dialog" :propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+      <drugs-stock-dialog
+        ref="dialog" :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      ></drugs-stock-dialog>
+      <div class="cell clearfix">
+        <label class="title"><span class="name">退货时间</span> : </label>
+        <el-date-picker size="small" v-model="return_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
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入药品名称"
+                  v-model="scope.row.drug_id"
+                  :value="typeName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入规格名称"
+                  v-model="scope.row.drug_id"
+                  :value="specificationName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退货数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count'
+                            style="padding-top: 17px">
+                <el-input placeholder="请输入退货数量" type="number" v-model="scope.row.return_count"></el-input>
+              </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">
+
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+
+
+        </el-table>
+      </el-form>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { getDrugSalesReturnConfig, postDrugSalesReturn,GetAllDrugInfoByID,GetAllConfig } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
+  import DrugsStockDialog from './drugsStockDialog/index'
+
+  export default {
+    components: { DrugsStockDialog, BreadCrumb },
+    name: 'salesReturnOrderAdd',
+
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材退货单' },
+          { path: false, name: '新增退货单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退货单' },
+          { path: false, name: '新增退货单' }
+        ],
+
+        type: this.$route.query.type,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        return_time: '',
+        currentIndex: 0,
+        recordInfo: {
+          recordData: []
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          return_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ]
+        },
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goods:[],
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          manufacturer: 0,
+          dealer: 0
+        },
+        form: {
+          manufacturer: 0,
+          dealer: 0
+        },
+        warehouseInfoList: [],
+        manufacturer: [],
+        dealer: [],
+        goodType: [],
+        goodInfo:[]
+
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        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].good_type_id = val.selectedGoodInfo[i].good_type_id
+                this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+              } else {
+                const tempForm = {}
+                tempForm['drug_id'] = val.selectedGoodInfo[i].id
+                tempForm['return_count'] = ''
+                tempForm['price'] = ''
+                this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+              }
+          }
+        }
+        this.propForm.goodType = []
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.$refs.dialog.hide()
+        this.propForm.goodType = []
+
+      },
+      GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            for(let i = 0; i<  response.data.data.drugs.length;i++){
+              this.goodType.push(response.data.data.drugs[i])
+              if(response.data.data.drugs[i].drug_specs != null) {
+                for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                  this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+                }
+              }
+            }
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+
+            this.form.manufacturer = 0
+            this.form.dealer = 0
+          }
+          loading.close()
+
+        })
+
+      },
+       typeName: function(drug_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_name;
+
+          }
+        }
+        return name;
+      }, specificationName: function(drug_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_spec;
+          }
+        }
+        return name;
+      }, handleDelete: function(index, row) {
+        if (this.recordInfo.recordData.length <= 1) {
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        } else {
+          this.recordInfo.recordData.splice(index, 1)
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+
+        return Math.round(parseFloat(val) * 100) / 100
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      showDialog(index, row) {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        this.currentIndex = index
+        this.isVisibility = true
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        }
+        GetAllDrugInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+              loading.close()
+
+            } else {
+              loading.close()
+
+              if (response.data.data.drugs.length <= 0) {
+                this.$message.error('该厂商或经销商没有药品信息')
+                return
+              }
+              this.$refs.dialog.show()
+              for (let i = 0; i < response.data.data.drugs.length; i++) {
+                this.propForm.goods.push(
+                  response.data.data.drugs[i]
+                );
+              }
+              const obj = {};
+              this.propForm.goods = this.propForm.goods.reduce(
+                (cur, next) => {
+                  obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                  return cur;
+                },
+                []
+              ); // 设置cur默认类型为数组，并且初始值为空的数组
+            }
+
+          for (let i = 0; i < this.propForm.goods.length; i++) {
+            for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+              var respObj = this.propForm.goods[i].drug_specs[a];
+              respObj["isSelected"] = false;
+            }
+          }
+          }
+        )
+      },
+
+      back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            let total = 0
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].drug_id == 0) {
+                this.$message.error('药品名称或者药品规格名称不能为空')
+                return
+              }
+
+              total = total + array[i].price * array[i].return_count
+            }
+
+            if(this.recordInfo.recordData.length <= 0){
+              this.$message.success('请添加退货商品')
+              return
+            }
+
+            const params = {
+              'salesReturn': this.recordInfo.recordData
+            }
+            postDrugSalesReturn(params, this.return_time, total, this.form.dealer, this.form.manufacturer, this.type).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('退货成功')
+
+                this.recordInfo.recordData = []
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, changeManufacturer(val) {
+        this.propForm.manufacturer = val
+        console.log(val)
+      }, changeDealer(val) {
+        this.propForm.dealer = val
+        console.log(val)
+      }
+    },
+    created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.return_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      const tempObj = {}
+      tempObj['drug_id'] = 0
+      tempObj['return_count'] = ''
+      tempObj['price'] = ''
+      this.recordInfo.recordData.push(tempObj)
+      console.log(this.recordInfo.recordData)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/drugs/drugSalesReturnOrderDetail.vue

@@ -0,0 +1,224 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+    </div>
+
+    <div class="app-container">
+
+      <div class="filter-container">
+        <span style="font-size: 18px;color: #606266">退货单详情</span>
+        <el-row style="float:right;color: #606266">
+          <span style="color: #606266">{{ReturnInfo.salesReturn.order_number}}</span>
+        </el-row>
+      </div>
+
+
+      <div class="cell clearfix">
+        <span style="width: 300px;color: #606266">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266"
+        >厂商:
+          {{ ReturnInfo.salesReturn.manufacturers? ReturnInfo.salesReturn.manufacturers.manufacturer_name:'' }}</span
+        >
+        <span style="width: 300px;color: #606266"
+        >经销商: {{ ReturnInfo.salesReturn.dealers? ReturnInfo.salesReturn.dealers.dealer_name:''}}</span
+        >
+      </div>
+
+      <div class="filter-container" style="margin-top: 10px">
+        <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+        <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table :data="ReturnInfo.returnInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug.drug_name
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug?scope.row.drug.drug_spec:''
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退货数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.count}}</span>
+
+            </template>
+          </el-table-column>
+
+
+        </el-table>
+      </el-row>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { deleteDrugSalesReturn, GetAllConfig, getDrugReturnList } from "@/api/drug/drug_stock";
+  import BreadCrumb from '../../components/bread-crumb'
+
+  export default {
+    name: 'stockInOrderDetail',
+    components: { BreadCrumb },
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材退货单' },
+          { path: false, name: '退货单详情' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他退货单' },
+          { path: false, name: '退货单详情' }
+        ],
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        ReturnInfo: {
+          loading: false,
+          returnInfoData: [],
+          salesReturn: {}
+        }
+      }
+    },
+    methods: {
+      GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getDrugReturnList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.ReturnInfo.returnInfoData.push(response.data.data.list[i])
+            }
+            this.ReturnInfo.salesReturn = response.data.data.salesReturn
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.ReturnInfo.salesReturn.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteDrugSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/drugs/drugStockDetail.vue

@@ -0,0 +1,520 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        @click="AddNewOrder"
+        class="filter-item"
+        style="float:right;"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        >新增
+      </el-button>
+    </div>
+
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input
+          size="small"
+          style="width: 400px;"
+          class="filter-item"
+          v-model.trim="searchKey"
+          placeholder="单据编码/制单人/厂商"
+        />
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          v-model="start_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"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          v-model="end_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"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+      <div class="filter-container" style="margin-top: 10px">
+        <el-checkbox
+          style="width: 30px"
+          v-model="checked"
+          @change="changeAllSelected"
+          >全选</el-checkbox
+        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.warehousing_order }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{ specificationName(scope.row.good_id) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{ getTypeName(scope.row) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.warehousing_time | parseTime("{y}-{m}-{d}") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{ getXuserName(scope.row.creater) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.price }}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.warehousing_count }}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.price * scope.row.warehousing_count }}
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { deleteCancelStock, GetAllConfig, getStockDetail } from "@/api/stock";
+import BreadCrumb from "../components/bread-crumb";
+
+export default {
+  name: "salesReturnOrder",
+  components: { BreadCrumb },
+  created() {
+    var year = new Date().getFullYear();
+    var month = new Date().getMonth() + 1;
+    var day = new Date().getDate();
+    if (parseInt(month) < 10) {
+      month = "0" + month;
+    }
+    if (parseInt(day) < 10) {
+      day = "0" + day;
+    }
+    const endTime = year + "-" + month + "-" + day;
+    this.end_time = endTime;
+
+    var year = new Date().getFullYear();
+    var month = new Date().getMonth();
+    var day = new Date().getDate();
+    if (parseInt(month) < 10) {
+      month = "0" + month;
+    }
+    if (parseInt(day) < 10) {
+      day = "0" + day;
+    }
+    const startTime = year + "-" + month + "-" + day;
+    this.start_time = startTime;
+    this.GetCancelStock();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/detail", name: "出入库明细查询" }
+      ],
+      searchKey: "",
+      type: 1,
+      page: 1,
+      limit: 7,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      cancelStockDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: []
+    };
+  },
+  methods: {
+    getTypeName: function(row) {
+      let name = "";
+      let name2 = "";
+      if (row.type == 1) {
+        name = "耗材";
+      } else if (row.type == 2) {
+        name = "其他";
+      }
+      if (row.types == 1) {
+        name2 = "入库单";
+      } else if (row.types == 2) {
+        name2 = "出库单";
+      } else if (row.types == 3) {
+        name2 = "退货单";
+      } else if (row.types == 4) {
+        name2 = "退库单";
+      }
+      return name + name2;
+    },
+    specificationName: function(good_info_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_info_id) {
+          name = this.goodInfo[i].specification_name;
+        }
+      }
+      return name;
+    },
+    search: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords: this.searchKey
+      };
+      this.cancelStockDate = [];
+      getStockDetail(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.cancelStockDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    AddNewOrder: function() {
+      this.$router.push({
+        name: "cancelStockOrderAdd",
+        query: { type: this.type }
+      });
+    },
+    GetCancelStock: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.cancelStockDate = [];
+      getStockDetail(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.cancelStockDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
+            }
+          }
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetWarehouse();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetWarehouse();
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      console.log("time是-----", time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo;
+        }
+      });
+    },
+    getManufactuerName: function(manufacturer_id) {
+      for (let i = 0; i < this.manufacturer.length; i++) {
+        if (this.manufacturer[i].id == manufacturer_id) {
+          return this.manufacturer[i].manufacturer_name;
+        }
+      }
+    },
+    getDealerName: function(dealer_id) {
+      for (let i = 0; i < this.dealer.length; i++) {
+        if (this.dealer[i].id == dealer_id) {
+          return this.dealer[i].dealer_name;
+        }
+      }
+    },
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "cancelStockDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+</style>

src/xt_pages/stock/drugs/drugStockDetailIndex.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="service-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="入库明细" name="first">
+            <stock-in-detail></stock-in-detail>
+          </el-tab-pane>
+          <el-tab-pane label="退货明细">
+            <sales-return-detail></sales-return-detail>
+
+          </el-tab-pane>
+          <el-tab-pane label="出库明细">
+            <stock-out-detail></stock-out-detail>
+
+          </el-tab-pane>
+          <el-tab-pane label="退库明细">
+           <cancel-stock-detail></cancel-stock-detail>
+          </el-tab-pane>
+
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import StockInDetail from './detail/stockInDetail'
+  import StockOutDetail from './detail/stockOutDetail'
+  import SalesReturnDetail from './detail/salesReturnDetail'
+  import CancelStockDetail from './detail/cancelStockDetail'
+
+  export default {
+    name: 'stockDetailIndex',
+    components: {
+      CancelStockDetail,
+      SalesReturnDetail,
+      StockOutDetail,
+      StockInDetail,
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/detail', name: '出入库明细查询' }
+        ],
+        activeName: 'first'
+
+      }
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event, this.activeName)
+      }
+    }
+  }
+</script>
+
+
+
+
+
+

src/xt_pages/stock/drugs/drugStockInDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <stock-in-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></stock-in-order-detail>
+  <stock-in-order-edit v-else></stock-in-order-edit>
+</template>
+
+<script>
+  import StockInOrderDetail from './drugStockInOrderDetail'
+  import StockInOrderEdit from './drugStockInOrderEdit'
+  export default {
+    name: 'stockInDeatail',
+    components: { StockInOrderEdit, StockInOrderDetail },
+    data() {
+      return {
+        isEdit: 0
+      }
+  }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -0,0 +1,553 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <!--<bread-crumb :crumbs='crumbs'></bread-crumb>-->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        @click="handleWarehouse"
+        class="filter-item"
+        style="float:right;"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        >新增</el-button
+      >
+    </div>
+
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input
+          size="small"
+          style="width: 400px;"
+          v-model.trim="searchKey"
+          class="filter-item"
+          placeholder="单据编码/制单人/厂商"
+        />
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">入库时间</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_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"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+      <div class="cell clearfix">
+        <el-checkbox
+          style="width: 70px"
+          v-model="checked"
+          @change="changeAllSelected"
+          >全选</el-checkbox
+        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
+      </div>
+
+      <el-table
+        :data="Warehouse.warehouseDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column align="center" type="selection" width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehousing_time | parseTime("{y}-{m}-{d}") }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehousing_order }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{ getXuserName(scope.row.creater) }}
+          </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">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleEdit(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import {
+  deleteDrugWarehouseInfo,
+  GetAllConfig,
+  getDrugWarehouseInfoList,
+  getDrugWarehouseList
+} from "@/api/drug/drug_stock";
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+  name: "drugStockInOrder",
+  components: { BreadCrumb },
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+
+    this.GetWarehouse();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "入库单" }
+      ],
+      searchKey: "",
+      type: 1,
+      page: 1,
+      limit: 10,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      selectedTableData: [],
+      Warehouse: {
+        loading: false,
+        warehouseDate: [],
+        tableCurrentIndex: ""
+      },
+
+      WarehouseInfo: {
+        loading: false,
+        warehouseInfoDate: []
+      },
+      startTime: ""
+    };
+  },
+  methods: {
+    search: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords: this.searchKey
+      };
+      this.Warehouse.warehouseDate = [];
+      getDrugWarehouseList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.Warehouse.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.Warehouse.loading = false;
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.Warehouse.warehouseDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    GetWarehouse: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.Warehouse.warehouseDate = [];
+      getDrugWarehouseList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.Warehouse.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.Warehouse.loading = false;
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.Warehouse.warehouseDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      // 把每一行的索引放进row
+      row.index = rowIndex;
+    },
+    onRowClick(row, event, column) {
+      this.WarehouseInfo.warehouseInfoDate = [];
+      this.Warehouse.tableCurrentIndex = row.index;
+      const params = {
+        id: row.id
+      };
+      this.WarehouseInfo.loading = true;
+      getDrugWarehouseInfoList(params).then(response => {
+        if (response.data.state == 0) {
+          this.WarehouseInfo.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.WarehouseInfo.loading = false;
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push(
+              response.data.data.info[i]
+            );
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllDoctorAndNurse() {
+      fetchAllDoctorAndNurse().then(response => {
+        if (response.data.state == 1) {
+          this.doctorOptions = response.data.data.doctors;
+        }
+      });
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
+            }
+          }
+        }
+      });
+    },
+    clicks: function() {
+      console.log(this.WarehouseInfo.warehouseInfoDate);
+    },
+    handleWarehouse: function() {
+      this.$router.push({ path: "/drugstock/in/add", query: { type: this.type } });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetWarehouse();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetWarehouse();
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.startTime = this.getTimestamp(val);
+        this.GetWarehouse();
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "drugStockInDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
+                  if (ids[i] == this.Warehouse.warehouseDate[y].id) {
+                    this.Warehouse.warehouseDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
+                  if (ids[i] == this.Warehouse.warehouseDate[y].id) {
+                    this.Warehouse.warehouseDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -0,0 +1,705 @@
+<template>
+
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb v-if="type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="type == 2" :crumbs='crumbs2'></bread-crumb>
+
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+      </div>
+    </div>
+    <div class="app-container">
+
+      <!--<stock-in-dialog ref="dialog" :propForm="propForm"-->
+                       <!--:visibility="isVisibility"-->
+                       <!--v-on:dialog-comfirm="comfirm"-->
+                       <!--v-on:dialog-cancle="cancle"></stock-in-dialog>-->
+      <drugs-stock-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      ></drugs-stock-dialog>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">入库时间</span> : </label>
+        <el-date-picker size="small" v-model="warehousing_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
+          id="oictable"
+          :data="recordInfo.recordData"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          max-height="450"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入药品名称"
+                  v-model="scope.row.drug_id"
+                  :value="typeName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入规格名称"
+                  v-model="scope.row.drug_id"
+                  :value="specificationName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>进价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入单价"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--{{scope.row.warehousing_count}}-->
+              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.warehousing_count'"
+                :rules="tableRules.warehousing_count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入入库数量"
+                  type="number"
+                  v-model="scope.row.warehousing_count"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="进价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价" align="center" width="150">
+            <template slot-scope="scope">
+              <!--{{ // calculate(scope.row.price * scope.row.warehousing_count) }}-->
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价总价" align="center" width="150">
+            <template slot-scope="scope">
+              <!--{{ calculate(scope.row.price * scope.row.warehousing_count) }}-->
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item>
+                <el-input
+                  placeholder="请输入批号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产日期" width="250" align="center">
+            <template slot-scope="scope">
+              <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" width="250" align="center">
+            <template slot-scope="scope">
+              <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" width="150" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    GetAllConfig,
+    GetAllDrugInfoByID,
+    postDrugWarehouse
+  } from "@/api/drug/drug_stock";
+  import BreadCrumb from '../../components/bread-crumb'
+  import DrugsStockDialog from './drugsStockDialog/index'
+
+  export default {
+    components: { DrugsStockDialog, BreadCrumb },
+    name: 'stockIn',
+
+    data() {
+      var checkGoodId = (rule, value, callback) => {
+        setTimeout(() => {
+          if (value == '' || value == 0) {
+            return callback(new Error('规格名称不能为空'))
+          }
+        }, 2000)
+      }
+
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材入库单' },
+          { path: false, name: '新增入库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他入库单' },
+          { path: false, name: '新增入库单' }
+        ],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          warehousing_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+
+          good_id: [
+            { validator: checkGoodId, trigger: 'blur' }
+          ]
+
+        },
+        type: this.$route.query.type,
+        total: '',
+        product_date: '',
+        expiry_date: '',
+        numbers: '',
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goods: [],
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库',
+          formValue: {
+            good_type_id: '',
+            good_id: '',
+            number: '',
+            product_date: '',
+            expiry_date: '',
+            warehousing_count: '',
+            price: '',
+            remark: '',
+            dealer: '',
+            manufacturer: ''
+
+          },
+          isCreated: 1
+
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        formValue: {
+          good_type_id: '',
+          good_id: '',
+          number: '',
+          product_date: '',
+          expiry_date: '',
+          warehousing_count: '',
+          price: '',
+          remark: '',
+          dealer: '',
+          manufacturer: ''
+
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: [],
+        goodInfo:[]
+      }
+    },
+    methods: {
+      handleSave: function() {
+        if (this.recordInfo.recordData.length <= 0) {
+          this.$message.error('请添加入库信息')
+          return
+        }
+        sessionStorage.removeItem('warehousing_orders')
+        this.$router.back(-1)
+      }, handleCancle: function() {
+        this.$confirm('是否放弃编辑返回上一页?', '放弃编辑', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          sessionStorage.removeItem('warehousing_orders')
+          this.$router.back(-1)
+        }).catch(() => {
+
+        })
+      }, handleCreate: function() {
+
+        this.propForm.formValue = {}
+        this.propForm.isCreated = 1
+        this.isVisibility = true
+      }, comfirm: function(val) {
+
+        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
+
+            } else {
+              const tempForm = {}
+              tempForm["id"] = 0;
+              tempForm['drug_id'] = val.selectedGoodInfo[i].id
+              tempForm['number'] = ''
+              tempForm['product_date'] = ''
+              tempForm['expiry_date'] = ''
+              tempForm['warehousing_count'] = ''
+              tempForm['price'] = ''
+              tempForm['remark'] = ''
+              tempForm['dealer'] = ''
+              tempForm['manufacturer'] = ''
+              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.$refs.dialog.hide()
+      },  GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            for(let i = 0; i<  response.data.data.drugs.length;i++){
+              this.goodType.push(response.data.data.drugs[i])
+              if(response.data.data.drugs[i].drug_specs != null) {
+                for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                  this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+                }
+              }
+            }
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+
+            this.form.manufacturer = 0
+            this.form.dealer = 0
+          }
+          loading.close()
+
+        })
+      }, typeName: function(drug_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_name;
+
+          }
+        }
+        return name;
+      }, specificationName: function(drug_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_spec;
+          }
+        }
+        return name;
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['drug_id'] = 0
+        tempObj['number'] = ''
+        tempObj['product_date'] = ''
+        tempObj['expiry_date'] = ''
+        tempObj['warehousing_count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        tempObj['dealer'] = ''
+        tempObj['manufacturer'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (this.recordInfo.recordData.length <= 1) {
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        } else {
+          this.recordInfo.recordData.splice(index, 1)
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      },
+      // GetWarehouseInfoByOrdeNumber: function() {
+      //   const params = {
+      //     'warehousing_order': sessionStorage.getItem('warehousing_orders')
+      //   }
+      //   this.recordInfo.recordData = []
+      //   getWarehouseInfoByOrdeNumber(params).then(response => {
+      //     if (response.data.state != 0) {
+      //       for (let i = 0; i < response.data.data.info.length; i++) {
+      //         this.recordInfo.recordData.push(response.data.data.info[i])
+      //       }
+      //     }
+      //   })
+      // },
+      getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      showDialog(index, row) {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        this.currentIndex = index
+        this.isVisibility = true
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        }
+        GetAllDrugInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+              loading.close()
+
+            } else {
+              loading.close()
+
+              if (response.data.data.drugs.length <= 0) {
+                this.$message.error('该厂商或经销商没有药品信息')
+                return
+              }
+              this.$refs.dialog.show()
+              for (let i = 0; i < response.data.data.drugs.length; i++) {
+                this.propForm.goods.push(
+                  response.data.data.drugs[i]
+                );
+              }
+              const obj = {};
+              this.propForm.goods = this.propForm.goods.reduce(
+                (cur, next) => {
+                  obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                  return cur;
+                },
+                []
+              ); // 设置cur默认类型为数组，并且初始值为空的数组
+            }
+
+            for (let i = 0; i < this.propForm.goods.length; i++) {
+              for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+                var respObj = this.propForm.goods[i].drug_specs[a];
+                respObj["isSelected"] = false;
+              }
+            }
+          }
+        )
+      },
+      getSummaries(param) {
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总价'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        })
+
+        return sums
+      }
+      ,
+      back() {
+        this.$router.go(-1)
+      }
+      ,
+      submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+
+              if (array[i].drug_id == 0) {
+                this.$message.error('药品名称或者药品规格名称不能为空')
+                return
+              }
+            }
+
+            if(this.recordInfo.recordData.length <= 0){
+              this.$message.success('请添加入库商品')
+              return
+            }
+
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('入库成功')
+
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }
+      ,
+      changeManufacturer(val) {
+
+      }, changeDealer(val) {
+
+      }
+    }
+    ,
+    created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.warehousing_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      const tempObj = {}
+      tempObj['drug_id'] = 0
+      tempObj['number'] = ''
+      tempObj['product_date'] = ''
+      tempObj['expiry_date'] = ''
+      tempObj['warehousing_count'] = ''
+      tempObj['price'] = ''
+      tempObj['remark'] = ''
+      tempObj['dealer'] = ''
+      tempObj['manufacturer'] = ''
+
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/drugs/drugStockInOrderDetail.vue

@@ -0,0 +1,281 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb
+        v-if="this.$route.query.type == 1"
+        :crumbs="crumbs"
+      ></bread-crumb>
+      <bread-crumb
+        v-if="this.$route.query.type == 2"
+        :crumbs="crumbs2"
+      ></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="filter-container">
+        <span style="font-size: 18px;color: #606266">入库单详情</span>
+        <el-row style="float:right;">
+          <span style="color: #606266"
+            >入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span
+          >
+        </el-row>
+      </div>
+
+      <div class="cell clearfix">
+        <span style="width: 300px;color: #606266"
+          >单据日期:
+          {{
+            WarehouseInfo.warehouse.warehousing_time | parseTime("{y}-{m}-{d}")
+          }}</span
+        >
+        <span style="width: 300px;color: #606266"
+          >厂商:
+          {{ WarehouseInfo.warehouse.manufacturers?  WarehouseInfo.warehouse.manufacturers.manufacturer_name:'' }}</span
+        >
+        <span style="width: 300px;color: #606266"
+          >经销商: {{ WarehouseInfo.warehouse.dealers?WarehouseInfo.warehouse.dealers.dealer_name:''}}</span
+        >
+      </div>
+
+      <div class="cell clearfix" style="margin-top: 10px">
+        <el-button size="small" icon="el-icon-edit" @click="editRecord"
+          >编辑</el-button
+        >
+        <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
+          >删除</el-button
+        >
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="WarehouseInfo.warehouseInfoDate"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug.drug_name
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug?scope.row.drug.drug_spec:''
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.price }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.warehousing_count }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" min-width="25">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.number }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" min-width="40" align="center">
+            <template v-if="scope.row.product_date != 0" slot-scope="scope">
+              {{ scope.row.product_date | parseTime("{y}-{m}-{d}") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" min-width="40" align="center">
+            <template v-if="scope.row.expiry_date != 0" slot-scope="scope">
+              {{ scope.row.expiry_date | parseTime("{y}-{m}-{d}") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-popover placement="top-start" width="250" trigger="hover">
+                <div>{{ scope.row.remark }}</div>
+                <span slot="reference" v-if="scope.row.remark.length > 20">{{
+                  scope.row.remark.substr(0, 20) + "..."
+                }}</span>
+                <span slot="reference" v-else>{{ scope.row.remark }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import {
+  GetAllConfig,
+  getDrugWarehouseInfoList,
+  deleteDrugWarehouseInfo
+} from "@/api/drug/drug_stock";
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+  name: "stockInOrderDetail",
+  components: { BreadCrumb },
+  created() {
+    const order_id = this.$route.query.id;
+    this.GetOrderDetail(order_id);
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "耗材入库单" },
+        { path: false, name: "入库单详情" }
+      ],
+      crumbs2: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "其他入库单" },
+        { path: false, name: "入库单详情" }
+      ],
+      isEdit: 0,
+      checked: false,
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      dealer: [],
+      Warehouse: {
+        loading: false,
+        warehouseDate: [],
+        tableCurrentIndex: ""
+      },
+
+      WarehouseInfo: {
+        loading: false,
+        warehouseInfoDate: [],
+        warehouse: {}
+      }
+    };
+  },
+  methods: {
+
+    calculate: function(val) {
+      if (val == 0) {
+        return "";
+      }
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetOrderDetail: function(order_id) {
+      const params = {
+        id: order_id
+      };
+      getDrugWarehouseInfoList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push(
+              response.data.data.info[i]
+            );
+          }
+          this.WarehouseInfo.warehouse = response.data.data.warehousing;
+        }
+      });
+    },
+    deleteRecord: function() {
+      const ids = [];
+      ids.push(this.WarehouseInfo.warehouse.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              this.$router.back(-1);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    editRecord: function() {
+      this.$emit("edit-record");
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+</style>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -0,0 +1,703 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb
+        v-if="this.$route.query.type == 1"
+        :crumbs="crumbs"
+      ></bread-crumb>
+      <bread-crumb
+        v-if="this.$route.query.type == 2"
+        :crumbs="crumbs2"
+      ></bread-crumb>
+
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item"
+          >取 消</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          @click="submit()"
+          class="filter-item"
+          >保 存</el-button
+        >
+      </div>
+    </div>
+
+    <div class="app-container">
+      <!--<stock-in-dialog-->
+        <!--ref="dialog"-->
+        <!--:propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+      <drugs-stock-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      >
+      </drugs-stock-dialog>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">入库时间</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="warehousing_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="请选择经销商"
+        >
+          <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="请选择厂商"
+        >
+          <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"
+          style="width: 100%"
+          border
+          max-height="450"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入药品名称"
+                  v-model="scope.row.drug_id"
+                  :value="typeName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入规格名称"
+                  v-model="scope.row.drug_id"
+                  :value="specificationName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>进价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入单价"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--{{scope.row.warehousing_count}}-->
+              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.warehousing_count'"
+                :rules="tableRules.warehousing_count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入入库数量"
+                  type="number"
+                  v-model="scope.row.warehousing_count"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="进价总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价" align="center" width="150">
+            <template slot-scope="scope">
+              <!--{{ // calculate(scope.row.price * scope.row.warehousing_count) }}-->
+            </template>
+          </el-table-column>
+
+          <el-table-column label="零价总价" align="center" width="150">
+            <template slot-scope="scope">
+              <!--{{ calculate(scope.row.price * scope.row.warehousing_count) }}-->
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item>
+                <el-input
+                  placeholder="请输入批号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产日期" width="250" align="center">
+            <template slot-scope="scope">
+              <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" width="250" align="center">
+            <template slot-scope="scope">
+              <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" width="150" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+// import stockInDialog from "./Dialog/stockInDialog";
+import { uParseTime } from "@/utils/tools";
+
+import {
+  GetAllConfig,
+  GetAllDrugInfoByID,
+  getDrugWarehouseInfoList,
+  modifyDrugWarehouseInfo,
+  deleteDrugWarehouseInfo,
+  DeleteDrugWarehouseInfoItem,
+  EditDrugWarehouse
+} from "@/api/drug/drug_stock";
+import BreadCrumb from "../../components/bread-crumb";
+import DrugsStockDialog from './drugsStockDialog/index'
+
+export default {
+  components: { DrugsStockDialog, BreadCrumb },
+  name: "stockIn",
+
+  data() {
+    var checkGoodId = (rule, value, callback) => {
+      setTimeout(() => {
+        if (value == "" || value == 0) {
+          return callback(new Error("规格名称不能为空"));
+        }
+      }, 2000);
+    };
+
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "耗材入库单" },
+        { path: false, name: "编辑入库单" }
+      ],
+      crumbs2: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "其他入库单" },
+        { path: false, name: "编辑入库单" }
+      ],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      warehousing_time: "",
+      adminUserOptions: null,
+      currentIndex: 0,
+
+      recordInfo: {
+        recordData: [],
+        stock_in_code: "",
+        current_index: ""
+      },
+      tableRules: {
+        price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
+        warehousing_count: [
+          { required: true, message: "数量不能为空", trigge: "blur" }
+        ],
+
+        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+      },
+
+      total: "",
+      product_date: "",
+      expiry_date: "",
+      numbers: "",
+      // prop
+      isVisibility: false,
+      propForm: {
+        goods: [],
+        goodType: [],
+        goodInfo: [],
+        goodUnit: [],
+        title: "入库",
+        isCreated: 1
+      },
+
+      form: {
+        manufacturer: "",
+        dealer: ""
+      },
+      warehouse: {},
+      manufacturer: [],
+      dealer: [],
+      goodType: [],
+      goodInfo:[],
+    };
+  },
+  methods: {
+    comfirm: function(val) {
+      this.$refs.dialog.hide();
+      console.log(val)
+      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;
+          } else {
+
+            const tempForm = {};
+            tempForm["id"] = 0;
+            tempForm["drug_id"] = val.selectedGoodInfo[i].id;
+            tempForm["number"] = "";
+            tempForm["product_date"] = "";
+            tempForm["expiry_date"] = "";
+            tempForm["warehousing_count"] = "";
+            tempForm["price"] = "";
+            tempForm["remark"] = "";
+            tempForm["dealer"] = "";
+            tempForm["manufacturer"] = "";
+            this.recordInfo.recordData.splice(
+              this.currentIndex + 1,
+              0,
+              tempForm
+            );
+          }
+        }
+      }
+
+      console.log( this.recordInfo.recordData)
+
+      this.currentIndex = -1;
+    },
+    cancle: function() {
+      this.$refs.dialog.hide();
+      this.propForm.goods = [];
+
+      this.propForm.goodType = [];
+    },
+    GetConfigInfo: function() {
+      const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          for(let i = 0; i<  response.data.data.drugs.length;i++){
+            this.goodType.push(response.data.data.drugs[i])
+            if(response.data.data.drugs[i].drug_specs != null) {
+              for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+              }
+            }
+          }
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+        }
+        loading.close();
+      });
+    },
+    typeName: function(drug_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == drug_id) {
+          name = this.goodInfo[i].drug_name;
+
+        }
+      }
+      return name;
+    },
+    specificationName: function(drug_id) {
+      console.log(this.goodInfo)
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == drug_id) {
+          name = this.goodInfo[i].drug_spec;
+        }
+      }
+      return name;
+    },
+    handleEdit: function(index, row) {
+      const tempObj = {};
+      tempObj["id"] = 0;
+      tempObj["drug_id"] = 0;
+      tempObj["number"] = "";
+      tempObj["product_date"] = "";
+      tempObj["expiry_date"] = "";
+      tempObj["warehousing_count"] = "";
+      tempObj["price"] = "";
+      tempObj["remark"] = "";
+      tempObj["dealer"] = "";
+      tempObj["manufacturer"] = "";
+      this.recordInfo.recordData.push(tempObj);
+    },
+    handleDelete: function(index, row) {
+      if (row.id == 0) {
+        this.recordInfo.recordData.splice(index, 1);
+      } else {
+        const params = {
+          id: row.id
+        };
+        this.$confirm("确认删除该入库商品信息记录?", "删除入库商品信息记录", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            DeleteDrugWarehouseInfoItem(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                this.$message.success("删除成功");
+
+                this.recordInfo.recordData.splice(index, 1);
+              }
+            });
+          })
+          .catch(() => {});
+      }
+    },
+    calculate: function(val) {
+      if (val == 0) {
+        return "";
+      }
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    getTime(val, temp) {
+      if (val != 0) {
+        return uParseTime(val, temp);
+      } else {
+        return "";
+      }
+    },
+    showDialog(index, row) {
+      this.currentIndex = index;
+      const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+
+      const params = {
+        manufacturer_id: this.form.manufacturer,
+        dealer_id: this.form.dealer
+      };
+      GetAllDrugInfoByID(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          if (response.data.data.drugs.length <= 0) {
+            this.$message.error("该厂商或经销商没有药品信息");
+            loading.close();
+
+            return;
+          }
+          this.$refs.dialog.show();
+          for (let i = 0; i < response.data.data.drugs.length; i++) {
+            this.propForm.goods.push(
+              response.data.data.drugs[i]
+            );
+          }
+          const obj = {};
+          this.propForm.goods = this.propForm.goods.reduce(
+            (cur, next) => {
+              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+              return cur;
+            },
+            []
+          ); // 设置cur默认类型为数组，并且初始值为空的数组
+        }
+
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+            var respObj = this.propForm.goods[i].drug_specs[a];
+            respObj["isSelected"] = false;
+          }
+        }
+        loading.close();
+      });
+    },
+    back() {
+      this.$router.go(-1);
+    },
+    submit() {
+      this.$refs["tableForm"].validate(valid => {
+        if (valid) {
+          const array = this.recordInfo.recordData;
+          for (let i = 0; i < array.length; i++) {
+            if (array[i].drug_id == 0) {
+              this.$message.error("药品名称或者药品规格名称不能为空");
+              return;
+            }
+          }
+          const params = {
+            stockIn: this.recordInfo.recordData
+          };
+
+          EditDrugWarehouse(
+            params,
+            this.warehousing_time,
+            this.$route.query.id,
+            this.$route.query.type,
+            this.form.manufacturer,
+            this.form.dealer
+          ).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$message.success("入库成功");
+
+              this.$router.back(-1);
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    GetOrderDetail: function(order_id) {
+      const params = {
+        id: order_id
+      };
+      getDrugWarehouseInfoList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          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,
+              "{y}-{m}-{d}"
+            );
+            response.data.data.info[i].expiry_date = this.getTime(
+              response.data.data.info[i].expiry_date,
+              "{y}-{m}-{d}"
+            );
+            response.data.data.info[i].price = response.data.data.info[
+              i
+            ].price.toString();
+            response.data.data.info[
+              i
+            ].warehousing_count = response.data.data.info[
+              i
+            ].warehousing_count.toString();
+
+            this.recordInfo.recordData.push(response.data.data.info[i]);
+          }
+
+          this.warehouse = response.data.data.warehousing;
+          this.form.manufacturer = this.warehouse.manufacturer;
+          this.form.dealer = this.warehouse.dealer;
+
+          this.warehousing_time = this.getTime(
+            this.warehouse.warehousing_time,
+            "{y}-{m}-{d}"
+          );
+
+          if (this.recordInfo.recordData.length == 0) {
+            const tempObj = {};
+            tempObj["id"] = 0;
+            tempObj["drug_id"] = 0;
+            tempObj["number"] = "";
+            tempObj["product_date"] = "";
+            tempObj["expiry_date"] = "";
+            tempObj["warehousing_count"] = "";
+            tempObj["price"] = "";
+            tempObj["remark"] = "";
+            tempObj["dealer"] = "";
+            tempObj["manufacturer"] = "";
+            this.recordInfo.recordData.push(tempObj);
+          }
+        }
+      });
+    }
+
+  },
+  created() {
+    this.GetConfigInfo();
+    this.propForm.goodUnit = this.$store.getters.good_unit;
+    const order_id = this.$route.query.id;
+    this.GetOrderDetail(order_id);
+  }
+};
+</script>
+<style>
+#oictable ::-webkit-scrollbar {
+  height: 15px;
+}
+</style>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+</style>

src/xt_pages/stock/drugs/drugStockOutDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <stock-out-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></stock-out-order-detail>
+  <stock-out-edit v-else></stock-out-edit>
+</template>
+
+<script>
+  import StockOutOrderDetail from './drugStockOutOrderDetail'
+  import StockOutEdit from './drugStockOutOrderEdit'
+  export default {
+    name: 'stockInDeatail',
+    components: { StockOutEdit, StockOutOrderDetail},
+    data() {
+      return {
+        isEdit: 0
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -0,0 +1,539 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        @click="AddNewOrder"
+        class="filter-item"
+        style="float:right;"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        >新增</el-button
+      >
+    </div>
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input
+          size="small"
+          style="width: 400px;"
+          class="filter-item"
+          v-model.trim="searchKey"
+          placeholder="单据编码/制单人/厂商"
+        />
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">出库时间</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_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"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+      <div class="cell clearfix">
+        <el-checkbox
+          style="width: 70px"
+          v-model="checked"
+          @change="changeAllSelected"
+          >全选</el-checkbox
+        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
+      </div>
+
+      <el-table
+        :data="warehouseOutDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehouse_out_time | parseTime("{y}-{m}-{d}") }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehouse_out_order_number }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{ getXuserName(scope.row.creater) }}
+          </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">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleEdit(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="danger"
+                :disabled="scope.row.is_sys == 1"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+
+import {
+  deleteDrugWarehouseOut,
+  GetAllConfig,
+  getDrugWarehouseOutList
+} from "@/api/drug/drug_stock";
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+  name: "salesReturnOrder",
+  components: { BreadCrumb },
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.GetWarehouseOut();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      searchKey: "",
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "出库单" }
+      ],
+      page: 1,
+      limit: 10,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      warehouseOutDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: [],
+      type: 1
+    };
+  },
+  methods: {
+    search: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords: this.searchKey
+      };
+      this.warehouseOutDate = [];
+      getDrugWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    AddNewOrder: function() {
+      this.$router.push({
+        name: "drugStockOutOrderAdd",
+        query: { type: this.type }
+      });
+    },
+     GetWarehouseOut: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.warehouseOutDate = [];
+      getDrugWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
+            }
+          }
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetWarehouseOut();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetWarehouseOut();
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetWarehouseOut();
+      }
+      this.GetWarehouseOut();
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouseOut();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+        }
+      });
+    },
+
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "stockOutDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除出库单记录?", "删除出库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugWarehouseOut(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.warehouseOutDate.length; y++) {
+                  if (ids[i] == this.warehouseOutDate[y].id) {
+                    this.warehouseOutDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteDrugWarehouseOut(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.warehouseOutDate.length; y++) {
+                  if (ids[i] == this.warehouseOutDate[y].id) {
+                    this.warehouseOutDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+  .filter-container {
+    padding-bottom: 5px;
+  }
+  .search-component {
+    width: 500px;
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
+  }
+
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
+  }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -0,0 +1,593 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb
+        v-if="this.$route.query.type == 1"
+        :crumbs="crumbs"
+      ></bread-crumb>
+      <bread-crumb
+        v-if="this.$route.query.type == 2"
+        :crumbs="crumbs2"
+      ></bread-crumb>
+
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item"
+          >取 消</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          @click="submit()"
+          class="filter-item"
+          >保 存</el-button
+        >
+      </div>
+    </div>
+
+    <div class="app-container">
+    <!---->
+      <!--<stock-in-dialog-->
+        <!--ref="dialog" :propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+
+      <drugs-stock-dialog
+        ref="dialog" :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      ></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
+          max-height="450"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入药品名称"
+                  v-model="scope.row.drug_id"
+                  :value="typeName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入规格名称"
+                  v-model="scope.row.drug_id"
+                  :value="specificationName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入单价"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.count'"
+                :rules="tableRules.count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入出库数量"
+                  type="number"
+                  v-model="scope.row.count"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.count) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" min-width="20">
+            <template slot-scope="scope">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import {  postDrugWarehouseOut,GetAllConfig,GetAllDrugInfoByID } from "@/api/drug/drug_stock";
+
+import BreadCrumb from "../../components/bread-crumb";
+import DrugsStockDialog from './drugsStockDialog/index'
+
+export default {
+  components: { DrugsStockDialog,   BreadCrumb },
+  name: "salesReturnOrderAdd",
+
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "耗材出库单" },
+        { path: false, name: "新增出库单" }
+      ],
+      crumbs2: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "其他出库单" },
+        { path: false, name: "新增出库单" }
+      ],
+      type: this.$route.query.type,
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      warehouse_out_time: "",
+      currentIndex: 0,
+      recordInfo: {
+        recordData: []
+      },
+      tableRules: {
+        price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
+        count: [{ required: true, message: "数量不能为空", trigge: "blur" }]
+      },
+      ruleForm: {
+        manufacturer: [
+          { required: true, message: "请选择厂商", trigger: "change" }
+        ]
+      },
+      // prop
+      isVisibility: false,
+      propForm: {
+        goods: [],
+        goodType: [],
+        goodInfo: [],
+        goodUnit: [],
+        manufacturer: 0,
+        dealer: 0
+      },
+      form: {
+        manufacturer: 0,
+        dealer: 0
+      },
+      warehouseInfoList: [],
+      manufacturer: [],
+      dealer: [],
+      goodType: [],
+      goodInfo:[]
+    };
+  },
+  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
+
+          } else {
+            const tempForm = {}
+            tempForm['drug_id'] = val.selectedGoodInfo[i].id
+            tempForm['count'] = ''
+            tempForm['price'] = ''
+            tempForm['remark'] = ''
+            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;
+    },
+    cancle: function() {
+      this.$refs.dialog.hide();
+    },
+    GetConfigInfo: function() {
+
+      GetAllConfig().then(response => {
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          for(let i = 0; i<  response.data.data.drugs.length;i++){
+            this.goodType.push(response.data.data.drugs[i])
+            if(response.data.data.drugs[i].drug_specs != null) {
+              for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+              }
+            }
+          }
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+
+          this.form.manufacturer = 0
+          this.form.dealer = 0
+        }
+        loading.close()
+
+      });
+    },
+    typeName: function(drug_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == drug_id) {
+          name = this.goodInfo[i].drug_name;
+
+        }
+      }
+      return name;
+    }, specificationName: function(drug_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == drug_id) {
+          name = this.goodInfo[i].drug_spec;
+        }
+      }
+      return name;
+    },
+    handleEdit: function(index, row) {
+      const tempObj = {};
+      tempObj["drug_id"] = 0;
+      tempObj["count"] = "";
+      tempObj["price"] = "";
+      tempObj["remark"] = "";
+
+      this.recordInfo.recordData.push(tempObj);
+    },
+    handleDelete: function(index, row) {
+      if (this.recordInfo.recordData.length <= 1) {
+        this.$message.error("只有一条记录的时候无法删除");
+        return;
+      } else {
+        this.recordInfo.recordData.splice(index, 1);
+      }
+    },
+    calculate: function(val) {
+      if (isNaN(val)) {
+        return "";
+      }
+      if (val == 0) {
+        return "";
+      }
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    getTime(val, temp) {
+      if (val != 0) {
+        return uParseTime(val, temp);
+      } else {
+        return "";
+      }
+    },
+    showDialog(index, row) {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.currentIndex = index
+      const params = {
+        manufacturer_id: this.form.manufacturer,
+        dealer_id: this.form.dealer
+      }
+      GetAllDrugInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+            loading.close()
+
+          } else {
+            loading.close()
+
+            if (response.data.data.drugs.length <= 0) {
+              this.$message.error('该厂商或经销商没有物品信息')
+              return
+            }
+
+
+            this.$refs.dialog.show()
+            for (let i = 0; i < response.data.data.drugs.length; i++) {
+              this.propForm.goods.push(
+                response.data.data.drugs[i]
+              );
+            }
+            const obj = {};
+            this.propForm.goods = this.propForm.goods.reduce(
+              (cur, next) => {
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                return cur;
+              },
+              []
+            ); // 设置cur默认类型为数组，并且初始值为空的数组
+
+
+          }
+
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+            var respObj = this.propForm.goods[i].drug_specs[a];
+            respObj["isSelected"] = false;
+          }
+        }
+        }
+      )
+
+    },
+    back() {
+      this.$router.go(-1);
+    },
+    submit() {
+      this.$refs["tableForm"].validate(valid => {
+        if (valid) {
+          const array = this.recordInfo.recordData;
+          let total = 0;
+          for (let i = 0; i < array.length; i++) {
+            if (array[i].good_type_id == 0) {
+              this.$message.error("商品类型不能为空");
+              return;
+            }
+            if (array[i].good_id == 0) {
+              this.$message.error("规格名称不能为空");
+              return;
+            }
+            total = total + array[i].price * array[i].return_count;
+          }
+          if (this.recordInfo.recordData.length <= 0) {
+            this.$message.success("请添加出库商品");
+            return;
+          }
+
+          const params = {
+            stockOut: this.recordInfo.recordData
+          };
+          console.log(this.form.dealer);
+
+          postDrugWarehouseOut(
+            params,
+            this.warehouse_out_time,
+            this.form.dealer,
+            this.form.manufacturer,
+            this.type
+          ).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$message.success("出库成功");
+              this.recordInfo.recordData = [];
+              this.$router.back(-1);
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    changeManufacturer(val) {
+      this.propForm.manufacturer = val;
+    },
+    changeDealer(val) {
+      this.propForm.dealer = val;
+    }
+  },
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.warehouse_out_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    const tempObj = {};
+    tempObj["drug_id"] = 0;
+    tempObj["return_count"] = 0;
+    tempObj["price"] = "";
+    tempObj["remark"] = "";
+
+    this.recordInfo.recordData.push(tempObj);
+    this.GetConfigInfo();
+    this.propForm.goodUnit = this.$store.getters.good_unit;
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+</style>

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -0,0 +1,300 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
+    </div>
+
+    <div class="app-container">
+
+      <div class="filter-container">
+        <span style="font-size: 18px;color: #606266">出库单详情</span>
+        <el-row style="float:right;">
+          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+        </el-row>
+      </div>
+
+
+      <div class="cell clearfix">
+        <span style="width: 300px;color: #606266">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266">厂商 {{warehousingOutInfo.info.manufacturers?warehousingOutInfo.info.manufacturers.manufacturer_name:''}}</span>
+        <span style="width: 300px;color: #606266">经销商 {{warehousingOutInfo.info.dealers?warehousingOutInfo.info.dealers.dealer_name:''}}</span>
+      </div>
+
+      <div class="filter-container" style="margin-top: 10px">
+        <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
+        <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+                  :span-method="merge"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug.drug_name
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug?scope.row.drug.drug_spec:''
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.price}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.count}}</span>
+
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{calculate(scope.row.price*scope.row.count)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-popover placement="top-start" width="250" trigger="hover">
+                <div>{{scope.row.remark}}</div>
+                <span slot="reference"
+                      v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
+                <span slot="reference" v-else>{{ scope.row.remark}}</span>
+              </el-popover>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="" align="center"  >
+            <template slot-scope="scope" v-if="scope.row.is_sys == 1">
+             <div style="color: #589ff8" @click="jump(scope.row)">使用明细</div>
+            </template>
+          </el-table-column>
+
+
+
+        </el-table>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { deleteDrugWarehouseOut, GetAllConfig, getDrugWarehouseOutInfo } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
+
+  export default {
+    name: 'stockInOrderDetail',
+    components: { BreadCrumb },
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        tempArr: [],
+        sameRowArr: [],
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材出库单' },
+          { path: false, name: '出库单详情' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他出库单' },
+          { path: false, name: '出库单详情' }
+        ],
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        warehousingOutInfo: {
+          loading: false,
+          warehousingOutData: [],
+          info: {}
+        }
+      }
+    },
+    methods: {
+     calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(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 {
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+            }
+            this.warehousingOutInfo.info = response.data.data.info
+            this.handleSpanTempArr()
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.warehousingOutInfo.info.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库单?', '删除出库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteDrugWarehouseOut(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      },jump(row){
+        this.$router.push({
+          name: 'user_detail',
+          query: { id: row.id }
+        })
+      },merge({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      },handleSpanTempArr(){
+        this.tempArr = []
+
+        for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.warehousingOutInfo.warehousingOutData[i].good_type_id === this.warehousingOutInfo.warehousingOutData[i - 1].good_type_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.warehousingOutInfo.warehousingOutData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.good_type_id === this.warehousingOutInfo.warehousingOutData[index - 1].good_type_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+
+
+
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+  .el-table__body div > div:hover {
+    background-color: #409eff !important;
+    color: #fff !important;
+  }
+
+</style>

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -0,0 +1,533 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
+      <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
+
+
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+      </div>
+    </div>
+
+    <div class="app-container">
+
+      <!--<stock-in-dialog-->
+        <!--ref="dialog"-->
+        <!--:propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;</stock-in-dialog>-->
+      <!--<stock-in-dialog-->
+        <!--ref="dialog"-->
+        <!--:propForm="propForm"-->
+        <!--:visibility="isVisibility"-->
+        <!--v-on:dialog-comfirm="comfirm"-->
+        <!--v-on:dialog-cancle="cancle"-->
+      <!--&gt;-->
+      <!--</stock-in-dialog>-->
+
+      <drugs-stock-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      >
+      </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
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入药品名称"
+                  v-model="scope.row.drug_id"
+                  :value="typeName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入规格名称"
+                  v-model="scope.row.drug_id"
+                  :value="specificationName(scope.row.drug_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.price"></el-input>
+              </el-form-item>
+
+
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.count"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{calculate(scope.row.price*scope.row.count)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" min-width="20">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugSalesReturnConfig, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID } from '@/api/drug/drug_stock'
+  import BreadCrumb from '../../components/bread-crumb'
+  import DrugsStockDialog from './drugsStockDialog/index'
+
+  export default {
+    components: { DrugsStockDialog, BreadCrumb},
+    name: 'salesReturnEdit',
+
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材出库单' },
+          { path: false, name: '编辑出库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他出库单' },
+          { path: false, name: '编辑出库单' }
+        ],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+
+        adminUserOptions: null,
+        currentIndex: 0,
+        warehouse_out_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+        },
+        // prop
+        isVisibility: false,
+        propForm: {
+          goods:[],
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库',
+          manufacturer: 0,
+          dealer: 0
+        },
+
+        form: {
+          manufacturer: 0,
+          dealer: 0
+        },
+        warehouseInfoList: [],
+        warehouseOut: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: [],
+        goodInfo:[],
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.$refs.dialog.hide();
+        this.propForm.goodType = [];
+        this.propForm.goods = [];
+
+        if (val.selectedGoodInfo.length > 0) {
+          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+            if (i == 0) {
+
+              this.recordInfo.recordData[this.currentIndex].drug_id =
+                val.selectedGoodInfo[i].id;
+
+            } else {
+              const tempForm = {};
+              tempForm["id"] = 0;
+              tempForm["drug_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;
+      },
+      cancle: function() {
+        this.$refs.dialog.hide()
+        this.propForm.goods = [];
+
+        this.propForm.goodType = [];
+      }, GetConfigInfo: function() {
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            for(let i = 0; i<  response.data.data.drugs.length;i++){
+              this.goodType.push(response.data.data.drugs[i])
+              if(response.data.data.drugs[i].drug_specs != null) {
+                for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+                  this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+                }
+              }
+            }
+            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          }
+          loading.close();
+        });
+      },  typeName: function(drug_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_name;
+
+          }
+        }
+        return name;
+      },
+      specificationName: function(drug_id) {
+        console.log(this.goodInfo)
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].drug_spec;
+          }
+        }
+        return name;
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['drug_id'] = 0
+        tempObj['count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该出库商品信息记录?', '删除出库商品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteDrugWarehouseOutInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      showDialog(index, row) {
+        this.currentIndex = index;
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        };
+        GetAllDrugInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.goodInfo.length <= 0) {
+              this.$message.error("该厂商或经销商没有药品信息");
+              return;
+            }
+            this.$refs.dialog.show();
+            for (let i = 0; i < response.data.data.drugs.length; i++) {
+              this.propForm.goods.push(
+                response.data.data.drugs[i]
+              );
+            }
+            const obj = {};
+            this.propForm.goods = this.propForm.goods.reduce(
+              (cur, next) => {
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                return cur;
+              },
+              []
+            ); // 设置cur默认类型为数组，并且初始值为空的数组
+          }
+
+          for (let i = 0; i < this.propForm.goods.length; i++) {
+            for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+              var respObj = this.propForm.goods[i].drug_specs[a];
+              respObj["isSelected"] = false;
+            }
+          }
+          loading.close();
+        });
+      },
+
+      back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].drug_id == 0) {
+                this.$message.error("药品名称或者药品规格名称不能为空");
+                return;
+              }
+            }
+
+            const params = {
+              'stockOut': this.recordInfo.recordData
+            }
+            editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('保存成功')
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(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 {
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
+              response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            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
+
+          }
+
+          if (this.recordInfo.recordData.length == 0) {
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['drug_id'] = 0
+            tempObj['count'] = ''
+            tempObj['price'] = ''
+            tempObj['remark'] = ''
+            this.recordInfo.recordData.push(tempObj)
+          }
+        })
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, changeManufacturer(val) {
+        this.propForm.manufacturer = val
+      }, changeDealer(val) {
+        this.propForm.dealer = val
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/drugs/drugStockUserDetail.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+
+    <div class="app-container">
+
+      <div class="filter-container">
+        <span style="font-size: 18px;color: #606266">商品使用明细</span>
+      </div>
+
+      <div class="cell clearfix">
+        <span style="width: 300px;color: #606266">商品类型: {{userList[0].type.type_name}} </span>
+        <span style="width: 300px;color: #606266">规格名称: {{userList[0].info.specification_name}}</span>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>序号</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
+              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用人</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
+              <span v-if="scope.row.is_total == 1"></span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span >{{scope.row.count}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用时间</span>
+            </template>
+            <template slot-scope="scope">
+              <span  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>
+
+        </el-table>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { getWarehouseOutUser } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
+
+  export default {
+    name: 'stockInOrderDetail',
+    components: { BreadCrumb },
+    created() {
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材出库单' },
+          { path: false, name: '出库单详情' },
+          { path: false, name: '使用明细' }
+
+        ],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        userList:[]
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseOutUser(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var total = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              var obj = response.data.data.list[i]
+              obj['is_total'] = 0
+              this.userList.push(obj)
+              total = total + response.data.data.list[i].count
+            }
+            this.userList.push({
+              is_total: 1,
+              total: total,
+            })
+
+            console.log(this.userList)
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

@@ -0,0 +1,249 @@
+<template>
+  <el-dialog title="选择药品" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <div class="filter-container">
+      <el-input style="width: 150px;" class="filter-item" placeholder="药品规格名称" v-model="keywords"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-table
+          :data="propForm.goods"
+          ref="table"
+          border
+          highlight-current-row
+          max-height="250"
+          :row-class-name="tableRows"
+          @row-click="onRowClicks"
+          @current-change="goodTypeTableChange"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+          style="width: 100%">
+          <el-table-column
+            align="center"
+            label="药品规格">
+            <template slot-scope="scope">
+              <span>{{scope.row.drug_name}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="16">
+        <el-table
+          :data="goodInfoTableData"
+          border
+          ref="multipleTable"
+          max-height="250"
+          @row-click="clickRow"
+          @selection-change="changeGoodInfoTableData"
+          @select="selectGoodInfo"
+          @select-all="changeAllGoodInfoTableData"
+          row-key="row_key"
+          style="width: 100%"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column
+            align="center"
+            type="selection"
+            width="55">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="规格名称"
+            property="drug_spec"
+            style="word-break: keep-all;white-space:nowrap;"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="单位"
+            property="good_unit"
+          >
+            <template slot-scope="scope">
+              <!--<span>{{getName(scope.row.good_unit)}}</span>-->
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            align="center"
+            label="单价"
+            property="buy_price"
+          >
+            <template slot-scope="scope">
+              <!--<span>{{scope.row.buy_price}}</span>-->
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-col>
+    </el-row>
+
+
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="cancle('form')">取 消</el-button>
+    <el-button type="primary" @click="comfirm('form')">保 存</el-button>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  import { GetGoodInfoByGoodId } from '@/api/stock'
+
+  export default {
+    name: 'drugsStockDialog',
+    data() {
+      return {
+        goodInfo: [],
+        goodInfoTableData: [],
+        keywords: '',
+        multipleSelection: [],
+        currentGoodTypeId: 0,
+        isClose: false,
+        visibility: false,
+        SelectedDatas: [],
+        table_current_index: -1
+      }
+    },
+    props: {
+      propForm: {
+        type: Object
+      }
+    },
+    methods: {
+      hide: function() {
+        this.visibility = false
+      },
+      show: function() {
+        this.visibility = true
+
+      },
+      goodTypeTableChange: function(currentRow, oldCurrentRow) {
+        this.goodInfoTableData = currentRow.drug_specs != null ? currentRow.drug_specs : []
+        for (let i = 0; i < this.goodInfoTableData.length; i++) {
+          if (this.goodInfoTableData[i].isSelected) {
+            this.$nextTick(function() {
+              this.$refs.multipleTable.toggleRowSelection(this.goodInfoTableData[i])
+            })
+          }
+        }
+
+      },
+      cancle: function(formName) {
+        this.goodInfoTableData = []
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs.multipleTable.clearSelection()
+        this.$refs.table.setCurrentRow(null)
+
+      },
+      comfirm: function(formName) {
+        this.goodInfoTableData = []
+        this.$emit('dialog-comfirm', this.getValue())
+        this.$refs.multipleTable.clearSelection()
+        this.$refs.table.setCurrentRow(null)
+      },
+      getValue: function() {
+        this.multipleSelection = []
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+                if (this.propForm.goods[i].drug_specs[a].isSelected) {
+                  this.multipleSelection.push(this.propForm.goods[i].drug_specs[a])
+                }
+          }
+        }
+        const obj = {
+          selectedGoodInfo: this.multipleSelection,
+        }
+        console.log(obj)
+        return obj
+      }, goodTypeSelect: function(id) {
+        this.tempGoodInfo = []
+        this.goodInfo = []
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].good_type_id == id) {
+            this.tempGoodInfo.push(this.propForm.goodInfo[i])
+          }
+        }
+      }, goodInfoSelect: function(id) {
+        let index = 0
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].id == id) {
+            index = i
+          }
+        }
+        this.form.good_type_id = this.propForm.goodInfo[index].good_type_id
+      }, getName: function(id) {
+        if (id == 0) {
+          return ''
+        }
+
+        for (let i = 0; i < this.propForm.goodUnit.length; i++) {
+          if (this.propForm.goodUnit[i].id == id) {
+            return this.propForm.goodUnit[i].name
+          }
+        }
+      }, search: function() {
+        if (this.keywords.length <= 0) {
+          this.$message.error('搜索关键字不能为空')
+          return
+        }
+        const searchArr = []
+        for (let i = 0; i < this.goodInfoTableData.length; i++) {
+          if (this.goodInfoTableData[i].drug_spec.indexOf(this.keywords) != -1) {
+            searchArr.push(this.goodInfoTableData[i])
+          }
+        }
+        this.goodInfoTableData = []
+        for (let i = 0; i < searchArr.length; i++) {
+          this.goodInfoTableData.push(searchArr[i])
+        }
+      }, changeGoodInfoTableData: function(val) {
+        console.log(val)
+      }, changeAllGoodInfoTableData: function(selection) {
+        var goodInfos = this.propForm.goods[this.table_current_index].drug_specs
+        if (selection.length > 0) {
+          for (let y = 0; y < goodInfos.length; y++) {
+            for (let i = 0; i < selection.length; i++) {
+              if (goodInfos[y].id == selection[i].id) {
+                goodInfos[y].isSelected = true
+              }
+            }
+          }
+        }
+      }, clickRow: function(row) {
+        // this.$refs.multipleTable.toggleRowSelection(row)
+
+      },tableRows({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClicks(row, event, column) {
+        this.table_current_index = row.index
+      }, selectGoodInfo(selection, row) {
+
+        var goodInfos = this.propForm.goods[this.table_current_index].drug_specs
+        // for (let y = 0; y < goodInfos.length; y++) {
+        //   goodInfos[y].isSelected = false
+        // }
+        if (selection.length > 0) {
+          for (let y = 0; y < goodInfos.length; y++) {
+            for (let i = 0; i < selection.length; i++) {
+              if (goodInfos[y].id == selection[i].id) {
+                goodInfos[y].isSelected = true
+              }
+            }
+          }
+        }
+
+
+
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/drugs/index.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <!--<el-checkbox style="float: right;margin-right: 35px;padding-top: 20px;height: 15px" v-model="is_open" @change="changeOpen">是否启用自动扣减功能</el-checkbox>-->
+    <div class="app-container" >
+      <div class="service-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="厂家" name="first">
+            <manufacturer></manufacturer>
+          </el-tab-pane>
+          <el-tab-pane label="经销商">
+            <dealer></dealer>
+          </el-tab-pane>
+          <el-tab-pane label="商品类型">
+            <good-type></good-type>
+          </el-tab-pane>
+          <el-tab-pane label="商品信息">
+            <good-info></good-info>
+          </el-tab-pane>
+          <el-tab-pane label="自动扣减">
+            <automatic-reduce></automatic-reduce>
+          </el-tab-pane>
+
+        </el-tabs>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Dealer from './config/dealer'
+  import Manufacturer from './config/manufacturer'
+  import GoodInfo from './config/goodInfo'
+  import GoodType from './config/goodType'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import AutomaticReduce from './config/automaticReduce'
+  export default {
+    name: 'service',
+    components: {
+      AutomaticReduce,
+      GoodType,
+      GoodInfo,
+      Manufacturer,
+      Dealer,
+      BreadCrumb
+    },
+    data() {
+      return {
+        is_open: false,
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/config', name: '库存配置' }
+        ],
+        activeName: 'first',
+        config:null,
+      }
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event, this.activeName)
+      }
+    },created(){
+
+    }
+  }
+</script>
+
+

src/xt_pages/workforce/schedule_print.vue

@@ -273,6 +273,7 @@
             const collection = this.schedules[index]
             collection.day = resp.data.days[index].split("-")[1]+"-"+resp.data.days[index].split("-")[2]
           }
+
           this.total = resp.data.total
           var schedules = resp.data.schedules
 
@@ -297,7 +298,7 @@
             } else {
               time_type_schedules = main_collection.all.evening
             }
-            
+
 
             var zone_schedules = time_type_schedules[schedule.zone.name] ? time_type_schedules[schedule.zone.name] : []
 
@@ -305,6 +306,7 @@
 
             time_type_schedules[schedule.zone.name] = zone_schedules
 
+
             if (schedule.mode.id == 2) { // HDF
               main_collection.hdf.push(schedule)
 
@@ -315,6 +317,7 @@
 
           }
 
+
         } else {
           this.$message.error(resp.msg)
         }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //     store.dispatch('VerifyConfigList', []).then(() => {
-  //       next()
-  //     })
-  //   }
-  //   if (store.getters.permission_routers === undefined) {
-  //     store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //       next()
-  //     })
-  //   } else {
-  //     next()
-  //   }
-  //   return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+      store.dispatch('VerifyConfigList', []).then(() => {
+        next()
+      })
+    }
+    if (store.getters.permission_routers === undefined) {
+      store.dispatch('xt_GenerateRoutes', []).then(() => {
+        next()
+      })
+    } else {
+      next()
+    }
+    return
   // 线上注释
 
   NProgress.start()