Skip to content

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

修改入库登记、出库登记

parent c3e6b386
Show 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,6 +82,7 @@ this.$post('common/datetime',{}).then(res=>{ ...@@ -78,6 +82,7 @@ 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.djid){
if(this.form.start<this.nowTime-30*24*60*60*1000){ if(this.form.start<this.nowTime-30*24*60*60*1000){
this.$warning('最早开始时间不得超过30天') this.$warning('最早开始时间不得超过30天')
return return
...@@ -91,11 +96,12 @@ this.$post('common/datetime',{}).then(res=>{ ...@@ -91,11 +96,12 @@ this.$post('common/datetime',{}).then(res=>{
this.$warning('开始时间不得晚于结束时间') this.$warning('开始时间不得晚于结束时间')
return 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
<template> <template>
<BasePage @getRow='getRow' class="min_full" style="height: 100%;" :config="config"> <BasePage
@getRow="getRow"
class="min_full"
style="height: 100%"
:config="config"
>
<template #dialog="ctx"> <template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
<Sclltldb v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='生产领料退料同步'" :app='ctx.basePage' /> <Sclltldb
<Wxtltb v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='外协退料同步'" :app='ctx.basePage' /> v-if="
<Cbzxtltb v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='成本中心退料同步'" :app='ctx.basePage' /> ctx.basePage.showDialog &&
ctx.basePage.DialogTitle == '生产领料退料同步'
"
:app="ctx.basePage"
/>
<Wxtltb
v-if="
ctx.basePage.showDialog && ctx.basePage.DialogTitle == '外协退料同步'
"
:app="ctx.basePage"
/>
<Cbzxtltb
v-if="
ctx.basePage.showDialog &&
ctx.basePage.DialogTitle == '成本中心退料同步'
"
:app="ctx.basePage"
/>
</template> </template>
<template #toolbar="ctx"> <template #toolbar="ctx">
<el-button
<el-button v-if="ctx.basePage.powerObj['21']" @click="sclltldb(ctx.basePage)" size='mini' type="primary">生产领料退料同步</el-button> v-if="ctx.basePage.powerObj['21']"
<el-button v-if="ctx.basePage.powerObj['22']" @click="wxtltb(ctx.basePage)" size='mini' type="primary">外协退料同步</el-button> @click="sclltldb(ctx.basePage)"
<el-button v-if="ctx.basePage.powerObj['23']" @click="cbzxtltb(ctx.basePage)" size='mini' type="primary">成本中心退料同步</el-button> size="mini"
<el-button v-if="ctx.basePage.powerObj['24']" @click="qr(ctx.basePage)" size='mini' type="primary">确认</el-button> type="primary"
<el-button v-if="ctx.basePage.powerObj['24']" @click="qxqr(ctx.basePage)" size='mini' type="primary">取消确认</el-button> >生产领料退料同步</el-button
>
<el-button
v-if="ctx.basePage.powerObj['22']"
@click="wxtltb(ctx.basePage)"
size="mini"
type="primary"
>外协退料同步</el-button
>
<el-button
v-if="ctx.basePage.powerObj['23']"
@click="cbzxtltb(ctx.basePage)"
size="mini"
type="primary"
>成本中心退料同步</el-button
>
<el-button
v-if="ctx.basePage.powerObj['24']"
@click="qr(ctx.basePage)"
size="mini"
type="primary"
>确认</el-button
>
<el-button
v-if="ctx.basePage.powerObj['24']"
@click="qxqr(ctx.basePage)"
size="mini"
type="primary"
>取消确认</el-button
>
</template> </template>
</BasePage> </BasePage>
</template> </template>
<script> <script>
import Edit from './edit.vue' import Edit from "./edit.vue";
import Shd from './shd.vue' import Shd from "./shd.vue";
import Sclltldb from './sclltldb.vue' import Sclltldb from "./sclltldb.vue";
import Wxtltb from './wxtltb.vue' import Wxtltb from "./wxtltb.vue";
import Cbzxtltb from './cbzxtltb.vue' import Cbzxtltb from "./cbzxtltb.vue";
export default { export default {
data() { data() {
return { return {
config: { config: {
queryDetail: true, queryDetail: true,
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/rkgl/ckthtz', url: "lxyl/rkgl/ckthtz",
tableTitle: [{ tableTitle: [
{
title: "状态", title: "状态",
field: "zt", field: "zt",
fieldType: "ftString", fieldType: "ftString",
align: 'center', align: "center",
width: 80, width: 80,
"transform": { transform: {
"url": "lxyl/rkgl/ckthtz/init/zt", url: "lxyl/rkgl/ckthtz/init/zt",
"label": "name", label: "name",
"value": "id" value: "id",
} },
}, },
{ {
title: "入库单号", title: "入库单号",
field: "djid", field: "djid",
width: 140 width: 140,
}, },
{ {
title: "业务日期", title: "业务日期",
field: "ywrq", field: "ywrq",
fieldType: 'ftDate' fieldType: "ftDate",
}, },
// {
// title: "入库人",
// field: "rkr",
// width: 140
// },
{ {
title: "工厂", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140,
}, },
{ {
title: "事务类型", title: "事务类型",
field: "swlxName", field: "swlxName",
width: 100 width: 100,
},
{
title: "入库人",
field: "rkrName",
width: 100
}, },
{ {
title: "仓库", title: "仓库",
field: "ckid", field: "ckid",
width: 140, width: 140,
hidden: true hidden: true,
}, },
{ {
title: "仓库", title: "仓库",
field: "ckName", field: "ckName",
width: 140 width: 140,
},
{
title: "码盘状态",
field: "mpzt",
width: 100,
"transform": {
"url": "wms/rkgl/rktz/init/mpzt",
"label": "name",
"value": "id"
}
}, },
{ {
title: "包装状态", title: "包装状态",
field: "bzzt", field: "bzzt",
width: 100, width: 100,
"transform": { transform: {
"url": "wms/rkgl/rktz/init/bzzt", url: "wms/rkgl/rktz/init/bzzt",
"label": "name", label: "name",
"value": "id" value: "id",
}
}, },
{
title: "过账状态",
field: "gzzt",
width: 100,
"transform": {
"url": "lxyl/common/init/gzzt",
"label": "name",
"value": "id"
}
},
{
title: "部门",
field: "bmName",
width: 140
}, },
{ {
title: "单据来源", title: "单据来源",
field: "djly", field: "djly",
width: 140, width: 140,
"transform": { transform: {
"url": "lxyl/rkgl/ckthtz/init/djly", url: "lxyl/rkgl/ckthtz/init/djly",
"label": "name", label: "name",
"value": "id" value: "id",
} },
}, },
// { // {
// title: "来源单据号", // title: "来源单据号",
...@@ -140,157 +153,152 @@ ...@@ -140,157 +153,152 @@
{ {
title: "备注", title: "备注",
field: "bz", field: "bz",
width: 240 width: 240,
}, },
{ {
title: "维护人", title: "维护人",
field: "whr" field: "whr",
}, },
{ {
title: "维护时间", title: "维护时间",
field: "whsj", field: "whsj",
fieldType: 'ftDateTime' fieldType: "ftDateTime",
} },
], ],
queryParams: [ queryParams: [
[{ [
label: '日期', {
label: "日期",
startProp: "start", startProp: "start",
endProp: "end", endProp: "end",
span: 8, span: 8,
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": "仓库", label: "仓库",
"prop": "ckid", prop: "ckid",
"span": 8, span: 8,
"type": "RelSelect", type: "RelSelect",
"value": "", value: "",
"typeConfig": { typeConfig: {
"src": "jcsj/common/ck/queryCkid", src: "jcsj/common/ck/queryCkid",
"match": { match: {
"value": "id", value: "id",
"label": "name" label: "name",
} },
} },
}, },
{ {
label: '单据编号', label: "单据编号",
prop: 'djid', prop: "djid",
span: 8, span: 8,
type: 'input', type: "input",
value: '' value: "",
}, },
],
[
],[
{ {
label: '状态', label: "状态",
prop: 'zt', prop: "zt",
span: 8, span: 8,
type: 'RelSelect', type: "RelSelect",
typeConfig: { typeConfig: {
src: 'lxyl/rkgl/ckthtz/init/zt' src: "lxyl/rkgl/ckthtz/init/zt",
} },
}, },
{ {
label: '事务类型', label: "事务类型",
prop: 'swlxid', prop: "swlxid",
span: 8, span: 8,
type: 'RelSelect', type: "RelSelect",
typeConfig: { typeConfig: {
src: 'lxyl/rkgl/ckthtz/init/swlx' src: "lxyl/rkgl/ckthtz/init/swlx",
} },
}, },
{ {
label: '来源单号', label: "来源单号",
prop: 'lydh', prop: "lydh",
span: 8, span: 8,
type: 'input', type: "input",
value: '' value: "",
} },
] ],
], ],
/* 默认启停用 */ /* 默认启停用 */
},
} };
}
}, },
methods: { methods: {
qr(ctx) { qr(ctx) {
if (ctx.singleItem && ctx.singleItem.id) { if (ctx.singleItem && ctx.singleItem.id) {
this.$confirm('是否继续操作, 是否继续?', '提示', { this.$confirm("是否继续操作, 是否继续?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(res => { }).then((res) => {
this.$post('lxyl/rkgl/ckthtz/confirm', { this.$post("lxyl/rkgl/ckthtz/confirm", {
id: ctx.singleItem.id id: ctx.singleItem.id,
}).then(res => { }).then((res) => {
if (res.success) { if (res.success) {
this.$success('操作成功') this.$success("操作成功");
ctx.refresh() ctx.refresh();
} }
}) });
}) });
} else { } else {
this.$warning('请选中一条数据') this.$warning("请选中一条数据");
} }
}, },
qxqr(ctx) { qxqr(ctx) {
if (ctx.singleItem && ctx.singleItem.id) { if (ctx.singleItem && ctx.singleItem.id) {
this.$confirm('是否继续操作, 是否继续?', '提示', { this.$confirm("是否继续操作, 是否继续?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(res => { }).then((res) => {
this.$post('lxyl/rkgl/ckthtz/unconfirm', { this.$post("lxyl/rkgl/ckthtz/unconfirm", {
id: ctx.singleItem.id id: ctx.singleItem.id,
}).then(res => { }).then((res) => {
if (res.success) { if (res.success) {
this.$success('操作成功') this.$success("操作成功");
ctx.refresh() ctx.refresh();
} }
}) });
}) });
} else { } else {
this.$warning('请选中一条数据') this.$warning("请选中一条数据");
} }
}, },
sclltldb(ctx){ sclltldb(ctx) {
ctx.DialogWidth='35vw' ctx.DialogWidth = "35vw";
ctx.DialogTitle='生产领料退料同步' ctx.DialogTitle = "生产领料退料同步";
ctx.showDialog=true ctx.showDialog = true;
}, },
wxtltb(ctx){ wxtltb(ctx) {
ctx.DialogWidth='35vw' ctx.DialogWidth = "35vw";
ctx.DialogTitle='外协退料同步' ctx.DialogTitle = "外协退料同步";
ctx.showDialog=true ctx.showDialog = true;
}, },
cbzxtltb(ctx){ cbzxtltb(ctx) {
ctx.DialogWidth='35vw' ctx.DialogWidth = "35vw";
ctx.DialogTitle='成本中心退料同步' ctx.DialogTitle = "成本中心退料同步";
ctx.showDialog=true ctx.showDialog = true;
}, },
getRow(val){ getRow(val) {
this.$emit('getRow',val) this.$emit("getRow", val);
}, },
}, },
components: { components: {
Edit, Edit,
Shd, Shd,
Sclltldb, Sclltldb,
Wxtltb, Wxtltb,
Cbzxtltb Cbzxtltb,
} },
};
}
</script> </script>
<style> <style>
......
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