Skip to content

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

Fix the bug in routeView, 

template tag has v-if attrs still routeView components
now delete template tags
add v-if in routerViews
parent b6334858
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 36 deletions
src/layout/components/AppMain.vue
View file @ e6b2a430
<template> <template>
<section class="app-main"> <section class="app-main">
<transition name="fade-transform" mode="out-in"> <transition name="fade-transform" mode="out-in">
<template v-if="cachedViews.indexOf(key)!=-1 ">
<keep-alive > <keep-alive >
<router-view :key="key" /> <router-view v-if="cachedViews.includes(key)" :key="key" />
</keep-alive> </keep-alive>
</template> <router-view v-if="!cachedViews.includes(key)" :key="key" />
<template v-else >
<router-view :key="key" />
</template>
</transition> </transition>
</section> </section>
......
src/views/ccgl/ckgl/ckd/mx.vue
View file @ e6b2a430
...@@ -70,25 +70,30 @@ ...@@ -70,25 +70,30 @@
width: 100, width: 100,
}, },
{ {
title: "库存数量", title: "已出库数量",
field: "kcsl", field: "cksl",
width: 100, width: 100,
}, },
// {
// title: "库存数量",
// field: "kcsl",
// width: 100,
// },
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
width: 180, width: 180,
}, },
{ // {
title: "已出数量", // title: "已出数量",
field: "ycsl", // field: "ycsl",
width: 100, // width: 100,
}, // },
{ // {
title: "过账数量", // title: "过账数量",
field: "gzsl", // field: "gzsl",
width: 100, // width: 100,
}, // },
{ {
title: "状态", title: "状态",
field: "zt", field: "zt",
......
src/views/ccgl/ckgl/ckd/top/edit.vue
View file @ e6b2a430
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
{ {
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
width: 240, width: 180,
}, },
{ {
title: "物料名称", title: "物料名称",
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
field: "yfsl", field: "yfsl",
allowEdit: true, allowEdit: true,
type: 'inputNumber', type: 'inputNumber',
width: 200, // width: 200,
blur: toFixed(null), blur: toFixed(null),
}, },
// { // {
......
src/views/ccgl/ckgl/ckd/top/index.vue
View file @ e6b2a430
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
ctx.basePage.refresh() ctx.basePage.refresh()
}" :url="'/lxyl/ckgl/cktz/import'" /> }" :url="'/lxyl/ckgl/cktz/import'" />
<el-button @click="tbwl(ctx.basePage)" size='mini' type="primary" style="margin-left: 10px;">同步sap出库单</el-button> <el-button @click="tbwl(ctx.basePage)" size='mini' type="primary" style="margin-left: 10px;">同步sap出库单</el-button>
<el-button @click="qr(ctx.basePage)" size='mini' type="primary">确认</el-button>
<el-button @click="qxqr(ctx.basePage)" size='mini' type="primary">取消确认</el-button>
</template> </template>
</BasePage> </BasePage>
...@@ -169,6 +171,46 @@ ...@@ -169,6 +171,46 @@
}, },
methods: { methods: {
qr(ctx){
if (ctx.singleItem && ctx.singleItem.id) {
this.$confirm('是否继续操作, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
this.$post('lxyl/ckgl/cktz/confirm', {
id: ctx.singleItem.id
}).then(res => {
if (res.success) {
this.$success('操作成功')
ctx.refresh()
}
})
})
} else {
this.$warning('请选中一条数据')
}
},
qxqr(ctx){
if (ctx.singleItem && ctx.singleItem.id) {
this.$confirm('是否继续操作, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
this.$post('lxyl/ckgl/cktz/unconfirm', {
id: ctx.singleItem.id
}).then(res => {
if (res.success) {
this.$success('操作成功')
ctx.refresh()
}
})
})
} else {
this.$warning('请选中一条数据')
}
},
tbwl(ctx){ tbwl(ctx){
ctx.DialogWidth='30vw' ctx.DialogWidth='30vw'
ctx.DialogTitle='同步sap出库单' ctx.DialogTitle='同步sap出库单'
......
src/views/ccgl/ckgl/dbckd/ckqd.vue
View file @ e6b2a430
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
}, },
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'wms/ckgl/dbck/wms/ckgl/dbck', url: 'wms/ckgl/dbck/query/dbckqd',
queryUrl: 'wms/ckgl/dbck/wms/ckgl/dbck', queryUrl: 'wms/ckgl/dbck/query/dbckqd',
tableTitle: [ tableTitle: [
{ {
title: "库位", title: "库位",
......
src/views/ccgl/ckgl/dbckd/top/index.vue
View file @ e6b2a430
...@@ -40,7 +40,18 @@ ...@@ -40,7 +40,18 @@
queryDetail:true, queryDetail:true,
/* 基本配置*/ /* 基本配置*/
url: 'wms/ckgl/dbck', url: 'wms/ckgl/dbck',
tableTitle: [{ tableTitle: [
{
title: "状态",
field: "zt",
width: 80,
"transform": {
"url": "wms/ckgl/dbck/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "出库单号", title: "出库单号",
field: "djid", field: "djid",
fieldType: "upper", fieldType: "upper",
...@@ -87,16 +98,7 @@ ...@@ -87,16 +98,7 @@
// "value": "id" // "value": "id"
// } // }
// }, // },
{
title: "状态",
field: "zt",
width: 140,
"transform": {
"url": "wms/ckgl/dbck/init/zt",
"label": "name",
"value": "id"
}
},
// { // {
// title: "单据来源", // title: "单据来源",
// field: "djly", // field: "djly",
......
src/views/ccgl/ckgl/jhd/top/dbckd.vue
View file @ e6b2a430
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
queryDetail: true, queryDetail: true,
/* 基本配置*/ /* 基本配置*/
url: 'wms/ckgl/dbck', url: 'wms/ckgl/dbck',
queryUrl:'wms/ckgl/jhtz/query/dbck',
tableTitle: [{ tableTitle: [{
title: "出库单号", title: "出库单号",
field: "djid", field: "djid",
......
src/views/ccgl/ckgl/jhd/top/dbckqd.vue
View file @ e6b2a430
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'wms/ckgl/dbck', url: 'wms/ckgl/dbck',
queryUrl: 'wms/ckgl/dbck/query/detail', queryUrl: 'wms/ckgl/jhtz/query/dbckmx',
tableTitle: [{ tableTitle: [{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
......
src/views/ccgl/ckgl/jhd/top/edit.vue
View file @ e6b2a430
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
this.DialogTitle = '选择调拨出库单' this.DialogTitle = '选择调拨出库单'
this.showDialog = true this.showDialog = true
}, },
save(){},
/* 选择库存回调 */ /* 选择库存回调 */
savekc(list) { savekc(list) {
list.forEach(item => { list.forEach(item => {
......
src/views/ccgl/ckgl/jhd/top/rkd.vue
View file @ e6b2a430
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
queryDetail: true, queryDetail: true,
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/ckgl/cktz', url: 'lxyl/ckgl/cktz',
queryUrl:'wms/ckgl/jhtz/query/cktz',
tableTitle: [{ tableTitle: [{
title: "状态", title: "状态",
field: "zt", field: "zt",
......
src/views/ccgl/ckgl/jhd/top/rkqd.vue
View file @ e6b2a430
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/ckgl/cktz', url: 'lxyl/ckgl/cktz',
queryUrl: 'lxyl/ckgl/cktz/query/detail', queryUrl: 'wms/ckgl/jhtz/query/cktzmx',
tableTitle: [{ tableTitle: [{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
......
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