Skip to content

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

adjust bzzy page

parent 025a83d7
Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 27 deletions
src/views/ccgl/kngl/bzzy/top/edit.vue
View file @ be665f46
......@@ -44,6 +44,7 @@
editMixin_expand
} from 'common'
import Mp from './mp.vue'
import Rkd from '../wmsRkd/index.vue'
export default {
mixins: [editMixin, editMixin_expand],
components: {
......@@ -82,8 +83,9 @@
/* 添加熬子表*/
list.forEach(item=>{
item.lydjid=item.id
item.zxx='N'
delete item.id
item.zbsl=0
item.zbsl=item.zbsl
this.formDetail.push(_.cloneDeep(item))
})
......@@ -136,7 +138,9 @@
type: 'AuxInput',
typeConfig: {
isRequest: false,
code: 'WMSRKD',
code: true,
dynamic:true,
component:Rkd,
label: 'rktzDjid',
transform: {
value: 'id',
......@@ -270,7 +274,24 @@
}
],
/* 从表编辑数据 */
editTableTitle: [{
editTableTitle: [
{
title: "不装托",
field: "zxx",
allowEdit: true,
type: 'select',
options:[
{
value:'Y',
label:'是'
},
{
value:'N',
label:'否'
}
],
width: 140
},{
title: "唯一码",
field: "packCode",
width: 140
......
src/views/ccgl/kngl/bzzy/top/mp.vue
View file @ be665f46
<template>
<DefaultDialog :app='app'>
<div slot="form" style="display: flex;height: 70vh;">
<div style="width: 50%;height: 100%;display: flex;">
<BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full" style="height: 100%;" :autoQuery='false'
:config="config">
<template #dialog="ctx">
......@@ -13,10 +14,28 @@
</BasePage>
</div>
<div style="height: 100%;width: 50%;">
<EditTable ref="editTable" :app='editTableConfig' >
<template slot="tabCustom">
<el-table-column label="操作" width="90" header-align="center" fixed="right" >
<template slot-scope="scope">
<el-button style="text-align: center;color: red;width: 100%;"
@click.native.prevent="del(scope.$index,scope)" type="text" size="small">
<i class="el-icon-delete"></i>删除
</el-button>
</template>
</el-table-column>
</template>
</EditTable>
</div>
</div>
<div slot="reFooter" class="refooter" >
<span slot="footer" class="dialog-footer" >
<el-button @click="app.showDialog=false">取 消</el-button>
<el-button type="primary" @click="save()">确 定</el-button>
<el-button type="primary" @click="selected()">选 定</el-button>
<el-button type="primary" @click="save()">完 成</el-button>
</span>
</div>
</DefaultDialog>
......@@ -43,6 +62,52 @@
},
data() {
return {
editTableConfig:{
editTableTitle:[
{
label: "唯一码",
prop: "packCode",
width: 140
},
{
label: "物料编码",
prop: "wlxxCode",
width: 140
},
{
label: "物料名称",
prop: "wlxxName",
width: 140
},
{
label: "物料规格",
prop: "wlxxGg",
width: 140
},
{
label: "物料批号",
prop: "wlph",
width: 180,
allowEdit: true,
type: 'inputText',
},
{
label: "装包数量",
prop: "zbsl",
width: 140,
allowEdit: true,
type: 'inputNumber',
},
{
label: "制令号",
prop: "zlh",
width: 180,
allowEdit: true,
type: 'inputText',
},
],
editTableData:[]
},
power: {
add: false,
copy: false,
......@@ -61,7 +126,7 @@
config: {
/* 基本配置*/
url: 'lxyl/rkgl/rktz/query/detail',
queryUrl: 'lxyl/rkgl/rktz/query/detail',
queryUrl: 'wms/rkgl/bzzy/query/rktzmx',
tableTitle: [{
title: "物料编码",
field: "wlxxCode",
......@@ -93,16 +158,16 @@
field: "yssl",
width: 100,
},
// {
// title: "码盘数量",
// field: "ztsl",
// width: 120,
// },
// {
// title: "包装数量",
// field: "bzsl",
// width: 120,
// },
{
title: "装包数量",
field: "zbsl",
width: 120,
},
{
title: "待装包数量",
field: "dzbsl",
width: 120,
},
// {
// title: "入库数量",
// field: "rksl",
......@@ -163,10 +228,77 @@
},
methods: {
save() {
del(index,scope){
let row=scope.row
this.$refs.basePage.$refs.TablePager.tableData.forEach(eei=>{
if(eei.id==row.id){
eei.dzbsl= parseFloat(eei.dzbsl) +parseFloat(row.zbsl)
}
})
this.editTableConfig.editTableData.splice(index,1)
},
selected(){
let list=this.$refs.basePage.$refs.TablePager.selectedList||[]
if(list.length!=1){
this.$warning('该操作只能选中一条数据后操作')
}else{
this.$prompt('请输入每包数量', '', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputValidator: (value) => {
const pattern = /^[0-9]*$/;
if (pattern.test(value)) {
return true;
} else {
return '请输入整数数量';
}
},
}).then(({ value }) => {
if(value){
/* 开始判断如何分包*/
let data=list[0]
let num=parseFloat(data.dzbsl)||0
if(value>num){
this.$warning('所选数量超过待包装数量')
}else{
let list=[]
/* 计算新的数组*/
let quotient = Math.floor(num / value);
// 计算余数
let remainder = num % value;
for (let i = 0; i < quotient; i++) {
let pjData=_.cloneDeep(data)
pjData.zbsl=value
list.push(pjData);
}
if(remainder!=0){
let fnData=_.cloneDeep(data)
fnData.zbsl=remainder
list.push(fnData);
}
list.forEach(newItem=>{
this.editTableConfig.editTableData.push(_.cloneDeep(newItem))
})
this.$refs.basePage.$refs.TablePager.tableData.forEach(eei=>{
if(eei.id==data.id){
eei.dzbsl=0
}
})
}
}
})
}
},
save() {
let list= _.cloneDeep(this.editTableConfig.editTableData)
if(list.length==0){
this.$warning('请至少勾选一条数据')
this.$warning('请至少添加一条数据')
}else{
this.$emit('save',list)
this.app.showDialog=false
......@@ -191,5 +323,8 @@
}
</script>
<style>
<style lang="scss" scoped>
::v-deep .el-icon-refresh-right {
display: none;
}
</style>
src/views/ccgl/kngl/bzzy/wmsRkd/index.vue 0 → 100644
View file @ be665f46
<template>
<BasePage ref="basePage" :power='power' class="min_full" :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">示例按钮</el-button> -->
</template>
</BasePage>
</template>
<script>
export default {
data() {
return {
power: {
add: false,
copy: false,
delButton: false,
editButton: false,
operateButtons: false,
workFlow: false,
/* 表格 */
showSelection: false,
saveSelected: false
},
config: {
/* 基本配置*/
url: 'wms/rkgl/rktz',
queryUrl:'wms/rkgl/bzzy/query/rktz',
tableTitle: [
{
title: "状态",
field: "zt",
fieldType: "ftString",
align: 'center',
width: 80,
"transform": {
"url": "wms/rkgl/rktz/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "入库单号",
field: "djid",
width: 140
},
{
title: "入库日期",
field: "ywrq",
fieldType: 'ftDate'
},
{
title: "入库人",
field: "rkr",
width: 140
},
{
title: "事务类型",
field: "swlxName",
width: 100
},
{
title: "仓库",
field: "ckid",
width: 140,
hidden: true
},
{
title: "仓库",
field: "ckName",
width: 140
},
{
title: "入库部门",
field: "bmName",
width: 140
},
{
title: "备注",
field: "bz",
width: 240
},
{
title: "维护人",
field: "whr"
},
{
title: "维护时间",
field: "whsj",
fieldType: 'ftDateTime'
}
],
queryParams: [
[{
label: '日期',
startProp: "start",
endProp: "end",
span: 12,
type: 'RelDaterangeV2',
startValue: new Date().getTime()-1000*60*60*24*30,
endValue:new Date().getTime(),
},
{
"label": "仓库",
"prop": "ckid",
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
},
{
label: '单据编号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
}
],[
{
label: '状态',
prop: 'zt',
span: 6,
type: 'RelSelect',
typeConfig: {
src: 'wms/rkgl/rktz/init/zt'
}
},
{
label: '事务类型',
prop: 'swlxid',
span: 6,
type: 'RelSelect',
typeConfig: {
src: 'wms/rkgl/rktz/init/swlx'
}
}
]
],
/* 默认启停用 */
showqt: false,
}
}
},
methods: {
/* 示例*/
// demo(basePage){
// }
},
components: {
}
}
</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