Skip to content

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

修改入库登记、出库登记

parent c3e6b386
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 376 deletions
src/views/ccgl/ckgl/ckdj/index.vue
View file @ c2ddcee2
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
], ],
queryParams: [ queryParams: [
[{ [{
label: '出库日期', label: '日期',
startProp: "start", startProp: "start",
endProp: "end", endProp: "end",
span: 6, span: 6,
...@@ -117,26 +117,26 @@ ...@@ -117,26 +117,26 @@
} }
} }
}, },
{
"label": "事务类型",
"prop": "swlxid",
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "wms/ckgl/ckdj/init/swlx",
"match": {
"value": "id",
"label": "name"
}
}
},
{ {
label: '出库单号', label: '出库单号',
prop: 'cktzDjid', prop: 'cktzDjid',
span: 6, span: 6,
type: 'input', type: 'input',
value: '' value: ''
},
{
label: '过账状态',
prop: 'gzzt',
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
src: "lxyl/common/init/gzzt",
match: {
"value": "id",
"label": "name"
}
}
} }
], ],
[ [
...@@ -146,7 +146,21 @@ ...@@ -146,7 +146,21 @@
span: 8, span: 8,
type: 'input', type: 'input',
value: '' value: ''
} },
{
label: "事务类型",
prop: "swlxid",
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
"src": "wms/ckgl/ckdj/init/swlx",
match: {
value: "id",
label: "name"
}
}
},
] ]
], ],
/* 默认启停用 */ /* 默认启停用 */
......
src/views/ccgl/rkgl/rkd/top/shd.vue
View file @ c2ddcee2
...@@ -59,7 +59,6 @@ this.$post('common/datetime',{}).then(res=>{ ...@@ -59,7 +59,6 @@ this.$post('common/datetime',{}).then(res=>{
span: 24, span: 24,
type: 'datetime', type: 'datetime',
value: '', value: '',
"required": true,
}, },
{ {
label: '结束日期', label: '结束日期',
...@@ -67,7 +66,12 @@ this.$post('common/datetime',{}).then(res=>{ ...@@ -67,7 +66,12 @@ this.$post('common/datetime',{}).then(res=>{
span: 24, span: 24,
type: 'datetime', type: 'datetime',
value: '', value: '',
"required": true, },
{
label: '送货单号',
prop: 'djid',
span: 24,
value: '',
}, },
] ]
...@@ -78,24 +82,26 @@ this.$post('common/datetime',{}).then(res=>{ ...@@ -78,24 +82,26 @@ this.$post('common/datetime',{}).then(res=>{
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if(valid){ if(valid){
/* 判定开始参数不能大于30天*/ /* 判定开始参数不能大于30天*/
if(this.form.start<this.nowTime-30*24*60*60*1000){ if (!this.form.djid){
this.$warning('最早开始时间不得超过30天') if(this.form.start<this.nowTime-30*24*60*60*1000){
return this.$warning('最早开始时间不得超过30天')
} return
/* 开始时间和结束时间不能大于120分钟*/ }
if(this.form.end-this.form.start>120*60*1000){ /* 开始时间和结束时间不能大于120分钟*/
this.$warning('开始时间与结束时间间隔不能大于120分钟') if(this.form.end-this.form.start>120*60*1000){
return this.$warning('开始时间与结束时间间隔不能大于120分钟')
} return
if(this.form.start>this.form.end){ }
this.$warning('开始时间不得晚于结束时间') if(this.form.start>this.form.end){
return this.$warning('开始时间不得晚于结束时间')
return
}
} }
/* 构建参数*/ /* 构建参数*/
let params={ let params={
start:this.form.start, start:this.form.start,
end:this.form.end end:this.form.end,
djid:this.form.djid
} }
this.isLoading=true this.isLoading=true
this.$post('lxyl/rkgl/rktz/scm/sync',params).then(res=>{ this.$post('lxyl/rkgl/rktz/scm/sync',params).then(res=>{
......
src/views/ccgl/rkgl/rkdj/index.vue
View file @ c2ddcee2
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
label: '入库日期', label: '入库日期',
startProp: "start", startProp: "start",
endProp: "end", 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(),
...@@ -102,11 +102,11 @@ ...@@ -102,11 +102,11 @@
{ {
"label": "仓库", "label": "仓库",
"prop": "ckid", "prop": "ckid",
"span": 8, "span": 6,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
"src": "jcsj/common/ck/queryCkid", "src": "lxyl/jcsj/uck/ck/queryCjckid",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
...@@ -116,22 +116,36 @@ ...@@ -116,22 +116,36 @@
{ {
label: '入库单号', label: '入库单号',
prop: 'rktzDjid', prop: 'rktzDjid',
span: 8, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{
label: '过账状态',
prop: 'gzzt',
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
src: "lxyl/common/init/gzzt",
match: {
"value": "id",
"label": "name"
}
}
}
], ],
[{ [{
label: '入库任务号', label: '入库任务号',
prop: 'lydjDjid', prop: 'lydjDjid',
span: 8, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
"label": "事务类型", "label": "事务类型",
"prop": "swlxid", "prop": "swlxid",
"span": 8, "span": 6,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
......
src/views/ccgl/thgl/ckth/mx.vue
View file @ c2ddcee2
...@@ -37,7 +37,18 @@ ...@@ -37,7 +37,18 @@
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/rkgl/ckthtz/query/detail', url: 'lxyl/rkgl/ckthtz/query/detail',
queryUrl: 'lxyl/rkgl/ckthtz/query/detail', queryUrl: 'lxyl/rkgl/ckthtz/query/detail',
tableTitle: [{ tableTitle: [
{
title: "状态",
field: "zt",
width: 80,
"transform": {
"url": "lxyl/rkgl/ckthtz/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
fieldType: "upper", fieldType: "upper",
...@@ -86,43 +97,24 @@ ...@@ -86,43 +97,24 @@
{ {
title: "数量", title: "数量",
field: "yssl", field: "yssl",
width: 120, fieldType:"float"
},
{
title: "码盘数量",
field: "ztsl",
width: 120,
}, },
{ {
title: "包装数量", title: "包装数量",
field: "zbsl", field: "zbsl",
width: 120, fieldType:"float"
}, },
{ {
title: "入库数量", title: "入库数量",
field: "rksl", field: "rksl",
width: 100, fieldType:"float"
}, },
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
width: 180, width: 180,
}, },
{
title: "状态",
field: "zt",
width: 120,
"transform": {
"url": "lxyl/rkgl/ckthtz/init/zt",
"label": "name",
"value": "id"
}
},
// {
// title: "来源单号",
// field: "lydjid",
// width: 120,
// },
// { // {
// title: "关闭人", // title: "关闭人",
// field: "gbr", // field: "gbr",
......
src/views/ccgl/thgl/ckth/top/edit.vue
View file @ c2ddcee2
...@@ -243,21 +243,6 @@ ...@@ -243,21 +243,6 @@
} }
} }
}, },
{
"label": "部门",
"prop": "bmid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/bm/query",
"match": {
"value": "id",
"label": "bmmc"
}
}
},
{ {
label: '工厂', label: '工厂',
prop: 'hzid', prop: 'hzid',
...@@ -274,30 +259,6 @@ ...@@ -274,30 +259,6 @@
} }
} }
}, },
// {
// label: '供应商',
// prop: 'gysid',
// span: 8,
// type: 'input',
// readonly:true,
// show:this.type=='view'?true:false
// },
// {
// label: '入库人',
// prop: 'rkrid',
// span: 8,
// type: 'AuxInput',
// typeConfig: {
// code: 'USER',
// label: 'rkrName',
// transform: {
// value: 'id',
// label: 'username'
// }
// },
// },
{ {
label: '备注', label: '备注',
prop: 'bz', prop: 'bz',
......
src/views/ccgl/thgl/ckth/top/index.vue
View file @ c2ddcee2
This diff is collapsed.
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