Skip to content

L
lxyl-vue
Commit 8c1c7464 authored by 周毅's avatar 周毅
Browse files
Options

调拨通知单合并到入库、出库通知单

parent 21a36c67
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 72 deletions
src/views/ccgl/ckgl/ckd/top/index.vue
View file @ 8c1c7464
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
fieldType: 'ftDate' fieldType: 'ftDate'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
...@@ -78,11 +78,6 @@ ...@@ -78,11 +78,6 @@
field: "swlxName", field: "swlxName",
width: 100 width: 100
}, },
{
title: "仓库编码",
field: "ckCode",
width: 140
},
{ {
title: "仓库", title: "仓库",
field: "ckName", field: "ckName",
......
src/views/ccgl/ckgl/ckdj/edit.vue
View file @ 8c1c7464
...@@ -194,6 +194,10 @@ ...@@ -194,6 +194,10 @@
prop: 'lydjDjid', prop: 'lydjDjid',
span: 8, span: 8,
type: 'input', type: 'input',
formatter: (row, b, c) => {
let id = row.cktzDjid || row.dbckDjid
return id
}
}, },
{ {
label: '备注', label: '备注',
......
src/views/ccgl/ckgl/ckdj/index.vue
View file @ 8c1c7464
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
// delUrl: 'lxyl/ckgl/pkck/delete/ckdj', // delUrl: 'lxyl/ckgl/pkck/delete/ckdj',
queryDetail: true, queryDetail: true,
/* 基本配置*/ /* 基本配置*/
url: 'wms/ckgl/ckdj', url: 'lxyl/ckgl/ckdj',
tableTitle: [ tableTitle: [
{ {
title: "过账状态", title: "过账状态",
...@@ -105,24 +105,18 @@ ...@@ -105,24 +105,18 @@
queryParams: [ queryParams: [
[{ [{
label: '出库日期', label: '出库日期',
startProp: "ywrqb", startProp: "start",
endProp: "ywrqe", endProp: "end",
span: 8, span: 6,
type: 'RelDaterangeV2', type: 'RelDaterangeV2',
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30, startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
endValue: new Date().getTime(), endValue: new Date().getTime(),
}, },
{
label: '出库单号',
prop: 'djid',
span: 8,
type: 'input',
value: ''
},
{ {
"label": "仓库", "label": "仓库",
"prop": "ckid", "prop": "ckid",
"span": 8, "span": 6,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
...@@ -132,8 +126,37 @@ ...@@ -132,8 +126,37 @@
"label": "name" "label": "name"
} }
} }
},
{
"label": "事务类型",
"prop": "swlxid",
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "wms/ckgl/ckdj/init/swlx",
"match": {
"value": "id",
"label": "name"
}
}
},
{
label: '出库单号',
prop: 'cktzDjid',
span: 6,
type: 'input',
value: ''
}
],
[
{
label: '出库任务号',
prop: 'lydjDjid',
span: 8,
type: 'input',
value: ''
} }
] ]
], ],
/* 默认启停用 */ /* 默认启停用 */
......
src/views/ccgl/ckgl/dbckd/ckdmx.vue
View file @ 8c1c7464
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
{ {
title: "调拨数量", title: "调拨数量",
field: "bcsl", field: "yfsl",
width: 100, width: 100,
}, },
{ {
......
src/views/ccgl/ckgl/dbckd/ckqd.vue
View file @ 8c1c7464
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
}, },
{ {
title: "调拨数量", title: "调拨数量",
field: "bcsl", field: "yfsl",
width: 120, width: 120,
fieldType: 'float' fieldType: 'float'
}, },
......
src/views/ccgl/ckgl/dbckd/top/ajydk.vue
View file @ 8c1c7464
<template> <template>
<RelDialog bigTitle detailTable='DBCKQD' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' <RelDialog bigTitle detailTable='CKTZQD' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
:app='app' :buttonApp='buttonApp'> :app='app' :buttonApp='buttonApp'>
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<Jyd @save='jydSave' v-if="showDialog" :app='this' /> <Jyd @save='jydSave' v-if="showDialog" :app='this' />
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
}, },
{ {
title: "调拨数量", title: "调拨数量",
field: "bcsl", field: "yfsl",
allowEdit: false, allowEdit: false,
type: 'inputNumber', type: 'inputNumber',
width: 200, width: 200,
......
src/views/ccgl/ckgl/dbckd/top/akck.vue
View file @ 8c1c7464
<template> <template>
<RelDialog bigTitle detailTable='DBCKQD' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' <RelDialog bigTitle detailTable='CKTZQD' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
:app='app' :buttonApp='buttonApp'> :app='app' :buttonApp='buttonApp'>
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<Kc @save='kcSave' v-if="showDialog" :app='this' /> <Kc @save='kcSave' v-if="showDialog" :app='this' />
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
let length = this.formDetail.length let length = this.formDetail.length
this.formDetail.splice(0, length) this.formDetail.splice(0, length)
list.forEach(item => { list.forEach(item => {
item.bcsl=item.kcsl item.yfsl=item.kcsl
item.lydjid = item.id item.lydjid = item.id
delete item.id delete item.id
this.formDetail.push(_.cloneDeep(item)) this.formDetail.push(_.cloneDeep(item))
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
}, },
{ {
title: "调拨数量", title: "调拨数量",
field: "bcsl", field: "yfsl",
allowEdit: true, allowEdit: true,
type: 'inputNumber', type: 'inputNumber',
width: 200, width: 200,
......
src/views/ccgl/ckgl/dbckd/top/edit.vue
View file @ 8c1c7464
<template> <template>
<RelDialog bigTitle detailTable='DBCKMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' <RelDialog bigTitle detailTable='CKTZMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
:app='app' :buttonApp='buttonApp'> :app='app' :buttonApp='buttonApp'>
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20" :app="this" class="editRow"> <el-row :gutter="20" :app="this" class="editRow">
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
}, },
{ {
title: "调拨数量", title: "调拨数量",
field: "bcsl", field: "yfsl",
allowEdit: true, allowEdit: true,
type: 'inputNumber', type: 'inputNumber',
width: 200, width: 200,
......
src/views/ccgl/ckgl/dbckd/top/index.vue
View file @ 8c1c7464
...@@ -69,11 +69,6 @@ ...@@ -69,11 +69,6 @@
field: "ywrq", field: "ywrq",
fieldType: "ftDate" fieldType: "ftDate"
}, },
{
title: "部门",
field: "bmName",
width: 140
},
{ {
title: "拨出仓库", title: "拨出仓库",
field: "ckName", field: "ckName",
...@@ -90,36 +85,9 @@ ...@@ -90,36 +85,9 @@
field: "swlxName", field: "swlxName",
width: 140 width: 140
}, },
// {
// title: "货主",
// field: "hzName",
// width: 140
// },
// {
// title: "单据来源",
// field: "djly",
// width: 140,
// "transform": {
// "url": "wms/ckgl/dbck/init/djly",
// "label": "name",
// "value": "id"
// }
// },
// {
// title: "单据来源",
// field: "djly",
// width: 140,
// "transform": {
// "url": "wms/ckgl/dbck/init/djly",
// "label": "name",
// "value": "id"
// }
// },
{ {
title: "来源单据号", title: "来源单据号",
field: "lydjDjid", field: "lydjid",
width: 140 width: 140
}, },
{ {
......
src/views/ccgl/ckgl/lkckrw/top/index.vue
View file @ 8c1c7464
...@@ -91,6 +91,18 @@ ...@@ -91,6 +91,18 @@
field: "rqCode", field: "rqCode",
width: 100 width: 100
}, },
{
title: "需要拣货",
field: "jhbz",
align:"center",
formatter(a, b, v) {
let map = {
Y: '✔',
N: 'X'
}
return map[v];
}
},
{ {
title: "开始时间", title: "开始时间",
field: "kssj", field: "kssj",
...@@ -117,6 +129,29 @@ ...@@ -117,6 +129,29 @@
fieldType: "ftDateTime" fieldType: "ftDateTime"
}, },
], ],
cellStyle({row, column, rowIndex, columnIndex}) {
// 定义样式变量
let cellStyle;
switch(row.jhbz) {
// 0代表正常
case 'Y':
// 设置文本颜色 绿色 可以直接写颜色编码，也可以直接写颜色的单词
cellStyle = 'color:green';
break;
// 0代表金禁用
case 'N':
// 设置文本颜色 红色
cellStyle = 'color:red';
break;
// 如果有其他状态，就默认显示，不给文本颜色
default:
cellStyle = '';
}
console.log(column);
if(column.property=="jhbz"){
return cellStyle
}
},
queryParams: [ queryParams: [
[{ [{
label: '日期', label: '日期',
......
src/views/ccgl/ckgl/xpk/top/index.vue
View file @ 8c1c7464
...@@ -74,6 +74,18 @@ ...@@ -74,6 +74,18 @@
field: "packCode", field: "packCode",
width: 140 width: 140
}, },
{
title: "拣货",
field: "jhbz",
align:"center",
formatter(a, b, v) {
let map = {
Y: '✔',
N: 'X'
}
return map[v];
}
},
{ {
title: "创建人", title: "创建人",
field: "cjr", field: "cjr",
...@@ -84,6 +96,29 @@ ...@@ -84,6 +96,29 @@
fieldType: "ftDateTime" fieldType: "ftDateTime"
} }
], ],
cellStyle({row, column, rowIndex, columnIndex}) {
// 定义样式变量
let cellStyle;
switch(row.jhbz) {
// 0代表正常
case 'Y':
// 设置文本颜色 绿色 可以直接写颜色编码，也可以直接写颜色的单词
cellStyle = 'color:green';
break;
// 0代表金禁用
case 'N':
// 设置文本颜色 红色
cellStyle = 'color:red';
break;
// 如果有其他状态，就默认显示，不给文本颜色
default:
cellStyle = '';
}
console.log(column);
if(column.property=="jhbz"){
return cellStyle
}
},
queryParams: [ queryParams: [
[ [
{ {
......
src/views/ccgl/cxfx/kwxq/index.vue
View file @ 8c1c7464
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
}, },
{ {
title: "物料批号", title: "物料批号",
field: "WlphInfo", field: "wlph",
width: 180 width: 180
}, },
{ {
......
src/views/ccgl/rkgl/cjbhghk/top/index.vue
View file @ 8c1c7464
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
width: 140 width: 140
}, },
{ {
title: "入库单号", title: "重检单号",
field: "lydjDjid", field: "lydjDjid",
width: 140 width: 140
}, },
......
src/views/ccgl/rkgl/dbrkd/rkdmx.vue
View file @ 8c1c7464
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
}, },
{ {
title: "调拨数量", title: "调拨数量",
field: "brsl", field: "yssl",
width: 100, width: 100,
}, },
{ {
......
src/views/ccgl/rkgl/dbrkd/top/edit.vue
View file @ 8c1c7464
<template> <template>
<RelDialog bigTitle detailTable='DBRKMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' <RelDialog bigTitle detailTable='RKTZMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
:app='app' :buttonApp='buttonApp'> :app='app' :buttonApp='buttonApp'>
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20" :app="this" class="editRow"> <el-row :gutter="20" :app="this" class="editRow">
......
src/views/ccgl/rkgl/dbrkd/top/index.vue
View file @ 8c1c7464
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
}, },
{ {
title: "调拨出库单号", title: "调拨出库单号",
field: "dbckDjid", field: "lydjDjid",
width: 140 width: 140
}, },
{ {
...@@ -96,11 +96,6 @@ ...@@ -96,11 +96,6 @@
"value": "id" "value": "id"
} }
}, },
{
title: "来源单据号",
field: "lydjDjid",
width: 140
},
{ {
title: "备注", title: "备注",
field: "bz", field: "bz",
......
src/views/ccgl/rkgl/lkjhhk/top/index.vue
View file @ 8c1c7464
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
width: 140 width: 140
}, },
{ {
title: "入库单号", title: "出库单号",
field: "lydjDjid", field: "lydjDjid",
width: 140 width: 140
}, },
......
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