Commit a6126628 authored by 李苏's avatar 李苏 💬

1

parent 65a5ddb3
......@@ -25,7 +25,6 @@
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-form>
......
<template>
<BasePage class="min_full" :config="config">
<BasePage :power='power' class="min_full" :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
......@@ -16,6 +16,21 @@
export default {
data() {
return {
power: {
add: false,
copy: false,
/* 手动控制删除 */
delButton: false,
/* 手动控制编辑按钮权限 */
editButton: false,
/* 是否渲染右侧操作按钮 */
operateButtons: false,
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择,以及记住选择 */
showSelection: false,
saveSelected: false
},
config: {
/* 基本配置*/
url: 'wms/cxfx/kwmx',
......@@ -85,8 +100,8 @@
width: 140
},
{
title: "数量",
field: "sl",
title: "库存数量",
field: "kcsl",
width: 140
}
......@@ -195,4 +210,4 @@
</script>
<style>
</style>
\ No newline at end of file
</style>
......@@ -64,6 +64,11 @@
field: "wlph",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 140
},
{
title: "码盘数量",
field: "mpsl",
......@@ -74,11 +79,7 @@
field: "rqCode",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 140
},
{
title: "唯一码",
field: "packCode",
......
<template>
<RelDialog bigTitle detailTable='RKTZMX' @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">
<EditColItem :required="item.required||false" :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>
<RelDialog bigTitle detailTable='RKTZMX' @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">
<EditColItem :required="item.required||false" :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>
<div class="editTab">
<editTableForEdit :indexApp='app' code='WMSWLXX' :type='type' @save='save' ref="editTableForEdit"
:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
:editTableData="formDetail">
<template v-if="type!='view'" #toolbar="ctx">
<!-- <AuxButton :queryParams="{
<div class="editTab">
<editTableForEdit :indexApp='app' code='WMSWLXX' :type='type' @save='save' ref="editTableForEdit"
:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
:editTableData="formDetail">
<template v-if="type!='view'" #toolbar="ctx">
<!-- <AuxButton :queryParams="{
ckid:form.ckid
}" rename='按码盘单开' code='MPD' @save="save" /> -->
</template>
</editTableForEdit>
</template>
</editTableForEdit>
</div>
<el-row :gutter="20" :app="this" class="editRow bottomInfo">
<EditColItem :required="item.required||false" :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" />
<!-- 额外数据 -->
</div>
<el-row :gutter="20" :app="this" class="editRow bottomInfo">
<EditColItem :required="item.required||false" :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 class="bottomInfo" :gutter="20">
<!-- <el-row class="bottomInfo" :gutter="20">
<el-col class="center" :span="12">
创建人:{{
form.cjr||localUser
......@@ -41,66 +38,65 @@
}}
</el-col>
</el-row> -->
</el-form>
</el-form>
<!-- editTab数据 -->
</RelDialog>
<!-- editTab数据 -->
</RelDialog>
</template>
<script>
import {
toFixed,
doRkdChange
} from 'common/src/utils/blur.js'
import {
editMixin,
editMixin_expand
} from 'common'
import {
toFixed,
doRkdChange
} from 'common/src/utils/blur.js'
import {
editMixin,
editMixin_expand
} from 'common'
export default {
mixins: [editMixin, editMixin_expand],
methods: {
/* 需要整体row时的回调 */
computedRow(row) {
// this.$refs.editTableForEdit.$forceUpdate()
},
/* 选择list时的回调 */
save(list) {
list.forEach(item => {
// 转换并且push
item.wlid = item.id
item.wlmc = item.name
item.wlcode = item.code
item.xqsl = 0
item.xqrq = new Date().getTime()
delete item.id
this.formDetail.push(_.cloneDeep(item))
export default {
mixins: [editMixin, editMixin_expand],
methods: {
/* 需要整体row时的回调 */
computedRow(row) {
// this.$refs.editTableForEdit.$forceUpdate()
},
/* 选择list时的回调 */
save(list) {
list.forEach(item => {
// 转换并且push
item.wlid = item.id
item.wlmc = item.name
item.wlcode = item.code
item.xqsl = 0
item.xqrq = new Date().getTime()
delete item.id
this.formDetail.push(_.cloneDeep(item))
})
}
},
})
}
},
mounted() {
this.$nextTick(()=>{
this.form.whr=this.username
this.form.rkr=this.username
this.$nextTick(() => {
this.form.whr = this.username
this.form.rkr = this.username
})
},
data() {
return {
editColItemList2:[
{
data() {
return {
editColItemList2: [{
"label": "状态",
"prop": "zt",
"span": 8,
"type": "RelSelect",
"value": "",
readonly:true,
readonly: true,
"typeConfig": {
"src": "wms/rkgl/rktz/init/zt",
"match": {
"value": "id",
"label": "name"
}
"src": "wms/rkgl/rktz/init/zt",
"match": {
"value": "id",
"label": "name"
}
}
},
{
......@@ -108,7 +104,7 @@
prop: 'whr',
type: 'input',
span: 8,
readonly:true,
readonly: true,
},
{
......@@ -116,70 +112,70 @@
prop: 'whsj',
span: 8,
type: 'datetime',
readonly:true,
value:new Date().getTime()
readonly: true,
value: new Date().getTime()
}
],
/* 常规edit数据 */
editColItemList: [{
label: '入库单号',
prop: 'djid',
span: 8,
type: 'input',
},
{
label: '入库日期',
prop: 'ywrq',
span: 8,
type: 'date',
value: new Date().getTime(),
"required": true,
},
{
"label": "仓库",
"prop": "ckid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
},
{
"label": "事务类型",
"prop": "swlxid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "wms/rkgl/rktz/init/swlx",
"match": {
"value": "id",
"label": "name"
}
}
},
{
"label": "部门",
"prop": "bmid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/bm/query",
"match": {
"value": "id",
"label": "bmmc"
}
}
},
/* 常规edit数据 */
editColItemList: [{
label: '入库单号',
prop: 'djid',
span: 8,
type: 'input',
},
{
label: '入库日期',
prop: 'ywrq',
span: 8,
type: 'date',
value: new Date().getTime(),
"required": true,
},
{
"label": "仓库",
"prop": "ckid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
},
{
"label": "事务类型",
"prop": "swlxid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "wms/rkgl/rktz/init/swlx",
"match": {
"value": "id",
"label": "name"
}
}
},
{
"label": "部门",
"prop": "bmid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/bm/query",
"match": {
"value": "id",
"label": "bmmc"
}
}
},
{
label: '入库人',
prop: 'rkr',
......@@ -187,130 +183,146 @@
type: 'input',
"required": true,
},
{
label: '备注',
prop: 'bz',
span: 24,
type: 'input',
},
{
label: '货主',
prop: 'hzid',
span: 8,
type: 'AuxInput',
// required: true,
typeConfig: {
isRequest: true,
code: 'HZID',
label: 'hzName',
transform: {
value: 'id',
label: 'name'
}
}
},
{
label: '备注',
prop: 'bz',
span: 16,
type: 'input',
},
],
/* 从表编辑数据 */
editTableTitle: [{
title: "序号",
field: "xh",
width: 50,
align: "center"
},
{
title: "物料编码",
field: "code",
width: 180,
type: 'AuxInput',
typeConfig: {
"code": "MATERIAL",
"label": "wlcode",
"transform": {
"value": "code",
"label": "code"
},
give(data) {
this.form.wlid = data.id
this.form.wlmc = data.name
this.form.wlcode = data.code
],
/* 从表编辑数据 */
editTableTitle: [{
title: "序号",
field: "xh",
width: 50,
align: "center"
},
{
title: "物料编码",
field: "code",
width: 180,
type: 'AuxInput',
typeConfig: {
"code": "MATERIAL",
"label": "wlcode",
"transform": {
"value": "code",
"label": "code"
},
give(data) {
this.form.wlid = data.id
this.form.wlmc = data.name
this.form.wlcode = data.code
}
}
}
},
{
title: "物料名称",
field: "wlmc",
width: 160
},
{
title: "规格",
field: "gg",
width: 140
},
// {
// title: "计量单位",
// field: "jldwname",
// width: 100,
// allowEdit: false
// },
}
},
{
title: "物料名称",
field: "wlmc",
width: 160
},
{
title: "规格",
field: "gg",
width: 140
},
// {
// title: "计量单位",
// field: "jldwname",
// width: 100,
// allowEdit: false
// },
/* 不可编辑*/
/* 不可编辑*/
{
title: "物料批号",
field: "wlph",
type: 'inputText',
width: 200,
// show: JSON.parse(localStorage.getItem('isPhgl'))
title: "物料批号",
field: "wlph",
type: 'inputText',
width: 200,
// show: JSON.parse(localStorage.getItem('isPhgl'))
},
{
title: "制令号",
field: "zlh",
type: 'inputText',
width: 180,
allowEdit: true
title: "制令号",
field: "zlh",
type: 'inputText',
width: 180,
allowEdit: true
},
{
title: "数量",
field: "yssl",
allowEdit: true,
type: 'inputNumber',
title: "数量",
field: "yssl",
allowEdit: true,
type: 'inputNumber',
blur: toFixed(null),
blur: toFixed(null),
},
{
title: "已入库数量",
field: "rksl",
{
title: "已入库数量",
field: "rksl",
},
},
// {
// title: "库位",
// field: "kwid",
// width: 240,
// type: 'AuxInput',
// typeConfig: {
// isRequest: false,
// "code": "KWWH",
// "label": "kwName",
// queryParams: (row) => {
// return {
// ckid: this.form.ckid
// }
// },
// "transform": {
// "value": "id",
// "label": "name"
// }
// {
// title: "库位",
// field: "kwid",
// width: 240,
// type: 'AuxInput',
// typeConfig: {
// isRequest: false,
// "code": "KWWH",
// "label": "kwName",
// queryParams: (row) => {
// return {
// ckid: this.form.ckid
// }
// },
// "transform": {
// "value": "id",
// "label": "name"
// }
// },
// show: JSON.parse(localStorage.getItem('isKwgl')),
// },
{
title: "备注",
field: "bz",
width: 200,
type: 'inputText',
allowEdit: true
}
// },
// show: JSON.parse(localStorage.getItem('isKwgl')),
// },
{
title: "备注",
field: "bz",
width: 200,
type: 'inputText',
allowEdit: true
}
]
}
}
}
]
}
}
}
</script>
<style lang="scss" scoped>
@import url("~common/src/assets/styles/editDetail.scss");
@import url("~common/src/assets/styles/editDetail.scss");
</style>
......@@ -49,6 +49,11 @@
field: "rkr",
width: 140
},
{
title: "货主",
field: "hzName",
width: 140
},
{
title: "事务类型",
field: "swlxName",
......
......@@ -126,13 +126,13 @@
editColItemList: [{
label: '单据号',
prop: 'djid',
span: 12,
span: 8,
type: 'input',
},
{
"label": "仓库",
"prop": "ckid",
"span": 12,
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
......@@ -147,7 +147,7 @@
{
"label": "事务类型",
"prop": "swlxid",
"span": 12,
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
......@@ -162,7 +162,7 @@
{
"label": "部门",
"prop": "bmid",
"span": 12,
"span": 8,
"type": "RelSelect",
"value": "",
"typeConfig": {
......@@ -176,7 +176,7 @@
{
label: '业务日期',
prop: 'ywrq',
span: 12,
span: 8,
type: 'date',
value: new Date().getTime(),
"required": true,
......@@ -184,7 +184,7 @@
{
label: '上架人',
prop: 'sjrid',
span: 12,
span: 8,
"required": true,
type: 'AuxInput',
typeConfig: {
......
......@@ -69,6 +69,12 @@
fieldType: "ftString",
width: 100
},
{
title: "货主",
field: "hzName",
fieldType: "ftString",
width: 100
},
{
title: "单据来源",
field: "djly",
......@@ -79,6 +85,11 @@
},
width: 80
},
{
title: "来源单号",
field: "rktzDjid",
width: 140
},
{
title: "来源单据号",
field: "lydjDjid",
......
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