Skip to content

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

Last week's work

parent d125eceb
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 99 deletions
src/views/ccgl/ckgl/ckdj/edit.vue
View file @ acfdfa54
<template> <template>
<RelDialog bigTitle detailTable='KCSW' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' <RelDialog @getForm='getForm' bigTitle detailTable='KCSW' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
:app='app' :buttonApp='buttonApp'> :app='app' :buttonApp='buttonApp'>
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <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">
...@@ -16,18 +16,13 @@ ...@@ -16,18 +16,13 @@
:editTableData="formDetail"> :editTableData="formDetail">
</editTableForEdit> </editTableForEdit>
</div> </div>
<el-row class="bottomInfo" :gutter="20"> <el-row :gutter="20" :app="this" class="editRow bottomInfo">
<el-col class="center" :span="12"> <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"
form.cjr||localUser :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig'
}} :rule="item.rule" />
</el-col> <!-- 额外数据 -->
<el-col class="center" :span="12"> </el-row>
创建时间:{{
$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
}}
</el-col>
</el-row>
</el-form> </el-form>
<!-- editTab数据 --> <!-- editTab数据 -->
...@@ -57,6 +52,9 @@ ...@@ -57,6 +52,9 @@
}, },
mixins: [editMixin, editMixin_expand], mixins: [editMixin, editMixin_expand],
methods: { methods: {
getForm(row){
row.transrkd=row.cktzDjid||row.dbckDjid
},
/* 需要整体row时的回调 */ /* 需要整体row时的回调 */
computedRow(row) { computedRow(row) {
// this.$refs.editTableForEdit.$forceUpdate() // this.$refs.editTableForEdit.$forceUpdate()
...@@ -96,19 +94,46 @@ ...@@ -96,19 +94,46 @@
mounted() {}, mounted() {},
data() { data() {
return { return {
editColItemList2:[
{
"label": "单据来源",
"prop": "djly",
"span": 8,
"type": "RelSelect",
"value": "",
readonly:true,
"typeConfig": {
"src": "wms/ckgl/ckdj/init/djly",
"match": {
"value": "id",
"label": "name"
}
}
},
{
label: '维护人',
prop: 'whr',
type: 'input',
span: 8,
readonly:true,
},
{
label: '维护时间',
prop: 'whsj',
span: 8,
type: 'datetime',
readonly:true,
value:new Date().getTime()
}
],
form: { form: {
djlx: 'LLCK' djlx: 'LLCK'
}, },
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [
label: '领料单号',
prop: 'lldjid',
span: 8,
type: 'input',
"required": true,
},
{ {
label: '出库单号', label: '库存单号',
prop: 'djid', prop: 'djid',
span: 8, span: 8,
type: 'input', type: 'input',
...@@ -148,7 +173,7 @@ ...@@ -148,7 +173,7 @@
"value": "", "value": "",
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "kc/llck/init/swlx", "src": "wms/ckgl/ckdj/init/swlx",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
...@@ -156,7 +181,7 @@ ...@@ -156,7 +181,7 @@
} }
}, },
{ {
"label": "领料部门", "label": "部门",
"prop": "bmid", "prop": "bmid",
"span": 8, "span": 8,
"type": "RelSelect", "type": "RelSelect",
...@@ -171,8 +196,8 @@ ...@@ -171,8 +196,8 @@
} }
}, },
{ {
label: '领料人', label: '经手人',
prop: 'llr', prop: 'jsr',
// readonly:true, // readonly:true,
span: 8, span: 8,
type: 'input', type: 'input',
...@@ -187,6 +212,18 @@ ...@@ -187,6 +212,18 @@
"required": true "required": true
}, },
{
label: '出库单号',
prop: 'transrkd',
span: 8,
type: 'input',
},
{
label: '拣货单号',
prop: 'jhtzDjid',
span: 8,
type: 'input',
},
{ {
label: '备注', label: '备注',
prop: 'bz', prop: 'bz',
...@@ -202,18 +239,18 @@ ...@@ -202,18 +239,18 @@
align: "center" align: "center"
}, },
{ {
title: "物料编号", title: "物料编码",
field: "wlcode", field: "wlxxCode",
width: 240, width: 160,
}, },
{ {
title: "物料名称", title: "物料名称",
field: "wlmc", field: "wlxxName",
width: 160 width: 180
}, },
{ {
title: "规格", title: "规格",
field: "gg", field: "wlxxGg",
width: 140 width: 140
}, },
...@@ -222,13 +259,12 @@ ...@@ -222,13 +259,12 @@
field: "cksl", field: "cksl",
allowEdit: true, allowEdit: true,
type: 'inputNumber', type: 'inputNumber',
width: 200,
blur: toFixed(null), blur: toFixed(null),
}, },
{ // {
title: "应发数量", // title: "应发数量",
field: "yfsl" // field: "yfsl"
}, // },
{ {
title: "计量单位", title: "计量单位",
field: "jldwName", field: "jldwName",
...@@ -238,10 +274,13 @@ ...@@ -238,10 +274,13 @@
{ {
title: "物料批号", title: "物料批号",
field: "wlph", field: "wlph",
type: 'inputText',
width: 200, width: 200,
show: JSON.parse(localStorage.getItem('isPhgl'))
}, },
{
title: "制令号",
field: "zlh",
width: 160,
},
{ {
show: JSON.parse(localStorage.getItem('isKwgl')), show: JSON.parse(localStorage.getItem('isKwgl')),
title: "库位", title: "库位",
......
src/views/ccgl/ckgl/ckdj/index.vue
View file @ acfdfa54
...@@ -37,14 +37,19 @@ ...@@ -37,14 +37,19 @@
/* 基本配置*/ /* 基本配置*/
url:'wms/ckgl/ckdj', url:'wms/ckgl/ckdj',
tableTitle: [ tableTitle: [
{"title": "出库单号", "field": "djid", "width": 140}, {"title": "库存单号", "field": "djid", "width": 140},
{"title": "出库日期", "field": "ywrq", fieldType: 'ftDate'}, {"title": "出库日期", "field": "ywrq", fieldType: 'ftDate'},
{"title": "仓库", "field": "ckName", "width": 140}, {"title": "仓库", "field": "ckName", "width": 140},
{"title": "事务类型", "field": "swlxName", "width": 100}, {"title": "事务类型", "field": "swlxName", "width": 100},
{"title": "部门", "field": "bmName", "width": 130}, {"title": "部门", "field": "bmName", "width": 130},
{"title": "经手人", "field": "jsr", "width": 120}, {"title": "经手人", "field": "jsr", "width": 120},
{"title": "保管员", "field": "bgy", "width": 120}, {"title": "保管员", "field": "bgy", "width": 120},
{"title": "领料单号", "field": "lldjid", "width": 140}, {"title": "出库单号", "field": "lldjid", "width": 140,formatter:(row,b,c)=>{
let id=row.cktzDjid||row.dbckDjid
return id
}},
{"title": "拣货单号", "field": "jhtzDjid", "width": 140},
{"title": "备注", "field": "bz", "width": 220}, {"title": "备注", "field": "bz", "width": 220},
{"title": "维护人", "field": "whr"}, {"title": "维护人", "field": "whr"},
{"title": "维护时间", "field": "whsj", fieldType: 'ftDateTime'} {"title": "维护时间", "field": "whsj", fieldType: 'ftDateTime'}
......
src/views/ccgl/ckgl/dbckd/ckqd.vue
View file @ acfdfa54
...@@ -75,18 +75,13 @@ ...@@ -75,18 +75,13 @@
{ {
title: "计量单位", title: "计量单位",
field: "jldwName", field: "jldwName",
width: 140 width: 80
}, },
{ {
title: "物料批号", title: "物料批号",
field: "wlph", field: "wlph",
width: 140, width: 140,
}, },
{
title: "库位名称",
field: "wlxxName",
width: 120,
},
{ {
title: "制令号", title: "制令号",
...@@ -94,8 +89,8 @@ ...@@ -94,8 +89,8 @@
width: 180, width: 180,
}, },
{ {
title: "库存数量", title: "调拨数量",
field: "kcsl", field: "bcsl",
width: 120, width: 120,
fieldType: 'float' fieldType: 'float'
}, },
......
src/views/ccgl/ckgl/dbckd/top/akck.vue
View file @ acfdfa54
...@@ -101,13 +101,13 @@ ...@@ -101,13 +101,13 @@
showDialog:false, showDialog:false,
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [{
label: '入库单号', label: '出库单号',
prop: 'djid', prop: 'djid',
span: 8, span: 8,
type: 'input', type: 'input',
}, },
{ {
label: '入库日期', label: '业务日期',
prop: 'ywrq', prop: 'ywrq',
span: 8, span: 8,
type: 'date', type: 'date',
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"required": true, "required": true,
readonly:true,
"typeConfig": { "typeConfig": {
"src": "jcsj/common/ck/queryCkid", "src": "jcsj/common/ck/queryCkid",
"match": { "match": {
...@@ -176,6 +177,7 @@ ...@@ -176,6 +177,7 @@
}, },
{ {
label: '货主', label: '货主',
readonly:true,
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/ckgl/dbckd/top/edit.vue
View file @ acfdfa54
...@@ -63,13 +63,13 @@ ...@@ -63,13 +63,13 @@
return { return {
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [{
label: '入库单号', label: '出库单号',
prop: 'djid', prop: 'djid',
span: 8, span: 8,
type: 'input', type: 'input',
}, },
{ {
label: '入库日期', label: '业务日期',
prop: 'ywrq', prop: 'ywrq',
span: 8, span: 8,
type: 'date', type: 'date',
......
src/views/ccgl/ckgl/dbckd/top/index.vue
View file @ acfdfa54
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
width: 140 width: 140
}, },
{ {
title: "出库日期", title: "业务日期",
field: "ywrq", field: "ywrq",
fieldType: "ftDate" fieldType: "ftDate"
}, },
......
src/views/ccgl/ckgl/jhd/top/dbckd.vue
View file @ acfdfa54
...@@ -49,16 +49,15 @@ ...@@ -49,16 +49,15 @@
width: 140 width: 140
}, },
{ {
title: "仓库", title: "拨出仓库",
field: "ckName", field: "ckName",
width: 140 width: 140
}, },
{ {
title: "调拨出库仓库", title: "拨入仓库",
field: "dfckName", field: "dfckName",
width: 140 width: 140
}, },
{ {
title: "事务类型", title: "事务类型",
field: "swlxName", field: "swlxName",
......
src/views/ccgl/ckgl/jhd/top/dbckqd.vue
View file @ acfdfa54
...@@ -46,12 +46,12 @@ mixins:[wlsx,wlphsx], ...@@ -46,12 +46,12 @@ mixins:[wlsx,wlphsx],
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
fieldType: "upper", fieldType: "upper",
width: 140 width: 160
}, },
{ {
title: "物料名称", title: "物料名称",
field: "wlxxName", field: "wlxxName",
width: 140 width: 180
}, },
{ {
title: "物料规格", title: "物料规格",
...@@ -73,11 +73,11 @@ mixins:[wlsx,wlphsx], ...@@ -73,11 +73,11 @@ mixins:[wlsx,wlphsx],
field: "bcsl", field: "bcsl",
width: 100, width: 100,
}, },
{ // {
title: "已出库数量", // title: "已出库数量",
field: "ycksl", // field: "ycksl",
width: 100, // width: 100,
}, // },
{ {
title: "状态", title: "状态",
field: "zt", field: "zt",
......
src/views/ccgl/ckgl/jhd/top/edit.vue
View file @ acfdfa54
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
"required": true, "required": true,
}, },
{ {
readonly:true,
"label": "仓库", "label": "仓库",
"prop": "ckid", "prop": "ckid",
"span": 8, "span": 8,
...@@ -188,6 +189,7 @@ ...@@ -188,6 +189,7 @@
} }
}, },
{ {
readonly:true,
"label": "事务类型", "label": "事务类型",
"prop": "swlxid", "prop": "swlxid",
"span": 8, "span": 8,
...@@ -203,7 +205,8 @@ ...@@ -203,7 +205,8 @@
} }
}, },
{ {
"label": "领料部门", readonly:true,
"label": "部门",
"prop": "bmid", "prop": "bmid",
"span": 8, "span": 8,
"type": "RelSelect", "type": "RelSelect",
...@@ -249,12 +252,12 @@ ...@@ -249,12 +252,12 @@
{ {
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
width: 240, width: 140,
}, },
{ {
title: "物料名称", title: "物料名称",
field: "wlxxName", field: "wlxxName",
width: 160 width: 180
}, },
{ {
title: "规格", title: "规格",
...@@ -274,16 +277,16 @@ ...@@ -274,16 +277,16 @@
type: 'inputNumber', type: 'inputNumber',
allowEdit: false, allowEdit: false,
}, },
{ // {
title: "库存数量", // title: "库存数量",
field: "kcsl", // field: "kcsl",
type: 'inputNumber', // type: 'inputNumber',
allowEdit: false, // allowEdit: false,
}, // },
{ {
title: "计量单位", title: "计量单位",
field: "jldwName", field: "jldwName",
width: 100, width: 80,
allowEdit: false allowEdit: false
}, },
{ {
......
src/views/ccgl/ckgl/jhd/top/index.vue
View file @ acfdfa54
<template> <template>
<BasePage @getRow='getRow' class="min_full" style="height: 100%;" :config="config"> <BasePage @getRow='getRow' :power='power' class="min_full" style="height: 100%;" :config="config">
<template #dialog="ctx"> <template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template> </template>
...@@ -18,6 +18,21 @@ ...@@ -18,6 +18,21 @@
export default { export default {
data() { data() {
return { return {
power: {
add: true,
copy: false,
/* 手动控制删除 */
delButton: true,
/* 手动控制编辑按钮权限 */
editButton: true,
/* 是否渲染右侧操作按钮 */
operateButtons: true,
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择，以及记住选择 */
showSelection: false,
saveSelected: false
},
config: { config: {
queryDetail: true, queryDetail: true,
/* 基本配置*/ /* 基本配置*/
......
src/views/ccgl/rkgl/rkdj/edit.vue
View file @ acfdfa54
...@@ -98,21 +98,21 @@ ...@@ -98,21 +98,21 @@
data() { data() {
return { return {
editColItemList2:[ editColItemList2:[
// { {
// "label": "状态", "label": "单据来源",
// "prop": "zt", "prop": "djly",
// "span": 8, "span": 8,
// "type": "RelSelect", "type": "RelSelect",
// "value": "", "value": "",
// readonly:true, readonly:true,
// "typeConfig": { "typeConfig": {
// "src": "wms/rkgl/rktz/init/zt", "src": "wms/rkgl/rkdj/init/djly",
// "match": { "match": {
// "value": "id", "value": "id",
// "label": "name" "label": "name"
// } }
// } }
// }, },
{ {
label: '维护人', label: '维护人',
prop: 'whr', prop: 'whr',
...@@ -131,13 +131,8 @@ ...@@ -131,13 +131,8 @@
} }
], ],
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [
label: '入库单号',
prop: 'transrkd',
span: 8,
type: 'input',
"required": true,
},
{ {
label: '库存单号', label: '库存单号',
prop: 'djid', prop: 'djid',
...@@ -190,7 +185,7 @@ ...@@ -190,7 +185,7 @@
"value": "", "value": "",
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "kc/rktz/init/swlx", "src": "wms/rkgl/rkdj/init/swlx",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
...@@ -202,12 +197,29 @@ ...@@ -202,12 +197,29 @@
prop: 'bgy', prop: 'bgy',
span: 8, span: 8,
type: 'input', type: 'input',
}, },
{
label: '经手人',
prop: 'jsr',
span: 8,
type: 'input',
},
{
label: '入库单号',
prop: 'transrkd',
span: 8,
type: 'input',
},
{
label: '上架单号',
prop: 'sjtzDjid',
span: 8,
type: 'input',
},
{ {
label: '备注', label: '备注',
prop: 'bz', prop: 'bz',
span: 16, span: 24,
type: 'input', type: 'input',
}, },
], ],
......
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