Skip to content

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

Last week's work

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