Skip to content

L
lxyl-vue
Commit 195008cd authored by 李苏's avatar 李苏 💬
Browse files
Options

功能调整

parent 344d49be
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 122 deletions
src/store/modules/permission.js
View file @ 195008cd
......@@ -149,9 +149,11 @@ const permission = {
newmenus.push(mi)
}
})
res.data = dynamicRouter([...newCommonList, ...newErpList, ...newPowerRoutes], asymenus) || [...
newCommonList, ...newErpList, ...newPowerRoutes
]
res.data=[...
newCommonList, ...newErpList, ...newPowerRoutes]
// res.data = dynamicRouter([...newCommonList, ...newErpList, ...newPowerRoutes], asymenus) || [...
// newCommonList, ...newErpList, ...newPowerRoutes
// ]
/* 重置首页路由*/
// let hompePage = treeToList([...newCommonList,...newErpList,...newPowerRoutes]).filter(item=>item.mkid==localStorage.getItem('homeMkid'))
let ttlist = treeToList([...newCommonList, ...newErpList, ...newPowerRoutes])
......
src/views/ccgl/ckgl/ckd/mx.vue
View file @ 195008cd
......@@ -39,7 +39,7 @@
url: 'wms/ckgl/llck',
queryUrl: 'wms/ckgl/llck/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/ckgl/ckd/top/edit.vue
View file @ 195008cd
......@@ -192,7 +192,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
width: 240,
},
......
src/views/ccgl/ckgl/dbckd/ckdmx.vue
View file @ 195008cd
......@@ -43,7 +43,7 @@
url: 'wms/ckgl/dbck',
queryUrl: 'wms/ckgl/dbck/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/ckgl/dbckd/rkqd.vue
View file @ 195008cd
......@@ -41,7 +41,7 @@
url: 'wms/rkgl/dbrk',
queryUrl: 'wms/rkgl/dbrk/query/dbrkqd',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlcode",
fieldType: "upper",
width: 140
......
src/views/ccgl/ckgl/dbckd/top/edit.vue
View file @ 195008cd
......@@ -176,7 +176,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
width: 240,
type: 'AuxInput',
......
src/views/ccgl/ckgl/jhd/mx.vue
View file @ 195008cd
......@@ -40,7 +40,7 @@
url: 'wms/ckgl/llck',
queryUrl: 'wms/ckgl/jhtz/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/ckgl/jhd/qd.vue
View file @ 195008cd
......@@ -38,7 +38,7 @@
queryUrl: 'wms/ckgl/jhtz/query/jhtzqd',
tableTitle: [
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/ckgl/jhd/top/dbckqd.vue
View file @ 195008cd
......@@ -41,7 +41,7 @@
url: 'wms/ckgl/dbck',
queryUrl: 'wms/ckgl/dbck/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/ckgl/jhd/top/edit.vue
View file @ 195008cd
......@@ -251,7 +251,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
width: 240,
},
......
src/views/ccgl/ckgl/jhd/top/rkqd.vue
View file @ 195008cd
......@@ -41,7 +41,7 @@
url: 'wms/ckgl/llck',
queryUrl: 'wms/ckgl/llck/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/rkgl/dbrkd/rkdmx.vue
View file @ 195008cd
......@@ -43,7 +43,7 @@
url: 'wms/rkgl/dbrk',
queryUrl: 'wms/rkgl/dbrk/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/rkgl/dbrkd/rkqd.vue
View file @ 195008cd
......@@ -41,7 +41,7 @@
url: 'wms/rkgl/dbrk',
queryUrl: 'wms/rkgl/dbrk/query/dbrkqd',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/rkgl/dbrkd/top/edit.vue
View file @ 195008cd
......@@ -161,7 +161,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
width: 240,
type: 'AuxInput',
......
src/views/ccgl/rkgl/mpzy/rkqd.vue
View file @ 195008cd
......@@ -42,7 +42,7 @@
queryUrl: 'wms/rkgl/dbrk/query/dbrkqd',
tableTitle: [
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/rkgl/mpzy/top/edit.vue
View file @ 195008cd
......@@ -165,7 +165,7 @@
typeConfig: {
isRequest: false,
code: 'WMSRKD',
label: 'showdjid',
label: 'rktzDjid',
transform: {
value: 'id',
label: 'djid'
......@@ -177,9 +177,7 @@
})()
}
}
},
},
{
label: '码盘单号',
......@@ -256,19 +254,12 @@
},
"required": true,
},
{
label: '备注',
prop: 'bz',
span: 16,
type: 'input',
},
],
/* 从表编辑数据 */
editTableTitle: [{
......@@ -297,8 +288,8 @@
width: 140
},
{
title: "物料数量",
field: "sl",
title: "码盘数量",
field: "mpsl",
width: 140
},
{
......
src/views/ccgl/rkgl/mpzy/top/index.vue
View file @ 195008cd
......@@ -46,7 +46,7 @@
{
title: "业务日期",
field: "ywrq",
fieldType: "ftDateTime"
fieldType: "ftDate"
},
{
title: "仓库",
......
src/views/ccgl/rkgl/mpzy/top/mp.vue
View file @ 195008cd
......@@ -16,7 +16,7 @@
label:'code'}" :match="{
label:'rqCode',
value:'rqid'
}" code='RQGL' :form='form' />
}" code='RQGLK' :form='form' />
</div>
</el-col>
<el-col :span="6" class="search-col">
......@@ -146,6 +146,7 @@
this.editTableConfig.editTableData.length>0
){
let list =this.editTableConfig.editTableData||[]
list.forEach(item=>item.mpsl=item.sl)
this.$emit('save',list)
this.app.showDialog=false
/* 触发传递事件*/
......
src/views/ccgl/rkgl/rkd/mx.vue
View file @ 195008cd
......@@ -38,7 +38,7 @@
url: 'wms/rkgl/rktz',
queryUrl: 'wms/rkgl/rktz/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlcode",
fieldType: "upper",
width: 140
......@@ -80,7 +80,7 @@
},
{
title: "码盘数量",
field: "mpsl",
field: "ztsl",
width: 120,
},
{
......
src/views/ccgl/rkgl/rkd/rkqd.vue
View file @ 195008cd
......@@ -40,7 +40,7 @@
url: 'wms/rkgl/rktz',
queryUrl: 'wms/rkgl/rktz/query/rkqd',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......@@ -77,7 +77,7 @@
},
{
title: "容器",
field: "rqName",
field: "rqCode",
width: 100,
},
{
......
src/views/ccgl/rkgl/rkd/top/edit.vue
View file @ 195008cd
......@@ -206,7 +206,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "code",
width: 180,
type: 'AuxInput',
......
src/views/ccgl/rkgl/sjrw/index.vue
View file @ 195008cd
......@@ -3,7 +3,7 @@
<div class=" higher flex-column">
<!-- 分层-->
<div class="top">
<Top @getRow='topGetRow' ref="top"></Top>
<Top @sxmx='sxmx' @getRow='topGetRow' ref="top"></Top>
</div>
<div class="bottom flex">
<div class="full" >
......@@ -11,7 +11,7 @@
<el-tab-pane class="full" label="上架单明细" name="first">
<Mx ref="mx" class="full" />
</el-tab-pane>
<el-tab-pane class="full" label="上架汇总" name="second">
<el-tab-pane class="full" label="上架作业" name="second">
<Sjhz ref="sjhz" class="full" />
</el-tab-pane>
<el-tab-pane class="full" label="上架结果" name="third">
......@@ -44,6 +44,9 @@
}
},
methods: {
sxmx(){
this.$refs.mx.$refs.basePage.refresh()
},
topGetRow(row) {
let mid = row.id
this.$refs.mx.$refs.basePage.queryParams.mid = mid
......
src/views/ccgl/rkgl/sjrw/mx.vue
View file @ 195008cd
......@@ -4,9 +4,7 @@
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
</template>
</BasePage>
</template>
......@@ -37,7 +35,7 @@
url: 'wms/rkgl/sjtz',
queryUrl: 'wms/rkgl/sjtz/query/detail',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......@@ -52,21 +50,26 @@
field: "wlxxGg",
width: 140
},
{
title: "物料批号",
field: "wlph",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 120,
},
{
title: "物料批号",
field: "wlph",
title: "库位",
field: "kwName",
width: 140
},
{
title: "应收数量",
field: "yssl",
width: 100,
},
// {
// title: "应收数量",
// field: "yssl",
// width: 100,
// },
{
title: "唯一码",
field: "packCode",
......
src/views/ccgl/rkgl/sjrw/top/edit.vue
View file @ 195008cd
......@@ -186,7 +186,7 @@
],
/* 从表编辑数据 */
editTableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......
src/views/ccgl/rkgl/sjrw/top/index.vue
View file @ 195008cd
......@@ -4,7 +4,7 @@
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">直接入库</el-button> -->
<el-button @click="tjkw(ctx.basePage)" size='mini' type="primary">推荐库位</el-button>
<!-- <ImportButton @success="()=>{
ctx.basePage.refresh()
}" :url="'/wms/rkgl/rktz/import'" /> -->
......@@ -21,7 +21,7 @@
config: {
queryDetail: true,
/* 基本配置*/
url: 'wms/rkgl/sjtz',
url: 'lxyl/rkgl/sjtz',
tableTitle: [{
title: "上架单号",
field: "djid",
......@@ -31,7 +31,7 @@
{
title: "业务日期",
field: "ywrq",
fieldType: "ftDateTime"
fieldType: "ftDate"
},
{
title: "仓库",
......@@ -63,7 +63,6 @@
fieldType: "ftString",
width: 192
},
{
title: "上架人",
field: "sjrName",
......@@ -186,6 +185,26 @@
},
methods: {
tjkw(ctx){
if(ctx.singleItem&&ctx.singleItem.id){
this.$confirm('是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res=>{
this.$post('lxyl/rkgl/sjtz/calcKw',{
id:ctx.singleItem.id
}).then(res=>{
if(res.success){
this.$success('操作成功')
this.$emit('sxmx')
}
})
})
}else{
this.$warning('请选择一条数据')
}
},
getRow(val){
this.$emit('getRow',val)
}
......
src/views/ccgl/rkgl/sjrw/top/rkd.vue
View file @ 195008cd
......@@ -32,18 +32,7 @@
/* 基本配置*/
url: 'wms/rkgl/rktz',
queryUrl:'wms/rkgl/sjtz/query/rktz',
tableTitle: [{
title: "状态",
field: "zt",
fieldType: "ftString",
align: 'center',
width: 80,
"transform": {
"url": "wms/rkgl/rktz/init/zt",
"label": "name",
"value": "id"
}
},
tableTitle: [
{
title: "入库单号",
field: "djid",
......@@ -55,14 +44,24 @@
fieldType: 'ftDate'
},
{
title: "入库人",
field: "rkr",
title: "仓库",
field: "ckName",
width: 140
},
{
title: "部门",
field: "bmName",
width: 140
},
{
title: "事务类型",
field: "swlxName",
width: 100
},
{
title: "入库人",
field: "rkr",
width: 140
},
{
title: "仓库",
......@@ -70,16 +69,7 @@
width: 140,
hidden: true
},
{
title: "仓库",
field: "ckName",
width: 140
},
{
title: "入库部门",
field: "bmName",
width: 140
},
{
title: "备注",
field: "bz",
......
src/views/ccgl/rkgl/sjrw/top/rkqd.vue
View file @ 195008cd
<template>
<BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full" style="height: 100%;border-top: 0px;" :autoQuery='false'
<BasePage fePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full" style="height: 100%;border-top: 0px;" :autoQuery='false'
:config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
......@@ -33,15 +33,15 @@
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择，以及记住选择 */
showSelection: false,
saveSelected: false
showSelection: true,
saveSelected: true
},
config: {
/* 基本配置*/
url: 'wms/rkgl/rktz',
queryUrl: 'wms/rkgl/sjtz/query/rktzqd',
tableTitle: [{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
......@@ -49,23 +49,24 @@
{
title: "物料名称",
field: "wlxxName",
width: 140
width: 180
},
{
title: "物料规格",
field: "wlxxGg",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 120,
width: 180
},
{
title: "物料批号",
field: "wlph",
width: 140
width: 180
},
{
title: "制令号",
field: "zlh",
width: 180,
},
{
title: "应收数量",
field: "yssl",
......@@ -78,18 +79,8 @@
},
{
title: "容器",
field: "rqName",
width: 100,
},
{
title: "状态",
field: "zt",
width: 100,
"transform": {
"url": "wms/rkgl/dbrk/init/zt",
"label": "name",
"value": "id"
}
field: "rqCode",
width: 200,
}
],
queryParams: [],
......@@ -104,7 +95,6 @@
},
demo(ctx){
if(ctx.singleItem&&ctx.singleItem.id){
console.log(ctx.singleItem)
}else{
this.$warning('请选中一条数据')
}
......
src/views/ccgl/rkgl/sjrw/top/xzrkqd.vue
View file @ 195008cd
......@@ -49,11 +49,11 @@
},
methods: {
save() {
let list=this.$refs.rkqd.$refs.basePage.tabData||[]
let list=this.$refs.rkqd.$refs.basePage.$refs.TablePager.selectedList||[]
if(list.length==0){
this.$warning('请选择存在数据的入库单')
this.$warning('请选择存在数据的入库单或者勾选入库清单')
}else{
let obj={
list:list,
......
src/views/ccgl/zlgl/jyd/top/edit.vue
View file @ 195008cd
......@@ -192,7 +192,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
width: 240,
},
......
src/views/ccgl/zlgl/kccjd/top/edit.vue
View file @ 195008cd
......@@ -192,7 +192,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
width: 240,
},
......
src/views/ccgl/zlgl/kccjd/top/index.vue
View file @ 195008cd
......@@ -49,7 +49,7 @@
title: "业务日期",
field: "ywrq",
width: 140,
fieldType: 'ftDateTime'
fieldType: 'ftDate'
},
{
title: "维护人",
......
src/views/ccgl/zlgl/kcyhd/top/edit.vue
View file @ 195008cd
......@@ -192,7 +192,7 @@
align: "center"
},
{
title: "物料编号",
title: "物料编码",
field: "wlxxCode",
width: 240,
},
......
src/views/ccgl/zlgl/kcyhd/top/index.vue
View file @ 195008cd
......@@ -49,7 +49,7 @@
title: "业务日期",
field: "ywrq",
width: 140,
fieldType: 'ftDateTime'
fieldType: 'ftDate'
},
{
title: "维护人",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment