Skip to content

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

202418调整

parent d947af05
Show 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
...@@ -7,17 +7,15 @@ ...@@ -7,17 +7,15 @@
<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" <editTableForEdit :indexApp='app' :AuxButton='false' ref="editTableForEdit" :editTableTitle='editTableTitle'
:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow' v-if="editTableForEdit" :computedRow='computedRow' :editTableData="formDetail">
:editTableData="formDetail">
<template v-if="type!='view'" #toolbar="ctx"> <template v-if="type!='view'" #toolbar="ctx">
<el-button @click="add" size='mini' type="primary">新增</el-button> <el-button @click="add" size='mini' type="primary">选择调整明细</el-button>
</template> </template>
</editTableForEdit> </editTableForEdit>
...@@ -36,12 +34,18 @@ ...@@ -36,12 +34,18 @@
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时的回调 */
...@@ -49,13 +53,13 @@ import Cx from './cx.vue' ...@@ -49,13 +53,13 @@ import Cx from './cx.vue'
// 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))
}) })
...@@ -63,7 +67,7 @@ import Cx from './cx.vue' ...@@ -63,7 +67,7 @@ import Cx from './cx.vue'
} }
}, },
components:{ components: {
Cx Cx
}, },
mounted() { mounted() {
...@@ -72,18 +76,12 @@ import Cx from './cx.vue' ...@@ -72,18 +76,12 @@ import Cx from './cx.vue'
}, },
data() { data() {
return { return {
DialogTitle:'新增', DialogTitle: '新增',
DialogWidth:'60vw', DialogWidth: '60vw',
showDialog:false, showDialog: false,
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [{
label: '变更单号', label: '业务日期',
prop: 'djid',
span: 8,
type: 'input',
},
{
label: '变更日期',
prop: 'ywrq', prop: 'ywrq',
span: 8, span: 8,
type: 'date', type: 'date',
...@@ -91,20 +89,34 @@ import Cx from './cx.vue' ...@@ -91,20 +89,34 @@ import Cx from './cx.vue'
"required": true, "required": true,
}, },
{ {
"label": "SAP变更类型", "label": "仓库",
"prop": "bglx", "prop": "ckid",
"span": 8, "span": 6,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"required": true,
"typeConfig": { "typeConfig": {
"src": "lxyl/kcgl/zlhbg/init/sapbglx", "src": "jcsj/common/ck/queryCkid",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
} }
} }
}, },
{
label: '负责人',
prop: 'fzrid',
span: 8,
type: 'AuxInput',
typeConfig: {
code: 'USER',
label: 'usersName',
transform: {
value: 'id',
label: 'username'
}
},
"required": true,
},
{ {
label: '备注', label: '备注',
prop: 'bz', prop: 'bz',
......
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