product_platform/wms-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善采购入库

Browse Source
This commit is contained in:
guoxing
2024-07-29 13:37:22 +08:00
parent c9a8fa9832
commit ae2c548049
9 changed files with 1001 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/Common/dictcommons.js
View File

@@ -183,4 +183,17 @@ export function getWarehouseareas(data) {
'Content-Type': 'application/json'
}
})
}
// 查询所有库位
export function getWarehouseAacks(data) {
return request({
url: '/wms/apiadmin/base/warehouserack/selectAll',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
})
}

8
src/api/baseinfo/goodsShelves/goodsShelves.js
View File

@@ -49,4 +49,12 @@ export default {
})
},
// 查询所有库位列表
warehouserackListAll: function(params) {
return request({
url: '/wms/apiadmin/warehouserack/listAll',
method: 'post',
data: params,
})
},
}

13
src/api/goods/goods.js
View File

@@ -68,6 +68,19 @@ export default {
'Content-Type': 'application/json'
}
})
},
// 查询商品分页列表
getGoodsListAllByOrg: function(params) {
return request({
url: '/wms/apiadmin/basegoodssku/listAllByOrg',
// url: '/wms/apiadmin/base/basegoodsspu/goodsListPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
}

63
src/api/inStorage/deliveryNotice.js
View File

@@ -56,4 +56,67 @@ export default {
},
// 入库预约
// 查询发货人信息
fetchDetailsBySid: function(data) {
return request({
url: '/wms/apiadmin/supplierinfo/fetchDetailsBySid/' + data,
method: 'get',
headers: {
'Content-Type': 'application/json'
}
});
},
// 查询商品明细信息
selectByBillSid: function(data) {
return request({
url: '/wms/apiadmin/wmsansbilldetails/selectByBillSid/' + data,
method: 'get',
headers: {
'Content-Type': 'application/json'
}
});
},
// 查询操作记录信息
operationrecordDetails: function(data) {
return request({
url: '/wms/apiadmin/operationrecord/details',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 修改库区
updateRack: function(data) {
return request({
url: '/wms/apiadmin/WmsAnsBill/updateRack',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 修改备注
updateRemarks: function(data) {
return request({
url: '/wms/apiadmin/WmsAnsBill/updateRemarks',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
}

172
src/api/inStorage/receivingGoods.js
View File

@@ -2,10 +2,11 @@ import request from '@/utils/request'
export default {
// 查询分页列表
//采购入库
// 入库单列表
listPage: function(params) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage',
url: '/wms/apiadmin/purchaseInStorage/listPage',
method: 'post',
data: params,
headers: {
@@ -14,91 +15,122 @@ export default {
})
},
// 初始化
init: function(data) {
// 根据入库单sid获取明细
selectByBillSid: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sid=' + data,
url: '/wms/apiadmin/purchaseInStorage/selectByBillSid/' + data,
method: 'get'
});
},
// 获取组织下所有的预约单
getReservationBill: function(data) {
return request({
url: '/wms/apiadmin/purchaseInStorage/getReservationBill/' + data,
method: 'get'
});
},
// 新增、保存
save: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// // 查询分页列表
// listPage: function(params) {
// return request({
// url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage',
// method: 'post',
// data: params,
// headers: {
// 'Content-Type': 'application/json'
// }
// })
// },
// 确认
submit: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// // 初始化
// init: function(data) {
// return request({
// url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sid=' + data,
// method: 'get'
// });
// },
// 保存 上架单
saveUpShelf: function(data) {
return request({
url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// // 新增、保存
// save: function(data) {
// return request({
// url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
// method: 'post',
// data: data,
// headers: {
// 'Content-Type': 'application/json'
// }
// });
// },
// // 确认
// submit: function(data) {
// return request({
// url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
// method: 'post',
// data: data,
// headers: {
// 'Content-Type': 'application/json'
// }
// });
// },
// 查询所有商品
getGoodsListPage: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// // 保存 上架单
// saveUpShelf: function(data) {
// return request({
// url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
// method: 'post',
// data: data,
// headers: {
// 'Content-Type': 'application/json'
// }
// });
// },
// // 查询所有商品
// getGoodsListPage: function(params) {
// return request({
// url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
// method: 'post',
// data: params,
// headers: {
// 'Content-Type': 'application/json'
// }
// })
// },
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/delBySids',
method: 'DELETE',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// deleteBySids: function(data) {
// return request({
// url: '/wms/apiadmin/inventory/WmsReceiptBill/delBySids',
// method: 'DELETE',
// data: data,
// headers: {
// 'Content-Type': 'application/json'
// }
// })
// },
// 初始化新增上架单
initUpshelf: function(params) {
return request({
url: '/wms/apiadmin/WmsShelfBill/getInit?sid=' + params.sid + "&orgPath=" + params.orgPath + "&userSid=" +
params.userSid,
method: 'get',
headers: {
'Content-Type': 'application/json'
}
});
// // 初始化新增上架单
// initUpshelf: function(params) {
// return request({
// url: '/wms/apiadmin/WmsShelfBill/getInit?sid=' + params.sid + "&orgPath=" + params.orgPath + "&userSid=" +
// params.userSid,
// method: 'get',
// headers: {
// 'Content-Type': 'application/json'
// }
// });
// },
},
}

12
src/router/index.js
View File

@@ -191,7 +191,7 @@ export const constantRoutes = [
component: () => import('@/views/inStorage/deliveryNotice/index'),
name: 'DeliveryNotice',
meta: {
title: '到货通知单',
title: '入库预约',
noCache: true
}
},
@@ -200,7 +200,7 @@ export const constantRoutes = [
component: () => import('@/views/inStorage/receivingGoods/index'),
name: 'ReceivingGoods',
meta: {
title: '收货单管理',
title: '采购入库',
noCache: true
}
},
@@ -277,9 +277,11 @@ export const constantRoutes = [
path: '/inOutStorage/index',
component: () => import('@/views/reports/inOutStorage/index.vue'),
name: 'InventoryRefer',
meta: { title: '出入库查询', noCache: true }
},
]
meta: {
title: '出入库查询',
noCache: true
}
}, ]
},

605
src/views/inStorage/deliveryNotice/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="预期到货通知单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar ref="btnbar" view-title="入库预约管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -9,47 +9,48 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
<el-form-item label="入库类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>至
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="采购单号">
<el-form-item label="外部单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="item.sid" :label="item.name" :value="item.name">
<el-form-item label="单据编码">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品">
<el-select v-model="queryParams.params.goodsSkuSid" placeholder="请选择" style="width: 220px;">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-form-item label="申请时间">
<el-date-picker v-model="queryParams.params.applicationTimeStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>至
<el-date-picker v-model="queryParams.params.applicationTimeEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="入库状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="承运商">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="预计到货日期">
<el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
至
<el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-form-item label="运单号">
<el-input v-model="queryParams.params.waybillNumber" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.name">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="审核状态">
<el-select v-model="queryParams.params.reviewStatus" placeholder="请选择">
<el-option v-for="(item,i) in reviewStatusList" :key="item.sid" :label="item.name" :value="item.name">
<el-form-item label="库位">
<el-select v-model="queryParams.params.warehouseRackSid" placeholder="请选择库位">
<el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackName"
:value="item.sid">
</el-option>
</el-select>
</el-form-item>
@@ -62,115 +63,187 @@
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">预期到货通知单列表</div>
<div class="tit">入库预约列表</div>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle" @row-click="rowItemClick">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="120">
<!-- <el-table-column fixed label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" width="220" />
<el-table-column prop="createTime" label="单据日期" align="center" width="150" />
<el-table-column prop="createByName" label="制单人" align="center" width="150" />
<el-table-column prop="sourceBillNo" label="采购单号" align="center" width="180" />
<el-table-column prop="busTypeValue" label="业务类型" align="center" width="150" />
</el-table-column> -->
<el-table-column prop="applicationTime" label="申请时间" align="center" width="220" />
<el-table-column prop="billNo" label="单据编码" align="center" width="220" />
<el-table-column prop="busTypeValue" label="单据类型" align="center" width="150" />
<el-table-column prop="handoverStatus" label="交接状态" align="center" width="150" />
<el-table-column prop="handoverTime" label="交接时间" align="center" width="180" />
<el-table-column prop="billStateValue" label="状态" align="center" width="150" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
<el-table-column label="入库库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseAreaName" placeholder="请选择"
@focus="getWarehouseAreaList(scope.row.warehouseSid)"
@change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList2" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column> -->
<el-table-column prop="applicant" label="申请人" align="center" width="150" />
<el-table-column prop="reservationTime" label="预约时间" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="sourceBillNo" label="外部单号" align="center" width="150" />
<el-table-column label="单据备注" align="center" width="180">
<template slot-scope="scope">
<el-input ref="" v-model="scope.row.remarks" clearable placeholder=""
@change="itemRemarks(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="contact" label="联系人" align="center" width="150" />
<el-table-column prop="mobile" label="联系人电话" align="center" width="150" />
<el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150" />
<el-table-column prop="billState" label="单据状态" align="center" width="150" />
<el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" />
<el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" />
<el-table-column prop="mobile" label="联系电话" align="center" width="150" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- <div class="pages"> -->
<!-- <div class="tit" /> -->
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
<!-- <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
</div> -->
<el-dialog title="审核单据" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm" class="formadd" style="margin-top: -40px;" :model="formobj">
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
text-color="#666" active-text-color="white">
<el-menu-item index="1">商品明细</el-menu-item>
<el-menu-item index="2">发货人信息</el-menu-item>
<el-menu-item index="3">操作记录</el-menu-item>
</el-menu>
<div v-show="activeIndex=='1'" style="margin-bottom: 50px;">
<el-table :data="goodsDetailList" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuCode" label="商品条码" align="center" />
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格值" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="orderCount" label="预约数量" align="center" />
<el-table-column prop="actualInCount" label="实际入库数量" align="center" />
<el-table-column prop="waitInCount" label="待收货数量" align="center" />
</el-table>
</div>
<div v-show="activeIndex=='2'" style="margin-bottom: 50px;">
<el-form ref="dataForm" class="formaddcopy02" :model="formobj">
<el-row class="first_row">
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审核结果</span>
</el-form-item>
<el-col :span="6">
<div class="span-sty">姓名</div>
<el-form-item> <span class="addinputInfo">{{ formobj.contactName }}</span></el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="formobj.reviewStatus" size="small" @change="changeTheme">
<el-radio :label="1">合格</el-radio>
<el-radio :label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
<el-col :span="6">
<div class="span-sty">省</div>
<el-form-item> <span class="addinputInfo">{{ formobj.province }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">市</div>
<el-form-item> <span class="addinputInfo">{{ formobj.city }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">县</div>
<el-form-item> <span class="addinputInfo">{{ formobj.county }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审核意见</span>
</el-form-item>
<el-col :span="6">
<div class="span-sty">村镇</div>
<el-form-item> <span class="addinputInfo"></span></el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw" style="width:100%"
clearable />
</el-form-item>
<el-col :span="12">
<div class="span-sty">详细地址</div>
<el-form-item> <span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">邮编</div>
<el-form-item> <span class="addinputInfo">{{ formobj.zipCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">手机</div>
<el-form-item> <span class="addinputInfo">{{ formobj.contactMobile }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">电话</div>
<el-form-item> <span class="addinputInfo">{{ formobj.contactTelePhone }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">邮箱</div>
<el-form-item> <span class="addinputInfo">{{ formobj.email }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty"></div>
<el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveExamine">确 定</el-button>
</div>
<div v-show="activeIndex=='3'" style="margin-bottom: 50px;">
<el-table :data="operateList" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="createTime" label="操作时间" width="250" align="center" />
<el-table-column prop="userName" label="操作账号" width="180" align="center" />
<el-table-column prop="content" label="操作内容" align="center" />
</el-table>
</div>
</el-dialog>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
<!-- <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" /> -->
</div>
</template>
<script>
import req from '@/api/inStorage/deliveryNotice.js'
import req2 from '@/api/baseinfo/goodsShelves/goodsShelves.js'
import req3 from '@/api/goods/goods.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './receiptAdd.vue'
import divInfo from './receiptInfo.vue'
// import divAdd from './receiptAdd.vue'
// import divInfo from './receiptInfo.vue'
import {
getWarehouseareas,
getWarehouseAacks
} from '@/api/Common/dictcommons'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
// divAdd,
// divInfo
},
data() {
return {
activeIndex: '1',
dialogVisible: false,
formobj: {
sid: "",
reviewStatus: "",
remarks: ''
},
formobj: {},
btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false,
@@ -181,14 +254,21 @@
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAudit',
btnLabel: '审核'
btnKey: 'toPrintBill',
btnLabel: '打印入库预约单'
}, {
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '收货'
btnKey: 'toPrintCode',
btnLabel: '打印条码'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'toBuild',
btnLabel: '导出'
},
{
type: 'info',
@@ -203,21 +283,33 @@
size: 10,
total: 0,
params: {
name: ''
"busTypeKey": "",
"sourceBillNo": "",
"billNo": "",
"goodsSkuSid": "",
"applicationTimeStart": "",
"applicationTimeEnd": "",
"billState": "",
"supplierName": "",
"waybillNumber": "",
"warehouseRackSid": "",
"menuUrl": "",
"orgPath": "",
"userSid": ""
}
},
sids: [],
selectionList: [],
busTypeList: [{
name: "采购预约",
name: "采购入库",
sid: "0"
},
{
name: "调拨预约",
name: "验货入库",
sid: "1"
},
{
name: "其他预约",
name: "销退入库",
sid: "2"
}
],
@@ -230,68 +322,88 @@
sid: "1"
},
{
name: "已收货",
name: "收货完成",
sid: "2"
},
{
name: "已取消",
name: "关闭",
sid: "3"
}
],
reviewStatusList: [{
name: "待审核",
sid: "1"
},
{
name: "审核通过",
sid: "2"
},
{
name: "审核拒绝",
sid: "3"
}
]
goodsList: [],
warehouseRackList: [],
goodsDetailList: [],
operateList: [],
warehouseRackList2: [],
rowItemSid: '',
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.init()
this.loadList()
},
methods: {
saveExamine() {
init() {
var query = {
orgPath: window.sessionStorage.getItem('orgSidPath')
}
req2.warehouserackListAll(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
},
changeTheme() {
console.log("aaaaaa", this.warehouseRackList);
},
toAudit() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
}
})
return
req3.getGoodsListAllByOrg(query).then((res) => {
if (res.success) {
this.goodsList = res.data
console.log("aaaaaa", this.goodsList);
}
})
},
rowItemClick(row) {
console.log("row", row);
this.rowItemSid = row.sid
this.handleSelect(this.activeIndex)
},
handleSelect(val) {
console.log("val", val);
this.activeIndex = val
if (val == '1') { // 商品明细
req.selectByBillSid(this.rowItemSid).then((resp) => {
this.goodsDetailList = resp.data
}).catch(() => {})
}
this.dialogVisible = true
},
handleClose() {
this.dialogVisible = false
},
selectTime1() {
if (val == '2') { // 发货人信息
req.fetchDetailsBySid(this.rowItemSid).then((resp) => {
this.formobj = resp.data
}).catch(() => {})
}
},
selectTime2() {
if (val == '3') { // 操作记录
var parpams = {
sid: this.rowItemSid
}
req.operationrecordDetails(parpams).then((resp) => {
this.operateList = resp.data
}).catch(() => {})
}
},
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
},
// 搜索条件效果
clicksearchShow() {
@@ -304,11 +416,14 @@
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAudit':
this.toAudit()
case 'toPrintBill':
this.toPrintBill()
break
case 'toAdd':
this.toAdd()
case 'toPrintCode':
this.toPrintCode()
break
case 'toBuild':
this.toBuild()
break
case 'doClose':
this.doClose()
@@ -317,10 +432,47 @@
break
}
},
toPrintBill() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
},
toPrintCode() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
},
toBuild() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
@@ -328,6 +480,8 @@
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
this.rowItemSid = data.records[0].sid
this.handleSelect('1')
} else {
// 根据resp.code进行异常情况处理
this.dataList = []
@@ -354,95 +508,112 @@
size: 10,
total: 0,
params: {
name: ''
"busTypeKey": "",
"sourceBillNo": "",
"billNo": "",
"goodsSkuSid": "",
"applicationTimeStart": "",
"applicationTimeEnd": "",
"billState": "",
"supplierName": "",
"waybillNumber": "",
"warehouseRackSid": "",
"menuUrl": "",
"orgPath": "",
"userSid": ""
}
}
this.loadList()
},
toAdd() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
if(this.selectionList[0].billState=='已收货'){
this.$message({
type: 'warning',
message: "此记录已完成,不可重复操作。",
showClose: true
})
return
}
this.viewState = 2
this.$refs['divadd'].showEdit(this.selectionList[0])
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
toRelevancyInfo(row) {
const tip = '请确认是否删除所选品牌?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteGoods(row.sid).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
},
resetState() {
this.viewState = 1
},
enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '状态已更新',
showClose: true
})
} else { // 根据resp.code进行异常情况处理
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
}
}).catch(e => {
console.log(e)
})
getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList2 = res.data
}
})
},
selectWarehouseAreaCode(row, val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList2.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.warehouseAreaName = choose[0].areaCode
row.warehouseAreaSid = choose[0].sid
var query = {
sid: row.sid,
rackSid: row.warehouseAreaSid
}
req.updateRack(query).then((res) => {})
},
itemRemarks(row) {
console.log("itemRemarks", row);
var query = {
sid: row.sid,
remarks: row.remarks
}
req.updateRemarks(query).then((res) => {})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.el-menu-item.is-active {
background-color: #3370ff !important;
color: #fff;
span {
color: #fff;
}
}
.el-submenu__title.is-active {
background: #1c88cf !important;
color: #fff !important;
}
</style>

561
src/views/inStorage/receivingGoods/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="收货单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar ref="btnbar" view-title="采购入库管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -9,41 +9,41 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
<el-form-item label="入库单号">
<el-input v-model="queryParams.params.inStotageBillNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
<el-form-item label="外部单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="预约单号">
<el-input v-model="queryParams.params.preBillNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="入库库位">
<el-input v-model="queryParams.params.warehouseRackName" placeholder="" clearable />
</el-form-item>
<el-form-item label="入库时间">
<el-date-picker v-model="queryParams.params.inStotageStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>至
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
<el-date-picker v-model="queryParams.params.inStotageEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="预期到货通知单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
<el-form-item label="承运商">
<el-input v-model="queryParams.params.carrierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
<el-form-item label="运单号">
<el-input v-model="queryParams.params.waybillNumber" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品">
<el-select v-model="queryParams.params.goodsSkuSid" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="到货日期">
<el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
至
<el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="单据状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in billStateList" :key="i" :label="item.name" :value="item.sid">
<el-select v-model="queryParams.params.supplierSid" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in supplierList" :key="i" :label="item.supplierName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
@@ -56,40 +56,106 @@
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">收货单列表</div>
<div class="tit">采购入库列表</div>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle" @row-click="rowItemClick">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="180">
<el-table-column fixed label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.billState=='已完成'"
@click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" width="220" label="单据编号" align="center" />
<el-table-column prop="createTime" label="单据日期" align="center" />
<el-table-column prop="createByName" label="制单人" align="center" />
<el-table-column prop="sourceBillNo" label="预期到货通知单号" width="220"align="center" />
<el-table-column prop="busTypeValue" label="业务类型" align="center" />
<el-table-column prop="supplierName" label="供应商" align="center" />
<el-table-column prop="deliveryDate" label="到货日期" align="center" />
<el-table-column prop="billState" label="单据状态" align="center" />
<el-table-column prop="billStateValue" width="100" label="状态" align="center" />
<el-table-column prop="billNo" width="150" label="入库单号" align="center" />
<el-table-column prop="preBillNo" width="150" label="预约单号" align="center" />
<el-table-column prop="goodsTotal" width="100" label="商品总额" align="center" />
<el-table-column prop="goodsWeight" width="150" label="商品总重量(kg)" align="center" />
<el-table-column prop="goodsVolume" width="150" label="商品总体积(m³)" align="center" />
<el-table-column prop="goodsCount" width="100" label="商品总数" align="center" />
<el-table-column prop="warehouseName" width="180" label="供应商" align="center" />
<el-table-column prop="carrierName" width="180" label="承运商" align="center" />
<el-table-column prop="waybillNumber" width="120" label="运单号" align="center" />
<el-table-column prop="sourceBillNo" width="150" label="外部单号" align="center" />
<el-table-column prop="remarks" min-width="180" label="单据备注" align="center" />
<el-table-column prop="inStotageTime" width="120" label="入库时间" align="center" />
<el-table-column prop="operationName" width="120" label="操作员" align="center" />
<el-table-column prop="operationTime" width="120" label="操作时间" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- <div class="pages">
<div class="tit" /> -->
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
<!-- <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> -->
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
text-color="#666" active-text-color="white">
<el-menu-item index="1">入库明细</el-menu-item>
<el-menu-item index="2">单据备注</el-menu-item>
<el-menu-item index="3">操作记录</el-menu-item>
</el-menu>
<div v-show="activeIndex=='1'" style="margin-bottom: 50px;">
<el-table :data="goodsDetailList" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsName" label="商品名称" align="center" />
<el-table-column prop="goodsCode" label="商品编码" align="center" />
<el-table-column prop="goodsBarCode" label="商品条码" align="center" />
<el-table-column prop="goodsSpc" label="规格值" align="center" />
<el-table-column prop="boxBarCode" label="箱条码" align="center" />
<el-table-column prop="boxSpc" label="箱规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="costPrice" label="成本单价" align="center" />
<el-table-column prop="totalPrice" label="总价" align="center" />
<el-table-column prop="count" label="数量" align="center" />
<el-table-column prop="auxiliaryUnit" label="辅助单位" align="center" />
<el-table-column prop="serialNumber" label="序列号" align="center" />
<el-table-column prop="batchNumber" label="生产批次号" align="center" />
<el-table-column prop="warehouserack" label="入库库位" align="center" />
<el-table-column prop="remarks" label="明细备注" align="center" />
</el-table>
</div>
<div v-show="activeIndex=='2'" style="margin-bottom: 50px;">
<el-form ref="dataForm" class="formaddcopy02" :model="billRemarks">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">买家留言</div>
<el-form-item> <span class="addinputInfo">{{ billRemarks.buyerMessage }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item> <span class="addinputInfo">{{ billRemarks.reamrks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">系统备注</div>
<el-form-item> <span class="addinputInfo">{{ billRemarks.systemRemarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div v-show="activeIndex=='3'" style="margin-bottom: 50px;">
<el-table :data="operationList" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="times" label="操作时间" width="250" align="center" />
<el-table-column prop="name" label="操作账号" width="180" align="center" />
<el-table-column prop="centent" label="操作内容" align="center" />
</el-table>
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
@@ -99,11 +165,98 @@
<divAddupShelfRecord v-show="viewState == 5" ref="divAddupShelfRecord" @doback="resetState"
@reloadlist="loadList" />
<el-dialog title="选择预约单" :visible.sync="dialogVisible" :before-close="handleClose"
style="width:150%;margin-left: -20%;">
<el-form :inline="true" style="margin-top: -30px;">
<el-form-item label="外部单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="入库状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-select v-model="queryParams.params.supplierSid" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in supplierList" :key="i" :label="item.supplierName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="申请时间">
<el-date-picker v-model="queryParams.params.inStotageStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>至
<el-date-picker v-model="queryParams.params.inStotageEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="商品">
<el-select v-model="queryParams.params.goodsSkuSid" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-left: 50px;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
<!-- <div class="btn" style="text-align: center;margin-bottom: 30px;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div> -->
</el-form>
<el-table :data="billList" border style="width: 100%" @selection-change="selectionLineChangeHandle"
@row-click="rowItemClick">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="scope.row.goodsLsit" border stripe size="small" :ref="'sub' + scope.$index"
@select="subSelect" @select-all="subSelectAll">
<el-table-column type="selection" width="100" align="center" />
<el-table-column prop="goodsCode" label="商品编码" align="center" show-overflow-tooltip />
<el-table-column prop="goodsBarCode" label="商品条码" align="center" show-overflow-tooltip />
<el-table-column prop="goodsName" label="商品名称" align="center" show-overflow-tooltip />
<el-table-column prop="goodsSpcCode" label="规格编码" align="center" show-overflow-tooltip />
<el-table-column prop="goodsSpc" label="规格值" align="center" show-overflow-tooltip />
<el-table-column prop="unit" label="单位" align="center" show-overflow-tooltip />
<el-table-column prop="reservationNum" label="预约数量" align="center" show-overflow-tooltip />
<el-table-column prop="unInStorageNum" label="待入库数量" align="center" show-overflow-tooltip />
<el-table-column prop="actualInStorageNum" label="实际入库数量" align="center" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column prop="stae" label="状态" align="center" />
<el-table-column prop="createTime" label="申请时间" align="center" />
<el-table-column prop="billNo" label="单据编码" align="center" />
<el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="supplierName" label="供应商" align="center" />
<el-table-column prop="warehouseRackName" label="入库库位" align="center" />
<el-table-column prop="sourceBillNo" label="外部单号" align="center" />
<el-table-column prop="remarks" label="单据备注" align="center" />
<el-table-column prop="createByName" label="申请人" align="center" />
<el-table-column prop="contacts" label="联系电话" align="center" />
<el-table-column prop="contactsNumber" label="联系人" align="center" />
</el-table>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveData">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/inStorage/receivingGoods.js'
// import req2 from '@/api/baseinfo/goodsShelves/goodsShelves.js'
import req3 from '@/api/goods/goods.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@@ -111,7 +264,8 @@
import divInfo from './receivingGoodsInfo.vue'
import divAddupShelfRecord from './upShelfAddRecord.vue'
import {
getTypeValueList
// getTypeValueList,
choiceSupplierInfo
} from '@/api/Common/dictcommons'
export default {
components: {
@@ -124,12 +278,8 @@
},
data() {
return {
activeIndex: "1",
dialogVisible: false,
formobj: {
sid: "",
reviewStatus: "",
remarks: ''
},
btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false,
@@ -137,25 +287,32 @@
tableLoading: false,
dataList: [],
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAudit',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '上架'
btnLabel: '选择预约单'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'toPrintBill',
btnLabel: '打印采购单'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'toPrintCode',
btnLabel: '打印条码'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'toBuild',
btnLabel: '导出'
},
{
type: 'info',
@@ -175,52 +332,111 @@
},
sids: [],
selectionList: [],
busTypeList: [
],
goodsList: [],
supplierList: [],
goodsDetailList: [],
billRemarks: {},
operationList: [],
billStateList: [{
name: "新建",
name: "在途",
sid: "0"
},
{
name: "已完成",
name: "部分收货",
sid: "1"
},
{
name: "收货完成",
sid: "2"
},
{
name: "关闭",
sid: "3"
}
],
billList: []
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.init()
this.loadList()
},
methods: {
getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
init() {
var query = {
orgPath: window.sessionStorage.getItem('orgSidPath')
}
// req2.warehouserackListAll(query).then((res) => {
// if (res.success) {
// this.warehouseRackList = res.data
// console.log("aaaaaa", this.warehouseRackList);
// }
// })
req3.getGoodsListAllByOrg(query).then((res) => {
if (res.success) {
this.busTypeList = res.data
this.goodsList = res.data
}
})
// 供应商
choiceSupplierInfo({
createOrgSid: window.sessionStorage.getItem('orgSidPath')
}).then((resp) => {
if (resp.success) {
this.supplierList = resp.data
}
})
},
methods: {
saveExamine() {
rowItemClick(row) {
console.log("row", row);
// this.rowItemSid = row.sid
this.goodsDetailList = []
this.billRemarks = {}
this.operationList = []
req.selectByBillSid(row.sid).then((resp) => {
this.goodsDetailList = resp.data.goodsList
this.billRemarks = resp.data.billRemarks
this.operationList = resp.data.operationList
}).catch(() => {})
// this.handleSelect(this.activeIndex)
},
handleSelect(val) {
console.log("val", val);
this.activeIndex = val
// if (val == '1') { // 商品明细
// req.selectByBillSid(this.rowItemSid).then((resp) => {
// this.goodsDetailList = resp.data
// }).catch(() => {})
// }
// if (val == '2') { // 发货人信息
// req.fetchDetailsBySid(this.rowItemSid).then((resp) => {
// this.formobj = resp.data
// }).catch(() => {})
// }
// if (val == '3') { // 操作记录
// var parpams = {
// sid: this.rowItemSid
// }
// req.operationrecordDetails(parpams).then((resp) => {
// this.operateList = resp.data
// }).catch(() => {})
// }
},
changeTheme() {
},
toAudit() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
selectTime1() {
},
selectTime2() {
},
selectionLineChangeHandle(val) {
console.log("val", val);
@@ -243,15 +459,18 @@
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAudit':
this.toAudit()
break
case 'doDel':
this.doDel()
break
case 'toAdd':
this.toAdd()
break
case 'toPrintBill':
this.toPrintBill()
break
case 'toPrintCode':
this.toPrintCode()
break
case 'toBuild':
this.toBuild()
break
case 'doClose':
this.doClose()
break
@@ -262,7 +481,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
@@ -270,6 +489,7 @@
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
this.rowItemClick(this.dataList[0])
} else {
// 根据resp.code进行异常情况处理
this.dataList = []
@@ -301,45 +521,18 @@
}
this.loadList()
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
toAdd() {
req.getReservationBill(window.sessionStorage.getItem('orgSidPath')).then((resp) => {
if (resp.success) {
this.billList = resp.data
this.dialogVisible = true
} else {}
}).catch(() => {})
},
toPrintBill() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
@@ -361,73 +554,73 @@
this.viewState = 5
this.$refs['divAddupShelfRecord'].showEdit(this.selectionList[0])
},
toEdit(row) {
toPrintCode(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
toBuild(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
toRelevancyInfo(row) {
const tip = '请确认是否删除所选品牌?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteGoods(row.sid).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
},
resetState() {
this.viewState = 1
},
enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '状态已更新',
showClose: true
})
} else { // 根据resp.code进行异常情况处理
}
}).catch(e => {
console.log(e)
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.el-menu-item.is-active {
background-color: #3370ff !important;
color: #fff;
span {
color: #fff;
}
}
.el-submenu__title.is-active {
background: #1c88cf !important;
color: #fff !important;
}
</style>

18
src/views/system/menuManage/menuManage.vue
View File

@@ -63,8 +63,8 @@
</template>
</el-table-column>-->
<el-table-column prop="menuTypeValue" width="120" label="类型" align="center" />
<el-table-column prop="pageUrl" label="路由路径" align="center" />
<el-table-column prop="menuUrl" label="路由名称" align="center" />
<el-table-column prop="pageUrl" label="路由路径" align="center" />
<el-table-column prop="pageName" label="组件路径" align="center" />
<el-table-column prop="cid" label="权限标识" align="center" />
<el-table-column prop="isShow" label="状态" align="center">
@@ -119,13 +119,13 @@
</td>
</tr>
<tr>
<td>路由路径</td>
<td>路由名称</td>
<td>
<el-input v-model="form.menuUrl" />
</td>
</tr>
<tr>
<td>路由名称</td>
<td>路由路径</td>
<td>
<el-input v-model="form.pageUrl" />
</td>
@@ -234,18 +234,18 @@
<el-input v-model="form.name" style="width:300px" />
</td>
</tr>
<tr>
<td>路由路径</td>
<td>
<el-input v-model="form.pageUrl" style="width:300px" />
</td>
</tr>
<tr>
<td>路由名称</td>
<td>
<el-input v-model="form.menuUrl" style="width:300px" />
</td>
</tr>
<tr>
<td>路由路径</td>
<td>
<el-input v-model="form.pageUrl" style="width:300px" />
</td>
</tr>
<tr>
<td>菜单图片</td>
<td>