Skip to content

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

基础调整

parent 3d0db0b7
Hide whitespace changes
Inline Side-by-side
Showing with 910 additions and 23 deletions
src/router/index.js
View file @ 6ffe60e8
...@@ -678,6 +678,20 @@ export const powerRoutes = [ ...@@ -678,6 +678,20 @@ export const powerRoutes = [
name: 'bzzy', name: 'bzzy',
path: "bzzy", path: "bzzy",
}, },
/* */
{
component: 'ccgl/kngl/zlhbg/index',
hidden: false,
meta: {
"title": "制令号变更",
"icon": "",
"noCache": false,
"link": null,
"mkid": '920070800',
},
name: 'zlhbg',
path: "zlhbg",
},
] ]
}, },
] ]
......
src/views/ccgl/jcsj/ckdzb/edit.vue
View file @ 6ffe60e8
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
<RelDialog width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'> <RelDialog width="50%" :type='type' :editApp='editApp' :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"> <el-row :gutter="20" :app="this">
<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" /> <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> </el-row>
</el-form> </el-form>
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import { import {
editMixin editMixin
} from 'common' } from 'common'
...@@ -19,25 +20,27 @@ ...@@ -19,25 +20,27 @@
editColItemList: [ editColItemList: [
{ {
label: '编码', label: 'SAP仓库编码',
prop: 'code', prop: 'sapckid',
span: 12,
type: 'input',
required:true,
},
{
label: '名称',
prop: 'name',
span: 12, span: 12,
type: 'input', type: 'input',
required:true, required: true,
}, },
{ {
label: '备注', "label": "仓库",
prop: 'bz', "prop": "ckid",
span: 24, required: true,
type: 'input' "span": 12,
}, "type": "RelSelect",
"value": "",
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
}
] ]
} }
......
src/views/ccgl/jcsj/ckdzb/index.vue
View file @ 6ffe60e8
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
data(){ data(){
return{ return{
power: { power: {
add: false, add: true,
copy: false, copy: true,
delButton: false, delButton: true,
editButton: false, editButton: true,
operateButtons: false, operateButtons: true,
workFlow: false, workFlow: false,
/* 表格 */ /* 表格 */
showSelection: false, showSelection: false,
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
tableTitle: [ tableTitle: [
{title: "仓库编码", field: "ckCode", fieldType:"upper", width: 140}, {title: "仓库编码", field: "ckCode", fieldType:"upper", width: 140},
{title: "仓库名称", field: "ckName", width: 140}, {title: "仓库名称", field: "ckName", width: 140},
{title: "SAP仓库编码", field: "sapCkCode", fieldType:"upper", width: 140}, {title: "SAP仓库编码", field: "sapckid", fieldType:"upper", width: 140},
{title: "维护人", field: "whr",width: 140}, {title: "维护人", field: "whr",width: 140},
{title: "维护时间", field: "whsj", fieldType:"ftDateTime"}, {title: "维护时间", field: "whsj", fieldType:"ftDateTime"},
], ],
......
src/views/ccgl/kngl/zlhbg/index.vue 0 → 100644
View file @ 6ffe60e8
<template>
<div class="outer">
<div class=" higher flex-column">
<!-- 分层-->
<div class="top">
<Top @getRow='topGetRow' ref="top"></Top>
</div>
<div class="bottom flex">
<div class="full" >
<el-tabs class="full" v-model="activeName" >
<el-tab-pane class="full" label="入库单明细" name="first">
<Mx ref="mx" class="full" />
</el-tab-pane>
<el-tab-pane class="full" label="入库清单" name="second">
<Rkqd ref="rkqd" class="full" />
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</div>
</template>
<script>
import Top from './top/index.vue'
import Mx from './mx.vue'
import Rkqd from './rkqd.vue'
export default {
components: {
Top,
Mx,
Rkqd
},
data(){
return{
activeName:'first'
}
},
methods: {
topGetRow(row) {
/* dom赋值*/
let mid = row.id
this.$refs.mx.$refs.basePage.queryParams.mid = mid
this.$refs.mx.$refs.basePage.$refs['TablePager'].pageQuery({
setFirstCurrent: true
})
this.$refs.rkqd.$refs.basePage.queryParams.mid = mid
this.$refs.rkqd.$refs.basePage.$refs['TablePager'].pageQuery({
setFirstCurrent: true
})
},
}
}
</script>
<style lang="scss" scoped>
.outer {
overflow: auto;
height: calc(100vh - 84px);
width: 100%;
.top {
width: 100%;
height: 45%;
}
.bottom {
width: 100%;
height: 55%;
.left {
width: 50%;
height: 100%;
}
.right {
width: 50%;
height: 100%;
}
}
}
.higher {
height: 140vh;
}
.flex-column {
display: flex;
flex-direction: column;
}
::v-deep .el-tabs__content{
height: calc(100% - 40px);
}
::v-deep .el-tabs__nav-scroll{
padding-left: 10px;
}
</style>
src/views/ccgl/kngl/zlhbg/mx.vue 0 → 100644
View file @ 6ffe60e8
<template>
<BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full" style="height: 100%;border-top: 0px;" :autoQuery='false'
:config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
</template>
</BasePage>
</template>
<script>
import wlsx from 'common/src/mixin/wlsx.js'
import wlphsx from 'common/src/mixin/wlphsx.js'
export default {
mixins:[wlphsx,wlsx],
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/rktz/query/detail',
tableTitle: [{
title: "物料编码",
field: "wlcode",
fieldType: "upper",
width: 140
},
{
title: "物料名称",
field: "wlmc",
width: 140
},
{
title: "物料规格",
field: "gg",
width: 140
},
{
title: "物料批号",
field: "wlph",
width: 140
},
{
title: "计量单位",
field: "jldwname",
width: 100,
},
{
title: "应收数量",
field: "yssl",
width: 100,
},
{
title: "入库数量",
field: "rksl",
width: 100,
},
{
title: "制令号",
field: "zlh",
width: 120,
},
{
title: "码盘数量",
field: "ztsl",
width: 120,
},
{
title: "过账数量",
field: "gzsl",
width: 120,
},
{
title: "状态",
field: "zt",
width: 120,
"transform": {
"url": "wms/rkgl/rktz/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "来源单号",
field: "lydjid",
width: 120,
},
{
title: "关闭人",
field: "gbr",
width: 120,
},
{
title: "关闭原因",
field: "gbyy",
width: 200,
},
{
title: "关闭时间",
field: "gbsj",
fieldType: 'ftDateTime'
},
{
title: "备注",
field: "bz",
width: 200
}
],
queryParams: [],
}
}
},
methods: {
getRow(val){
this.$emit('getRow',val)
},
demo(ctx){
if(ctx.singleItem&&ctx.singleItem.id){
console.log(ctx.singleItem)
}else{
this.$warning('请选中一条数据')
}
}
},
components: {
}
}
</script>
<style>
</style>
src/views/ccgl/kngl/zlhbg/rkqd.vue 0 → 100644
View file @ 6ffe60e8
<template>
<BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full"
style="height: 100%;border-top: 0px;" :autoQuery='false' :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
</template>
</BasePage>
</template>
<script>
export default {
mounted() {
},
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/rktz/query/rkqd',
tableTitle: [{
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
},
{
title: "物料名称",
field: "wlxxName",
width: 140
},
{
title: "物料规格",
field: "wlxxGg",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 120,
},
{
title: "物料批号",
field: "wlph",
width: 140
},
{
title: "应收数量",
field: "yssl",
width: 100,
},
{
title: "唯一码",
field: "packCode",
width: 240,
},
{
title: "容器",
field: "rqCode",
width: 100,
},
{
title: "状态",
field: "zt",
width: 100,
"transform": {
"url": "wms/rkgl/dbrk/init/zt",
"label": "name",
"value": "id"
}
}
],
queryParams: [],
}
}
},
methods: {
getRow(val) {
this.$emit('getRow', val)
},
demo(ctx) {
if (ctx.singleItem && ctx.singleItem.id) {
console.log(ctx.singleItem)
} else {
this.$warning('请选中一条数据')
}
}
},
components: {
}
}
</script>
<style>
</style>
src/views/ccgl/kngl/zlhbg/top/edit.vue 0 → 100644
View file @ 6ffe60e8
<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>
<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>
</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-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> -->
</el-form>
<!-- editTab数据 -->
</RelDialog>
</template>
<script>
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))
})
}
},
mounted() {
this.$nextTick(()=>{
this.form.whr=this.username
this.form.rkr=this.username
})
},
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: 'whr',
type: 'input',
span: 8,
readonly:true,
},
{
label: '维护时间',
prop: 'whsj',
span: 8,
type: 'datetime',
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"
}
}
},
{
label: '入库人',
prop: 'rkr',
span: 8,
type: 'input',
"required": true,
},
{
label: '备注',
prop: 'bz',
span: 24,
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
}
}
},
{
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: "zlh",
type: 'inputText',
width: 180,
allowEdit: true
},
{
title: "数量",
field: "yssl",
allowEdit: true,
type: 'inputNumber',
blur: toFixed(null),
},
{
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"
// }
// },
// 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");
</style>
src/views/ccgl/kngl/zlhbg/top/index.vue 0 → 100644
View file @ 6ffe60e8
<template>
<BasePage @getRow='getRow' class="min_full" style="height: 100%;" :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">直接入库</el-button> -->
</template>
</BasePage>
</template>
<script>
import Edit from './edit.vue'
export default {
data() {
return {
config: {
queryDetail: true,
/* 基本配置*/
url: 'lxyl/kcgl/zlhbg',
tableTitle: [
{
title: "变更单号",
field: "bgdh",
width: 140
},
{
title: "变更日期",
field: "bgrq",
fieldType: 'ftDate'
},
{
title: "SAP变更类型",
field: "sapbglx",
fieldType: 'ftDate'
},
{
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: "djly",
width: 140,
"transform": {
"url": "wms/rkgl/rktz/init/djly",
"label": "name",
"value": "id"
}
},
// {
// title: "来源单据号",
// field: "lydjDjid",
// width: 140
// },
{
title: "备注",
field: "bz",
width: 240
},
{
title: "维护人",
field: "whr"
},
{
title: "维护时间",
field: "whsj",
fieldType: 'ftDateTime'
}
],
queryParams: [
[{
label: '日期',
startProp: "start",
endProp: "end",
span: 8,
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'
}
}
]
],
/* 默认启停用 */
}
}
},
methods: {
getRow(val){
this.$emit('getRow',val)
}
},
components: {
Edit
}
}
</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