Skip to content

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

202418调整

parent d947af05
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 181 deletions
src/views/ccgl/kngl/kwtzd/top/cx.vue
View file @ 3e165811
...@@ -93,16 +93,8 @@ ...@@ -93,16 +93,8 @@
field: "wlph", field: "wlph",
width: 140 width: 140
}, },
{
title: "包装数量",
field: "packmxSl",
width: 140
},
{
title: "装托数量",
field: "ztsl",
width: 140
},
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
......
src/views/ccgl/kngl/kwtzd/top/edit.vue
View file @ 3e165811
<template> <template>
<RelDialog bigTitle detailTable='ZLHBGMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' <RelDialog bigTitle detailTable='ZLHBGMX' @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">
<!-- 查询弹框--> <!-- 查询弹框-->
<Cx @save="save" :app="this" v-if='this.showDialog' /> <Cx @save="save" :app="this" v-if='this.showDialog' />
<el-row :gutter="20" :app="this" class="editRow"> <el-row :gutter="20" :app="this" class="editRow">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " <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" 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' :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
:rule="item.rule" /> <!-- 额外数据 -->
<!-- 额外数据 --> </el-row>
</el-row>
<div class="editTab">
<div class="editTab"> <editTableForEdit :indexApp='app' :AuxButton='false' ref="editTableForEdit" :editTableTitle='editTableTitle'
<editTableForEdit :indexApp='app' :AuxButton='false' ref="editTableForEdit" v-if="editTableForEdit" :computedRow='computedRow' :editTableData="formDetail">
:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow' <template v-if="type!='view'" #toolbar="ctx">
:editTableData="formDetail"> <el-button @click="add" size='mini' type="primary">选择调整明细</el-button>
<template v-if="type!='view'" #toolbar="ctx"> </template>
<el-button @click="add" size='mini' type="primary">新增</el-button> </editTableForEdit>
</template>
</editTableForEdit> </div>
</el-form>
</div>
</el-form> <!-- editTab数据 -->
</RelDialog>
<!-- editTab数据 -->
</RelDialog>
</template> </template>
<script> <script>
import { import {
toFixed, toFixed,
doRkdChange doRkdChange
} from 'common/src/utils/blur.js' } from 'common/src/utils/blur.js'
import { import {
editMixin, editMixin,
editMixin_expand editMixin_expand
} from 'common' } from 'common'
import Cx from './cx.vue' import Cx from './cx.vue'
export default { export default {
mixins: [editMixin, editMixin_expand], mixins: [editMixin, editMixin_expand],
methods: { methods: {
add(){ add() {
this.showDialog=true /* */
if(this.form.ckid){
this.showDialog = true
}else{
this.$warning('请选择仓库后再进行操作')
}
}, },
/* 需要整体row时的回调 */ /* 需要整体row时的回调 */
computedRow(row) { computedRow(row) {
// this.$refs.editTableForEdit.$forceUpdate() // this.$refs.editTableForEdit.$forceUpdate()
}, },
/* 选择list时的回调 */ /* 选择list时的回调 */
save(list){ save(list) {
this.showDialog=false this.showDialog = false
this.formDetail.splice(0, this.formDetail.length); this.formDetail.splice(0, this.formDetail.length);
/* 添加熬子表*/ /* 添加熬子表*/
list.forEach(item=>{ list.forEach(item => {
item.lydjid=item.id item.lydjid = item.id
item.bzsl=item.packmxSl||0 item.bzsl = item.packmxSl || 0
delete item.id delete item.id
this.formDetail.push(_.cloneDeep(item)) this.formDetail.push(_.cloneDeep(item))
}) })
} }
}, },
components:{ components: {
Cx Cx
}, },
mounted() { mounted() {
}, },
data() { data() {
return { return {
DialogTitle:'新增', DialogTitle: '新增',
DialogWidth:'60vw', DialogWidth: '60vw',
showDialog:false, showDialog: false,
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [{
label: '变更单号', label: '业务日期',
prop: 'djid', prop: 'ywrq',
span: 8, span: 8,
type: 'input', type: 'date',
}, value: new Date().getTime(),
{ "required": true,
label: '变更日期', },
prop: 'ywrq',
span: 8,
type: 'date',
value: new Date().getTime(),
"required": true,
},
{
"label": "SAP变更类型",
"prop": "bglx",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "lxyl/kcgl/zlhbg/init/sapbglx",
"match": {
"value": "id",
"label": "name"
}
}
},
{
label: '备注',
prop: 'bz',
span: 24,
type: 'input',
},
],
/* 从表编辑数据 */
editTableTitle: [{
title: "序号",
field: "xh",
width: 50,
align: "center"
},
{ {
title: "物料编码", "label": "仓库",
field: "wlxxCode", "prop": "ckid",
width: 160 "span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
}, },
{
title: "物料名称",
field: "wlxxName",
width: 160
},
{
title: "规格",
field: "wlxxGg",
width: 140
},
{ {
title: "物料批号", label: '负责人',
field: "wlph", prop: 'fzrid',
width: 200, span: 8,
type: 'AuxInput',
typeConfig: {
code: 'USER',
label: 'usersName',
transform: {
value: 'id',
label: 'username'
}
},
"required": true,
}, },
{ {
title: "唯一码", label: '备注',
field: "packid", prop: 'bz',
width: 200, span: 24,
type: 'input',
},
],
/* 从表编辑数据 */
editTableTitle: [{
title: "序号",
field: "xh",
width: 50,
align: "center"
}, },
{ {
title: "容器", title: "物料编码",
field: "rqCode", field: "wlxxCode",
width: 200, width: 160
}, },
{ {
title: "货主", title: "物料名称",
field: "hzName", field: "wlxxName",
width: 200, width: 160
}, },
{ {
title: "制令号", title: "规格",
field: "zlh", field: "wlxxGg",
width: 200, width: 140
}, },
{ {
title: "变更后制令号", title: "物料批号",
field: "bghzlh", field: "wlph",
width: 200, width: 200,
}, },
{ {
title: "包装数量", title: "唯一码",
field: "bzsl", field: "packid",
width: 200, width: 200,
}, },
{ {
title: "装托数量", title: "容器",
field: "ztsl", field: "rqCode",
width: 200, width: 200,
},
{
title: "货主",
field: "hzName",
width: 200,
},
{
title: "制令号",
field: "zlh",
width: 200,
},
{
title: "变更后制令号",
field: "bghzlh",
width: 200,
},
{
title: "包装数量",
field: "bzsl",
width: 200,
},
{
title: "装托数量",
field: "ztsl",
width: 200,
} }
] ]
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import url("~common/src/assets/styles/editDetail.scss"); @import url("~common/src/assets/styles/editDetail.scss");
</style> </style>
src/views/ccgl/kngl/kwtzd/top/index.vue
View file @ 3e165811
...@@ -20,29 +20,24 @@ ...@@ -20,29 +20,24 @@
/* 基本配置*/ /* 基本配置*/
url: 'wms/kcgl/kwtz', url: 'wms/kcgl/kwtz',
tableTitle: [{ tableTitle: [{
title: "变更单号", title: "单据号",
field: "djid", field: "djid",
width: 140 width: 140
}, },
{ {
title: "变更日期", title: "业务日期",
field: "ywrq", field: "ywrq",
fieldType: 'ftDate' fieldType: 'ftDate'
}, },
{ {
title: "SAP变更类型", title: "仓库",
field: "bglx", field: "ckName",
width: 140 width: 140
}, },
{ {
title: "状态", title: "负责人",
field: "zt", field: "fzrName",
width: 100, width: 140
"transform": {
"url": "wms/kcgl/kwtz/init/zt",
"label": "name",
"value": "id"
}
}, },
{ {
title: "备注", title: "备注",
...@@ -60,7 +55,8 @@ ...@@ -60,7 +55,8 @@
} }
], ],
queryParams: [ queryParams: [
[{ [
{
label: '日期', label: '日期',
startProp: "start", startProp: "start",
endProp: "end", endProp: "end",
...@@ -72,7 +68,7 @@ ...@@ -72,7 +68,7 @@
{ {
"label": "仓库", "label": "仓库",
"prop": "ckid", "prop": "ckid",
"span": 6, "span": 8,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
...@@ -83,17 +79,10 @@ ...@@ -83,17 +79,10 @@
} }
} }
}, },
{
label: '变更单号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
},
{ {
label: '负责人', label: '负责人',
prop: 'fzr', prop: 'fzr',
span: 4, span: 8,
type: 'input', type: 'input',
value: '' value: ''
} }
......
vue.config.js
View file @ 3e165811
...@@ -39,8 +39,8 @@ module.exports = { ...@@ -39,8 +39,8 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.30.254:18080/dmg`, // target: `http://192.168.30.254:18080/dmg`,
// target: `http://192.168.30.254:28084/erp`, // target: `http://192.168.30.254:28084/erp`,
// target: `http://192.168.30.111:9080/lxyl`, target: `http://192.168.30.104:9080/lxyl`,
target: `http://localhost:9080/lxyl`, // target: `http://localhost:9080/lxyl`,
// target:'http://192.168.30.105:9081/erp', // target:'http://192.168.30.105:9081/erp',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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