Merge branch 'superman' of http://git.shengws.com:3000/zhangbj/xt_vue into superman

src/api/stock.js

@@ -1,632 +1,538 @@
 import request from '@/utils/request'
 
-
-export function createDealer(params){
+export function createDealer(params) {
   return request({
-    url:'/api/stock/dealer/create',
-    method:'post',
-    params:params
+    url: '/api/stock/dealer/create',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function modifyDealer(params){
+export function modifyDealer(params) {
   return request({
-    url:'/api/stock/dealer/modify',
-    method:'post',
-    params:params
+    url: '/api/stock/dealer/modify',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function getDealersList(params){
+export function getDealersList(params) {
   return request({
-    url:'/api/stock/dealer/list',
-    method:'get',
-    params:params
+    url: '/api/stock/dealer/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function deleteDealer(params){
+export function deleteDealer(params) {
   return request({
-    url:'/api/stock/dealer/delete',
-    method:'post',
-    params:params
+    url: '/api/stock/dealer/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function GetDealer(params){
+export function GetDealer(params) {
   return request({
-    url:'/api/stock/dealer/get',
-    method:'get',
-    params:params
+    url: '/api/stock/dealer/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-
-export function createManufacturer(params){
+export function createManufacturer(params) {
   return request({
-    url:'/api/stock/manufacturer/create',
-    method:'post',
-    params:params
+    url: '/api/stock/manufacturer/create',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function modifyManufacturer(params){
+export function modifyManufacturer(params) {
   return request({
-    url:'/api/stock/manufacturer/modify',
-    method:'post',
-    params:params
+    url: '/api/stock/manufacturer/modify',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function getManufacturerList(params){
+export function getManufacturerList(params) {
   return request({
-    url:'/api/stock/manufacturer/list',
-    method:'get',
-    params:params
+    url: '/api/stock/manufacturer/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function deleteManufacturer(params){
+export function deleteManufacturer(params) {
   return request({
-    url:'/api/stock/manufacturer/delete',
-    method:'post',
-    params:params
+    url: '/api/stock/manufacturer/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function GetManufacturer(params){
+export function GetManufacturer(params) {
   return request({
-    url:'/api/stock/manufacturer/get',
-    method:'get',
-    params:params
+    url: '/api/stock/manufacturer/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-
-
-
-
-
-
-export function createGoodType(params){
+export function createGoodType(params) {
   return request({
-    url:'/api/stock/good/type/create',
-    method:'post',
-    params:params
+    url: '/api/stock/good/type/create',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function modifyGoodType(params){
+export function modifyGoodType(params) {
   return request({
-    url:'/api/stock/good/type/modify',
-    method:'post',
-    params:params
+    url: '/api/stock/good/type/modify',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function getGoodTypeList(params){
+export function getGoodTypeList(params) {
   return request({
-    url:'/api/stock/good/type/list',
-    method:'get',
-    params:params
+    url: '/api/stock/good/type/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function deleteGoodType(params){
+export function deleteGoodType(params) {
   return request({
-    url:'/api/type/delete',
-    method:'post',
-    params:params
+    url: '/api/type/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function GetGoodType(params){
+export function GetGoodType(params) {
   return request({
-    url:'/api/stock/good/type/get',
-    method:'get',
-    params:params
+    url: '/api/stock/good/type/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-
-
-
-
-
-export function createGoodInfo(params){
+export function createGoodInfo(params) {
   return request({
-    url:'/api/stock/good/info/create',
-    method:'post',
-    params:params
+    url: '/api/stock/good/info/create',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function modifyGoodInfo(params){
+export function modifyGoodInfo(params) {
   return request({
-    url:'/api/stock/good/info/modify',
-    method:'post',
-    params:params
+    url: '/api/stock/good/info/modify',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function getGoodInfoList(params){
+export function getGoodInfoList(params) {
   return request({
-    url:'/api/stock/good/info/list',
-    method:'get',
-    params:params
+    url: '/api/stock/good/info/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function deleteGoodInfo(params){
+export function deleteGoodInfo(params) {
   return request({
-    url:'/api/info/delete',
-    method:'post',
-    params:params
+    url: '/api/info/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function GetGoodInfoByGoodId(params){
+export function GetGoodInfoByGoodId(params) {
   return request({
-    url:'/api/stock/good/info/get',
-    method:'get',
-    params:params
+    url: '/api/stock/good/info/get',
+    method: 'get',
+    params: params
   })
 }
 
-export function GetGoodInfo(params){
+export function GetGoodInfo(params) {
   return request({
-    url:'/api/stock/good/info',
-    method:'get',
-    params:params
+    url: '/api/stock/good/info',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-export function GetAllDeals(params){
+export function GetAllDeals(params) {
   return request({
-    url:'/api/stock/dealer/all',
-    method:'get',
-    params:params
+    url: '/api/stock/dealer/all',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function GetAllManufacturer(params){
+export function GetAllManufacturer(params) {
   return request({
-    url:'/api/stock/manufacturer/all',
-    method:'get',
-    params:params
+    url: '/api/stock/manufacturer/all',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function GetAllGoodType(params){
+export function GetAllGoodType(params) {
   return request({
-    url:'/api/stock/good/type/all',
-    method:'get',
-    params:params
+    url: '/api/stock/good/type/all',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function GetAllGoodInfo(params){
+export function GetAllGoodInfo(params) {
   return request({
-    url:'/api/stock/good/info/all',
-    method:'get',
-    params:params
+    url: '/api/stock/good/info/all',
+    method: 'get',
+    params: params
   })
 }
 
-export function postWarehouse(params,warehousing_time,manufacturer_id,dealer_id,type){
+export function postWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
   return request({
-    url:'/api/warehouse/create?warehousing_time='+warehousing_time+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id+"&type="+type,
-    method:'post',
-    data:params
+    url: '/api/warehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    method: 'post',
+    data: params
   })
 }
 
-
-export function getWarehouseList(params){
+export function getWarehouseList(params) {
   return request({
-    url:'/api/warehouse/list',
-    method:'get',
-    params:params
+    url: '/api/warehouse/list',
+    method: 'get',
+    params: params
   })
 }
 
-export function getWarehouseInfoList(params){
+export function getWarehouseInfoList(params) {
   return request({
-    url:'/api/warehouseinfo/list',
-    method:'get',
-    params:params
+    url: '/api/warehouseinfo/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function postSalesReturn(params,salesReturnTime,salesReturnTotal,dealer_id,manufacturer_id,type){
+export function postSalesReturn(params, salesReturnTime, salesReturnTotal, dealer_id, manufacturer_id, type) {
   return request({
-    url:'/api/salesreturn/create?time='+salesReturnTime+"&total="+salesReturnTotal+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id+"&type="+type,
-    method:'post',
-    data:params
+    url: '/api/salesreturn/create?time=' + salesReturnTime + '&total=' + salesReturnTotal + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type,
+    method: 'post',
+    data: params
   })
 }
 
-export function getWarehouseInfo(params){
+export function getWarehouseInfo(params) {
   return request({
-    url:'/api/info/get',
-    method:'get',
-    params:params
+    url: '/api/info/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-export function getSalesReturnList(params){
+export function getSalesReturnList(params) {
   return request({
-    url:'/api/salesreturn/list',
-    method:'get',
-    params:params
+    url: '/api/salesreturn/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function getSalesReturnInfoList(params){
+export function getSalesReturnInfoList(params) {
   return request({
-    url:'/api/return/info',
-    method:'get',
-    params:params
+    url: '/api/return/info',
+    method: 'get',
+    params: params
   })
 }
 
-export function getAllWarehouseInfo(params){
+export function getAllWarehouseInfo(params) {
   return request({
-    url:'/api/warehouseinfo',
-    method:'get',
-    params:params
+    url: '/api/warehouseinfo',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-
-export function getWarehouseOutInfoList(params){
+export function getWarehouseOutInfoList(params) {
   return request({
-    url:'/api/stock/out/info',
-    method:'get',
-    params:params
+    url: '/api/stock/out/info',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function postWarehouseOut(params,warehousing_time,dealer_id,manufacturer_id,type){
+export function postWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type) {
   return request({
-    url:'/api/warehouseout/create?warehousing_out_time='+warehousing_time+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id+"&type="+type,
-    method:'post',
-    data:params
+    url: '/api/warehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type,
+    method: 'post',
+    data: params
   })
 }
 
-
-export function getWarehouseInfoCountByGoodId(params){
+export function getWarehouseInfoCountByGoodId(params) {
   return request({
-    url:'/api/info/count',
-    method:'get',
-    params:params
+    url: '/api/info/count',
+    method: 'get',
+    params: params
   })
 }
 
-export function getWarehouseInfoByGoodTypeId(params){
+export function getWarehouseInfoByGoodTypeId(params) {
   return request({
-    url:'/api/warehouse/type',
-    method:'get',
-    params:params
+    url: '/api/warehouse/type',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-export function getCancelStockInfoList(params){
+export function getCancelStockInfoList(params) {
   return request({
-    url:'/api/cancel/info',
-    method:'get',
-    params:params
+    url: '/api/cancel/info',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function getAllStockOutList(params){
+export function getAllStockOutList(params) {
   return request({
-    url:'/api/out/list',
-    method:'get',
-    params:params
+    url: '/api/out/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-export function getAllStockQueryList(params){
+export function getAllStockQueryList(params) {
   return request({
-    url:'/api/stock/query',
-    method:'get',
-    params:params
+    url: '/api/stock/query',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function getWarehouseInfoByOrdeNumber(params){
+export function getWarehouseInfoByOrdeNumber(params) {
   return request({
-    url:'/api/stock/warehouse/get',
-    method:'get',
-    params:params
+    url: '/api/stock/warehouse/get',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function modifyWarehouseInfo(params){
+export function modifyWarehouseInfo(params) {
   return request({
-    url:'/api/warehouse/edit',
-    method:'post',
-    params:params
+    url: '/api/warehouse/edit',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function deleteWarehouseInfo(params){
+export function deleteWarehouseInfo(params) {
   return request({
-    url:'/api/warehouse/delete',
-    method:'post',
-    params:params
+    url: '/api/warehouse/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function getWarehouseOutInfoByOrdeNumber(params){
+export function getWarehouseOutInfoByOrdeNumber(params) {
   return request({
-    url:'/api/stock/out/get',
-    method:'get',
-    params:params
+    url: '/api/stock/out/get',
+    method: 'get',
+    params: params
   })
 }
 
-export function modifyWarehouseOutInfo(params){
+export function modifyWarehouseOutInfo(params) {
   return request({
-    url:'/api/stock/out/edit',
-    method:'post',
-    params:params
+    url: '/api/stock/out/edit',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-
-
-export function GetAllConfig(){
+export function GetAllConfig() {
   return request({
-    url:'/api/stock/config',
-    method:'get',
+    url: '/api/stock/config',
+    method: 'get'
   })
 }
 
-export function GetAllGoodInfoByID(params){
+export function GetAllGoodInfoByID(params) {
   return request({
-    url:'/api/good/get',
-    method:'get',
-    params:params
+    url: '/api/good/get',
+    method: 'get',
+    params: params
 
   })
 }
 
-
-export function DeleteWarehouseInfoItem(params){
+export function DeleteWarehouseInfoItem(params) {
   return request({
-    url:'/api/warehouseinfo/delete',
-    method:'post',
-    params:params
+    url: '/api/warehouseinfo/delete',
+    method: 'post',
+    params: params
 
   })
 }
 
-
-
-export function EditWarehouse(params,warehousing_time,id){
+export function EditWarehouse(params, warehousing_time, id) {
   return request({
-    url:'/api/warehouse/edit?warehousing_time='+warehousing_time+'&id='+id,
-    method:'post',
-    data:params
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id,
+    method: 'post',
+    data: params
   })
 }
 
-
-export function getSalesReturnConfig(){
+export function getSalesReturnConfig(params) {
   return request({
-    url:'/api/return/config',
-    method:'get',
+    url: '/api/return/config',
+    method: 'get',
+    params: params
+
   })
 }
 
-export function deleteSalesReturn(params){
+export function deleteSalesReturn(params) {
   return request({
-    url:'/api/salesreturn/delete',
-    method:'post',
-    params:params
+    url: '/api/salesreturn/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function getSaleReturnInfoList(params){
+export function getSaleReturnInfoList(params) {
   return request({
-    url:'/api/stock/salesReturn/list',
-    method:'get',
-    params:params
+    url: '/api/stock/salesReturn/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function getReturnList(params){
+export function getReturnList(params) {
   return request({
-    url:'/api/salesreturninfo/list',
-    method:'get',
-    params:params
+    url: '/api/salesreturninfo/list',
+    method: 'get',
+    params: params
   })
 }
-export function deleteSalesReturnInfo(params){
+export function deleteSalesReturnInfo(params) {
   return request({
-    url:'/api/salesreturninfo/delete',
-    method:'post',
-    params:params
+    url: '/api/salesreturninfo/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-
-export function editSalesReturnInfo(params,return_time,id){
+export function editSalesReturnInfo(params, return_time, id) {
   return request({
-    url:'/api/salesreturn/edit?return_time='+return_time+"&id="+id,
-    method:'post',
-    data:params
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id,
+    method: 'post',
+    data: params
   })
 }
 
-
-export function deleteWarehouseOut(params){
+export function deleteWarehouseOut(params) {
   return request({
-    url:'/api/warehouseout/delete',
-    method:'post',
-    params:params
+    url: '/api/warehouseout/delete',
+    method: 'post',
+    params: params
   })
 }
 
-export function deleteWarehouseOutInfo(params){
+export function deleteWarehouseOutInfo(params) {
   return request({
-    url:'/api/warehouseoutinfo/delete',
-    method:'post',
-    params:params
+    url: '/api/warehouseoutinfo/delete',
+    method: 'post',
+    params: params
   })
 }
 
-
-export function getWarehouseOutList(params){
+export function getWarehouseOutList(params) {
   return request({
-    url:'/api/warehouseout/list',
-    method:'get',
-    params:params
+    url: '/api/warehouseout/list',
+    method: 'get',
+    params: params
   })
 }
 
-export function getWarehouseOutInfo(params){
+export function getWarehouseOutInfo(params) {
   return request({
-    url:'/api/warehouseout/info',
-    method:'get',
-    params:params
+    url: '/api/warehouseout/info',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function editWarehouseoutInfo(params,warehouse_out_time,id){
+export function editWarehouseoutInfo(params, warehouse_out_time, id) {
   return request({
-    url:'/api/warehouseout/edit?warehouse_out_time='+warehouse_out_time+"&id="+id,
-    method:'post',
-    data:params
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id,
+    method: 'post',
+    data: params
   })
 }
 
-
-
-
-export function getCancelStockList(params){
+export function getCancelStockList(params) {
   return request({
-    url:'/api/cancelstock/list',
-    method:'get',
-    params:params
+    url: '/api/cancelstock/list',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-export function editCancelStockInfo(params,cancel_stock_time,id){
+export function editCancelStockInfo(params, cancel_stock_time, id) {
   return request({
-    url:'/api/cancelstockinfo/edit?cancel_time='+cancel_stock_time+"&id="+id,
-    method:'post',
-    data:params
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id,
+    method: 'post',
+    data: params
   })
 }
 
-
-export function getCancelStockInfo(params){
+export function getCancelStockInfo(params) {
   return request({
-    url:'/api/cancelstock/info',
-    method:'get',
-    params:params
+    url: '/api/cancelstock/info',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-export function deleteCancelStock(params){
+export function deleteCancelStock(params) {
   return request({
-    url:'/api/cancelstock/delete',
-    method:'post',
-    params:params
+    url: '/api/cancelstock/delete',
+    method: 'post',
+    params: params
   })
 }
 
-export function deleteCancelStockInfo(params){
+export function deleteCancelStockInfo(params) {
   return request({
-    url:'/api/cancelstockinfo/delete',
-    method:'post',
-    params:params
+    url: '/api/cancelstockinfo/delete',
+    method: 'post',
+    params: params
   })
 }
 
-export function postCancelStock(params,cancelStockTime,manufacturer_id,dealer_id,type){
+export function postCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type) {
   return request({
-    url:'/api/cancelstock/create?time='+cancelStockTime+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id+"&type="+type,
-    method:'post',
-    data:params
+    url: '/api/cancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    method: 'post',
+    data: params
   })
 }
-export function getCancelStockConfig(){
+export function getCancelStockConfig(params) {
   return request({
-    url:'/api/cancelstockinfo/config',
-    method:'get',
+    url: '/api/cancelstockinfo/config',
+    method: 'get',
+    params: params
   })
 }
 
-

src/components/Hamburger/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="" viewBox="0 0 1024 1024"
+    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="fill:#bfcbd9" viewBox="0 0 1024 1024"
       version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1691" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
       <path d="M966.8023 568.849776 57.196677 568.849776c-31.397081 0-56.850799-25.452695-56.850799-56.850799l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 543.397081 998.200404 568.849776 966.8023 568.849776z"
         p-id="1692"></path>
@@ -32,8 +32,8 @@ export default {
 .hamburger {
   display: inline-block;
   cursor: pointer;
-  width: 20px;
-  height: 20px;
+  width: 16px;
+  height: 16px;
   transform: rotate(90deg);
   transition: .38s;
   transform-origin: 50% 50%;

src/lang/zh.js

@@ -68,8 +68,8 @@ export default {
     paper: '透析管理',
     advice: '今日医嘱',
     prepare: '透析准备',
-    dialysisPrintOrder:'打印透析单',
-    details:'透析',
+    dialysisPrintOrder: '打印透析单',
+    details: '透析',
     data_dictionary: '数据字典',
     field_config: '字段配置',
     template: '模版配置',
@@ -89,8 +89,8 @@ export default {
     weight: '干体重',
     dialysisRecord: '透析记录',
     scheduling: '排班信息',
-    proeducation:'宣教信息',
-    doctorAdvice:'医嘱信息',
+    proeducation: '宣教信息',
+    doctorAdvice: '医嘱信息',
     device: '设备',
     deviceManage: '设备管理',
     dialysisMachineManage: '透析机管理',
@@ -99,51 +99,60 @@ export default {
     sign: '治疗签到',
     remind: '排班提醒',
     signWeight: '签到称重',
-    deviceZoneManage: "分区管理",
-    deviceGroupManage: "分组管理",
-    deviceNumberManage: "床位管理",
-    service:'我的服务',
-    invoice:'发票管理',
-    invoiceApply:'申请发票',
-    servicePay:'立即支付',
-    serviceOrder:'购买服务',
-    payType:'选择支付方式',
-    weChatPay:'确认支付',
-    completeOrder:'购买结果',
-    orderRecord:'订单详情',
-    recordList:'订单记录',
-    stockManage:'库存管理',
-    goodType:'物品类型',
-    stockIn:'入库管理',
-    stockOut:'出库管理',
-    manufacturer:'厂家',
-    dealer:'经销商',
-    salesReturn:'退货',
-    salesReutrnRecord:'退货记录',
-    warehouseRecord:'入库记录',
-    addStockOut:'出库',
-    cancelStock:'出库退库',
-    cancelStockRecord:'退库记录',
-    stockOutRecord:'出库记录',
-    addStockIn:'入库',
-    stockQuery:'库存查询',
-    workforce_template: "排班模板设置",
-    statistics:"统计分析",
-    config:'库存配置',
-    goodInfo:'物品信息',
-    CourseOfDiseaseManage: "病程管理",
-    RescueRecord: "抢救记录",
-    special_permission_manage: "特殊权限管理",
-    schedule_print: "排班打印",
+    deviceZoneManage: '分区管理',
+    deviceGroupManage: '分组管理',
+    deviceNumberManage: '床位管理',
+    service: '我的服务',
+    invoice: '发票管理',
+    invoiceApply: '申请发票',
+    servicePay: '立即支付',
+    serviceOrder: '购买服务',
+    payType: '选择支付方式',
+    weChatPay: '确认支付',
+    completeOrder: '购买结果',
+    orderRecord: '订单详情',
+    recordList: '订单记录',
+    stockManage: '库存管理',
+    goodType: '物品类型',
+    stockIn: '入库管理',
+    stockOut: '出库管理',
+    manufacturer: '厂家',
+    dealer: '经销商',
+    salesReturn: '退货',
+    salesReutrnRecord: '退货记录',
+    warehouseRecord: '入库记录',
+    addStockOut: '出库',
+    cancelStock: '出库退库',
+    cancelStockRecord: '退库记录',
+    stockOutRecord: '出库记录',
+    addStockIn: '入库',
+    stockQuery: '库存查询',
+    workforce_template: '排班模板设置',
+    statistics: '统计分析',
+    config: '库存配置',
+    goodInfo: '物品信息',
+    CourseOfDiseaseManage: '病程管理',
+    RescueRecord: '抢救记录',
+    special_permission_manage: '特殊权限管理',
+    schedule_print: '排班打印',
+
+    stockInOrder: '入库单',
+    salesReturnOrder: '退货单',
+    stockOutOrder: '出库单',
+    cancelStockOrder: '出库退库单',
+    otherStockInOrder: '其他入库单',
+    otherSalesReturnOrder: '其他退货单',
+    otherStockOutOrder: '其他出库单',
+    otherCancelStockOrder: '其他出库退库单',
+    stockInOrderAdd: '新增入库单',
+    salesReturnOrderAdd: '新增退货单',
+    stockOutOrderAdd: '新增出库单',
+    cancelStockOrderAdd: '新增出库退库单',
+    stockInDetail: '入库单详情',
+    salesReturnDetail: '退货单详情',
+    stockOutDetail: '出库单详情',
+    cancelStockDetail: '出库退库单详情'
 
-    stockInOrder:"入库单",
-    salesReturnOrder:"退货单",
-    stockOutOrder:"出库单",
-    cancelStockOrder:"出库退库单",
-    otherStockInOrder:"其他入库单",
-    otherSalesReturnOrder:"其他退货单",
-    otherStockOutOrder:"其他出库单",
-    otherCancelStockOrder:"其他出库退库单",
   },
   navbar: {
     logOut: '退出登录',
@@ -245,6 +254,6 @@ export default {
     config_value: '字段值',
     remark: '备注',
     course_disease: '病程',
-    rescue_record: '抢救记录',
+    rescue_record: '抢救记录'
   }
 }

src/router/index.js

@@ -496,28 +496,28 @@ export const xt_constantRouterMap = [
         name: 'stockOutOrderAdd',
         hidden: true,
         is_menu: false,
-        meta: { title: 'stockOutOrderAdd', noCache: true }
+        meta: { title: 'stockOutOrderAdd' }
       }, {
         path: '/stock/out/detail',
         component: () => import('@/xt_pages/stock/stockOutDetail'),
         name: 'stockOutDetail',
         hidden: true,
         is_menu: false,
-        meta: { title: 'stockOutDetail', noCache: true }
+        meta: { title: 'stockOutDetail' }
       }, {
         path: '/stock/cancel/add',
         component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
         name: 'cancelStockOrderAdd',
         hidden: true,
         is_menu: false,
-        meta: { title: 'cancelStockOrderAdd', noCache: true }
+        meta: { title: 'cancelStockOrderAdd' }
       }, {
         path: '/stock/cancel/detail',
         component: () => import('@/xt_pages/stock/cancelStockDetail'),
         name: 'cancelStockDetail',
         hidden: true,
         is_menu: false,
-        meta: { title: 'cancelStockDetail', noCache: true }
+        meta: { title: 'cancelStockDetail' }
       }
 
     ]

src/styles/index.scss

@@ -139,7 +139,7 @@ code {
   padding: 20px;
   background: #fff;
   margin: 0 15px 15px 15px;
-  min-height: calc(100vh - 185px);
+  min-height: calc(100vh - 178px);
 }
 
 .components-container {
@@ -385,12 +385,12 @@ code {
           float: left;
           list-style: none;
           cursor: pointer;
-          padding: 6px 0;
+          padding: 6px 10px;
           color: #606266;
           border-radius: 4px;
           margin: 0 8px 0 0;
           font-size: 14px;
-          width: 70px;
+          // width: 70px;
           text-align: center;
           &:hover {
             background: #f5f7fa;
@@ -412,11 +412,19 @@ code {
     .cell {
       margin: 0;
       padding: 0 12px;
+      display: inline-block;
+    }
+  }
+  th{
+    .cell{
+      color: #999!important;
+      
     }
   }
   td {
     .cell {
       padding: 0 12px;
+      color: #606266;
     }
   }
 }
@@ -443,7 +451,7 @@ code {
 
 
 .el-dialog__wrapper{
-  z-index: 9999 !important;
+  // z-index: 2012 !important;
 }
 
 .el-dialog{

src/views/layout/components/Navbar.vue

@@ -127,7 +127,7 @@ export default {
   top: 0;
   left: 0;
   right: 0;
-  z-index: 999;
+  z-index: 2052;
   .nav-logo {
     width: 162px;
     display: flex;

src/views/layout/components/Sidebar/index.vue

@@ -5,12 +5,14 @@
     </div>
     <el-menu
       mode="vertical"
+      unique-opened="ture"
       :show-timeout="200"
       :default-active="$route.path"
       :collapse="isCollapse"
       background-color="#304156"
       text-color="#bfcbd9"
       active-text-color="#409EFF"
+
     >
       <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
     </el-menu>

src/views/layout/components/TagsView.vue

@@ -124,7 +124,7 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
     position: fixed;
-    z-index: 999;
+    z-index: 2052;
     top: 60px;
     .tags-view-item {
       display: inline-block;

src/views/login/index.vue

@@ -179,7 +179,7 @@ export default {
         }
       }
     }
-    .el-form-item {
+     {
       border: 1px solid rgba(255, 255, 255, 0.1);
       background: rgba(0, 0, 0, 0.1);
       border-radius: 5px;

src/xt_pages/data/components/tableson.vue

@@ -15,15 +15,14 @@
         <template slot-scope="scope">
 
          <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-           <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleUpdate(scope.row)"></el-button>
+           <el-button icon="el-icon-edit-outline" type="primary" size="small" @click="handleUpdate(scope.row)"></el-button>
          </el-tooltip>
 
          <el-tooltip class="item" effect="dark" content="删除" placement="top">
-          <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="mini" type="danger" @click="handleModifyStatus(scope.row,'deleted')">
+          <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger" @click="handleModifyStatus(scope.row,'deleted')">
           </el-button>
          </el-tooltip>
          
-       
         </template>
       </el-table-column>
     </el-table>

src/xt_pages/data/components/templateTable.vue

@@ -23,10 +23,10 @@
       <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-           <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleUpdate(scope.row)"></el-button>
+           <el-button icon="el-icon-edit-outline" type="primary" size="small" @click="handleUpdate(scope.row)"></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="删除" placement="top">
-            <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="mini" type="danger" @click="handleModifyStatus(scope.row,'deleted')">
+            <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger" @click="handleModifyStatus(scope.row,'deleted')">
             </el-button>
           </el-tooltip>
           
@@ -194,8 +194,8 @@ export default {
     handleModifyStatus(row, status) {
       this.temp = Object.assign({}, row); // copy obj
       this.$confirm("此操作将永久删除该配置项, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
         type: "warning"
       }).then(() => {
           const tempData = Object.assign({}, this.temp);

src/xt_pages/data/druguse.vue

@@ -66,15 +66,17 @@
               <template slot-scope="scope">
                 <el-button
                   type="primary"
-                  size="mini"
+                  size="small"
+                  icon="el-icon-edit-outline"
                   @click="handleUpdateAdviceTemplate(scope.row, scope.$index)"
-                >{{$t('table.edit')}}</el-button>
+                ></el-button>
                 <el-button
                   v-if="scope.row.status!='deleted'"
-                  size="mini"
+                  size="small"
                   type="danger"
+                  icon="el-icon-delete"
                   @click="handleDeleteAdviceTemplate(scope.row, scope.$index)"
-                >{{$t('table.delete')}}</el-button>
+                ></el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -301,15 +303,17 @@
                 <el-button
                   v-show="scope.row.org_id!=0"
                   type="primary"
-                  size="mini"
+                  size="small"
+                  icon="el-icon-edit-outline"
                   @click="handleUpdateDrugWay(scope.row, scope.$index)"
-                >{{$t('table.edit')}}</el-button>
+                ></el-button>
                 <el-button
                   v-show="scope.row.org_id!=0"
-                  size="mini"
+                  size="small"
                   type="danger"
+                  icon="el-icon-delete"
                   @click="handleDeleteDrugWay(scope.row, scope.$index)"
-                >{{$t('table.delete')}}</el-button>
+                ></el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -369,15 +373,17 @@
                 <el-button
                   v-show="scope.row.org_id!=0"
                   type="primary"
-                  size="mini"
+                  size="small"
+                  icon="el-icon-edit-outline"
                   @click="handleUpdateEF(scope.row, scope.$index)"
-                >{{$t('table.edit')}}</el-button>
+                ></el-button>
                 <el-button
                   v-show="scope.row.org_id!=0"
-                  size="mini"
+                  size="small"
                   type="danger"
+                  icon="el-icon-delete"
                   @click="handleDeleteEF(scope.row, scope.$index)"
-                >{{$t('table.delete')}}</el-button>
+                ></el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -584,8 +590,8 @@ export default {
     },
     handleDeleteDrugDic(row, index) {
       this.$confirm("确认删除此医嘱模板?", "删除", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
         type: "warning"
       })
         .then(() => {
@@ -608,8 +614,8 @@ export default {
     },
     handleDeleteAdviceTemplate(row, index) {
       this.$confirm("确认删除此医嘱模板?", "删除", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
         type: "warning"
       })
         .then(() => {
@@ -819,8 +825,8 @@ export default {
     },
     handleDeleteDrugWay(row, index) {
       this.$confirm("确认删除此给药途径?", "删除", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
         type: "warning"
       })
         .then(() => {
@@ -914,8 +920,8 @@ export default {
     },
     handleDeleteEF(row, index) {
       this.$confirm("确认删除此执行频率?", "删除", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
         type: "warning"
       })
         .then(() => {

src/xt_pages/data/druguseTemplate.vue

@@ -138,7 +138,7 @@
                 <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                   <el-button
                     type="primary"
-                    size="mini"
+                    size="small"
                     icon="el-icon-edit-outline"
                     v-if="isShow(scope.$index, scope.row)"
                     @click="handleUpdateAdviceTemplate(scope.row, scope.$index)"
@@ -147,7 +147,7 @@
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" content="删除" placement="top">
                   <el-button
-                    size="mini"
+                    size="small"
                     type="danger"
                     icon="el-icon-delete"
                     @click="handleDeleteAdviceTemplate(scope.row, scope.$index)"
@@ -547,8 +547,6 @@
                 <el-table-column prop="breathing_rate" align="center" label="给药途径">
                   <template slot-scope="scope">
                     <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
-
-
                   </template>
 
                 </el-table-column>
@@ -873,16 +871,18 @@
                 <el-button
                   v-show="scope.row.org_id!=0"
                   type="primary"
-                  size="mini"
+                  size="small"
+                  icon="el-icon-edit-outline"
                   @click="handleUpdateDrugWay(scope.row, scope.$index)"
-                >{{$t('table.edit')}}
+                >
                 </el-button>
                 <el-button
                   v-show="scope.row.org_id!=0"
-                  size="mini"
+                  size="small"
                   type="danger"
+                  icon="el-icon-delete"
                   @click="handleDeleteDrugWay(scope.row, scope.$index)"
-                >{{$t('table.delete')}}
+                >
                 </el-button>
               </template>
             </el-table-column>
@@ -943,16 +943,18 @@
                 <el-button
                   v-show="scope.row.org_id!=0"
                   type="primary"
-                  size="mini"
+                  size="small"
+                  icon="el-icon-edit-outline"
                   @click="handleUpdateEF(scope.row, scope.$index)"
-                >{{$t('table.edit')}}
+                >
                 </el-button>
                 <el-button
                   v-show="scope.row.org_id!=0"
-                  size="mini"
+                  size="small"
                   type="danger"
+                  icon="el-icon-delete"
                   @click="handleDeleteEF(scope.row, scope.$index)"
-                >{{$t('table.delete')}}
+                >
                 </el-button>
               </template>
             </el-table-column>
@@ -1211,8 +1213,8 @@
           return
         }
         this.$confirm('删除记录', '是否删除该医嘱记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
           this.adviceTableData.splice(this.table_current_index, 1)
@@ -1245,8 +1247,8 @@
         this.advice_content_name = "医嘱内容"
       }, cancelTableHandle: function () {
         this.$confirm('放弃编辑', '是否放弃编辑,已编辑的数据将无法恢复', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
           this.adviceTableData = []
@@ -1308,8 +1310,8 @@
       },
       handleDeleteDrugDic(row, index) {
         this.$confirm("确认删除此医嘱模板?", "删除", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
           type: "warning"
         })
           .then(() => {
@@ -1333,8 +1335,8 @@
       },
       handleDeleteAdviceTemplate(row, index) {
         this.$confirm("确认删除此医嘱模板?", "删除", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
           type: "warning"
         })
           .then(() => {
@@ -1605,8 +1607,8 @@
       },
       handleDeleteDrugWay(row, index) {
         this.$confirm("确认删除此给药途径?", "删除", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
           type: "warning"
         })
           .then(() => {
@@ -1701,8 +1703,8 @@
       },
       handleDeleteEF(row, index) {
         this.$confirm("确认删除此执行频率?", "删除", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
           type: "warning"
         })
           .then(() => {
@@ -1848,8 +1850,8 @@
           return
         }
         this.$confirm('删除记录', '是否删除该医嘱记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
           let id = this.adviceTableDataTwo[this.table_current_index_two].id
@@ -2090,8 +2092,8 @@
         this.hoverOrderArr = []
 
         this.$confirm('删除记录', '是否删除该医嘱', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
           let id = row.id
@@ -2150,8 +2152,8 @@
         this.hoverOrderArr = []
 
         this.$confirm('删除子药', '是否删除该子药', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
           let id = row.id
@@ -2226,8 +2228,8 @@
           return
         }
         this.$confirm('删除记录', '是否删除该医嘱记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
           this.adviceTableData.splice(this.table_current_index, 1)

src/xt_pages/device/components/maintain/maintain_record_list_dialog.vue

@@ -37,10 +37,10 @@
                     <el-table-column label="操作" align="center" width="100" :resizable="false">
                         <template slot-scope="scope">
                             <div>
-                                <el-button icon="el-icon-edit" size="small">编辑</el-button>
+                                <el-button icon="el-icon-edit" size="small"></el-button>
                             </div>
                             <div style="margin-top: 5px;">
-                                <el-button type="danger" icon="el-icon-delete" size="small">移除</el-button>
+                                <el-button type="danger" icon="el-icon-delete" size="small"></el-button>
                             </div>
                         </template>
                     </el-table-column>

src/xt_pages/device/components/partition_dialog.vue

@@ -12,7 +12,7 @@
                         <!-- <el-table-column prop="amount" label="机号数量" align="center"></el-table-column> -->
                         <el-table-column label="操作" align="center"> 
                             <template slot-scope="scope">
-                                <el-button type="primary" icon="el-icon-edit" size="mini" @click="modifyZoneAt(scope.row)">编辑</el-button>
+                                <el-button type="primary" icon="el-icon-edit" size="small" @click="modifyZoneAt(scope.row)"></el-button>
 
                                 <!-- <el-popover placement="top" width="160" v-model="scope.row.willDelete">
                                     <el-button type="danger" slot="reference" icon="el-icon-delete" size="mini">删除</el-button>
@@ -36,7 +36,7 @@
                         <!-- <el-table-column prop="amount" label="机号数量" align="center"></el-table-column> -->
                         <el-table-column label="操作" align="center"> 
                             <template slot-scope="scope">
-                                <el-button type="primary" icon="el-icon-edit" size="mini" @click="modifyDeviceNumberAt(scope.row)">编辑</el-button>
+                                <el-button type="primary" icon="el-icon-edit" size="small" @click="modifyDeviceNumberAt(scope.row)"></el-button>
 
                                 <!-- <el-popover placement="top" width="160" v-model="scope.row.visible">
                                     <p>确定要删除吗？</p>
@@ -58,7 +58,7 @@
                         <!-- <el-table-column prop="amount" label="机号数量" align="center"></el-table-column> -->
                         <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
-                                <el-button type="primary" icon="el-icon-edit" size="mini" @click="modifyGroupAt(scope.row)">编辑</el-button>
+                                <el-button type="primary" icon="el-icon-edit" size="small" @click="modifyGroupAt(scope.row)"></el-button>
 
                                 <!-- <el-popover placement="top" width="160" v-model="scope.row.visible">
                                     <p>确定要删除吗？</p>

src/xt_pages/device/components/quality_control/quality_record_list_dialog.vue

@@ -40,8 +40,12 @@
                     <el-table-column label="检测结果(cfu/ml)" prop="detection_result" align="center" width="100" :resizable="false"></el-table-column>
                     <el-table-column label="操作" align="center" width="215" :resizable="false">
                         <template slot-scope="scope">
-                            <el-button icon="el-icon-edit" size="small">编辑</el-button>
-                            <el-button type="danger" icon="el-icon-delete" size="small">移除</el-button>
+                          <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                            <el-button type="primary" icon="el-icon-edit" size="small"></el-button>
+                          </el-tooltip>
+                          <el-tooltip  class="item" effect="dark" content="移除" placement="top">
+                            <el-button  type="danger" icon="el-icon-delete" size="small"></el-button>
+                          </el-tooltip>                          
                         </template>
                     </el-table-column>
                 </el-table>
@@ -69,8 +73,12 @@
                     </el-table-column>
                     <el-table-column label="操作" align="center" width="185" :resizable="false">
                         <template slot-scope="scope">
-                            <el-button icon="el-icon-edit" size="small">编辑</el-button>
-                            <el-button type="danger" icon="el-icon-delete" size="small">移除</el-button>
+                          <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
+                            <el-button type="primary" icon="el-icon-edit" size="small"></el-button>
+                          </el-tooltip>
+                          <el-tooltip class="item" effect="dark" content="移除" placement="top">                            
+                            <el-button type="danger" icon="el-icon-delete" size="small"></el-button>
+                          </el-tooltip>
                         </template>
                     </el-table-column>
                 </el-table>

src/xt_pages/device/components/sterilize_plan/sterilize_plan_pane.vue

@@ -23,7 +23,9 @@
                     </el-table-column>
                     <el-table-column label="操作" min-width="15%" align="center">
                         <template slot-scope="scope">
-                            <el-button type="danger" size="small">移除</el-button>
+                          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                            <el-button type="danger" size="small" icon="el-icon-delete"></el-button>
+                           </el-tooltip>
                         </template>
                     </el-table-column>
                 </el-table>

src/xt_pages/device/components/use_registration_pane.vue

@@ -241,18 +241,19 @@
                 <el-table-column  prop="sign" label="签名" min-width="30px;" align="center" > </el-table-column>
                 <el-table-column  prop="operation" label="操作" min-width="60px;" align="center" > 
                   <template  slot-scope="scope">
-                    <el-button type="primary"   icon="el-icon-edit" size="mini"></el-button>
-                    <!-- <el-button type="danger" slot="reference"  icon="el-icon-delete" size="mini" ></el-button> -->
+
+                    <el-button type="primary"   icon="el-icon-edit" size="small"></el-button>
+                    <!-- <el-button type="danger" slot="reference"  icon="el-icon-delete" size="small" ></el-button> -->
                      <el-popover
                                 placement="top"
                                 width="160"
                                 v-model="scope.row.visible">
                                 <p>确定要删除吗？</p>
                                 <div style="text-align: right; margin: 0">
-                                    <el-button type="primary" size="mini" @click="scope.row.visible = false;">确定</el-button>                            
-                                    <el-button size="mini" type="text" @click="scope.row.visible = false;">取消</el-button>
+                                    <el-button size="mini" type="text" @click="scope.row.visible = false;">取 消</el-button>                                    
+                                    <el-button type="primary" size="mini" @click="scope.row.visible = false;">确 定</el-button>                            
                                 </div>
-                           <el-button type="danger" slot="reference"  icon="el-icon-delete" size="mini" ></el-button>
+                           <el-button type="danger" slot="reference"  icon="el-icon-delete" size="small" ></el-button>
                      </el-popover>
                   </template> 
                 </el-table-column>

src/xt_pages/device/components/water_pane.vue

@@ -190,8 +190,8 @@
                 <el-table-column  prop="sign" label="签名" min-width="30px;" align="center" > </el-table-column>
                 <el-table-column  prop="operation" label="操作" min-width="70px;" align="center" > 
                   <template  slot-scope="scope">
-                    <el-button type="primary"   icon="el-icon-edit" size="mini"  ></el-button>
-                    <!-- <el-button type="danger" slot="reference"  icon="el-icon-delete" size="mini" ></el-button> -->
+                    <el-button type="primary"   icon="el-icon-edit" size="small"  ></el-button>
+                    <!-- <el-button type="danger" slot="reference"  icon="el-icon-delete" size="small" ></el-button> -->
                     <el-popover
                                 placement="top"
                                 width="160"

src/xt_pages/device/group_main.vue

@@ -12,10 +12,10 @@
                     <el-table-column label="操作" align="center">
                         <template slot-scope="scope">
                            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="mini" @click="modifyGroupAt(scope.row)"></el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="small" @click="modifyGroupAt(scope.row)"></el-button>
                            </el-tooltip>
                            <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="mini" @click="deleteGroupAt(scope.row)"></el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="small" @click="deleteGroupAt(scope.row)"></el-button>
                            </el-tooltip>
                         </template>  
                     </el-table-column>

src/xt_pages/device/number_main.vue

@@ -14,10 +14,10 @@
                     <el-table-column label="操作" align="center"> 
                         <template slot-scope="scope">
                            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="mini" @click="modifyDeviceNumberAt(scope.row)"></el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="small" @click="modifyDeviceNumberAt(scope.row)"></el-button>
                            </el-tooltip>
                            <el-tooltip class="item" effect="dark" content="删除" placement="top">                           
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="mini" @click="deleteDeviceNumberAt(scope.row)"></el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="small" @click="deleteDeviceNumberAt(scope.row)"></el-button>
                            </el-tooltip>                           
                         </template>  
                     </el-table-column>

src/xt_pages/device/zone_main.vue

@@ -17,10 +17,10 @@
                     <el-table-column label="操作" align="center"> 
                         <template slot-scope="scope">
                           <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="mini" @click="modifyZoneAt(scope.row)"></el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" icon="el-icon-edit-outline" size="small" @click="modifyZoneAt(scope.row)"></el-button>
                           </el-tooltip>  
                           <el-tooltip class="item" effect="dark" content="删除" placement="top">                          
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="mini" @click="deleteZoneAt(scope.row)"></el-button>
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" icon="el-icon-delete" size="small" @click="deleteZoneAt(scope.row)"></el-button>
                           </el-tooltip>  
                         </template>  
                     </el-table-column>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -418,70 +418,7 @@
         cursor: pointer;
       }
     }
-    // .cell {
-    //   margin: 0px 0 15px 0;
-    //   -moz-box-sizing: border-box;
-    //   -webkit-box-sizing: border-box;
-    //   -o-box-sizing: border-box;
-    //   -ms-box-sizing: border-box;
-    //   box-sizing: border-box;
-    //   display: -webkit-box;
-    //   display: -ms-flexbox;
-    //   // display: flex;
-    //   -webkit-box-align: flex-start;
-    //   -ms-flex-align: flex-start;
-    //   align-items: flex-start;
-    //   text-align: left;
-    //   justify-content: flex-start;
-    //   color: #333;
-    //   .title {
-    //     width: 80px;
-    //     display: inline-block;
-    //     font-weight: normal;
-    //     color: #909399;
-    //     padding: 6px 0;
-    //     font-weight: 700;
-    //     .name {
-    //       width: 60px;
-    //       text-align: justify;
-    //       text-justify: distribute-all-lines;
-    //       text-align-last: justify;
-    //       -moz-text-align-last: justify;
-    //       -webkit-text-align-last: justify;
-    //       display: inline-block;
-    //     }
-    //   }
-    //   .time {
-    //     -webkit-box-flex: 1;
-    //     -ms-flex: 1;
-    //     flex: 1;
-    //     ul {
-    //       padding: 0;
-    //       margin: 0;
-    //       li {
-    //         float: left;
-    //         list-style: none;
-    //         cursor: pointer;
-    //         padding: 3px 0;
-    //         width: 70px;
-    //         color: #606266;
-    //         border-radius: 4px;
-    //         margin: 0 10px 0 0;
-    //         color: #409eff;
-    //         border: 1px #409eff solid;
-    //         text-align: center;
-    //         &:hover {
-    //           background: #409eff;
-    //           color: #fff;
-    //         }
-    //       }
-    //       .active {
-    //         background: #409eff;
-    //         color: #fff;
-    //       }
-    //     }
-    //   }
-    // }
+    
     .amount {
       font-weight: normal;
       padding: 10px 0 0 0;

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

@@ -98,7 +98,7 @@
         </el-table-column>
         <!--<el-table-column label="操作" min-width="20" align="center">-->
           <!--<template slot-scope="scope">-->
-            <!--<el-button type="primary" size="mini"-->
+            <!--<el-button type="primary" size="small"-->
                        <!--@click="scope.row.groupno>0?openEditGroupAdvice(scope.row.groupno):openEdit(scope.$index, scope.row)"-->
                        <!--v-if="isShowStartTime(scope.$index, scope.row)">编辑-->
             <!--</el-button>-->

src/xt_pages/dialysis/dialysisPrepare.vue

@@ -159,35 +159,5 @@
 
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .cell {
-  .name {
-    float: left;
-    width: 88px;
-    text-align: right;
-    color: #606266;
-    height: 36px;
-    line-height: 36px;
-  }
-  .type {
-    float: left;
-    ul {
-      padding: 0;
-      margin: 0;
-      li {
-        float: left;
-        list-style-type: none;
-        padding: 0 10px;
-        border-radius: 6px;
-        margin: 0 10px;
-        height: 36px;
-        line-height: 36px;
-        color:#606266;
-        &:hover{
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
-}
+
 </style>

src/xt_pages/dialysis/doctorAdvice.vue

@@ -217,52 +217,4 @@ export default {
 
 
 <style rel="stylesheet/scss"  lang="scss" scoped >
-// .title{
-//   float: left;
-//   width: 80px;
-//   height: 36px;
-//   line-height: 36px;
-//   text-align: right;
-// }
-.cell {
-  .name {
-    float: left;
-    width: 88px;
-    text-align: right;
-    color: #606266;
-    height: 36px;
-    line-height: 36px;
-  }
-  .type {
-    float: left;
-    ul {
-      padding: 0;
-      margin: 0;
-      li {
-        float: left;
-        list-style-type: none;
-        padding: 0 10px;
-        border-radius: 6px;
-        margin: 0 10px;
-        height: 36px;
-        line-height: 36px;
-        color:#606266;
-        &:hover{
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
-  .collate{
-    float: left;
-    margin: 0 0 0 20px;
-    .tit{
-      color: #606266;
-      margin: 0 6px 0 0;
-      font-weight: normal;
-    }
-
-  }
-}
 </style>

src/xt_pages/dialysis/schedualPatient2.vue

@@ -318,70 +318,6 @@
         cursor: pointer;
       }
     }
-    .cell {
-      margin: 0px 0 15px 0;
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      -o-box-sizing: border-box;
-      -ms-box-sizing: border-box;
-      box-sizing: border-box;
-      display: -webkit-box;
-      display: -ms-flexbox;
-      // display: flex;
-      -webkit-box-align: flex-start;
-      -ms-flex-align: flex-start;
-      align-items: flex-start;
-      text-align: left;
-      justify-content: flex-start;
-      color: #333;
-      .title {
-        width: 80px;
-        display: inline-block;
-        font-weight: normal;
-        color: #909399;
-        padding: 6px 0;
-        font-weight: 700;
-        .name {
-          width: 60px;
-          text-align: justify;
-          text-justify: distribute-all-lines;
-          text-align-last: justify;
-          -moz-text-align-last: justify;
-          -webkit-text-align-last: justify;
-          display: inline-block;
-        }
-      }
-      .time {
-        -webkit-box-flex: 1;
-        -ms-flex: 1;
-        flex: 1;
-        ul {
-          padding: 0;
-          margin: 0;
-          li {
-            float: left;
-            list-style: none;
-            cursor: pointer;
-            padding: 3px 0;
-            width: 70px;
-            color: #606266;
-            border-radius: 4px;
-            margin: 0 10px 0 0;
-            color: #409eff;
-            border: 1px #409eff solid;
-            text-align: center;
-            &:hover {
-              background: #409eff;
-              color: #fff;
-            }
-          }
-          .active {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-      }
-    }
     .amount {
       font-weight: normal;
       padding: 10px 0 0 0;

src/xt_pages/qcd/dialysisTotal.vue

@@ -448,66 +448,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/outcomeIndicators/control.vue

@@ -428,66 +428,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/outcomeIndicators/query.vue

@@ -355,66 +355,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/patientAnalysis/bloodPressure.vue

@@ -452,66 +452,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/patientAnalysis/dialysisAge.vue

@@ -416,66 +416,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/patientAnalysis/lapseto.vue

@@ -398,66 +398,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/patientAnalysis/total.vue

@@ -361,66 +361,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/patientAnalysis/weight.vue

@@ -493,66 +493,7 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
+
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/processIndicators.1.vue

@@ -362,66 +362,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/qcd/processIndicators.vue

@@ -378,66 +378,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/role/admin.vue

@@ -31,10 +31,16 @@
       <el-table-column label="操作" width="210px">
         <template slot-scope="scope">
           <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}">
-            <el-button type="primary" icon="el-icon-edit-outline">编辑</el-button>
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+              <el-button type="primary" icon="el-icon-edit-outline" size="small"></el-button>
+            </el-tooltip> 
           </router-link>
-          <el-button type="danger" icon="el-icon-delete" v-if="scope.row.status == 1" @click="disableAdminAction(scope.row)">移除</el-button>
-          <el-button size="medium" type="info" icon="el-icon-refresh" v-if="scope.row.status == 0" @click="recoverAdminAction(scope.row)">恢复</el-button>
+          <el-tooltip class="item" effect="dark" content="移除" placement="top">
+            <el-button type="danger" size="small" icon="el-icon-delete" v-if="scope.row.status == 1" @click="disableAdminAction(scope.row)"></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="恢复" placement="top">
+            <el-button size="small" type="info" icon="el-icon-refresh" v-if="scope.row.status == 0" @click="recoverAdminAction(scope.row)"></el-button>
+          </el-tooltip>
         </template>
       </el-table-column>
     </el-table>

src/xt_pages/role/role.vue

@@ -22,11 +22,22 @@
       <el-table-column label="操作" min-width="40%">
         <template slot-scope="scope">
           <router-link :to='{ path:"/role/perview", query:{ id:scope.row.id }}'>
-            <el-button type="warning" icon="el-icon-setting">权限设置</el-button>
+            <el-tooltip class="item" effect="dark" content="权限设置" placement="top">
+              <el-button type="warning" icon="el-icon-setting" size="small"></el-button>
+            </el-tooltip>
           </router-link>
-          <el-button type="primary" icon="el-icon-edit-outline" @click="modifyRoleAction(scope.row)">编辑</el-button>
-          <el-button type="danger" icon="el-icon-delete" v-if="scope.row.status === 1" @click="disableRoleAction(scope.row)">移除</el-button>
-          <el-button type="info" icon="el-icon-refresh" v-if="scope.row.status !== 1" @click="recoverRoleAction(scope.row)">恢复</el-button>
+          <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+           <el-button type="primary" size="small" icon="el-icon-edit-outline" @click="modifyRoleAction(scope.row)"></el-button>
+          </el-tooltip>
+          
+          <el-tooltip class="item" effect="dark" content="移除" placement="top">
+           <el-button type="danger" size="small" icon="el-icon-delete" v-if="scope.row.status === 1" @click="disableRoleAction(scope.row)"></el-button>
+          </el-tooltip>
+          
+          <el-tooltip class="item" effect="dark" content="恢复" placement="top">
+           <el-button type="info" size="small" icon="el-icon-refresh" v-if="scope.row.status !== 1" @click="recoverRoleAction(scope.row)"></el-button>
+          </el-tooltip>
+          
         </template>
       </el-table-column>
     </el-table>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -2,7 +2,7 @@
   <el-dialog width="854px" :title="titles" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
-    <el-form class="demo-form-inline" 
+    <el-form class="demo-form-inline"
              :rules="rules" :model="form" ref="form"
              label-width="116px">
       <el-row>
@@ -40,7 +40,7 @@
         </el-col>
       </el-row>
 
-      <el-row>     
+      <el-row>
         <el-col :span="8">
           <el-form-item label="生产厂家" prop="dealer">
             <el-select  v-model="form.manufacturer" placeholder="请选择">
@@ -73,8 +73,8 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
-      <el-row>           
+
+      <el-row>
         <el-col :span="8">
           <el-form-item label="出货价" prop="sell_price">
             <el-input  type="number" v-model="form.sell_price"></el-input>
@@ -93,8 +93,8 @@
           </el-form-item>
         </el-col>
       </el-row>
-    
-      <el-row>           
+
+      <el-row>
        <el-col :span="16">
         <el-form-item label="是否可复用" prop="is_reuse">
             <el-radio v-model="form.is_reuse" label="1">可以</el-radio>
@@ -102,7 +102,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-col>
         <el-form-item label="备注" prop="remark">
           <el-input type="textarea" :row="5" v-model="form.remark"
@@ -123,10 +123,8 @@
 </template>
 
 <script>
-
-
   export default {
-    name: "goodInfoDailog",
+    name: 'goodInfoDailog',
     data() {
       return {
         good_unit: '',
@@ -142,15 +140,15 @@
           dealer: '',
           expiry_date_warn_day_count: '',
           stock_warn_count: '',
-          is_reuse: '2',
+          is_reuse: '2'
         },
 
         rules: {
           specification_name: [
-            {required: true, message: '请输入规格名称', trigger: 'blur'},
+            { required: true, message: '请输入规格名称', trigger: 'blur' }
           ],
           good_id: [
-            {required: true, message: '请选择物品类型', trigger: 'change'}
+            { required: true, message: '请选择物品类型', trigger: 'change' }
           ]
 
         }
@@ -163,33 +161,31 @@
       },
       titles: {
         type: String,
-        default: "",
+        default: ''
       },
       formValue: {
         type: Object
       },
       isCreated: {
         type: Number,
-        default: 1,
+        default: 1
 
       }
 
     },
     methods: {
-      cancle: function (formName) {
-
-        this.$emit('dialog-cancle', this.getValue());
-
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
       },
-      comfirm: function (formName) {
+      comfirm: function(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            this.$emit('dialog-comfirm', this.getValue());
+            this.$emit('dialog-comfirm', this.getValue())
           }
-        });
+        })
       },
-      getValue: function () {
-        let form = {}
+      getValue: function() {
+        const form = {}
         form['specification_name'] = this.form.specification_name
         form['good_unit'] = this.good_unit
         form['buy_price'] = this.form.buy_price
@@ -203,17 +199,16 @@
         form['isCreated'] = this.isCreated
         form['good_id'] = this.form.good_id
         return form
-      }, changeSelected: function (val) {
-
+      }, changeSelected: function(val) {
         console.log(val)
       }
     },
     watch: {
       visibility(val) {
-
         this.form = this.formValue
+        console.log(this.form)
         this.good_unit = this.formValue.good_unit
-        if(this.isCreated == 1){
+        if (this.isCreated == 1) {
           this.good_unit = ''
         }
       }

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -1,11 +1,169 @@
 <template>
+  <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :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.goodType"
+          ref="templatetable"
+          border
+          highlight-current-row
+          max-height="250"
+          @current-change="goodTypeTableChange"
+          style="width: 100%">
+          <el-table-column
+            prop="type_name"
+            label="商品类型">
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="16">
+        <el-table
+          :data="goodInfoTableData"
+          border
+          ref="multipleTable"
+          max-height="250"
+          @selection-change="changeGoodInfoTableData"
+          @select-all="changeAllGoodInfoTableData"
+          row-key="row_key"
+          style="width: 100%"
+        >
+          <el-table-column
+            type="selection"
+            width="55">
+          </el-table-column>
+          <el-table-column
+            label="规格名称"
+            property="specification_name"
+            style="word-break: keep-all;white-space:nowrap;"
+          ></el-table-column>
+          <el-table-column
+            label="单位"
+            property="good_unit"
+          >
+            <template slot-scope="scope">
+              <span>{{getName(scope.row.good_unit)}}</span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-col>
+    </el-row>
+
+
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="cancle()">取 消</el-button>
+    <el-button type="primary" @click="comfirm()">确 定</el-button>
+  </span>
+  </el-dialog>
 
 </template>
 
 <script>
-    export default {
-        name: "sales-return-dialog"
+  export default {
+    name: 'salesReturnDialog',
+    data() {
+      return {
+        goodInfo: [],
+        goodInfoTableData: [],
+        keywords: '',
+        multipleSelection: [],
+        currentGoodTypeId: 0,
+        isClose: false
+      }
+    },
+    props: {
+      propForm: {
+        type: Object
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      }
+
+    },
+    methods: {
+      goodTypeTableChange: function(currentRow, oldCurrentRow) {
+        this.currentGoodTypeId = currentRow.id
+
+        this.goodInfoTableData = []
+        this.goodInfo = []
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.currentGoodTypeId == this.propForm.goodInfo[i].good_type_id) {
+            this.goodInfo.push(this.propForm.goodInfo[i])
+            this.goodInfoTableData.push(this.propForm.goodInfo[i])
+          }
+        }
+      },
+      cancle: function() {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs.multipleTable.clearSelection()
+      },
+      comfirm: function() {
+        this.$emit('dialog-comfirm', this.getValue())
+        this.$refs.multipleTable.clearSelection()
+      },
+      getValue: function() {
+        const obj = {
+          selectedGoodInfo: this.multipleSelection,
+          goodTypeId: this.currentGoodTypeId
+        }
+        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].specification_name.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) {
+        this.multipleSelection = val
+      }, changeAllGoodInfoTableData: function(val) {
+        this.multipleSelection = val
+      }
     }
+  }
+
 </script>
 
 <style scoped>

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -1,146 +1,83 @@
 <template>
   <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose" width="854px">
+             :close-on-press-escape="isClose">
 
-    <el-form  class="demo-form-inline" 
-              :rules="rules" :model="form" ref="form"
-             label-width="100px">
-    <el-row>
-      <el-col :span="8">
-        <el-form-item label="物品类型" prop="good_type_id">
-          <el-select v-model="form.good_type_id" placeholder="请选择"     @change="goodTypeSelect"
-          >
-            <el-option
-              v-for="item in tempGoodType"
-              :key="item.id"
-              :label="item.type_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="8">
-        <el-form-item label="规格名称" prop="good_id">
-          <el-select v-model="form.good_id" placeholder="请选择"  @change="goodInfoSelect">
-            <el-option
-              v-for="item in tempGoodInfo"
-
-              :key="item.id"
-              :label="item.specification_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="8">
-        <el-form-item label="批号" prop="number">
-          <el-input v-model="form.number"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    
-    <el-row>    
-      <el-col :span="8">
-        <el-form-item label="生产日期" prop="product_date">
-          <el-date-picker v-model="form.product_date" prefix-icon="el-icon-date" :editable="false"
-                          style="width: 173px;"
-                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"></el-date-picker>
-        </el-form-item>
-      </el-col>
+    <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-form-item label="有效日期" prop="expiry_date">
-          <el-date-picker v-model="form.expiry_date" prefix-icon="el-icon-date" :editable="false"
-                          style="width: 173px;"
-                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"></el-date-picker>
-        </el-form-item>
-
-
-      </el-col>
-
-      <el-col :span="8">
-        <el-form-item label="入库数量" prop="warehousing_count">
-          <el-input type="number" v-model="form.warehousing_count"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>        
-      <el-col :span="8">
-        <el-form-item label="物品单价" prop="price">
-          <el-input type="number"  v-model="form.price"></el-input>
-        </el-form-item>
+        <el-table
+          :data="propForm.goodType"
+          ref="templatetable"
+          border
+          highlight-current-row
+          max-height="250"
+          @current-change="goodTypeTableChange"
+          style="width: 100%">
+          <el-table-column
+            prop="type_name"
+            label="商品类型">
+          </el-table-column>
+        </el-table>
       </el-col>
+      <el-col :span="16">
+        <el-table
+          :data="goodInfoTableData"
+          border
+          ref="multipleTable"
+          max-height="250"
+          @selection-change="changeGoodInfoTableData"
+          @select-all="changeAllGoodInfoTableData"
+          row-key="row_key"
+          style="width: 100%"
+        >
+          <el-table-column
+            type="selection"
+            width="55">
+          </el-table-column>
+          <el-table-column
+            label="规格名称"
+            property="specification_name"
+            style="word-break: keep-all;white-space:nowrap;"
+          ></el-table-column>
+          <el-table-column
+            label="单位"
+            property="good_unit"
+          >
+            <template slot-scope="scope">
+              <span>{{getName(scope.row.good_unit)}}</span>
+            </template>
+          </el-table-column>
 
-      <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-table>
       </el-col>
     </el-row>
-    
-    </el-form>
 
 
     <span slot="footer" class="dialog-footer">
-    <el-button v-if="propForm.isCreated == 3" @click="cancle('form')">取 消</el-button>
-    <el-button v-if="propForm.isCreated != 3 " @click="cancle('form')">取 消</el-button>
-    <el-button v-if="propForm.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 { GetGoodInfoByGoodId } from '@/api/stock'
+
   export default {
-    name: "stockInDialog",
+    name: 'stockInDialog',
     data() {
       return {
-        form:{
-          good_type_id: '',
-          good_id: '',
-          number: '',
-          product_date: '',
-          expiry_date: '',
-          warehousing_count: '',
-          price: '',
-          remark: '',
-          dealer: '',
-          manufacturer: '',
-        },
-        tempGoodType: [],
-        tempGoodInfo: [],
-        isClose: false,
-        size: 11,
-        isShow: true,
-        rules: {
-          good_id: [
-            {required: true, message: '请选择物品类型', trigger: 'change'}
-          ],
-          good_type_id: [
-            {required: true, message: '请选择规格名称', trigger: 'change'}
-          ],
-          number: [
-            {required: true, message: '请输入批号', trigger: 'blur'}
-          ],
-          expiry_date: [
-            {required: true, message: '请选择日期', trigger: 'change'}
-          ],
-          warehousing_count: [
-            {required: true, message: '请选择入库数量', trigger: 'blur'}
-          ],
-          price: [
-            {required: true, message: '请选择物品单价', trigger: 'blur'}
-          ],
-
-
-        }
+        goodInfo: [],
+        goodInfoTableData: [],
+        keywords: '',
+        multipleSelection: [],
+        currentGoodTypeId: 0,
+        isClose: false
       }
     },
     props: {
@@ -150,90 +87,88 @@
       visibility: {
         type: Boolean,
         default: false
-      },
+      }
 
     },
     methods: {
-      cancle: function (formName) {
-        this.$emit('dialog-cancle', this.getValue());
-        this.$refs[formName].resetFields();
-      },
-      comfirm: function (formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            this.$emit('dialog-comfirm', this.getValue());
-
-          }
-        });
-      },
-      getValue: function () {
-        let form = {}
-        form['good_type_id'] = this.form.good_type_id
-        form['good_id'] = this.form.good_id
-        form['number'] = this.form.number
-        form['product_date'] = this.form.product_date
-        form['expiry_date'] = this.form.expiry_date
-        form['warehousing_count'] = this.form.warehousing_count
-        form['price'] = this.form.price
-        if(this.form.remark == undefined){
-          form['remark'] = ""
-        }else{
-          form['remark'] = this.form.remark
+      goodTypeTableChange: function(currentRow, oldCurrentRow) {
+        this.currentGoodTypeId = currentRow.id
+        const params = {
+          id: currentRow.id
         }
-
-        console.log(form['remark'])
-        form['isCreated'] = this.propForm.isCreated
-        for(let i = 0; i <this.propForm.goodInfo.length; i++){
-
-          if(this.propForm.goodInfo[i].id == this.propForm.formValue.good_id){
-
-            form['dealer'] = this.propForm.goodInfo[i].dealer
-            form['manufacturer'] = this.propForm.goodInfo[i].manufacturer
+        this.goodInfoTableData = []
+        this.goodInfo = []
+        GetGoodInfoByGoodId(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.goodInfo.push(response.data.data.list[i])
+              this.goodInfoTableData.push(response.data.data.list[i])
+            }
           }
+        })
+      },
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs.multipleTable.clearSelection()
+      },
+      comfirm: function(formName) {
+        this.$emit('dialog-comfirm', this.getValue())
+        this.$refs.multipleTable.clearSelection()
+      },
+      getValue: function() {
+        const obj = {
+          selectedGoodInfo: this.multipleSelection,
+          goodTypeId: this.currentGoodTypeId
         }
-
-
-        return form
-      }, goodTypeSelect: function (id) {
-
+        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;
+      }, 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
-      }
-    },
-    watch: {
-      visibility(val) {
-        this.form = this.propForm.formValue
-        this.tempGoodInfo = this.propForm.goodInfo
-        this.tempGoodType = this.propForm.goodType
-        if(!val) {
-          this.form.good_type_id = ''
-          this.form.good_id = ''
-          this.form.number = ''
-          this.form.product_date = ''
-          this.form.expiry_date = ''
-          this.form.warehousing_count = ''
-          this.form.product_date = ''
-          this.form.price = ''
-          this.form.remark = ''
-
+      }, getName: function(id) {
+        if (id == 0) {
+          return ''
         }
-        !val && setTimeout(() => {
-          this.$refs['form'].resetFields();
-
 
-        }, 0);
+        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].specification_name.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) {
+        this.multipleSelection = val
+      }, changeAllGoodInfoTableData: function(val) {
+        this.multipleSelection = val
       }
     }
   }

src/xt_pages/stock/addStockIn.vue

@@ -72,20 +72,29 @@
           </el-table-column>
           <el-table-column label="操作" align="center" min-width="70">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                @click="handleEdit(scope.$index, scope.row)">编辑
-              </el-button>
-              <el-button
-                size="mini"
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)">删除
-              </el-button>
-              <el-button
-                size="mini"
-                type="primary"
-                @click="showDetails(scope.$index, scope.row)">查看详情
-              </el-button>
+              <el-tooltip class="item" effect="dark" content="添加" placement="top">
+                <el-button
+                  size="small"
+                  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="small"
+                  icon="el-icon-delete"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
+                <el-button
+                  size="small"
+                  icon="el-icon-document"
+                  type="primary"
+                  @click="showDetails(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
             </template>
           </el-table-column>
         </el-table>

src/xt_pages/stock/addStockOut.vue

@@ -61,20 +61,29 @@
           </el-table-column>
           <el-table-column label="操作" align="center" min-width="70">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                @click="handleEdit(scope.$index, scope.row)">编辑
-              </el-button>
-              <el-button
-                size="mini"
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)">删除
-              </el-button>
-              <el-button
-                size="mini"
-                type="primary"
-                @click="showDetails(scope.$index, scope.row)">查看详情
-              </el-button>
+              <el-tooltip class="item" effect="dark" content="添加" placement="top">
+                <el-button
+                  size="small"
+                  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="small"
+                  icon="el-icon-delete"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
+                <el-button
+                  size="small"
+                  icon="el-icon-document"
+                  type="primary"
+                  @click="showDetails(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
             </template>
           </el-table-column>
         </el-table>

src/xt_pages/stock/cancelStock.vue

@@ -62,12 +62,14 @@
 
           <el-table-column label="操作" align="center" min-width="30">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)">删除
-              </el-button>
-
+              <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>

src/xt_pages/stock/cancelStockOrder.vue

@@ -1,131 +1,132 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="AddNewOrder" type="primary">新增</el-button>
-      </el-row>
+  <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="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-    </div>
-
-    <div class="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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 class="app-container">
+
+
+      <div class="cell" style="margin-top:20px">
+        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell">
+        <span>出库退库时间:&nbsp;&nbsp;</span>
+        <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="">-</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"
+          style="width: 100%" border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+          <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-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit"
+                @click="handleEdit(scope.$index, scope.row)">
+              </el-button>
+
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+              </el-button>
+
+            </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>
-
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
-        :data="cancelStockDate"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%" border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-
-      >
-        <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-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row)">
-            </el-button>
-
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">
-            </el-button>
-
-          </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>
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
-  import {
-    deleteCancelStock,
-    GetAllConfig,
-    getCancelStockList,
-  } from '@/api/stock'
+  import { deleteCancelStock, GetAllConfig, getCancelStockList } 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
@@ -156,7 +157,11 @@
     },
     data() {
       return {
-        type:1,
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/cancel', name: '出库退库单' }
+        ],
+        type: 1,
         page: 1,
         limit: 7,
         checked: false,
@@ -173,13 +178,13 @@
         goodInfo: [],
         manufacturer: [],
         selectedTableData: [],
-        dealer: [],
+        dealer: []
 
       }
     },
     methods: {
-      AddNewOrder:function(){
-        this.$router.push({ name: 'cancelStockOrderAdd'})
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
       },
       GetCancelStock: function() {
         const Params = {
@@ -187,7 +192,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.type,
+          type: this.type
         }
         this.cancelStockDate = []
         getCancelStockList(Params).then(response => {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -1,6 +1,10 @@
 <template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
 
-  <div class="app-container sign-and-weigh-box">
+  <div class="app-container">
 
     <sales-return-dialog :propForm="propForm"
                          :visibility="isVisibility"
@@ -11,13 +15,11 @@
 
       <el-row>
         <el-col :span="8"><div>
-          <span>退货时间:</span>
+          <span>退库时间:</span>
           <el-date-picker 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></el-col>
-
-
         <el-col :span="8">
           <div>
             <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
@@ -54,11 +56,13 @@
             <el-table-column label="操作" align="center" min-width="30">
               <template slot-scope="scope">
                 <el-button
-                  size="mini"
+                  size="small"
+                  icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">+
                 </el-button>
                 <el-button
-                  size="mini"
+                  size="small"
+                  icon="el-icon-delete"
                   type="danger"
                   @click="handleDelete(scope.$index, scope.row)">-
                 </el-button>
@@ -86,34 +90,26 @@
                 <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">
-                <!--{{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 + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
                   <el-input type="number"  v-model="scope.row.return_count" ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-
           </el-table>
         </el-form>
       </el-col>
 
-
       <span  class="dialog-footer" style="margin-top: 20px;float:right">
         <el-button @click="back()">取 消</el-button>
         <el-button type="primary" @click="submit()">确 定</el-button>
@@ -121,33 +117,41 @@
 
     </el-row>
   </div>
+  </div>
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import {
     getCancelStockConfig,
-    postCancelStock,
+    postCancelStock
   } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    components: { SalesReturnDialog},
+    components: { BreadCrumb, SalesReturnDialog },
     name: 'salesReturnOrderAdd',
 
     data() {
       return {
-        type:2,
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/return', name: '退库单' },
+          { path: '/stock/return/add', name: '新增退库单' }
+        ],
+
+        type: this.$route.query.type,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
         currentIndex: 0,
         recordInfo: {
-          recordData: [],
+          recordData: []
         },
         tableRules: {
           return_count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
-          ],
+          ]
         },
         ruleForm: {
           manufacturer: [
@@ -160,7 +164,7 @@
         propForm: {
           goodType: [],
           goodInfo: [],
-          goodUnit: [],
+          goodUnit: []
         },
         form: {
           manufacturer: '',
@@ -194,38 +198,39 @@
       }, cancle: function() {
         this.isVisibility = false
       }, GetConfigInfo: function() {
-        getCancelStockConfig().then(response => {
+        const params = {
+          type: this.$route.query.type
+        }
+        getCancelStockConfig(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            var warehouseOutList =  response.data.data.warehouseOutList
-            var warehouseOutInfoList =  response.data.data.warehouseOutInfoList
-            for (let i = 0; i <warehouseOutList.length; i++ ){
-              if(warehouseOutList[i].Manufacturer.id > 0){
+            var warehouseOutList = response.data.data.warehouseOutList
+            var warehouseOutInfoList = response.data.data.warehouseOutInfoList
+            for (let i = 0; i < warehouseOutList.length; i++) {
+              if (warehouseOutList[i].Manufacturer.id > 0) {
                 this.manufacturer.push(warehouseOutList[i].Manufacturer)
               }
-              if(warehouseOutList[i].Dealer.id > 0){
+              if (warehouseOutList[i].Dealer.id > 0) {
                 this.dealer.push(warehouseOutList[i].Dealer)
               }
             }
 
             for (let i = 0; i < warehouseOutInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
-
             }
 
-
             const obj = {}
             const obj2 = {}
             const obj4 = {}
-            //去重复
-            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+            // 去重复
+            this.manufacturer = this.manufacturer.reduce((cur, next) => {
               obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
               return cur
             }, [])
-            //去重复
-            this.dealer =  this.dealer.reduce((cur, next) => {
+            // 去重复
+            this.dealer = this.dealer.reduce((cur, next) => {
               obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
               return cur
             }, [])
@@ -233,8 +238,6 @@
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
-
-
           }
         })
       }, typeName: function(good_type_id) {
@@ -262,7 +265,6 @@
       }, handleDelete: function(index, row) {
         this.recordInfo.recordData.splice(index, 1)
       }, calculate: function(val) {
-
         if (val == 0) {
           return ''
         }
@@ -282,20 +284,16 @@
         } else {
           this.isVisibility = true
           console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++){
-            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+          for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+            if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
               this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
             }
-
           }
           const obj3 = {}
           this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
             obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
             return cur
           }, [])
-
-
-
         }
       }, back() {
         this.$router.go(-1)
@@ -322,21 +320,21 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            postCancelStock(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 {
+            postCancelStock(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",
+                  title: '成功',
+                  message: '退货成功',
+                  type: 'success',
                   duration: 2000
-                });
+                })
                 this.recordInfo.recordData = []
                 this.$router.back(-1)
               }
-            });
+            })
           } else {
             return false
           }

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -1,9 +1,12 @@
 <template>
-
-  <div class="app-container sign-and-weigh-box">
+  <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: 20px">退货单详情</span>
+      <span style="font-size: 20px">退库单详情</span>
       <el-row style="float:right;">
         <span>{{CancelStockInfo.cancelStock.order_number}}</span>
       </el-row>
@@ -11,10 +14,10 @@
 
 
 
-    <div class="filter-container">
-      <span>单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
-      <span>经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
+    <div class="cell">
+      <span style="width: 300px">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span style="width: 300px">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
+      <span style="width: 300px">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
     </div>
 
     <div class="filter-container" style="margin-top: 10px">
@@ -57,14 +60,18 @@
       </el-table>
     </el-row>
   </div>
+  </div>
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { GetAllConfig,getCancelStockInfo,deleteCancelStock } from '@/api/stock'
+  import { GetAllConfig, getCancelStockInfo, deleteCancelStock } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
     name: 'cancelStockOrderDetail',
+    components: { BreadCrumb },
     created() {
       const order_id = this.$route.query.id
       this.GetConfigInfo()
@@ -72,6 +79,11 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/cancel', name: '退库单' },
+          { path: '/stock/cancel/add', name: '退库单详情' }
+        ],
         isEdit: 0,
         checked: false,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -1,121 +1,125 @@
 <template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <sales-return-dialog :propForm="propForm"
+                           :visibility="isVisibility"
+                           v-on:dialog-comfirm="comfirm"
+                           v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+      <div class="filter-container">
+
+        <el-row>
+          <el-col :span="8">
+            <div>
+              <span>退库时间:</span>
+              <el-date-picker 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>
+          </el-col>
+        </el-row>
+      </div>
 
       <el-row>
-        <el-col :span="8">
-          <div>
-            <span>入库时间:</span>
-            <el-date-picker 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>
+        <el-col>
+          <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+            <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                      max-height="450"
+            >
+
+              <el-table-column label="操作" align="center" min-width="30">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    @click="handleEdit(scope.$index, scope.row)">+
+                  </el-button>
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    @click="handleDelete(scope.$index, scope.row)">-
+                  </el-button>
+                </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_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>
+          </el-form>
         </el-col>
-      </el-row>
-    </div>
 
-    <el-row>
-      <el-col>
-        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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_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>
-        </el-form>
-      </el-col>
-
-
-      <span class="dialog-footer" style="margin-top: 20px;float:right">
+
+        <span class="dialog-footer" style="margin-top: 20px;float:right">
         <el-button @click="back()">取 消</el-button>
         <el-button type="primary" @click="submit()">确 定</el-button>
       </span>
-
-    </el-row>
+      </el-row>
+    </div>
   </div>
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import {
-    deleteCancelStockInfo,
-    getCancelStockInfo,
-    getCancelStockConfig,
-    editCancelStockInfo
-  } from '@/api/stock'
+  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    components: { SalesReturnDialog },
+    components: { BreadCrumb, SalesReturnDialog },
     name: 'cancelStockOrderEdit',
 
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/cancel', name: '退库单' },
+          { path: '/stock/cancel/detail', name: '编辑退库单' }
+        ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehousing_time: '',
         adminUserOptions: null,
@@ -183,7 +187,10 @@
       }, cancle: function() {
         this.isVisibility = false
       }, GetConfigInfo: function() {
-        getCancelStockConfig().then(response => {
+        const params = {
+          type: this.$route.query.type
+        }
+        getCancelStockConfig(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
@@ -192,7 +199,6 @@
             for (let i = 0; i < warehouseOutInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
               this.propForm.goodType.push(warehouseOutInfoList[i].GoodInfo.GoodsType)
-
             }
             const obj3 = {}
             const obj4 = {}
@@ -279,7 +285,6 @@
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
           return cur
         }, [])
-
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -328,7 +333,7 @@
             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();
+              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

src/xt_pages/stock/config/dealer.vue

@@ -57,7 +57,7 @@
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
-                  size="mini"
+                  size="small"
                   type="primary"
                   icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
@@ -65,7 +65,7 @@
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
-                  size="mini"
+                  size="small"
                   type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">

src/xt_pages/stock/config/goodInfo.vue

@@ -57,7 +57,7 @@
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
-                  size="mini"
+                  size="small"
                   type="primary"
                   icon="el-icon-edit-outline"
                   @click="handleGoodInfoEdit(scope.$index, scope.row)">
@@ -65,7 +65,7 @@
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除" placement="top">              
                 <el-button
-                  size="mini"
+                  size="small"
                   type="danger"
                   icon="el-icon-delete"
                   @click="handleGoodInfoDelete(scope.$index, scope.row)">

src/xt_pages/stock/config/goodType.vue

@@ -38,7 +38,7 @@
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
-                  size="mini"
+                  size="small"
                   type="primary"
                   icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
@@ -46,7 +46,7 @@
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
-                  size="mini"
+                  size="small"
                   type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">

src/xt_pages/stock/config/manufacturer.vue

@@ -53,7 +53,7 @@
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
-                  size="mini"
+                  size="small"
                   type="primary"
                   icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
@@ -61,7 +61,7 @@
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除" placement="top">              
                 <el-button
-                  size="mini"
+                  size="small"
                   type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">

src/xt_pages/stock/index.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
   </div>
   <div class="app-container">
     <div class="service-box">
@@ -26,13 +26,13 @@
 </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";
-  export default {
-    name: "service",
+  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'
+export default {
+    name: 'service',
     components: {
       GoodType,
       GoodInfo,
@@ -42,28 +42,19 @@
     },
     data() {
       return {
-        activeName: "first"
-      };
-    },
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/config', name: '库存配置' }
+        ],
+        activeName: 'first'
+      }
+  },
     methods: {
       handleClick(tab, event) {
-        console.log(tab, event, this.activeName);
-
-        // switch (this.activeName) {
-        //   case "invoice":
-        //     this.$router.push("/service/invoice");
-        //
-        //     break;
-        //   case "third":
-        //     this.$router.push("/service/recordList");
-        //     break;
-        //
-        //   default:
-        //     break;
-        // }
+        console.log(tab, event, this.activeName)
       }
     }
-  };
+  }
 </script>
 
 

src/xt_pages/stock/otherCancelStockDetail.vue

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

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -1,131 +1,130 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="AddNewOrder" type="primary">新增</el-button>
-      </el-row>
+  <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="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-    </div>
-
-    <div class="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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 class="app-container">
+
+      <div class="cell" style="margin-top:20px">
+        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell">
+        <span>其他出库退库时间:&nbsp;&nbsp;</span>
+        <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="">-</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"
+          style="width: 100%" border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+          <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-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit"
+                @click="handleEdit(scope.$index, scope.row)">
+              </el-button>
+
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+              </el-button>
+
+            </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>
-
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
-        :data="cancelStockDate"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%" border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-
-      >
-        <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-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row)">
-            </el-button>
-
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">
-            </el-button>
-
-          </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>
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
-  import {
-    deleteCancelStock,
-    GetAllConfig,
-    getCancelStockList,
-  } from '@/api/stock'
+  import { deleteCancelStock, GetAllConfig, getCancelStockList } 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
@@ -156,6 +155,10 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/cancel', name: '其他出库退库单' }
+        ],
         type: 2,
         page: 1,
         limit: 7,
@@ -173,13 +176,13 @@
         goodInfo: [],
         manufacturer: [],
         selectedTableData: [],
-        dealer: [],
+        dealer: []
 
       }
     },
     methods: {
-      AddNewOrder:function(){
-        this.$router.push({ name: 'cancelStockOrderAdd'})
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
       },
       GetCancelStock: function() {
         const Params = {
@@ -187,7 +190,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.type,
+          type: this.type
         }
         this.cancelStockDate = []
         getCancelStockList(Params).then(response => {

src/xt_pages/stock/otherCancelStockOrderAdd.vue

@@ -1,408 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8"><div>
-          <span>退货时间:</span>
-          <el-date-picker 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></el-col>
-
-
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-              <el-form-item label="厂商：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" label-width="80px">
-              <el-form-item label="经销商：">
-                <el-select v-model="form.dealer" placeholder="请选择经销商">
-                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-      </el-row>
-
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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" >
-                <!--<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">
-                <!--{{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 + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-
-          </el-table>
-        </el-form>
-      </el-col>
-
-
-      <span  class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-  import {
-    getCancelStockConfig,
-    postCancelStock,
-  } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
-
-  export default {
-    components: { SalesReturnDialog},
-    name: 'salesReturnOrderAdd',
-
-    data() {
-      return {
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        return_time: '',
-        currentIndex: 0,
-        type:2,
-        recordInfo: {
-          recordData: [],
-        },
-        tableRules: {
-          return_count: [
-            { required: true, message: '数量不能为空', trigge: 'blur' }
-          ],
-        },
-        ruleForm: {
-          manufacturer: [
-            { required: true, message: '请选择厂商', trigger: 'change' }
-          ]
-
-        },
-        // prop
-        isVisibility: false,
-        propForm: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-        },
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    methods: {
-      comfirm: function(val) {
-        this.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['return_count'] = ''
-              this.recordInfo.recordData.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      }, GetConfigInfo: function() {
-        getCancelStockConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            var warehouseOutList =  response.data.data.warehouseOutList
-            var warehouseOutInfoList =  response.data.data.warehouseOutInfoList
-            for (let i = 0; i <warehouseOutList.length; i++ ){
-              if(warehouseOutList[i].Manufacturer.id > 0){
-                this.manufacturer.push(warehouseOutList[i].Manufacturer)
-              }
-              if(warehouseOutList[i].Dealer.id > 0){
-                this.dealer.push(warehouseOutList[i].Dealer)
-              }
-            }
-
-            for (let i = 0; i < warehouseOutInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
-
-            }
-
-
-            const obj = {}
-            const obj2 = {}
-            const obj4 = {}
-            //去重复
-            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            //去重复
-            this.dealer =  this.dealer.reduce((cur, next) => {
-              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-
-          }
-        })
-      }, typeName: function(good_type_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
-          }
-        }
-        return name
-      }, specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['good_type_id'] = 0
-        tempObj['good_id'] = 0
-        tempObj['return_count'] = ''
-        this.recordInfo.recordData.push(tempObj)
-      }, handleDelete: function(index, row) {
-        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) {
-        this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.isVisibility = true
-          console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++){
-            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
-              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
-            }
-
-          }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-
-
-
-        }
-      }, back() {
-        this.$router.go(-1)
-      }, submit() {
-        this.$refs['tableForm'].validate((valid) => {
-          if (valid) {
-            if (this.form.manufacturer == 0) {
-              this.$message.error('厂商不能为空')
-              return
-            }
-            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
-            }
-            const params = {
-              'cancelStock': this.recordInfo.recordData
-            }
-            postCancelStock(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
-          }
-        })
-      }
-    },
-    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.return_time = endTime
-      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;
-  }
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-  // border-radius: 4px 4px 0 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/otherCancelStockOrderDetail.vue

@@ -1,232 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <div class="filter-container">
-      <span style="font-size: 20px">退货单详情</span>
-      <el-row style="float:right;">
-        <span>{{CancelStockInfo.cancelStock.order_number}}</span>
-      </el-row>
-    </div>
-
-
-
-    <div class="filter-container">
-      <span>单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
-      <span>经销商 {{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
-      >
-        <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-  import { GetAllConfig,getCancelStockInfo,deleteCancelStock } from '@/api/stock'
-
-  export default {
-    name: 'cancelStockOrderDetail',
-    created() {
-      const order_id = this.$route.query.id
-      this.GetConfigInfo()
-      this.GetOrderDetail(order_id)
-    },
-    data() {
-      return {
-        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
-        }
-        getCancelStockInfo(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(() => {
-          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
-              })
-
-              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;
-  }
-
-  }
-
-  .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;
-
-  }
-
-</style>

src/xt_pages/stock/otherCancelStockOrderEdit.vue

@@ -1,391 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8">
-          <div>
-            <span>入库时间:</span>
-            <el-date-picker 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>
-        </el-col>
-      </el-row>
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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_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>
-        </el-form>
-      </el-col>
-
-
-      <span class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-
-  import {
-    deleteCancelStockInfo,
-    getCancelStockInfo,
-    getCancelStockConfig,
-    editCancelStockInfo
-  } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
-
-  export default {
-    components: { SalesReturnDialog },
-    name: 'cancelStockOrderEdit',
-
-    data() {
-      return {
-        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: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-          title: '入库'
-        },
-
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-
-        cancelStock: {},
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    methods: {
-      comfirm: function(val) {
-        this.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['count'] = ''
-              this.recordInfo.recordData.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      }, GetConfigInfo: function() {
-        getCancelStockConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            var warehouseOutInfoList = response.data.data.warehouseOutInfoList
-            for (let i = 0; i < warehouseOutInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
-              this.propForm.goodType.push(warehouseOutInfoList[i].GoodInfo.GoodsType)
-
-            }
-            const obj3 = {}
-            const obj4 = {}
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-          }
-        })
-      }, typeName: function(good_type_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
-          }
-        }
-        return name
-      }, specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['id'] = 0
-        tempObj['good_type_id'] = 0
-        tempObj['good_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(() => {
-            deleteCancelStockInfo(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.recordInfo.recordData.splice(index, 1)
-              }
-            })
-          }).catch(() => {
-          })
-        }
-      }, getTime(val, temp) {
-        if (val != 0) {
-          return uParseTime(val, temp)
-        } else {
-          return ''
-        }
-      }, showDialog(index, row) {
-        this.currentIndex = index
-
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
-          }
-        }
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-
-      }, 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].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
-                return
-              }
-              if (array[i].good_id == 0) {
-                this.$message.error('规格名称不能为空')
-                return
-              }
-            }
-
-            const params = {
-              'cancelStock': this.recordInfo.recordData
-            }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id).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)
-              }
-            })
-          } else {
-            return false
-          }
-        })
-      }, GetOrderDetail: function(order_id) {
-        const params = {
-          'id': order_id
-        }
-        getCancelStockInfo(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
-          }
-        })
-      }
-    },
-    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;
-  }
-
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-    border-radius: 4px 4px 0 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/otherSalesReturnDetail.vue

@@ -1,24 +0,0 @@
-<template>
-  <other-sales-return-order-detaill v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></other-sales-return-order-detaill>
-  <other-sales-reuturn-order-edit v-else></other-sales-reuturn-order-edit>
-</template>
-
-<script>
-  import OtherSalesReturnOrderDetail from './otherSalesReturnOrderDetail'
-  import OtherSalesReturnOrderEdit from './otherSalesReturnOrderEdit'
-  export default {
-    name: 'otherSalesReturnDetail',
-    components: { OtherSalesReturnOrderEdit, OtherSalesReturnOrderDetail},
-    data() {
-      return {
-        isEdit: 0
-      }
-    }
-
-  }
-
-</script>
-
-<style scoped>
-
-</style>

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -1,118 +1,120 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="AddNewOrder" type="primary">新增</el-button>
-      </el-row>
-    </div>
-
-    <div class="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+  <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="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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 class="app-container">
+
+      <div class="filter-container" style="margin-top:20px">
+        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="filter-container">
+        <span>其他退货时间:&nbsp;&nbsp;</span>
+        <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="">-</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="saleReturnDate"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%" border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+          <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">
+              {{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-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit"
+                @click="handleEdit(scope.$index, scope.row)">
+              </el-button>
+
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+              </el-button>
+
+            </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>
-
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
-        :data="saleReturnDate"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%" border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-
-      >
-        <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">
-            {{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-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row)">
-            </el-button>
-
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">
-            </el-button>
-
-          </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>
+
 </template>
 
 <script>
@@ -121,13 +123,15 @@
   import {
     deleteSalesReturn,
     GetAllConfig,
-    getWarehouseInfoList,
     getSalesReturnList,
+    getWarehouseInfoList,
     getWarehouseList
   } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    name: 'otherSalesReturnOrder',
+    name: 'salesReturnOrder',
+    components: { BreadCrumb },
     created() {
       var year = new Date().getFullYear()
       var month = new Date().getMonth() + 1
@@ -158,7 +162,11 @@
     },
     data() {
       return {
-        type:2,
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/return', name: '其他退货单' }
+        ],
+        type: 2,
         page: 1,
         limit: 7,
         checked: false,
@@ -175,13 +183,13 @@
         goodInfo: [],
         manufacturer: [],
         selectedTableData: [],
-        dealer: [],
+        dealer: []
 
       }
     },
     methods: {
-      AddNewOrder:function(){
-        this.$router.push({ name: 'salesReturnOrderAdd'})
+      AddNewOrder: function() {
+        this.$router.push({ name: 'salesReturnOrderAdd', query: { type: this.type }})
       },
       GetSalesReturn: function() {
         const Params = {
@@ -189,7 +197,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.type,
+          type: this.type
         }
         this.saleReturnDate = []
         getSalesReturnList(Params).then(response => {
@@ -272,7 +280,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'salesReturnDetail', query: { id: row.id }})
+        this.$router.push({ name: 'salesReturnDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/otherSalesReturnOrderAdd.vue

@@ -1,414 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8"><div>
-          <span>退货时间:</span>
-          <el-date-picker 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></el-col>
-
-
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-              <el-form-item label="厂商：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" label-width="80px">
-              <el-form-item label="经销商：">
-                <el-select v-model="form.dealer" placeholder="请选择经销商">
-                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-      </el-row>
-
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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" >
-                <!--<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">
-                <!--{{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 + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-
-          </el-table>
-        </el-form>
-      </el-col>
-
-
-      <span  class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-  import {
-    getSalesReturnConfig,
-    postSalesReturn,
-  } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
-
-  export default {
-    components: { SalesReturnDialog},
-    name: 'otherSalesReturnOrderAdd',
-
-    data() {
-      return {
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        return_time: '',
-        currentIndex: 0,
-        type:2,
-        recordInfo: {
-          recordData: [],
-        },
-        tableRules: {
-          price: [
-            { required: true, message: '单价不能为空', trigger: 'blur' }
-          ],
-          return_count: [
-            { required: true, message: '数量不能为空', trigge: 'blur' }
-          ],
-        },
-        ruleForm: {
-          manufacturer: [
-            { required: true, message: '请选择厂商', trigger: 'change' }
-          ]
-
-        },
-        // prop
-        isVisibility: false,
-        propForm: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-        },
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    methods: {
-      comfirm: function(val) {
-        this.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['return_count'] = ''
-              tempForm['price'] = ''
-              this.recordInfo.recordData.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            var warehouseList =  response.data.data.warehouseList
-            var warehouseInfoList =  response.data.data.warehouseInfoList
-            for (let i = 0; i <warehouseList.length; i++ ){
-              if(warehouseList[i].Manufacturer.id > 0){
-                this.manufacturer.push(warehouseList[i].Manufacturer)
-              }
-              if(warehouseList[i].Dealer.id > 0){
-                this.dealer.push(warehouseList[i].Dealer)
-              }
-            }
-
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-
-            }
-
-
-            const obj = {}
-            const obj2 = {}
-            const obj4 = {}
-            //去重复
-            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            //去重复
-            this.dealer =  this.dealer.reduce((cur, next) => {
-              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-
-          }
-        })
-      }, typeName: function(good_type_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
-          }
-        }
-        return name
-      }, specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['good_type_id'] = 0
-        tempObj['good_id'] = 0
-        tempObj['return_count'] = ''
-        tempObj['price'] = ''
-        this.recordInfo.recordData.push(tempObj)
-      }, handleDelete: function(index, row) {
-        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) {
-        this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.isVisibility = true
-          console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++){
-            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
-              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
-            }
-
-          }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-
-
-
-        }
-      }, back() {
-        this.$router.go(-1)
-      }, submit() {
-        this.$refs['tableForm'].validate((valid) => {
-          if (valid) {
-            if (this.form.manufacturer == 0) {
-              this.$message.error('厂商不能为空')
-              return
-            }
-            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
-            }
-            const params = {
-              'salesReturn': this.recordInfo.recordData
-            }
-            postSalesReturn(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.$notify({
-                  title: "成功",
-                  message: "退货成功",
-                  type: "success",
-                  duration: 2000
-                });
-                this.recordInfo.recordData = []
-                this.$router.back(-1)
-              }
-            });
-          } else {
-            return false
-          }
-        })
-      }
-    },
-    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.return_time = endTime
-      const tempObj = {}
-      tempObj['good_type_id'] = 0
-      tempObj['good_id'] = 0
-      tempObj['return_count'] = ''
-      tempObj['price'] = ''
-      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;
-  }
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-  // border-radius: 4px 4px 0 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/otherSalesReturnOrderDetail.vue

@@ -1,232 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <div class="filter-container">
-      <span style="font-size: 20px">退货单详情</span>
-      <el-row style="float:right;">
-        <span>{{ReturnInfo.salesReturn.order_number}}</span>
-      </el-row>
-    </div>
-
-
-
-    <div class="filter-container">
-      <span>单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
-      <span>经销商 {{getDealerName(ReturnInfo.salesReturn.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="ReturnInfo.returnInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
-      >
-        <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-  import { GetAllConfig,getReturnList,deleteSalesReturn } from '@/api/stock'
-
-  export default {
-    name: 'otherSalesReturnOrderDetail',
-    created() {
-      const order_id = this.$route.query.id
-      this.GetConfigInfo()
-      this.GetOrderDetail(order_id)
-    },
-    data() {
-      return {
-        isEdit: 0,
-        checked: false,
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        goodType: [],
-        goodInfo: [],
-        manufacturer: [],
-        dealer: [],
-
-        ReturnInfo: {
-          loading: false,
-          returnInfoData: [],
-          salesReturn: {}
-        }
-      }
-    },
-    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
-        }
-        getReturnList(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(() => {
-          deleteSalesReturn(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;
-  }
-
-  }
-
-  .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;
-
-  }
-
-</style>

src/xt_pages/stock/otherSalesReturnOrderEdit.vue

@@ -1,391 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8">
-          <div>
-            <span>入库时间:</span>
-            <el-date-picker 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>
-        </el-col>
-      </el-row>
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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_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>
-        </el-form>
-      </el-col>
-
-
-      <span class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-
-  import {
-    deleteSalesReturnInfo,
-    getReturnList,
-    getSalesReturnConfig,
-    editSalesReturnInfo
-  } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
-
-  export default {
-    components: { SalesReturnDialog },
-    name: 'otherSalesReutrnOrderEdit',
-
-    data() {
-      return {
-        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: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-          title: '入库'
-        },
-
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-
-        salesReturn: {},
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    methods: {
-      comfirm: function(val) {
-        this.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['count'] = ''
-              this.recordInfo.recordData.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            var warehouseInfoList = response.data.data.warehouseInfoList
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-              this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
-
-            }
-            const obj3 = {}
-            const obj4 = {}
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-          }
-        })
-      }, typeName: function(good_type_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
-          }
-        }
-        return name
-      }, specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['id'] = 0
-        tempObj['good_type_id'] = 0
-        tempObj['good_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(() => {
-            deleteSalesReturnInfo(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.recordInfo.recordData.splice(index, 1)
-              }
-            })
-          }).catch(() => {
-          })
-        }
-      }, getTime(val, temp) {
-        if (val != 0) {
-          return uParseTime(val, temp)
-        } else {
-          return ''
-        }
-      }, showDialog(index, row) {
-        this.currentIndex = index
-
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
-          }
-        }
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-
-      }, 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].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
-                return
-              }
-              if (array[i].good_id == 0) {
-                this.$message.error('规格名称不能为空')
-                return
-              }
-            }
-
-            const params = {
-              'salesReturn': this.recordInfo.recordData
-            }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id).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)
-              }
-            })
-          } else {
-            return false
-          }
-        })
-      }, GetOrderDetail: function(order_id) {
-        const params = {
-          'id': order_id
-        }
-        getReturnList(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.recordInfo.list[i].count =  this.recordInfo.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
-          }
-        })
-      }
-    },
-    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;
-  }
-
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-    border-radius: 4px 4px 0 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/otherStockInDetail.vue

@@ -1,24 +0,0 @@
-<template>
-  <other-stock-in-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></other-stock-in-order-detail>
-  <other-stock-in-order-edit v-else></other-stock-in-order-edit>
-</template>
-
-<script>
-  import OtherStockInOrderEdit from './otherStockInOrderEdit'
-  import OtherStockInOrderDetail from './otherStockInOrderDetail'
-  export default {
-    name: 'otherStockInDetail',
-    components: { OtherStockInOrderDetail, OtherStockInOrderEdit },
-    data() {
-      return {
-        isEdit: 0
-      }
-    }
-
-  }
-
-</script>
-
-<style scoped>
-
-</style>

src/xt_pages/stock/otherStockInOrder.vue

@@ -1,39 +1,35 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="handleWarehouse" type="primary">新增</el-button>
-      </el-row>
-    </div>
-
-    <div class="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-    </div>
-
-    <div class="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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 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="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>
+    <div class="app-container">
+
+      <div class="cell">
+        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell">
+        <span>其他入库时间:&nbsp;&nbsp;</span>
+        <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="">-</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="cell clearfix">
+        <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="Warehouse.warehouseDate"
         :class="signAndWeighBoxPatients"
@@ -42,14 +38,17 @@
         v-loading="Warehouse.loading"
         ref="multipleTable"
         @selection-change="select"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
 
       >
         <el-table-column
+          align="center"
           type="selection"
           width="55">
         </el-table-column>
 
-        <el-table-column label="单据日期" align="center">
+        <el-table-column label="单据日期"  align="center">
           <template slot-scope="scope">
             {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
           </template>
@@ -82,20 +81,22 @@
 
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row)">
-            </el-button>
-
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">
-            </el-button>
-
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-edit"
+                @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>
 
@@ -111,8 +112,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-
-    </el-row>
+    </div>
   </div>
 </template>
 
@@ -127,9 +127,11 @@
     getWarehouseInfoList,
     getWarehouseList
   } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    name: 'otherStockInOrder',
+    name: 'stockIn',
+    components: { BreadCrumb },
     created() {
       var year = new Date().getFullYear()
       var month = new Date().getMonth() + 1
@@ -160,6 +162,10 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/in/other', name: '其他入库单' }
+        ],
         page: 1,
         limit: 7,
         checked: false,
@@ -196,7 +202,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type : this.type,
+          type: this.type
         }
         this.Warehouse.warehouseDate = []
         getWarehouseList(Params).then(response => {
@@ -316,7 +322,7 @@
       }, clicks: function() {
         console.log(this.WarehouseInfo.warehouseInfoDate)
       }, handleWarehouse: function() {
-        this.$router.push({ path: '/stock/in/add' })
+        this.$router.push({ path: '/stock/in/add', query: { type: this.type }})
       }, handleReturnSales: function() {
         // this.$router.push({path:'/patients/create'}
         if (this.multipleSelection.length <= 0) {

src/xt_pages/stock/otherStockInOrderAdd.vue

@@ -1,613 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <stock-in-dialog :propForm="propForm"
-                     :visibility="isVisibility"
-                     v-on:dialog-comfirm="comfirm"
-                     v-on:dialog-cancle="cancle"></stock-in-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8"><div>
-          <span>入库时间:</span>
-          <el-date-picker 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></el-col>
-
-
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-              <el-form-item label="厂商：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" label-width="80px">
-              <el-form-item label="经销商：">
-                <el-select v-model="form.dealer" placeholder="请选择经销商">
-                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-      </el-row>
-
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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" >
-                <!--<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-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">
-                <!--{{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 type="number"  v-model="scope.row.warehousing_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.warehousing_count)}}
-              </template>
-            </el-table-column>
-
-            <el-table-column  align="center" min-width="25">
-              <template slot="header" slot-scope="scope">
-                <span>批号<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
-
-                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
-                  <el-input  v-model="scope.row.number" ></el-input>
-                </el-form-item>
-
-              </template>
-            </el-table-column>
-            <el-table-column label="生产日期" min-width="40" 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="有效日期" min-width="40" 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="备注" min-width="20" align="center">
-              <template slot-scope="scope">
-                <el-input  v-model="scope.row.remark"></el-input>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </el-col>
-
-
-      <span  class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import stockInDialog from './Dialog/stockInDialog'
-  import { uParseTime } from '@/utils/tools'
-
-  import {
-    GetAllGoodInfo,
-    GetAllGoodType,
-    postWarehouse,
-    GetAllConfig,
-    GetAllGoodInfoByID,
-    getWarehouseInfoByOrdeNumber,
-    modifyWarehouseInfo,
-    deleteWarehouseInfo
-  } from '@/api/stock'
-
-  export default {
-    components: { stockInDialog },
-    name: 'stockIn',
-
-    data() {
-      var checkGoodId = (rule, value, callback) => {
-        setTimeout(() => {
-          if (value == '' || value == 0) {
-            return callback(new Error('规格名称不能为空'))
-          }
-        }, 2000)
-      }
-
-      return {
-        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' }
-          ],
-          number: [
-            { required: true, message: '批号不能为空', trigge: 'blur' }
-          ],
-          good_id: [
-            { validator: checkGoodId, trigger: 'blur' }
-          ]
-
-        },
-        ruleForm: {
-          manufacturer: [
-            { required: true, message: '请选择厂商', trigger: 'change' }
-          ]
-
-        },
-
-        total: '',
-        product_date: '',
-        expiry_date: '',
-        numbers: '',
-
-        type: 2,
-
-        // prop
-        isVisibility: false,
-        propForm: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-          title: '入库',
-          formValue: {
-            good_type_id: '',
-            good_id: '',
-            number: '',
-            product_date: '',
-            expiry_date: '',
-            warehousing_count: '',
-            price: '',
-            remark: '',
-            dealer: '',
-            manufacturer: ''
-
-          },
-          isCreated: 1
-
-        },
-
-        goodInfo: {
-          loading: false,
-          goodTypeData: [],
-          type_code: ''
-        },
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-
-        formValue: {
-          good_type_id: '',
-          good_id: '',
-          number: '',
-          product_date: '',
-          expiry_date: '',
-          warehousing_count: '',
-          price: '',
-          remark: '',
-          dealer: '',
-          manufacturer: ''
-
-        },
-
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    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.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['number'] = ''
-              tempForm['product_date'] = 0
-              tempForm['expiry_date'] = 0
-              tempForm['warehousing_count'] = ''
-              tempForm['price'] = ''
-              tempForm['remark'] = ''
-              tempForm['dealer'] = ''
-              tempForm['manufacturer'] = ''
-              this.recordInfo.recordData.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      }, 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.propForm.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.propForm.goodInfo.push(response.data.data.goodInfo[i])
-            }
-          }
-        })
-      }, 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.goodType = response.data.data.goodType
-            this.goodInfo = response.data.data.goodInfo
-          }
-        })
-      }, typeName: function(good_type_id) {
-        let name = '请输入物品类型'
-        for (let i = 0; i < this.goodType.length; i++) {
-          if (this.goodType[i].id == good_type_id) {
-            name = this.goodType[i].type_name
-          }
-        }
-        return name
-      }, 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
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['good_type_id'] = 0
-        tempObj['good_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) {
-        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) {
-        this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.isVisibility = true
-          const params = {
-            id: this.form.manufacturer
-          }
-          GetAllGoodInfoByID(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('该厂商没商品，请添加商品')
-              } else {
-                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
-                }
-
-                const obj = {}
-                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-                  return cur
-                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-              }
-            }
-          })
-        }
-      }, 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) {
-            if (this.form.manufacturer == 0) {
-              this.$message.error('厂商不能为空')
-              return
-            }
-            const array = this.recordInfo.recordData
-            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
-              }
-            }
-
-            const params = {
-              'stockIn': this.recordInfo.recordData
-            }
-            postWarehouse(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.$notify({
-                  title: '成功',
-                  message: '入库成功',
-                  type: 'success',
-                  duration: 2000
-                })
-                this.$router.back(-1)
-              }
-            })
-          } else {
-            return false
-          }
-        })
-      }
-    },
-    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.warehousing_time = endTime
-
-      const tempObj = {}
-      tempObj['good_type_id'] = 0
-      tempObj['good_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 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;
-  // border-radius: 4px 4px 0 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/otherStockInOrderDetail.vue

@@ -1,281 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <div class="filter-container">
-      <span style="font-size: 20px">耗材入库单详情</span>
-      <el-row style="float:right;">
-        <span>{{WarehouseInfo.warehouse.warehousing_order}}</span>
-      </el-row>
-    </div>
-
-
-
-    <div class="filter-container">
-      <span>单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
-      <span>经销商 {{getDealerName(WarehouseInfo.warehouse.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="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-      >
-        <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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 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 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>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-  import { GetAllConfig, getWarehouseInfoList, deleteWarehouseInfo } from '@/api/stock'
-
-  export default {
-    name: 'otherStockInOrderDetail',
-    created() {
-      const order_id = this.$route.query.id
-      this.GetConfigInfo()
-      this.GetOrderDetail(order_id)
-    },
-    data() {
-      return {
-        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: {
-      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
-        }
-        getWarehouseInfoList(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(() => {
-          deleteWarehouseInfo(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;
-  }
-
-  }
-
-  .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;
-
-  }
-
-</style>

src/xt_pages/stock/otherStockInOrderEdit.vue

@@ -1,502 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8"><div>
-          <span>入库时间:</span>
-          <el-date-picker 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></el-col>
-      </el-row>
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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" >
-                <!--<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-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">
-                <!--{{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 type="number"  v-model="scope.row.warehousing_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.warehousing_count)}}
-              </template>
-            </el-table-column>
-
-            <el-table-column  align="center" min-width="25">
-              <template slot="header" slot-scope="scope">
-                <span>批号<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
-
-                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
-                  <el-input  v-model="scope.row.number" ></el-input>
-                </el-form-item>
-
-              </template>
-            </el-table-column>
-            <el-table-column label="生产日期" min-width="40" 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="有效日期" min-width="40" 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="备注" min-width="20" align="center">
-              <template slot-scope="scope">
-                <el-input  v-model="scope.row.remark"></el-input>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </el-col>
-
-
-      <span  class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import stockInDialog from './Dialog/stockInDialog'
-  import { uParseTime } from '@/utils/tools'
-
-  import {
-    GetAllConfig,
-    getWarehouseInfoList,
-    GetAllGoodInfoByID,
-    getWarehouseInfoByOrdeNumber,
-    modifyWarehouseInfo,
-    deleteWarehouseInfo,
-    DeleteWarehouseInfoItem,
-    EditWarehouse
-  } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
-
-  export default {
-    components: { SalesReturnDialog, stockInDialog },
-    name: 'stockInOrderEdit',
-
-    data() {
-      var checkGoodId = (rule, value, callback) => {
-        setTimeout(() => {
-          if (value == '' || value == 0) {
-            return callback(new Error('规格名称不能为空'))
-          }
-        }, 2000)
-      }
-
-      return {
-        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' }
-          ],
-          number: [
-            { required: true, message: '批号不能为空', trigge: 'blur' }
-          ],
-          good_id: [
-            { validator: checkGoodId, trigger: 'blur' }
-          ]
-
-        },
-        ruleForm: {
-          manufacturer: [
-            { required: true, message: '请选择厂商', trigger: 'change' }
-          ]
-
-        },
-
-        total: '',
-        product_date: '',
-        expiry_date: '',
-        numbers: '',
-        // prop
-        isVisibility: false,
-        propForm: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-          title: '入库',
-          isCreated: 1
-
-        },
-
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-        warehouse: {},
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    methods: {
-      comfirm: function(val) {
-        this.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_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.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      },  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.goodType = response.data.data.goodType
-            this.goodInfo = response.data.data.goodInfo
-          }
-        })
-
-      }, typeName: function(good_type_id) {
-        let name = '请输入物品类型'
-        for (let i = 0; i < this.goodType.length; i++) {
-          if (this.goodType[i].id == good_type_id) {
-            name = this.goodType[i].type_name
-          }
-        }
-        return name
-      }, 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
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['id'] = 0
-        tempObj['good_type_id'] = 0
-        tempObj['good_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(() => {
-            DeleteWarehouseInfoItem(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.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
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.isVisibility = true
-          const params = {
-            id: this.form.manufacturer
-          }
-          GetAllGoodInfoByID(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('该厂商没商品，请添加商品')
-              } else {
-                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
-                }
-
-                const obj = {}
-                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-                  return cur
-                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-              }
-            }
-          })
-        }
-      }, 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].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
-                return
-              }
-              if (array[i].good_id == 0) {
-                this.$message.error('规格名称不能为空')
-                return
-              }
-            }
-
-            const params = {
-              'stockIn': this.recordInfo.recordData
-            }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id).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)
-              }
-            })
-          } else {
-            return false
-          }
-        })
-      }, GetOrderDetail: function(order_id) {
-        const params = {
-          'id': order_id
-        }
-        getWarehouseInfoList(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}')
-          }
-        })
-      }
-    },
-    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;
-  }
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-    border-radius: 4px 4px 0 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/otherStockOutDetail.vue

@@ -1,26 +0,0 @@
-<template>
-  <other-stock-out-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></other-stock-out-order-detail>
-  <other-stock-out-order-edit v-else></other-stock-out-order-edit>
-</template>
-
-<script>
-  import StockOutOrderDetail from './stockOutOrderDetail'
-  import StockOutEdit from './stockOutOrderEdit'
-  import OtherStockOutOrderEdit from './otherStockOutOrderEdit'
-  import OtherStockOutOrderDetail from './otherStockOutOrderDetail'
-  export default {
-    name: 'otherStockOutDetail',
-    components: { OtherStockOutOrderDetail, OtherStockOutOrderEdit, StockOutEdit, StockOutOrderDetail},
-    data() {
-      return {
-        isEdit: 0
-      }
-    }
-
-  }
-
-</script>
-
-<style scoped>
-
-</style>

src/xt_pages/stock/otherStockOutOrder.vue

@@ -1,47 +1,42 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="AddNewOrder" type="primary">新增</el-button>
-      </el-row>
-    </div>
-
-    <div class="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+  <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">
+        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+
+      <div class="cell">
+        <span>其他出库时间:&nbsp;&nbsp;</span>
+        <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="">-</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="cell clearfix">
+        <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>
 
-    <div class="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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="warehouseOutDate"
         :class="signAndWeighBoxPatients"
         style="width: 100%" border
         highlight-current-row
         ref="multipleTable"
-        @selection-change="select"
 
+        @selection-change="select"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
         <el-table-column
           type="selection"
@@ -65,8 +60,6 @@
             {{getXuserName(scope.row.creater)}}
           </template>
         </el-table-column>
-
-
         <el-table-column label="厂家" align="center">
           <template slot-scope="scope">
             {{getManufactuerName(scope.row.manufacturer)}}
@@ -94,12 +87,9 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.$index, scope.row)">
             </el-button>
-
           </template>
         </el-table-column>
-
       </el-table>
-
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -111,21 +101,30 @@
         :total="total">
       </el-pagination>
 
-    </el-row>
+
+    </div>
   </div>
+
+
+
+
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+
   import {
     deleteWarehouseOut,
     GetAllConfig,
-    getWarehouseOutList,
+    getWarehouseOutList
   } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    name: 'otherStockOutOrder',
+    name: 'salesReturnOrder',
+    components: { BreadCrumb },
     created() {
       var year = new Date().getFullYear()
       var month = new Date().getMonth() + 1
@@ -156,6 +155,10 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/out', name: '其他出库单' }
+        ],
         page: 1,
         limit: 7,
         checked: false,
@@ -173,13 +176,13 @@
         manufacturer: [],
         selectedTableData: [],
         dealer: [],
-        type:2,
+        type: 2
 
       }
     },
     methods: {
-      AddNewOrder:function(){
-        this.$router.push({ name: 'stockOutOrderAdd'})
+      AddNewOrder: function() {
+        this.$router.push({ name: 'stockOutOrderAdd', query: { type: this.type }})
       },
       GetWarehouseOut: function() {
         const Params = {
@@ -187,7 +190,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.type,
+          type: this.type
         }
         this.warehouseOutDate = []
         getWarehouseOutList(Params).then(response => {
@@ -270,7 +273,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockOutDetail', query: { id: row.id }})
+        this.$router.push({ name: 'stockOutDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)
@@ -361,48 +364,121 @@
   }
 </script>
 
-<style rel="stylesheet/css" lang="scss" scoped>
-  .information {
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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;
-    padding: 30px 20px 30px 20px;
-
-  .border {
-    border-bottom: 1px #dcdfe6 solid;
-    margin: 0px 0 20px 0;
+    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;
   }
-
+  }
+  .cell {
+    margin: 0px 0 15px 0;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -o-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    display: -webkit-box;
+    display: -ms-flexbox;
+  // display: flex;
+    -webkit-box-align: flex-start;
+    -ms-flex-align: flex-start;
+    align-items: flex-start;
+    text-align: left;
+    justify-content: flex-start;
+    color: #333;
   .title {
+    width: 80px;
+    display: inline-block;
+    font-weight: normal;
+    color: #909399;
+    padding: 6px 0;
+    font-weight: 700;
+  .name {
+    width: 60px;
+    text-align: justify;
+    text-justify: distribute-all-lines;
+    text-align-last: justify;
+    -moz-text-align-last: justify;
+    -webkit-text-align-last: justify;
+    display: inline-block;
+  }
+  }
+  .time {
+    -webkit-box-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+  ul {
+    padding: 0;
+    margin: 0;
+  li {
+    float: left;
+    list-style: none;
+    cursor: pointer;
+    padding: 3px 0;
+    width: 70px;
+    color: #606266;
+    border-radius: 4px;
+    margin: 0 10px 0 0;
+    color: #409eff;
+    border: 1px #409eff solid;
+    text-align:center;
+  &:hover {
+     background: #409eff;
+     color: #fff;
+   }
+  }
+  .active {
     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;
-
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+  span {
+    color: #ef2525;
+    font-family: "Arial";
+    padding: 0 2px;
+  }
+  }
   }
-
 </style>
+

src/xt_pages/stock/otherStockOutOrderAdd.vue

@@ -1,443 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8"><div>
-          <span>退货时间:</span>
-          <el-date-picker 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></el-col>
-
-
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-              <el-form-item label="厂商：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" label-width="80px">
-              <el-form-item label="经销商：">
-                <el-select v-model="form.dealer" placeholder="请选择经销商">
-                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-      </el-row>
-
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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" >
-                <!--<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-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>
-        </el-form>
-      </el-col>
-
-
-      <span  class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-  import {
-    getSalesReturnConfig,
-    postWarehouseOut,
-  } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
-
-  export default {
-    components: { SalesReturnDialog},
-    name: 'otherStockOutOrderAdd',
-
-    data() {
-      return {
-        type:2,
-        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: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-        },
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    methods: {
-      comfirm: function(val) {
-        this.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['count'] = ''
-              tempForm['price'] = ''
-              tempForm['remark'] = ''
-
-              this.recordInfo.recordData.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            var warehouseList =  response.data.data.warehouseList
-            var warehouseInfoList =  response.data.data.warehouseInfoList
-            for (let i = 0; i <warehouseList.length; i++ ){
-              if(warehouseList[i].Manufacturer.id > 0){
-                this.manufacturer.push(warehouseList[i].Manufacturer)
-              }
-              if(warehouseList[i].Dealer.id > 0){
-                this.dealer.push(warehouseList[i].Dealer)
-              }
-            }
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-
-            }
-            const obj = {}
-            const obj2 = {}
-            const obj4 = {}
-            //去重复
-            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
-              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            //去重复
-            this.dealer =  this.dealer.reduce((cur, next) => {
-              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-
-
-          }
-        })
-      }, typeName: function(good_type_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
-          }
-        }
-        return name
-      }, specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['good_type_id'] = 0
-        tempObj['good_id'] = 0
-        tempObj['count'] = ''
-        tempObj['price'] = ''
-        tempObj['remark'] = ''
-
-
-        this.recordInfo.recordData.push(tempObj)
-      }, handleDelete: function(index, row) {
-        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) {
-        this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
-          this.$message.error('请先选择厂商')
-          return
-        } else {
-          this.isVisibility = true
-          console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++){
-            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
-              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
-            }
-
-          }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-
-
-
-        }
-      }, back() {
-        this.$router.go(-1)
-      }, submit() {
-        this.$refs['tableForm'].validate((valid) => {
-          if (valid) {
-            if (this.form.manufacturer == 0) {
-              this.$message.error('厂商不能为空')
-              return
-            }
-            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
-            }
-            const params = {
-              'stockOut': this.recordInfo.recordData
-            }
-            console.log(this.form.dealer)
-
-
-            postWarehouseOut(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.$notify({
-                  title: "成功",
-                  message: "退货成功",
-                  type: "success",
-                  duration: 2000
-                });
-                this.recordInfo.recordData = []
-                this.$router.back(-1)
-              }
-            });
-          } else {
-            return false
-          }
-        })
-      }
-    },
-    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.warehouse_out_time = endTime
-      const tempObj = {}
-      tempObj['good_type_id'] = 0
-      tempObj['good_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;
-  }
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-  // border-radius: 4px 4px 0 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/otherStockOutOrderDetail.vue

@@ -1,258 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <div class="filter-container">
-      <span style="font-size: 20px">退货单详情</span>
-      <el-row style="float:right;">
-        <span>{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
-      </el-row>
-    </div>
-
-
-
-    <div class="filter-container">
-      <span>单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
-      <span>经销商 {{getDealerName(warehousingOutInfo.info.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="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%" border
-      >
-        <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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>
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-  import { GetAllConfig,getWarehouseOutInfo,deleteWarehouseOut } from '@/api/stock'
-
-  export default {
-    name: 'otherStockOutOrderDetail',
-    created() {
-      const order_id = this.$route.query.id
-      this.GetConfigInfo()
-      this.GetOrderDetail(order_id)
-    },
-    data() {
-      return {
-        isEdit: 0,
-        checked: false,
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        goodType: [],
-        goodInfo: [],
-        manufacturer: [],
-        dealer: [],
-
-        warehousingOutInfo: {
-          loading: false,
-          warehousingOutData: [],
-          info: {}
-        }
-      }
-    },
-    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
-        }
-        getWarehouseOutInfo(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
-          }
-        })
-      }, 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(() => {
-          deleteWarehouseOut(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;
-  }
-
-  }
-
-  .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;
-
-  }
-
-</style>

src/xt_pages/stock/otherStockOutOrderEdit.vue

@@ -1,425 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                         :visibility="isVisibility"
-                         v-on:dialog-comfirm="comfirm"
-                         v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8">
-          <div>
-            <span>入库时间:</span>
-            <el-date-picker 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>
-        </el-col>
-      </el-row>
-    </div>
-
-    <el-row>
-      <el-col>
-        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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_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-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>
-        </el-form>
-      </el-col>
-
-
-      <span class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import { uParseTime } from '@/utils/tools'
-
-  import {
-    deleteWarehouseOutInfo,
-    getWarehouseOutInfo,
-    getSalesReturnConfig,
-    editWarehouseoutInfo
-  } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
-
-  export default {
-    components: { SalesReturnDialog},
-    name: 'otherStockOutOrderEdit',
-
-    data() {
-      return {
-        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: {
-          goodType: [],
-          goodInfo: [],
-          goodUnit: [],
-          title: '入库'
-        },
-
-        form: {
-          manufacturer: '',
-          dealer: ''
-        },
-
-        warehouseOut: {},
-        manufacturer: [],
-        dealer: [],
-        goodType: []
-      }
-    },
-    methods: {
-      comfirm: function(val) {
-        this.isVisibility = false
-        if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['count'] = ''
-              tempForm['price'] = ''
-              tempForm['remark'] = ''
-
-              this.recordInfo.recordData.push(tempForm)
-            }
-          }
-        }
-
-        this.currentIndex = -1
-      }, cancle: function() {
-        this.isVisibility = false
-      }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            var warehouseInfoList = response.data.data.warehouseInfoList
-            for (let i = 0; i < warehouseInfoList.length; i++) {
-              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-              this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
-
-            }
-            const obj3 = {}
-            const obj4 = {}
-            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
-              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-              return cur
-            }, [])
-          }
-        })
-      }, typeName: function(good_type_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodType.length; i++) {
-          if (this.propForm.goodType[i].id == good_type_id) {
-            name = this.propForm.goodType[i].type_name
-          }
-        }
-        return name
-      }, specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_name
-          }
-        }
-        return name
-      }, handleEdit: function(index, row) {
-        const tempObj = {}
-        tempObj['id'] = 0
-        tempObj['good_type_id'] = 0
-        tempObj['good_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(() => {
-            deleteWarehouseOutInfo(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.recordInfo.recordData.splice(index, 1)
-              }
-            })
-          }).catch(() => {
-          })
-        }
-      }, getTime(val, temp) {
-        if (val != 0) {
-          return uParseTime(val, temp)
-        } else {
-          return ''
-        }
-      }, showDialog(index, row) {
-        this.currentIndex = index
-
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
-            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
-          }
-        }
-        const obj3 = {}
-        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-          return cur
-        }, [])
-
-      }, 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].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
-                return
-              }
-              if (array[i].good_id == 0) {
-                this.$message.error('规格名称不能为空')
-                return
-              }
-            }
-
-            const params = {
-              'stockOut': this.recordInfo.recordData
-            }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id).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)
-              }
-            })
-          } else {
-            return false
-          }
-        })
-      }, GetOrderDetail: function(order_id) {
-        const params = {
-          'id': order_id
-        }
-        getWarehouseOutInfo(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}')
-
-          }
-
-        })
-      }, calculate: function(val) {
-        if (val == 0) {
-          return ''
-        }
-        return Math.round(parseFloat(val) * 100) / 100
-      }
-    },
-    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;
-  }
-
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-    border-radius: 4px 4px 0 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/salesReturn.vue

@@ -62,11 +62,14 @@
           </el-table-column>
           <el-table-column label="操作" align="center" min-width="30">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)">删除
-              </el-button>
+              <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>

src/xt_pages/stock/salesReturnEdit.vue

@@ -1,6 +1,10 @@
 <template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
 
-  <div class="app-container sign-and-weigh-box">
+  <div class="app-container">
 
     <sales-return-dialog :propForm="propForm"
                      :visibility="isVisibility"
@@ -12,7 +16,7 @@
       <el-row>
         <el-col :span="8">
           <div>
-            <span>入库时间:</span>
+            <span>退货时间:</span>
             <el-date-picker 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>
@@ -30,15 +34,22 @@
 
             <el-table-column label="操作" align="center" min-width="30">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
+                 <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-edit"
+                    @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>
 
@@ -97,6 +108,8 @@
 
     </el-row>
   </div>
+  </div>
+
 </template>
 
 <script>
@@ -109,13 +122,19 @@
     editSalesReturnInfo
   } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    components: { SalesReturnDialog },
+    components: { BreadCrumb, SalesReturnDialog },
     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,
@@ -161,7 +180,7 @@
       }
     },
     methods: {
-       comfirm: function(val) {
+      comfirm: function(val) {
         this.isVisibility = false
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
@@ -183,7 +202,11 @@
       }, cancle: function() {
         this.isVisibility = false
       }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
+        const params = {
+          type: this.$route.query.type
+
+        }
+        getSalesReturnConfig(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
@@ -192,7 +215,6 @@
             for (let i = 0; i < warehouseInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
               this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
-
             }
             const obj3 = {}
             const obj4 = {}
@@ -279,7 +301,6 @@
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
           return cur
         }, [])
-
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -328,7 +349,7 @@
             return false
           } else {
             for (let i = 0; i < response.data.data.list.length; i++) {
-              this.recordInfo.list[i].count =  this.recordInfo.list[i].count.toString();
+              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

src/xt_pages/stock/salesReturnOrder.vue

@@ -1,118 +1,120 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="AddNewOrder" type="primary">新增</el-button>
-      </el-row>
-    </div>
-
-    <div class="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+  <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="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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 class="app-container">
+
+      <div class="filter-container" >
+        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="filter-container">
+        <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="">-</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="saleReturnDate"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%" border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+          <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">
+              {{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-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit"
+                @click="handleEdit(scope.$index, scope.row)">
+              </el-button>
+
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+              </el-button>
+
+            </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>
-
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
-        :data="saleReturnDate"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%" border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-
-      >
-        <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">
-            {{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-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row)">
-            </el-button>
-
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">
-            </el-button>
-
-          </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>
+
 </template>
 
 <script>
@@ -121,13 +123,15 @@
   import {
     deleteSalesReturn,
     GetAllConfig,
-    getWarehouseInfoList,
     getSalesReturnList,
+    getWarehouseInfoList,
     getWarehouseList
   } 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
@@ -158,6 +162,10 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/return', name: '退货单' }
+        ],
         type: 1,
         page: 1,
         limit: 7,
@@ -175,13 +183,13 @@
         goodInfo: [],
         manufacturer: [],
         selectedTableData: [],
-        dealer: [],
+        dealer: []
 
       }
     },
     methods: {
-      AddNewOrder:function(){
-        this.$router.push({ name: 'salesReturnOrderAdd'})
+      AddNewOrder: function() {
+        this.$router.push({ name: 'salesReturnOrderAdd', query: { type: this.type }})
       },
       GetSalesReturn: function() {
         const Params = {
@@ -189,7 +197,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type:this.type,
+          type: this.type
         }
         this.saleReturnDate = []
         getSalesReturnList(Params).then(response => {
@@ -272,7 +280,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'salesReturnDetail', query: { id: row.id }})
+        this.$router.push({ name: 'salesReturnDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -1,148 +1,163 @@
 <template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <sales-return-dialog :propForm="propForm"
-                     :visibility="isVisibility"
-                     v-on:dialog-comfirm="comfirm"
-                     v-on:dialog-cancle="cancle"></sales-return-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8"><div>
-          <span>退货时间:</span>
-          <el-date-picker 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></el-col>
-
-
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-              <el-form-item label="厂商：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" label-width="80px">
-              <el-form-item label="经销商：">
-                <el-select v-model="form.dealer" placeholder="请选择经销商">
-                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-      </el-row>
-
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
 
-    <el-row>
-      <el-col>
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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" >
-                <!--<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>
+    <div class="app-container">
+      <sales-return-dialog :propForm="propForm"
+                           :visibility="isVisibility"
+                           v-on:dialog-comfirm="comfirm"
+                           v-on:dialog-cancle="cancle"></sales-return-dialog>
+      <div class="filter-container">
+        <el-row>
+          <el-col :span="8">
+            <div>
+              <span>退货时间:</span>
+              <el-date-picker 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>
+          </el-col>
+
+
+          <el-col :span="8">
+            <div>
+              <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+                <el-form-item label="厂商：" prop="manufacturer">
+                  <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                    <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name"
+                               :value="option.id"></el-option>
+                  </el-select>
                 </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>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div>
+              <el-form ref="form" :model="form" label-width="80px">
+                <el-form-item label="经销商：">
+                  <el-select v-model="form.dealer" placeholder="请选择经销商">
+                    <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name"
+                               :value="option.id"></el-option>
+                  </el-select>
                 </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">
-                <!--{{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 + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-
-          </el-table>
-        </el-form>
-      </el-col>
+              </el-form>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+              <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                        max-height="450"
+              >
+
+                <el-table-column label="操作" align="center" min-width="30">
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      @click="handleEdit(scope.$index, scope.row)">+
+                    </el-button>
+                    <el-button
+                      size="mini"
+                      type="danger"
+                      @click="handleDelete(scope.$index, scope.row)">-
+                    </el-button>
+                  </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">
+                    <!--<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">
+                    <!--{{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 + '.return_count'" :rules='tableRules.return_count'
+                                  style="padding-top: 17px">
+                      <el-input type="number" v-model="scope.row.return_count"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+
+              </el-table>
+            </el-form>
+          </el-col>
 
 
-      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+          <span class="dialog-footer" style="margin-top: 20px;float:right">
         <el-button @click="back()">取 消</el-button>
         <el-button type="primary" @click="submit()">确 定</el-button>
       </span>
 
-    </el-row>
+        </el-row>
+      </div>
+
+    </div>
   </div>
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import {
-    getSalesReturnConfig,
-    postSalesReturn,
-  } from '@/api/stock'
+  import { getSalesReturnConfig, postSalesReturn } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    components: { SalesReturnDialog},
+    components: { BreadCrumb, SalesReturnDialog },
     name: 'salesReturnOrderAdd',
 
     data() {
       return {
-        type:1,
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/return', name: '退回单' },
+          { path: '/stock/return/add', name: '新增退货单' }
+        ],
+
+        type: this.$route.query.type,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
         currentIndex: 0,
         recordInfo: {
-          recordData: [],
+          recordData: []
         },
         tableRules: {
           price: [
@@ -150,7 +165,7 @@
           ],
           return_count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
-          ],
+          ]
         },
         ruleForm: {
           manufacturer: [
@@ -163,7 +178,7 @@
         propForm: {
           goodType: [],
           goodInfo: [],
-          goodUnit: [],
+          goodUnit: []
         },
         form: {
           manufacturer: '',
@@ -179,7 +194,7 @@
       comfirm: function(val) {
         this.isVisibility = false
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
+          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
@@ -198,38 +213,39 @@
       }, cancle: function() {
         this.isVisibility = false
       }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
+        const params = {
+          type: this.type
+        }
+        getSalesReturnConfig(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            var warehouseList =  response.data.data.warehouseList
-            var warehouseInfoList =  response.data.data.warehouseInfoList
-            for (let i = 0; i <warehouseList.length; i++ ){
-              if(warehouseList[i].Manufacturer.id > 0){
+            var warehouseList = response.data.data.warehouseList
+            var warehouseInfoList = response.data.data.warehouseInfoList
+            for (let i = 0; i < warehouseList.length; i++) {
+              if (warehouseList[i].Manufacturer.id > 0) {
                 this.manufacturer.push(warehouseList[i].Manufacturer)
               }
-              if(warehouseList[i].Dealer.id > 0){
+              if (warehouseList[i].Dealer.id > 0) {
                 this.dealer.push(warehouseList[i].Dealer)
               }
             }
 
             for (let i = 0; i < warehouseInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-
             }
 
-
             const obj = {}
             const obj2 = {}
             const obj4 = {}
-            //去重复
-            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+            // 去重复
+            this.manufacturer = this.manufacturer.reduce((cur, next) => {
               obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
               return cur
             }, [])
-            //去重复
-            this.dealer =  this.dealer.reduce((cur, next) => {
+            // 去重复
+            this.dealer = this.dealer.reduce((cur, next) => {
               obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
               return cur
             }, [])
@@ -237,8 +253,6 @@
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
-
-
           }
         })
       }, typeName: function(good_type_id) {
@@ -267,7 +281,6 @@
       }, handleDelete: function(index, row) {
         this.recordInfo.recordData.splice(index, 1)
       }, calculate: function(val) {
-
         if (val == 0) {
           return ''
         }
@@ -287,20 +300,16 @@
         } else {
           this.isVisibility = true
           console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++){
-            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+          for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+            if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
               this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
             }
-
           }
           const obj3 = {}
           this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
             obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
             return cur
           }, [])
-
-
-
         }
       }, back() {
         this.$router.go(-1)
@@ -327,21 +336,21 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            postSalesReturn(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 {
+            postSalesReturn(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.$notify({
-                  title: "成功",
-                  message: "退货成功",
-                  type: "success",
+                  title: '成功',
+                  message: '退货成功',
+                  type: 'success',
                   duration: 2000
-                });
+                })
                 this.recordInfo.recordData = []
                 this.$router.back(-1)
               }
-            });
+            })
           } else {
             return false
           }
@@ -382,6 +391,7 @@
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+
   }
 
   .title {
@@ -391,7 +401,6 @@
     padding: 0 0 0 10px;
     color: #fff;
     margin: 0 0 10px 0;
-  // border-radius: 4px 4px 0 0;
   }
 
   .edit_separater {

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -1,70 +1,77 @@
 <template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <div class="filter-container">
-      <span style="font-size: 20px">退货单详情</span>
-      <el-row style="float:right;">
-        <span>{{ReturnInfo.salesReturn.order_number}}</span>
-      </el-row>
-    </div>
-
-
-
-    <div class="filter-container">
-      <span>单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
-      <span>经销商 {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </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 class="app-container">
+
+      <div class="filter-container">
+        <span style="font-size: 18px">退货单详情</span>
+        <el-row style="float:right;">
+          <span>{{ReturnInfo.salesReturn.order_number}}</span>
+        </el-row>
+      </div>
+
+
+      <div class="cell">
+        <span style="width: 300px">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px">厂商: {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
+        <span style="width: 300px">经销商: {{getDealerName(ReturnInfo.salesReturn.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="ReturnInfo.returnInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+        >
+          <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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>
-
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table :data="ReturnInfo.returnInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
-      >
-        <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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>
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { GetAllConfig,getReturnList,deleteSalesReturn } from '@/api/stock'
+  import { deleteSalesReturn, GetAllConfig, getReturnList } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
     name: 'stockInOrderDetail',
+    components: { BreadCrumb },
     created() {
       const order_id = this.$route.query.id
       this.GetConfigInfo()
@@ -72,6 +79,11 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/return', name: '退货单' },
+          { path: '/stock/return/detail', name: '退货单详情' }
+        ],
         isEdit: 0,
         checked: false,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',

src/xt_pages/stock/salesReutrnRecord.vue

@@ -26,7 +26,6 @@
                   highlight-current-row
                   @row-click="onRowClick"
                   :row-class-name="tableRowClassName"
-                  highlight-current-row
                   v-loading="salesReturn.loading"
         >
           <el-table-column label="退货单号" min-width="40" align="center">

src/xt_pages/stock/stockIn.vue

@@ -31,7 +31,6 @@
                   highlight-current-row
                   @row-click="onRowClick"
                   :row-class-name="tableRowClassName"
-                  highlight-current-row
                   v-loading="Warehouse.loading"
         >
           <el-table-column label="入库单号" min-width="40" align="center">

src/xt_pages/stock/stockInOrder.vue

@@ -1,39 +1,34 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="handleWarehouse" type="primary">新增</el-button>
-      </el-row>
-    </div>
-
-    <div class="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+  <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="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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>
+      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item" />
+      <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
     </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 class="cell">
+        <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="">-</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="cell clearfix">
+        <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>
 
-    </div>
-
-    <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="Warehouse.warehouseDate"
         :class="signAndWeighBoxPatients"
@@ -42,14 +37,17 @@
         v-loading="Warehouse.loading"
         ref="multipleTable"
         @selection-change="select"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
 
       >
         <el-table-column
+          align="center"
           type="selection"
           width="55">
         </el-table-column>
 
-        <el-table-column label="单据日期" align="center">
+        <el-table-column label="单据日期"  align="center">
           <template slot-scope="scope">
             {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
           </template>
@@ -82,19 +80,22 @@
 
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row)">
-            </el-button>
-
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">
-            </el-button>
+             <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>
@@ -111,8 +112,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-
-    </el-row>
+    </div>
   </div>
 </template>
 
@@ -127,9 +127,11 @@
     getWarehouseInfoList,
     getWarehouseList
   } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
     name: 'stockIn',
+    components: { BreadCrumb },
     created() {
       var year = new Date().getFullYear()
       var month = new Date().getMonth() + 1
@@ -160,6 +162,11 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/in', name: '入库单' }
+        ],
+        type: 1,
         page: 1,
         limit: 7,
         checked: false,
@@ -195,7 +202,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type : 1,
+          type: this.type
         }
         this.Warehouse.warehouseDate = []
         getWarehouseList(Params).then(response => {
@@ -315,7 +322,7 @@
       }, clicks: function() {
         console.log(this.WarehouseInfo.warehouseInfoDate)
       }, handleWarehouse: function() {
-        this.$router.push({ path: '/stock/in/add' })
+        this.$router.push({ path: '/stock/in/add', query: { type: this.type }})
       }, handleReturnSales: function() {
         // this.$router.push({path:'/patients/create'}
         if (this.multipleSelection.length <= 0) {
@@ -472,16 +479,6 @@
 
   }
 
-  .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;

src/xt_pages/stock/stockInOrderAdd.vue

@@ -1,194 +1,199 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-    <stock-in-dialog :propForm="propForm"
-                     :visibility="isVisibility"
-                     v-on:dialog-comfirm="comfirm"
-                     v-on:dialog-cancle="cancle"></stock-in-dialog>
-
-    <div class="filter-container">
-
-      <el-row>
-        <el-col :span="8">
-          <div>
-            <span>入库时间:</span>
-            <el-date-picker 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>
-        </el-col>
-
-
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-              <el-form-item label="厂商：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name"
-                             :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" label-width="80px">
-              <el-form-item label="经销商：">
-                <el-select v-model="form.dealer" placeholder="请选择经销商">
-                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name"
-                             :value="option.id"></el-option>
-                </el-select>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+
+      <stock-in-dialog :propForm="propForm"
+                       :visibility="isVisibility"
+                       v-on:dialog-comfirm="comfirm"
+                       v-on:dialog-cancle="cancle"></stock-in-dialog>
+
+      <div class="filter-container">
+
+        <el-row>
+          <el-col :span="8">
+            <el-form ref="form" :model="form" label-width="100px">
+              <el-form-item label="入库时间：">
+                <el-date-picker 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>
               </el-form-item>
             </el-form>
-          </div>
-        </el-col>
-      </el-row>
-
-    </div>
+          </el-col>
 
-    <el-row>
-      <el-col>
-        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
-          >
-
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </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">
-                <!--<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-col :span="8">
+            <div>
+              <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+                <el-form-item label="厂商：" prop="manufacturer">
+                  <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                    <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name"
+                               :value="option.id"></el-option>
+                  </el-select>
                 </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>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div>
+              <el-form ref="form" :model="form" label-width="80px">
+                <el-form-item label="经销商：">
+                  <el-select v-model="form.dealer" placeholder="请选择经销商">
+                    <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name"
+                               :value="option.id"></el-option>
+                  </el-select>
                 </el-form-item>
+              </el-form>
+            </div>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col>
+            <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+              <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                        max-height="450"
+              >
+
+                <el-table-column label="操作" align="center" min-width="30">
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      @click="handleEdit(scope.$index, scope.row)">+
+                    </el-button>
+                    <el-button
+                      size="mini"
+                      type="danger"
+                      @click="handleDelete(scope.$index, scope.row)">-
+                    </el-button>
+                  </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_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-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">
+                    <!--{{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 type="number" v-model="scope.row.warehousing_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.warehousing_count)}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column align="center" min-width="25">
+                  <template slot="header" slot-scope="scope">
+                    <span>批号<span style="color: red">*</span></span>
+                  </template>
+                  <template slot-scope="scope">
+                    <!--<el-input  v-model="scope.row.numbers"></el-input>-->
+
+                    <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
+                                  style="padding-top: 17px">
+                      <el-input v-model="scope.row.number"></el-input>
+                    </el-form-item>
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="生产日期" min-width="40" 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="有效日期" min-width="40" 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="备注" min-width="20" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.remark"></el-input>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form>
+          </el-col>
 
 
-              </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">
-                <!--{{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 type="number" v-model="scope.row.warehousing_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.warehousing_count)}}
-              </template>
-            </el-table-column>
-
-            <el-table-column align="center" min-width="25">
-              <template slot="header" slot-scope="scope">
-                <span>批号<span style="color: red">*</span></span>
-              </template>
-              <template slot-scope="scope">
-                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
-
-                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number'
-                              style="padding-top: 17px">
-                  <el-input v-model="scope.row.number"></el-input>
-                </el-form-item>
-
-              </template>
-            </el-table-column>
-            <el-table-column label="生产日期" min-width="40" 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="有效日期" min-width="40" 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="备注" min-width="20" align="center">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.remark"></el-input>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </el-col>
+          <span class="dialog-footer" style="margin-top: 20px;float:right">
+          <el-button @click="back()">取 消</el-button>
+          <el-button type="primary" @click="submit()">确 定</el-button>
+        </span>
 
+        </el-row>
 
-      <span class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
+      </div>
 
-    </el-row>
+    </div>
   </div>
+
 </template>
 
 <script>
@@ -205,9 +210,10 @@
     modifyWarehouseInfo,
     postWarehouse
   } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    components: { stockInDialog },
+    components: { BreadCrumb, stockInDialog },
     name: 'stockIn',
 
     data() {
@@ -220,6 +226,11 @@
       }
 
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/in', name: '入库单' },
+          { path: '/stock/in/add', name: '新增入库单' }
+        ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehousing_time: '',
         adminUserOptions: null,
@@ -252,7 +263,7 @@
           ]
 
         },
-        type: 1,
+        type: this.$route.query.type,
         total: '',
         product_date: '',
         expiry_date: '',
@@ -346,8 +357,8 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['number'] = ''
-              tempForm['product_date'] = 0
-              tempForm['expiry_date'] = 0
+              tempForm['product_date'] = ''
+              tempForm['expiry_date'] = ''
               tempForm['warehousing_count'] = ''
               tempForm['price'] = ''
               tempForm['remark'] = ''
@@ -396,7 +407,7 @@
           }
         })
       }, typeName: function(good_type_id) {
-        let name = '请输入物品类型'
+        let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == good_type_id) {
             name = this.goodType[i].type_name
@@ -621,3 +632,4 @@
   }
 
 </style>
+s

src/xt_pages/stock/stockInOrderDetail.vue

@@ -1,23 +1,23 @@
 <template>
-
-  <div class="app-container sign-and-weigh-box">
-
+  <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: 20px">耗材入库单详情</span>
+      <span style="font-size: 18px">耗材入库单详情</span>
       <el-row style="float:right;">
-        <span>{{WarehouseInfo.warehouse.warehousing_order}}</span>
+        <span>入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
       </el-row>
     </div>
 
-
-
-    <div class="filter-container">
-      <span>单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
-      <span>经销商 {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
+    <div class="cell">
+      <span style="width: 300px">单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}}</span>
+      <span style="width: 300px">厂商: {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
+      <span style="width: 300px">经销商: {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
     </div>
 
-    <div class="filter-container" style="margin-top: 10px">
+    <div class="cell" 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>
@@ -101,14 +101,18 @@
       </el-table>
     </el-row>
   </div>
+  </div>
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { GetAllConfig, getWarehouseInfoList, deleteWarehouseInfo } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
     name: 'stockInOrderDetail',
+    components: { BreadCrumb },
     created() {
       const order_id = this.$route.query.id
       this.GetConfigInfo()
@@ -116,6 +120,11 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/in', name: '入库单' },
+          { path: '/stock/in/detail', name: '入库单详情' }
+        ],
         isEdit: 0,
         checked: false,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',

src/xt_pages/stock/stockInOrderEdit.vue

@@ -1,11 +1,15 @@
 <template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
 
   <div class="app-container sign-and-weigh-box">
 
-    <sales-return-dialog :propForm="propForm"
+    <stock-in-dialog :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
-                     v-on:dialog-cancle="cancle"></sales-return-dialog>
+                     v-on:dialog-cancle="cancle"></stock-in-dialog>
 
     <div class="filter-container">
 
@@ -28,15 +32,22 @@
 
             <el-table-column label="操作" align="center" min-width="30">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
+                <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>
 
@@ -154,6 +165,8 @@
 
     </el-row>
   </div>
+  </div>
+
 </template>
 
 <script>
@@ -170,10 +183,10 @@ import {
   DeleteWarehouseInfoItem,
   EditWarehouse
   } from '@/api/stock'
-  import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import BreadCrumb from '../components/bread-crumb'
 
 export default {
-    components: { SalesReturnDialog, stockInDialog },
+    components: { BreadCrumb, stockInDialog },
     name: 'stockIn',
 
     data() {
@@ -186,6 +199,11 @@ export default {
       }
 
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/in', name: '入库单' },
+          { path: '/stock/in/detail', name: '编辑入库单' }
+        ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehousing_time: '',
         adminUserOptions: null,
@@ -273,7 +291,7 @@ export default {
         this.currentIndex = -1
       }, cancle: function() {
         this.isVisibility = false
-      },  GetConfigInfo: function() {
+      }, GetConfigInfo: function() {
         GetAllConfig().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -285,9 +303,8 @@ export default {
             this.goodInfo = response.data.data.goodInfo
           }
         })
-
       }, typeName: function(good_type_id) {
-        let name = '请输入物品类型'
+        let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == good_type_id) {
             name = this.goodType[i].type_name
@@ -350,7 +367,7 @@ export default {
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
-      },  getTime(val, temp) {
+      }, getTime(val, temp) {
         if (val != 0) {
           return uParseTime(val, temp)
         } else {

src/xt_pages/stock/stockOut.vue

@@ -32,7 +32,6 @@
                   highlight-current-row
                   @row-click="onRowClick"
                   :row-class-name="tableRowClassName"
-                  highlight-current-row
                   v-loading="WarehouseOut.loading"
         >
           <el-table-column label="出库单号" min-width="40" align="center">

src/xt_pages/stock/stockOutOrder.vue

@@ -1,47 +1,42 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="AddNewOrder" type="primary">新增</el-button>
-      </el-row>
-    </div>
-
-    <div class="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+  <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">
+        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+
+      <div class="cell">
+        <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="">-</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="cell clearfix">
+        <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>
 
-    <div class="filter-container">
-      <span>入库时间:</span>
-      <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="">-</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="warehouseOutDate"
         :class="signAndWeighBoxPatients"
         style="width: 100%" border
         highlight-current-row
         ref="multipleTable"
-        @selection-change="select"
 
+        @selection-change="select"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
         <el-table-column
           type="selection"
@@ -65,8 +60,6 @@
             {{getXuserName(scope.row.creater)}}
           </template>
         </el-table-column>
-
-
         <el-table-column label="厂家" align="center">
           <template slot-scope="scope">
             {{getManufactuerName(scope.row.manufacturer)}}
@@ -94,12 +87,9 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.$index, scope.row)">
             </el-button>
-
           </template>
         </el-table-column>
-
       </el-table>
-
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -111,21 +101,30 @@
         :total="total">
       </el-pagination>
 
-    </el-row>
+
+    </div>
   </div>
+
+
+
+
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+
   import {
     deleteWarehouseOut,
     GetAllConfig,
-    getWarehouseOutList,
+    getWarehouseOutList
   } 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
@@ -156,6 +155,10 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/out', name: '出库单' }
+        ],
         page: 1,
         limit: 7,
         checked: false,
@@ -173,13 +176,13 @@
         manufacturer: [],
         selectedTableData: [],
         dealer: [],
-        type:1,
+        type: 1
 
       }
     },
     methods: {
-      AddNewOrder:function(){
-        this.$router.push({ name: 'stockOutOrderAdd'})
+      AddNewOrder: function() {
+        this.$router.push({ name: 'stockOutOrderAdd', query: { type: this.type }})
       },
       GetWarehouseOut: function() {
         const Params = {
@@ -187,7 +190,7 @@
           limit: this.limit,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.type,
+          type: this.type
         }
         this.warehouseOutDate = []
         getWarehouseOutList(Params).then(response => {
@@ -270,7 +273,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockOutDetail', query: { id: row.id }})
+        this.$router.push({ name: 'stockOutDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)
@@ -361,48 +364,105 @@
   }
 </script>
 
-<style rel="stylesheet/css" lang="scss" scoped>
-  .information {
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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;
-    padding: 30px 20px 30px 20px;
-
-  .border {
-    border-bottom: 1px #dcdfe6 solid;
-    margin: 0px 0 20px 0;
+    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;
   }
-
-  .title {
+  }
+  .cell {
+    margin: 0px 0 15px 0;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -o-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    display: -webkit-box;
+    display: -ms-flexbox;
+  // display: flex;
+    -webkit-box-align: flex-start;
+    -ms-flex-align: flex-start;
+    align-items: flex-start;
+    text-align: left;
+    justify-content: flex-start;
+    color: #333;
+
+  .time {
+    -webkit-box-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+  ul {
+    padding: 0;
+    margin: 0;
+  li {
+    float: left;
+    list-style: none;
+    cursor: pointer;
+    padding: 3px 0;
+    width: 70px;
+    color: #606266;
+    border-radius: 4px;
+    margin: 0 10px 0 0;
+    color: #409eff;
+    border: 1px #409eff solid;
+    text-align:center;
+  &:hover {
+     background: #409eff;
+     color: #fff;
+   }
+  }
+  .active {
     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;
-
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+  span {
+    color: #ef2525;
+    font-family: "Arial";
+    padding: 0 2px;
+  }
+  }
   }
-
 </style>
+

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -1,6 +1,11 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
+  <div class="main-contain">
+    <div class="position">
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
+  </div>
+
+  <div class="app-container">
 
     <sales-return-dialog :propForm="propForm"
                          :visibility="isVisibility"
@@ -11,7 +16,7 @@
 
       <el-row>
         <el-col :span="8"><div>
-          <span>退货时间:</span>
+          <span>出库时间:</span>
           <el-date-picker 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>
@@ -53,15 +58,23 @@
 
             <el-table-column label="操作" align="center" min-width="30">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
+                <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>
 
@@ -142,28 +155,36 @@
 
     </el-row>
   </div>
+  </div>
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import {
     getSalesReturnConfig,
-    postWarehouseOut,
+    postWarehouseOut
   } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    components: { SalesReturnDialog},
+    components: { BreadCrumb, SalesReturnDialog },
     name: 'salesReturnOrderAdd',
 
     data() {
       return {
-        type:1,
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/out', name: '出库单' },
+          { path: '/stock/out/add', name: '新增出库单' }
+        ],
+        type: this.$route.query.type,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehouse_out_time: '',
         currentIndex: 0,
         recordInfo: {
-          recordData: [],
+          recordData: []
         },
         tableRules: {
           price: [
@@ -171,7 +192,7 @@
           ],
           count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
-          ],
+          ]
         },
         ruleForm: {
           manufacturer: [
@@ -184,7 +205,7 @@
         propForm: {
           goodType: [],
           goodInfo: [],
-          goodUnit: [],
+          goodUnit: []
         },
         form: {
           manufacturer: '',
@@ -221,35 +242,38 @@
       }, cancle: function() {
         this.isVisibility = false
       }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
+        const params = {
+          type: this.$route.query.type
+
+        }
+        getSalesReturnConfig(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            var warehouseList =  response.data.data.warehouseList
-            var warehouseInfoList =  response.data.data.warehouseInfoList
-            for (let i = 0; i <warehouseList.length; i++ ){
-              if(warehouseList[i].Manufacturer.id > 0){
+            var warehouseList = response.data.data.warehouseList
+            var warehouseInfoList = response.data.data.warehouseInfoList
+            for (let i = 0; i < warehouseList.length; i++) {
+              if (warehouseList[i].Manufacturer.id > 0) {
                 this.manufacturer.push(warehouseList[i].Manufacturer)
               }
-              if(warehouseList[i].Dealer.id > 0){
+              if (warehouseList[i].Dealer.id > 0) {
                 this.dealer.push(warehouseList[i].Dealer)
               }
             }
             for (let i = 0; i < warehouseInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
-
             }
             const obj = {}
             const obj2 = {}
             const obj4 = {}
-            //去重复
-            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+            // 去重复
+            this.manufacturer = this.manufacturer.reduce((cur, next) => {
               obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
               return cur
             }, [])
-            //去重复
-            this.dealer =  this.dealer.reduce((cur, next) => {
+            // 去重复
+            this.dealer = this.dealer.reduce((cur, next) => {
               obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
               return cur
             }, [])
@@ -257,8 +281,6 @@
               obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
               return cur
             }, [])
-
-
           }
         })
       }, typeName: function(good_type_id) {
@@ -285,12 +307,11 @@
         tempObj['price'] = ''
         tempObj['remark'] = ''
 
-
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         this.recordInfo.recordData.splice(index, 1)
       }, calculate: function(val) {
-        if(isNaN(val)){
+        if (isNaN(val)) {
           return ''
         }
         if (val == 0) {
@@ -311,20 +332,16 @@
         } else {
           this.isVisibility = true
           console.log(this.form.manufacturer)
-          for (let i = 0; i < this.propForm.goodInfo.length; i++){
-            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+          for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+            if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
               this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
             }
-
           }
           const obj3 = {}
           this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
             obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
             return cur
           }, [])
-
-
-
         }
       }, back() {
         this.$router.go(-1)
@@ -353,22 +370,21 @@
             }
             console.log(this.form.dealer)
 
-
-            postWarehouseOut(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 {
+            postWarehouseOut(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.$notify({
-                  title: "成功",
-                  message: "退货成功",
-                  type: "success",
+                  title: '成功',
+                  message: '退货成功',
+                  type: 'success',
                   duration: 2000
-                });
+                })
                 this.recordInfo.recordData = []
                 this.$router.back(-1)
               }
-            });
+            })
           } else {
             return false
           }

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -1,96 +1,104 @@
 <template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <div class="filter-container">
-      <span style="font-size: 20px">退货单详情</span>
-      <el-row style="float:right;">
-        <span>{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
-      </el-row>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
 
-
-
-    <div class="filter-container">
-      <span>单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span>厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
-      <span>经销商 {{getDealerName(warehousingOutInfo.info.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 class="app-container">
+
+      <div class="filter-container">
+        <span style="font-size: 18px">出库单详情</span>
+        <el-row style="float:right;">
+          <span>{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+        </el-row>
+      </div>
+
+
+      <div class="cell">
+        <span style="width: 300px;">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
+        <span style="width: 300px;">经销商 {{getDealerName(warehousingOutInfo.info.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="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
+                  border
+        >
+          <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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>
+      </el-row>
     </div>
-
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%" border
-      >
-        <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.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</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.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</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>
-    </el-row>
   </div>
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { GetAllConfig,getWarehouseOutInfo,deleteWarehouseOut } from '@/api/stock'
+  import { deleteWarehouseOut, GetAllConfig, getWarehouseOutInfo } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
     name: 'stockInOrderDetail',
+    components: { BreadCrumb },
     created() {
       const order_id = this.$route.query.id
       this.GetConfigInfo()
@@ -98,6 +106,11 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/out', name: '出库单' },
+          { path: '/stock/out/detail', name: '出库单详情' }
+        ],
         isEdit: 0,
         checked: false,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -1,6 +1,10 @@
 <template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
 
-  <div class="app-container sign-and-weigh-box">
+  <div class="app-container">
 
     <sales-return-dialog :propForm="propForm"
                      :visibility="isVisibility"
@@ -12,7 +16,7 @@
       <el-row>
         <el-col :span="8">
           <div>
-            <span>入库时间:</span>
+            <span>出库时间:</span>
             <el-date-picker 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>
@@ -30,15 +34,23 @@
 
             <el-table-column label="操作" align="center" min-width="30">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
+                 <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>
 
@@ -119,6 +131,8 @@
 
     </el-row>
   </div>
+  </div>
+
 </template>
 
 <script>
@@ -131,13 +145,19 @@
     editWarehouseoutInfo
   } from '@/api/stock'
   import SalesReturnDialog from './Dialog/salesReturnDialog'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
-    components: { SalesReturnDialog},
+    components: { BreadCrumb, SalesReturnDialog },
     name: 'salesReturnEdit',
 
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/out', name: '出库单' },
+          { path: '/stock/out/detail', name: '编辑出库单' }
+        ],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
 
         adminUserOptions: null,
@@ -155,7 +175,7 @@
           ],
           price: [
             { required: true, message: '单价不能为空', trigger: 'blur' }
-          ],
+          ]
 
         },
         ruleForm: {
@@ -209,7 +229,10 @@
       }, cancle: function() {
         this.isVisibility = false
       }, GetConfigInfo: function() {
-        getSalesReturnConfig().then(response => {
+        const params = {
+          type: this.$route.query.type
+        }
+        getSalesReturnConfig(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
@@ -218,7 +241,6 @@
             for (let i = 0; i < warehouseInfoList.length; i++) {
               this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
               this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
-
             }
             const obj3 = {}
             const obj4 = {}
@@ -307,7 +329,6 @@
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
           return cur
         }, [])
-
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -362,9 +383,7 @@
             }
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
-
           }
-
         })
       }, calculate: function(val) {
         if (val == 0) {

src/xt_pages/user/components/PatientSidebar.vue

@@ -202,7 +202,7 @@
     float: left;
     bottom: 0;
     left: 0;
-    z-index: 1001;
+    z-index: 99;
     overflow: hidden;
   }
 

src/xt_pages/user/dialysisSolution.1.vue

@@ -81,24 +81,31 @@
      </el-table-column>
      <el-table-column label="操作" align="center" min-width="140">
       <template slot-scope="scope">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="openEdit(scope.$index, scope.row)" v-if="scope.row.parent_id===0">编辑</el-button>
+        <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+          <el-button
+            size="small"
+            type="primary"
+            @click="openEdit(scope.$index, scope.row)" v-if="scope.row.parent_id===0"></el-button>
+          </el-tooltip>  
+          <el-tooltip class="item" effect="dark" content="编辑" placement="top">          
+          <el-button
+            size="small"
+            type="primary"
+            @click="openChildEdit(scope.$index, scope.row)" v-else></el-button>
+          </el-tooltip>  
+          <el-tooltip class="item" effect="dark" content="新增" placement="top">          
+          <el-button
+            size="small"
+            type="success"
+            @click="openNewChild(scope.$index, scope.row)" v-if="scope.row.parent_id===0"></el-button>
+          </el-tooltip>  
+          <el-tooltip class="item" effect="dark" content="删除" placement="top"> 
+          <el-button
+            size="small"
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"></el-button>
+          </el-tooltip>  
           
-        <el-button
-          size="mini"
-          type="primary"
-          @click="openChildEdit(scope.$index, scope.row)" v-else>编辑</el-button>
-
-        <el-button
-          size="mini"
-          type="success"
-          @click="openNewChild(scope.$index, scope.row)" v-if="scope.row.parent_id===0">新增</el-button>
-        <el-button
-          size="mini"
-          type="danger"
-          @click="handleDelete(scope.$index, scope.row)">删除</el-button>
       </template>
     </el-table-column>
    </el-table>

src/xt_pages/user/dialysisSolution.vue

@@ -89,11 +89,13 @@
      </el-table-column> -->
      <el-table-column label="操作" align="center" min-width="140">
       <template slot-scope="scope">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="openEdit(scope.$index, scope.row)" >编辑</el-button>
-
+        <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-edit-outline"
+            @click="openEdit(scope.$index, scope.row)" ></el-button>
+        </el-tooltip>
      <!--   <el-button
           size="mini"
           type="primary"

src/xt_pages/user/doctorAdvice.vue

@@ -3,10 +3,10 @@
         <patient-sidebar :id="patientID" defaultActive="1-4" v-on:tran-patient="onTranPatient"></patient-sidebar>
         <div class="patient-app-container advice-container app-container">
             <div class="filter-container">
-                <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" />
-                <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
-                <el-button  class="filter-item" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印医嘱</el-button>
-                <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-plus" >新增医嘱</el-button>
+                <el-input  size="small" style="width: 400px;" v-model="listQuery.keywords" class="filter-item" />
+                <el-button size="small"  class="filter-item" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
+                <el-button size="small" class="filter-item" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印医嘱</el-button>
+                <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-plus" >新增医嘱</el-button>
             </div>
             <div class="cell clearfix">
                 <label class="title"><span class="name">医嘱类型</span> : </label>
@@ -2839,66 +2839,7 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
+
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/user/patient.vue

@@ -393,70 +393,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 3px 0;
-          width: 70px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 10px 0 0;
-          color: #409eff;
-          border: 1px #409eff solid;
-          text-align:center;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/user/patientInfo.vue

@@ -2,38 +2,38 @@
 <template>
   <div class="patient-container">
   <patient-sidebar :id="patientID"></patient-sidebar>
-  <patient-detail :is-edit='true' :class='panelClass' v-on:tran-patient-info="patientInfo=$event"></patient-detail>
+  <!--<patient-detail :is-edit='true' :class='panelClass' v-on:tran-patient-info="patientInfo=$event"></patient-detail>-->
   </div>
 </template>
 
 <script>
-import PatientDetail from './components/PatientDetail'
+// import PatientDetail from './components/PatientDetail'
 import PatientSidebar from './components/PatientSidebar'
 
 export default {
   name: 'editForm',
-  components: { PatientDetail,PatientSidebar },
+  components: { PatientDetail, PatientSidebar },
 
-  data(){
-    return{
-      patientID:0,
-      panelClass:"patient-app-container",
-      patientInfo:{
-        id:0
-      },
+  data() {
+    return {
+      patientID: 0,
+      panelClass: 'patient-app-container',
+      patientInfo: {
+        id: 0
+      }
     }
   },
-  created(){
-    const id = this.$route.params && this.$route.params.id;
-      this.patientID = parseInt(id);
-      if (isNaN(this.patientID) || this.patientID <= 0) {
-          console.log("patient info not had id");
-          this.$notify.error({
-          title: "错误",
-          message: "无效的id"
-          });
-          this.$router.push('/patients/patients');
-      }
+  created() {
+    const id = this.$route.params && this.$route.params.id
+    this.patientID = parseInt(id)
+    if (isNaN(this.patientID) || this.patientID <= 0) {
+      console.log('patient info not had id')
+      this.$notify.error({
+        title: '错误',
+        message: '无效的id'
+      })
+      this.$router.push('/patients/patients')
+    }
   }
 
 }

src/xt_pages/user/patients.vue

@@ -1,16 +1,16 @@
 <template>
+<div class="main-contain">
+  <div class="position">
+    <bread-crumb></bread-crumb>
+    <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="$router.push({path:'/patients/create'})" class="filter-item" style="float:right;" type="primary" icon="el-icon-circle-plus-outline" size="small">新增</el-button>
+  </div>
   <div class="app-container">
-    <div class="filter-container">
+    <div class="cell">
+      <label class="title"><span class="name">病人搜索</span> : </label>
       <el-input   style="width: 400px;" v-model="searchKey" class="filter-item" placeholder="病人姓名/透析号" size="small"/>
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" size="small" >搜索</el-button>
-      <!-- <el-button  class="filter-item" type="primary" style="float:right;" icon="el-icon-download" >批量导入</el-button> -->
-      <!-- <el-button  type="primary" plain style="float:right;" icon="el-icon-download" >批量导入</el-button>       -->
-      <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="$router.push({path:'/patients/create'})" class="filter-item" style="float:right;" type="primary" icon="el-icon-zoom-in" size="small">新增病人</el-button>
     </div>
-    <!-- <div class="search-component clearfix">
-      <input type="text" class="searchBox" placeholder="姓名/首拼/透析号" v-model="searchVal">
-      <button class="searchBtn">搜 索</button>
-    </div> -->
+   
     <div class="cell">
       <label class="title"><span class="name">日期查询</span> : </label>
       <el-date-picker v-model="listQuery.start_time" size="small"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions1"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
@@ -33,14 +33,6 @@
         </ul>
       </div>
     </div>
-    <!-- <div class="cell clearfix">
-	    <label class="title"><span class="name">病人来源</span> : </label>
-	    <div class="time ">
-        <ul class="">
-          <li :class="item.value==sourceType?'active':''" :style="item.source>0&&lapsetoType!=1?'display:none;':''" @click="selectLapseTo(item.value, item.source, item.lapseto)" v-for="item in sourceArr" :key="item.value" >{{item.label}}</li>
-        </ul>
-      </div>
-    </div> -->
     <div class="cell clearfix">
       <label class="title"><span class="name">转归情况</span> : </label>
       <div class="time ">
@@ -67,7 +59,7 @@
           :value="item.id">
         </el-option>
       </el-select>
-      <el-select v-model="listQuery.reimbursement_way"  size="small" clearable  placeholder="付费方式"  @change="changeOtherSearch">
+      <el-select style="margin-left: 10px;" v-model="listQuery.reimbursement_way"  size="small" clearable  placeholder="付费方式"  @change="changeOtherSearch">
         <el-option
           v-for="item in reimbursement_ways"
           :key="item.id"
@@ -103,12 +95,8 @@
       </el-select>
     </div>
 
-    <!-- <div class="amount" >总<span>{{pageTotal}}</span>条 已选择{{pageSelect}}位患者</div> -->
     <el-table
-      ref="multipleTable" :data="tableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" label="全选" width="60px" align="center">
-        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
-      </el-table-column> -->
+      ref="multipleTable" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="tableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" @selection-change="handleSelectionChange">
       <el-table-column align="center" label="全选" width="60px" type="selection" ></el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>
@@ -151,8 +139,13 @@
       </el-table-column>
       <el-table-column  label="操作" align="center" min-width="140">
         <template slot-scope="scope">
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="OpenSetLapseto(scope.row, scope.$index)">转归</el-button>
-          <el-button type="primary" size="mini" @click="OpenView(scope.row.name,scope.row.dialysis_no,scope.row.id)">预览</el-button>
+          <el-tooltip class="item" effect="dark" content="转归" placement="top">
+            <el-button type="primary" icon="el-icon-edit" size="small" @click="OpenSetLapseto(scope.row, scope.$index)"></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="预览" placement="top">          
+            <el-button type="danger" icon="el-icon-tickets" size="small" @click="OpenView(scope.row.name,scope.row.dialysis_no,scope.row.id)"></el-button>
+          </el-tooltip>
+          
         </template>
       </el-table-column>
     </el-table>
@@ -247,6 +240,7 @@
       </div>
     </div>
   </div>
+</div>
 </template>
 
 <script>
@@ -255,12 +249,14 @@
   import Vue from 'vue'
   import  print from 'print-js'
   import { Base64 } from 'js-base64'
-  import {
-    uParseTime
-  } from '@/utils/tools'
+  import { uParseTime} from '@/utils/tools'
   import { log } from 'util'
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
   export default {
     name: 'Patient',
+    components:{
+      BreadCrumb
+    },
     data() {
       return {
         lapsetoRules: {
@@ -674,66 +670,6 @@
         cursor: pointer;
       }
     }
-    .cell {
-      margin: 0px 0 15px 0;
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      -o-box-sizing: border-box;
-      -ms-box-sizing: border-box;
-      box-sizing: border-box;
-      display: -webkit-box;
-      display: -ms-flexbox;
-      // display: flex;
-      -webkit-box-align: flex-start;
-      -ms-flex-align: flex-start;
-      align-items: flex-start;
-      text-align: left;
-      justify-content: flex-start;
-      color: #333;
-      .title {
-        width: 80px;
-        display: inline-block;
-        font-weight: normal;
-        color: #909399;
-        padding: 6px 0;
-        font-weight: 700;
-        .name {
-          width: 60px;
-          text-align: justify;
-          text-justify: distribute-all-lines;
-          text-align-last: justify;
-          -moz-text-align-last: justify;
-          -webkit-text-align-last: justify;
-          display: inline-block;
-        }
-      }
-      .time {
-        -webkit-box-flex: 1;
-        -ms-flex: 1;
-        flex: 1;
-        ul {
-          padding: 0;
-          margin: 0;
-          li {
-            float: left;
-            list-style: none;
-            cursor: pointer;
-            padding: 6px 10px;
-            color: #606266;
-            border-radius: 4px;
-            margin: 0 4px 0 0;
-            &:hover {
-              background: #409eff;
-              color: #fff;
-            }
-          }
-          .active {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-      }
-    }
     .amount {
       font-weight: normal;
       padding: 10px 0 0 0;

src/xt_pages/user/proeducation.vue

@@ -154,66 +154,6 @@ export default {
       cursor: pointer;
     }
   }
-  .cell {
-    margin: 0px 0 15px 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    // display: flex;
-    -webkit-box-align: flex-start;
-    -ms-flex-align: flex-start;
-    align-items: flex-start;
-    text-align: left;
-    justify-content: flex-start;
-    color: #333;
-    .title {
-      width: 80px;
-      display: inline-block;
-      font-weight: normal;
-      color: #909399;
-      padding: 6px 0;
-      font-weight: 700;
-      .name {
-        width: 60px;
-        text-align: justify;
-        text-justify: distribute-all-lines;
-        text-align-last: justify;
-        -moz-text-align-last: justify;
-        -webkit-text-align-last: justify;
-        display: inline-block;
-      }
-    }
-    .time {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      ul {
-        padding: 0;
-        margin: 0;
-        li {
-          float: left;
-          list-style: none;
-          cursor: pointer;
-          padding: 6px 10px;
-          color: #606266;
-          border-radius: 4px;
-          margin: 0 4px 0 0;
-          &:hover {
-            background: #409eff;
-            color: #fff;
-          }
-        }
-        .active {
-          background: #409eff;
-          color: #fff;
-        }
-      }
-    }
-  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;