Skip to content

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

修改WCS作业列表显示

parent c99205f1
Show whitespace changes
Inline Side-by-side
Showing with 421 additions and 376 deletions
src/views/ccgl/rkgl/spk/top/edit.vue
View file @ 0d2daefe
<template> <template>
<RelDialog ref="RelDialog" bigTitle @getForm='getForm' <RelDialog
@getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'> ref="RelDialog"
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> bigTitle
@getForm="getForm"
@getFormDetail="getFormDetail"
width="70%"
:type="type"
:editApp="editApp"
:app="app"
:buttonApp="buttonApp"
>
<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">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " <EditColItem
v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label" :required="item.required || false"
:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" /> :readonly="item.readonly ? true : false"
v-for="(item, index) in editColItemList"
:value="item.value"
:span="item.span"
:label="item.label"
:prop="item.prop"
:key="item.prop"
:type="item.type"
:typeConfig="item.typeConfig"
:rule="item.rule"
/>
<!-- 额外数据 --> <!-- 额外数据 -->
</el-row> </el-row>
<div class="editTab"> <div class="editTab">
<editTableForEdit :expandTitle='true' :phsxTitle='true' :AuxButton="false" :indexApp='app' :type='type' <editTableForEdit
ref="editTableForEdit" :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow' :expandTitle="true"
:editTableData="formDetail"> :phsxTitle="true"
<template v-if="type!='view'" #toolbar="ctx"> :AuxButton="false"
<AuxButton :dynamic='true' :component='Wym' rename='选择唯一码' code='dynamic' @save="savewym" /> :indexApp="app"
:type="type"
ref="editTableForEdit"
:editTableTitle="editTableTitle"
v-if="editTableForEdit"
:computedRow="computedRow"
:editTableData="formDetail"
>
<template v-if="type != 'view'" #toolbar="ctx">
<AuxButton
:dynamic="true"
:component="Wym"
rename="选择唯一码"
code="dynamic"
@save="savewym"
/>
</template> </template>
</editTableForEdit> </editTableForEdit>
</div> </div>
<el-row :gutter="20" :app="this" class="editRow bottomInfo"> <el-row :gutter="20" :app="this" class="editRow bottomInfo">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " <EditColItem
v-for="(item,index) in editColItemList2 " :value="item.value" :span="item.span" :label="item.label" :required="item.required || false"
:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" /> :readonly="item.readonly ? true : false"
v-for="(item, index) in editColItemList2"
:value="item.value"
:span="item.span"
:label="item.label"
:prop="item.prop"
:key="item.prop"
:type="item.type"
:typeConfig="item.typeConfig"
:rule="item.rule"
/>
</el-row> </el-row>
</el-form> </el-form>
<!-- editTab数据 --> <!-- editTab数据 -->
...@@ -34,37 +84,29 @@ ...@@ -34,37 +84,29 @@
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import Wym from './wym/index.vue' import Wym from "./wym/index.vue";
import WMSRKD from './wmsRkd' import WMSRKD from "./wmsRkd";
import { import { toFixed, digit, doRkdChange } from "common/src/utils/blur.js";
toFixed, import { editMixin, editMixin_expand } from "common";
digit,
doRkdChange
} from 'common/src/utils/blur.js'
import {
editMixin,
editMixin_expand
} from 'common'
export default { export default {
mixins: [editMixin, editMixin_expand], mixins: [editMixin, editMixin_expand],
methods: { methods: {
save() { save() {
this.$refs["form"].validate((valid) => {
this.$refs['form'].validate((valid)=>{ if (valid) {
if(valid){ this.$post("lxyl/rkgl/sjrw/pkrk/save", {
this.$post('lxyl/rkgl/sjrw/pkrk/save',{
...this.form, ...this.form,
datas:this.formDetail datas: this.formDetail,
}).then(res=>{ }).then((res) => {
if(res.success){ if (res.success) {
this.$success('操作成功') this.$success("操作成功");
this.$refs.RelDialog.closeAll() this.$refs.RelDialog.closeAll();
this.app.refresh() this.app.refresh();
} }
}) });
} }
}) });
}, },
getForm(val) { getForm(val) {
// val.djly = 'M' // val.djly = 'M'
...@@ -77,20 +119,18 @@ ...@@ -77,20 +119,18 @@
/* 选择库存回调 */ /* 选择库存回调 */
savewym(list) { savewym(list) {
let packidList=this.formDetail.map(pitem=>pitem.packid) let packidList = this.formDetail.map((pitem) => pitem.packid);
list.forEach(item => { list.forEach((item) => {
if(packidList.includes(item.packid)){ if (packidList.includes(item.packid)) {
console.log('重复') console.log("重复");
}else{ } else {
delete item.id delete item.id;
this.formDetail.push(_.cloneDeep(item)) this.formDetail.push(_.cloneDeep(item));
} }
// 转换并且push // 转换并且push
// item.lydjid = item.id // item.lydjid = item.id
});
},
})
}
}, },
mounted() { mounted() {
// this.form.llrName = this.username // this.form.llrName = this.username
...@@ -104,109 +144,112 @@ ...@@ -104,109 +144,112 @@
// djly:'M' // djly:'M'
}, },
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [
"label": "仓库", {
"prop": "ckid", label: "仓库",
"span": 8, prop: "ckid",
"type": "RelSelect", span: 8,
"value": "", type: "RelSelect",
"required": true, value: "",
"typeConfig": { required: true,
"src": "lxyl/jcsj/uck/ck/queryCjckid", typeConfig: {
"match": { src: "lxyl/jcsj/uck/ck/queryCjckid",
"value": "id", match: {
"label": "name" value: "id",
label: "name",
},
params: {
flid: "D",
},
}, },
params:{
flid:'D'
}
}
}, },
{ {
label: '库位', label: "库位",
prop: 'kwid', prop: "kwid",
span: 8, span: 8,
required: true, required: true,
type: 'AuxInput', type: "AuxInput",
typeConfig: { typeConfig: {
queryParams:()=>{ queryParams: () => {
return{ return {
ckid:this.form.ckid ckid: this.form.ckid,
} };
}, },
isRequest: false, isRequest: false,
code: 'WMSKWWH', code: "WMSKWWH",
label: 'kwCode', label: "kwCode",
transform: { transform: {
value: 'id', value: "id",
label: 'code' label: "code",
} },
}, },
}, },
{ {
label: '容器', label: "容器",
prop: 'rqid', prop: "rqid",
span: 8, span: 8,
required: true, required: true,
type: 'AuxInput', type: "AuxInput",
typeConfig: { typeConfig: {
isRequest: false, isRequest: false,
code: 'RQGLKMS', code: "RQGLKMS",
label: 'rqCode', label: "rqCode",
transform: { transform: {
value: 'id', value: "id",
label: 'code' label: "code",
}, },
give:(item)=>{ give: (item) => {
this.$post('wms/common/queryRqmxByCode',{ this.$post("wms/rkgl/sjrw/queryRqmxByCodeForSj", {
code:item.code code: item.code,
}).then(res=>{ }).then((res) => {
if(res.success){ if (res.success) {
let length=this.formDetail.length let length = this.formDetail.length;
this.formDetail.splice(0,length) this.formDetail.splice(0, length);
let list =res.data.records||[] let list = res.data.records || [];
let packidList=this.formDetail.map(pitem=>pitem.packid) let packidList = this.formDetail.map((pitem) => pitem.packid);
list.forEach(item=>{ list.forEach((item) => {
item.sl=item.packmxSl if (item.wlid){
delete item.id item.sl = item.packmxSl;
if(packidList.includes(item.packid)){ delete item.id;
console.log('重复') if (packidList.includes(item.packid)) {
}else{ console.log("重复");
this.formDetail.push(item) } else {
this.formDetail.push(item);
} }
})
}
})
} }
});
} }
});
},
},
}, },
{ {
label: '入库单', label: "入库单",
prop: 'lydjid', prop: "lydjid",
span: 8, span: 8,
required: false, required: false,
type: 'AuxInput', type: "AuxInput",
typeConfig: { typeConfig: {
isRequest: false, isRequest: false,
code: true, code: true,
dynamic: true, dynamic: true,
component: WMSRKD, component: WMSRKD,
label: 'lydjDjid', label: "lydjDjid",
transform: { transform: {
value: 'id', value: "id",
label: 'djid' label: "djid",
} },
} },
} },
], ],
/* 从表编辑数据 */ /* 从表编辑数据 */
editTableTitle: [{ editTableTitle: [
{
title: "序号", title: "序号",
field: "xh", field: "xh",
width: 50, width: 50,
align: "center" align: "center",
}, },
{ {
title: "唯一码", title: "唯一码",
...@@ -221,19 +264,19 @@ ...@@ -221,19 +264,19 @@
{ {
title: "物料名称", title: "物料名称",
field: "wlxxName", field: "wlxxName",
width: 160 width: 160,
}, },
{ {
title: "规格", title: "规格",
field: "wlxxGg", field: "wlxxGg",
width: 140 width: 140,
}, },
{ {
title: "数量", title: "数量",
field: "sl", field: "sl",
// type: 'inputText', // type: 'inputText',
width: 160 width: 160,
}, },
{ {
title: "物料批号", title: "物料批号",
...@@ -245,12 +288,12 @@ ...@@ -245,12 +288,12 @@
field: "zlh", field: "zlh",
// type: 'inputText', // type: 'inputText',
width: 180, width: 180,
} },
] ],
} };
} },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import url("~common/src/assets/styles/editDetail.scss"); @import url("~common/src/assets/styles/editDetail.scss");
</style> </style>
src/views/ccgl/rkgl/spk/top/index.vue
View file @ 0d2daefe
...@@ -38,17 +38,16 @@ ...@@ -38,17 +38,16 @@
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/rkgl/sjrw/pkrk', url: 'lxyl/rkgl/sjrw/pkrk',
tableTitle: [ tableTitle: [
{
title: "入库单号",
field: "lydjDjid",
width: 140
},
{ {
title: "任务号", title: "任务号",
field: "djid", field: "djid",
width: 140 width: 140
}, },
{
title: "日期",
field: "ywrq",
fieldType: "ftDate"
},
{ {
title: "仓库", title: "仓库",
field: "ckName", field: "ckName",
...@@ -60,12 +59,7 @@ ...@@ -60,12 +59,7 @@
width: 140 width: 140
}, },
{ {
title: "起始位", title: "库位",
field: "gwName",
width: 140
},
{
title: "目标位",
field: "kwName", field: "kwName",
width: 140 width: 140
}, },
...@@ -74,19 +68,26 @@ ...@@ -74,19 +68,26 @@
field: "rqCode", field: "rqCode",
width: 140 width: 140
}, },
// { {
// title: "唯一码", title: "唯一码",
// field: "packCode", field: "packCode",
// width: 140 width: 140
// }, },
{
title: "入库单号",
field: "lydjDjid",
width: 140
},
{ {
title: "创建人", title: "创建人",
field: "cjr" field: "cjr",
hidden: true
}, },
{ {
title: "创建时间", title: "创建时间",
field: "cjsj", field: "cjsj",
fieldType: "ftDateTime" fieldType: "ftDateTime",
hidden: true
}, },
{ {
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
title: "维护时间", title: "维护时间",
field: "whsj", field: "whsj",
fieldType: "ftDateTime" fieldType: "ftDateTime"
}, }
], ],
queryParams: [ queryParams: [
[{ [{
......
src/views/ccgl/wcsrwgl/wcszy/index.vue
View file @ 0d2daefe
...@@ -5,15 +5,13 @@ ...@@ -5,15 +5,13 @@
</template> </template>
<template #toolbar="ctx"> <template #toolbar="ctx">
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
</template> </template>
</BasePage> </BasePage>
</template> </template>
<script> <script>
// import Edit from './edit.vue' // import Edit from './edit.vue'
export default { export default {
data() { data() {
return { return {
power: { power: {
...@@ -29,91 +27,104 @@ ...@@ -29,91 +27,104 @@
workFlow: false, workFlow: false,
/* 表格开启选择，以及记住选择 */ /* 表格开启选择，以及记住选择 */
showSelection: false, showSelection: false,
saveSelected: false saveSelected: false,
}, },
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/wcszy', url: "lxyl/wcszy",
tableTitle: [{ tableTitle: [
title: "单据来源", {
field: "djly", title: "下架状态",
width: 140, field: "zt",
width: 100,
transform: { transform: {
"url": "lxyl/wcszy/init/djly", url: "lxyl/wcszy/init/zt",
"label": "name", label: "name",
"value": "id" value: "id",
}
}, },
{
title: "仓库编码",
field: "ckCode",
width: 140
}, },
{ {
title: "仓库名称", title: "上架状态",
field: "ckName", field: "sjzt",
width: 140 width: 100,
transform: {
url: "lxyl/wcszy/init/zt",
label: "name",
value: "id",
},
}, },
{ {
title: "货主编码", title: "类型",
field: "hzCode", field: "djly",
width: 140 width: 140,
transform: {
url: "lxyl/wcszy/init/djly",
label: "name",
value: "id",
},
}, },
{ {
title: "货主编码", title: "仓库",
field: "hzName", field: "ckName",
width: 140 width: 140,
}, },
{ {
title: "来源单据", title: "容器",
field: "lydjDjid", field: "rqCode",
width: 140 width: 120,
}, },
{ {
title: "上架状态", title: "库位",
field: "sjzt", field: "kwName",
width: 140, width: 140,
transform: {
"url": "lxyl/wcszy/init/zt",
"label": "name",
"value": "id"
}
}, },
{ {
title: "下架状态", title: "业务单号",
field: "zt", field: "lydjDjid",
width: 140, width: 140,
transform: {
"url": "lxyl/wcszy/init/zt",
"label": "name",
"value": "id"
}
}, },
{ {
title: "业务日期", title: "业务日期",
field: "ywrq", field: "ywrq",
fieldType: "ftDate" fieldType: "ftDate",
},
{
title: "创建人",
field: "cjr",
hidden: true
},
{
title: "创建时间",
field: "cjsj",
fieldType: "ftDateTime",
hidden: true
}, },
{
title: "维护人",
field: "whr"
},
{
title: "维护时间",
field: "whsj",
fieldType: "ftDateTime"
}
], ],
queryParams: [ queryParams: [
[ [
{ {
label: '单据来源', label: "单据来源",
prop: 'djly', prop: "djly",
span: 8, span: 8,
"type": "RelSelect", type: "RelSelect",
"value": "", value: "",
"typeConfig": { typeConfig: {
"src": "lxyl/wcszy/init/djly", src: "lxyl/wcszy/init/djly",
"match": { match: {
"value": "id", value: "id",
"label": "name" label: "name",
} },
} },
}, },
// { // {
// "label": "状态", // "label": "状态",
...@@ -129,30 +140,20 @@ ...@@ -129,30 +140,20 @@
// } // }
// } // }
// }, // },
], ],
], ],
},
};
}
}
}, },
methods: { methods: {
/* 示例*/ /* 示例*/
// demo(basePage){ // demo(basePage){
// } // }
}, },
components: { components: {
// Edit // Edit
} },
};
}
</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