Skip to content

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

Merge branch 'master' of gitlab.gavelinfo.com:lisu/lxyl-vue

parents 0e4db0e8 7e3f1c74
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 198 deletions
src/views/ccgl/ckgl/bfckd/ckqd.vue
View file @ 33314308
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
fieldType: 'float' fieldType: 'float'
}, },
// { // {
// title: "货主", // title: "工厂",
// field: "hzName", // field: "hzName",
// width: 180, // width: 180,
// }, // },
......
src/views/ccgl/ckgl/bfckd/top/edit.vue
View file @ 33314308
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/ckgl/bfckd/top/index.vue
View file @ 33314308
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
fieldType: 'ftDate' fieldType: 'ftDate'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzName', prop: 'hzName',
span: 8, span: 8,
type: 'input', type: 'input',
......
src/views/ccgl/ckgl/bfckd/top/kc.vue
View file @ 33314308
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
let hzid=list.map(item=>item.hzid) let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)] hzid=[...new Set(hzid)]
if(hzid.length>1){ if(hzid.length>1){
this.$warning('所选项货主不唯一，请选择相同货主的数据。') this.$warning('所选项工厂不唯一，请选择相同工厂的数据。')
}else{ }else{
this.$emit('save',obj) this.$emit('save',obj)
this.app.showDialog=false this.app.showDialog=false
......
src/views/ccgl/ckgl/bldj/top/wmsckd/index.vue
View file @ 33314308
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
fieldType: 'ftDate' fieldType: 'ftDate'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzName', prop: 'hzName',
span: 8, span: 8,
type: 'input', type: 'input',
......
src/views/ccgl/ckgl/ckd/ckqd.vue
View file @ 33314308
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
fieldType: 'float' fieldType: 'float'
}, },
// { // {
// title: "货主", // title: "工厂",
// field: "hzName", // field: "hzName",
// width: 180, // width: 180,
// }, // },
......
src/views/ccgl/ckgl/ckd/top/akck.vue
View file @ 33314308
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
} }
}, },
// { // {
// label: '货主', // label: '工厂',
// prop: 'hzid', // prop: 'hzid',
// span: 8, // span: 8,
// required: true, // required: true,
......
src/views/ccgl/ckgl/ckd/top/edit.vue
View file @ 33314308
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/ckgl/ckd/top/index.vue
View file @ 33314308
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzName', prop: 'hzName',
span: 8, span: 8,
type: 'input', type: 'input',
......
src/views/ccgl/ckgl/ckd/top/kc.vue
View file @ 33314308
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
......
src/views/ccgl/ckgl/dbckd/ckqd.vue
View file @ 33314308
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
......
src/views/ccgl/ckgl/dbckd/top/ajydk.vue
View file @ 33314308
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
} }
}, },
// { // {
// label: '货主', // label: '工厂',
// readonly: true, // readonly: true,
// prop: 'hzid', // prop: 'hzid',
// span: 8, // span: 8,
......
src/views/ccgl/ckgl/dbckd/top/akck.vue
View file @ 33314308
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
} }
}, },
// { // {
// label: '货主', // label: '工厂',
// readonly:true, // readonly:true,
// prop: 'hzid', // prop: 'hzid',
// span: 8, // span: 8,
......
src/views/ccgl/ckgl/dbckd/top/edit.vue
View file @ 33314308
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/ckgl/dbckd/top/jyd.vue
View file @ 33314308
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
} }
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
let hzid = list.map(item => item.hzid) let hzid = list.map(item => item.hzid)
hzid = [...new Set(hzid)] hzid = [...new Set(hzid)]
if (hzid.length > 1) { if (hzid.length > 1) {
this.$warning('所选项货主不唯一，请选择相同货主的数据。') this.$warning('所选项工厂不唯一，请选择相同工厂的数据。')
} else { } else {
this.$emit('save', obj) this.$emit('save', obj)
this.app.showDialog = false this.app.showDialog = false
......
src/views/ccgl/ckgl/dbckd/top/kc.vue
View file @ 33314308
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
let hzid=list.map(item=>item.hzid) let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)] hzid=[...new Set(hzid)]
if(hzid.length>1){ if(hzid.length>1){
this.$warning('所选项货主不唯一，请选择相同货主的数据。') this.$warning('所选项工厂不唯一，请选择相同工厂的数据。')
}else{ }else{
this.$emit('save',obj) this.$emit('save',obj)
this.app.showDialog=false this.app.showDialog=false
......
src/views/ccgl/ckgl/jhd/top/ackdk/rkd.vue
View file @ 33314308
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/ckgl/jhd/top/dbckd.vue
View file @ 33314308
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/ckgl/jhd/top/edit.vue
View file @ 33314308
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/ckgl/jhd/top/index.vue
View file @ 33314308
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
width: 100 width: 100
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
value: '' value: ''
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzInfo', prop: 'hzInfo',
span: 8, span: 8,
type: 'input', type: 'input',
......
src/views/ccgl/ckgl/jhd/top/rkd.vue
View file @ 33314308
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/ckgl/jhd/tzqd.vue
View file @ 33314308
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
width: 180 width: 180
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/ckgl/lkckrw/top/akck.vue
View file @ 33314308
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
width: 180 width: 180
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/ckgl/xpk/top/akck.vue
View file @ 33314308
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
......
src/views/ccgl/cqgl/cskc/top/pack.vue
View file @ 33314308
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
width: 260 width: 260
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/cxfx/sfhzcx/index.vue
View file @ 33314308
...@@ -65,19 +65,14 @@ ...@@ -65,19 +65,14 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "批号",
field: "hzName", field: "wlph",
width: 140 width: 140
}, },
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
width: 180 width: 140
},
{
title: "物料批号",
field: "wlph",
width: 180
}, },
{ {
title: "计量单位", title: "计量单位",
...@@ -87,28 +82,27 @@ ...@@ -87,28 +82,27 @@
{ {
title: "期初结存数量", title: "期初结存数量",
field: "qcjcsl", field: "qcjcsl",
width: 140, width: 100,
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "本期入库数量", title: "本期入库数量",
field: "bqrksl", field: "bqrksl",
width: 140, width: 100,
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "本期出库数量", title: "本期出库数量",
field: "bqcksl", field: "bqcksl",
width: 140, width: 100,
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "期末结存数量", title: "期末结存数量",
field: "qmjcsl", field: "qmjcsl",
width: 140, width: 100,
fieldType: 'float' fieldType: 'float'
} }
], ],
queryParams: [ queryParams: [
[{ [{
......
src/views/ccgl/cxfx/wymcx/index.vue
View file @ 33314308
...@@ -12,7 +12,10 @@ ...@@ -12,7 +12,10 @@
</template> </template>
<script> <script>
import wlsx from 'common/src/mixin/wlsx.js'
import wlphsx from 'common/src/mixin/wlphsx.js'
export default { export default {
mixins:[wlphsx,wlsx],
data() { data() {
return { return {
power: { power: {
...@@ -32,35 +35,40 @@ ...@@ -32,35 +35,40 @@
}, },
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'wms/jcsj/pack/queryPackDetail', url: 'lxyl/cxfx/pack/query',
queryUrl:'wms/jcsj/pack/queryPackDetail', queryUrl:'lxyl/cxfx/pack/query',
tableTitle: [ tableTitle: [
{ {
title: "唯一码", title: "唯一码",
field: "packCode", field: "packCode",
width: 140 width: 180
}, },
{ {
title: "容器码", title: "业务类型",
field: "rqCode", field: "djlx",
width: 140 width: 100,
transform: {
"url": "lxyl/cxfx/pack/init/djlx",
"label": "name",
"value": "id"
}
}, },
{ {
title: "货主编码", title: "入/出库单号",
field: "hzCode", field: "rcdjid",
width: 140 width: 120
}, },
{ {
title: "货主", title: "业务单号",
field: "hzName", field: "djid",
width: 140 width: 120
}, },
{ {
title: "状态", title: "状态",
field: "packZt", field: "zt",
width: 140, width: 80,
transform: { transform: {
"url": "wms/jcsj/rq/init/zt", "url": "wms/jcsj/pack/init/zt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
...@@ -68,47 +76,33 @@ ...@@ -68,47 +76,33 @@
{ {
title: "库存状态", title: "库存状态",
field: "packKczt", field: "packKczt",
width: 140, width: 80,
transform: { transform: {
"url": "wms/jcsj/rq/init/kczt", "url": "wms/jcsj/pack/init/kczt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
}, },
{ {
title: "容量状态", title: "容器码",
field: "packRlzt", field: "rqCode",
width: 140, width: 100
transform: {
"url": "wms/jcsj/rq/init/rlzt",
"label": "name",
"value": "id"
}
},
{
title: "运输状态",
field: "packYszt",
width: 140,
transform: {
"url": "wms/jcsj/rq/init/yszt",
"label": "name",
"value": "id"
}
}, },
{ {
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
width: 140 width: 120
}, },
{ {
title: "物料批号", title: "物料名称",
field: "wlph", field: "wlxxName",
width: 180 width: 180
}, },
{ {
title: "物料名称", title: "批号",
field: "wlxxName", field: "wlph",
width: 140 width: 180
}, },
{ {
title: "制令号", title: "制令号",
...@@ -118,12 +112,7 @@ ...@@ -118,12 +112,7 @@
{ {
title: "数量", title: "数量",
field: "sl", field: "sl",
width: 140 fieldType:"float"
},
{
title: "入库单号",
field: "rktzDjid",
width: 180
} }
], ],
queryParams: [ queryParams: [
......
src/views/ccgl/jcsj/cgywh/index.vue
View file @ 33314308
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
value: '' value: ''
}, },
{ {
label: '货主', label: '工厂',
prop: 'hz', prop: 'hz',
span: 6, span: 6,
type: 'input', type: 'input',
......
src/views/ccgl/jcsj/hz/index.vue
View file @ 33314308
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
], ],
queryParams: [ queryParams: [
[{ [{
label: '货主信息', label: '工厂信息',
prop: 'hzInfo', prop: 'hzInfo',
span: 6, span: 6,
type: 'input', type: 'input',
......
src/views/ccgl/kcpd/pdd/top/jyd.vue
View file @ 33314308
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
let hzid=list.map(item=>item.hzid) let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)] hzid=[...new Set(hzid)]
if(hzid.length>1){ if(hzid.length>1){
this.$warning('所选项货主不唯一，请选择相同货主的数据。') this.$warning('所选项工厂不唯一，请选择相同工厂的数据。')
}else{ }else{
this.$emit('save',obj) this.$emit('save',obj)
this.app.showDialog=false this.app.showDialog=false
......
src/views/ccgl/kngl/bz/top/cb.vue
View file @ 33314308
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
readonly: true readonly: true
}, },
// { // {
// label: '货主', // label: '工厂',
// prop: 'hzName', // prop: 'hzName',
// span: 12, // span: 12,
// type: 'input', // type: 'input',
......
src/views/ccgl/kngl/bz/top/index.vue
View file @ 33314308
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
width: 260 width: 260
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/bz/top/wym/index.vue
View file @ 33314308
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
// width: 140 // width: 140
// }, // },
// { // {
// title: "货主编码", // title: "工厂编码",
// field: "hzCode", // field: "hzCode",
// width: 140 // width: 140
// }, // },
// { // {
// title: "货主", // title: "工厂",
// field: "hzName", // field: "hzName",
// width: 140 // width: 140
// }, // },
......
src/views/ccgl/kngl/bz/top/zb.vue
View file @ 33314308
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
readonly:false, readonly:false,
editColItemList: [ editColItemList: [
// { // {
// label: '货主', // label: '工厂',
// prop: 'hzid', // prop: 'hzid',
// span: 12, // span: 12,
// type: 'AuxInput', // type: 'AuxInput',
......
src/views/ccgl/kngl/bzzy/top/cb.vue
View file @ 33314308
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
readonly: true readonly: true
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzName', prop: 'hzName',
span: 12, span: 12,
type: 'input', type: 'input',
......
src/views/ccgl/kngl/bzzy/top/edit.vue
View file @ 33314308
...@@ -334,12 +334,12 @@ ...@@ -334,12 +334,12 @@
type: 'inputText', type: 'inputText',
}, },
// { // {
// title: "货主", // title: "工厂",
// field: "hzid", // field: "hzid",
// width: 240 // width: 240
// }, // },
// { // {
// title: "货主", // title: "工厂",
// field: "hzid", // field: "hzid",
// width: 240, // width: 240,
// type: 'AuxInput', // type: 'AuxInput',
......
src/views/ccgl/kngl/kwtzd/qd.vue
View file @ 33314308
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
width: 180, width: 180,
}, },
// { // {
// title: "货主", // title: "工厂",
// field: "hzName", // field: "hzName",
// width: 120, // width: 120,
// }, // },
......
src/views/ccgl/kngl/kwtzd/top/cx.vue
View file @ 33314308
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
value: '' value: ''
} }
// { // {
// "label": "货主", // "label": "工厂",
// "prop": "hzid", // "prop": "hzid",
// "span": 6, // "span": 6,
// "type": "RelSelect", // "type": "RelSelect",
......
src/views/ccgl/kngl/kwtzdj/mx.vue
View file @ 33314308
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
width: 180, width: 180,
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 120, width: 120,
}, },
......
src/views/ccgl/kngl/kwtzdj/top/index.vue
View file @ 33314308
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/phsd/mx.vue
View file @ 33314308
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
width: 120, width: 120,
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 120, width: 120,
} }
......
src/views/ccgl/kngl/phsd/top/cx.vue
View file @ 33314308
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/phsd/top/edit.vue
View file @ 33314308
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
width: 200, width: 200,
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 200, width: 200,
}, },
......
src/views/ccgl/kngl/rqrz/top/index.vue
View file @ 33314308
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
width: 140 width: 140
}, },
{ {
title: "货主编码", title: "工厂编码",
field: "hzCode", field: "hzCode",
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/rqtz/wym.vue
View file @ 33314308
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
width: 140 width: 140
}, },
{ {
title: "货主编码", title: "工厂编码",
field: "hzCode", field: "hzCode",
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/tpck/ckqd.vue
View file @ 33314308
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
fieldType: 'float' fieldType: 'float'
}, },
// { // {
// title: "货主", // title: "工厂",
// field: "hzName", // field: "hzName",
// width: 180, // width: 180,
// }, // },
......
src/views/ccgl/kngl/tpck/top/akck.vue
View file @ 33314308
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/kngl/tpck/top/edit.vue
View file @ 33314308
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/kngl/tpck/top/index.vue
View file @ 33314308
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
fieldType: 'ftDate' fieldType: 'ftDate'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzName', prop: 'hzName',
span: 8, span: 8,
type: 'input', type: 'input',
......
src/views/ccgl/kngl/tpck/top/kc.vue
View file @ 33314308
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
let hzid=list.map(item=>item.hzid) let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)] hzid=[...new Set(hzid)]
if(hzid.length>1){ if(hzid.length>1){
this.$warning('所选项货主不唯一，请选择相同货主的数据。') this.$warning('所选项工厂不唯一，请选择相同工厂的数据。')
}else{ }else{
this.$emit('save',obj) this.$emit('save',obj)
this.app.showDialog=false this.app.showDialog=false
......
src/views/ccgl/kngl/tprk/top/edit.vue
View file @ 33314308
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
type: 'AuxInput', type: 'AuxInput',
......
src/views/ccgl/kngl/tprk/top/index.vue
View file @ 33314308
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
// width: 140 // width: 140
// }, // },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/tprk/top/pack.vue
View file @ 33314308
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
width: 260 width: 260
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/zlhbg/mx.vue
View file @ 33314308
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
width: 120, width: 120,
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 120, width: 120,
}, },
......
src/views/ccgl/kngl/zlhbg/top/cx.vue
View file @ 33314308
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/kngl/zlhbg/top/edit.vue
View file @ 33314308
...@@ -151,7 +151,7 @@ import Cx from './cx.vue' ...@@ -151,7 +151,7 @@ import Cx from './cx.vue'
width: 200, width: 200,
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 200, width: 200,
}, },
......
src/views/ccgl/kngl/zt/mx.vue
View file @ 33314308
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
}, },
// { // {
// title: "货主", // title: "工厂",
// field: "hzName", // field: "hzName",
// width: 140 // width: 140
// }, // },
......
src/views/ccgl/kngl/zt/top/index.vue
View file @ 33314308
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/rkgl/htrk/top/wym/index.vue
View file @ 33314308
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
width: 140 width: 140
}, },
{ {
title: "货主编码", title: "工厂编码",
field: "hzCode", field: "hzCode",
width: 140 width: 140
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/rkgl/rkd/mx.vue
View file @ 33314308
...@@ -43,13 +43,23 @@ ...@@ -43,13 +43,23 @@
{ {
title: "状态", title: "状态",
field: "zt", field: "zt",
width: 120, width: 80,
"transform": { "transform": {
"url": "lxyl/rkgl/rktz/init/zt", "url": "lxyl/rkgl/rktz/init/zt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
}, },
{
title: "包装状态",
field: "bzzt",
width: 80,
"transform": {
"url": "lxyl/rkgl/rktz/init/bzzt",
"label": "name",
"value": "id"
}
},
{ {
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
...@@ -97,14 +107,9 @@ ...@@ -97,14 +107,9 @@
fieldType:"float" fieldType:"float"
}, },
{ {
title: "包装状态", title: "上架数量",
field: "bzzt", field: "sjsl",
width: 80, fieldType:"float"
"transform": {
"url": "lxyl/rkgl/rktz/init/bzzt",
"label": "name",
"value": "id"
}
}, },
{ {
title: "制令号", title: "制令号",
......
src/views/ccgl/rkgl/rkd/top/pack.vue
View file @ 33314308
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
width: 260 width: 260
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/rkgl/sjrw/top/dbckd.vue
View file @ 33314308
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
fieldType: 'ftDate' fieldType: 'ftDate'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzName', prop: 'hzName',
span: 8, span: 8,
type: 'input', type: 'input',
......
src/views/ccgl/rkgl/sjrw/top/edit.vue
View file @ 33314308
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
type: 'AuxInput', type: 'AuxInput',
......
src/views/ccgl/rkgl/sjrw/top/index.vue
View file @ 33314308
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
width: 100 width: 100
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
fieldType: "ftString", fieldType: "ftString",
width: 100 width: 100
......
src/views/ccgl/rkgl/sjrw/top/rkd.vue
View file @ 33314308
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
width: 100 width: 100
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/rkgl/slk/top/wym/index.vue
View file @ 33314308
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
// width: 140 // width: 140
// }, // },
// { // {
// title: "货主编码", // title: "工厂编码",
// field: "hzCode", // field: "hzCode",
// width: 140 // width: 140
// }, // },
// { // {
// title: "货主", // title: "工厂",
// field: "hzName", // field: "hzName",
// width: 140 // width: 140
// }, // },
......
src/views/ccgl/thgl/rkth/ckqd.vue
View file @ 33314308
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
......
src/views/ccgl/thgl/rkth/top/kc.vue
View file @ 33314308
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
fieldType: 'float' fieldType: 'float'
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 180, width: 180,
}, },
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
let hzid=list.map(item=>item.hzid) let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)] hzid=[...new Set(hzid)]
if(hzid.length>1){ if(hzid.length>1){
this.$warning('所选项货主不唯一，请选择相同货主的数据。') this.$warning('所选项工厂不唯一，请选择相同工厂的数据。')
}else{ }else{
this.$emit('save',obj) this.$emit('save',obj)
this.app.showDialog=false this.app.showDialog=false
......
src/views/ccgl/zlgl/jyd/top/add.vue
View file @ 33314308
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
width: 180 width: 180
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/zlgl/jyd/top/edit.vue
View file @ 33314308
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/zlgl/jyd/top/index.vue
View file @ 33314308
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
width: 180 width: 180
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/zlgl/kccjd/top/edit.vue
View file @ 33314308
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
src/views/ccgl/zlgl/kcyhd/mx.vue
View file @ 33314308
...@@ -12,7 +12,10 @@ ...@@ -12,7 +12,10 @@
</template> </template>
<script> <script>
import wlsx from 'common/src/mixin/wlsx.js'
import wlphsx from 'common/src/mixin/wlphsx.js'
export default { export default {
mixins:[wlphsx,wlsx],
data() { data() {
return { return {
power: { power: {
...@@ -70,11 +73,6 @@ ...@@ -70,11 +73,6 @@
field: "wlxxGg", field: "wlxxGg",
width: 140 width: 140
}, },
// {
// title: "wcs任务号",
// field: "wcsCode",
// width: 140
// },
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
...@@ -85,11 +83,6 @@ ...@@ -85,11 +83,6 @@
field: "wlph", field: "wlph",
width: 180 width: 180
}, },
// {
// title: "货主",
// field: "hzName",
// width: 140
// },
{ {
title: "唯一码", title: "唯一码",
field: "packCode", field: "packCode",
...@@ -97,42 +90,14 @@ ...@@ -97,42 +90,14 @@
}, },
{ {
title: "数量", title: "数量",
field: "sl", field: "sl",
width: 140 fieldType:"float"
}, },
{ {
title: "容器", title: "容器",
field: "rqCode", field: "rqCode",
width: 140 width: 140
}, }
// {
// title: "重检日期",
// field: "cjrq",
// width: 140,
// fieldType: 'ftDateTime'
// },
// {
// title: "生产日期",
// field: "scrq",
// width: 140,
// fieldType: 'ftDateTime'
// },
// {
// title: "失效日期",
// field: "sxrq",
// width: 140,
// fieldType: 'ftDateTime'
// },
// {
// title: "合格标志",
// field: "hgbz",
// "transform": {
// "url": "lxyl/zlgl/ukcjyd/init/zjqdStatusEnum",
// "label": "name",
// "value": "id"
// },
// width: 140
// },
], ],
queryParams: [], queryParams: [],
......
src/views/ccgl/zlgl/kcyhd/top/add.vue
View file @ 33314308
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
width: 180 width: 180
}, },
{ {
title: "货主", title: "工厂",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
......
src/views/ccgl/zlgl/kcyhd/top/edit.vue
View file @ 33314308
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
} }
}, },
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
......
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