Commit 33314308 authored by 李苏's avatar 李苏 💬

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

parents 0e4db0e8 7e3f1c74
......@@ -98,7 +98,7 @@
fieldType: 'float'
},
// {
// title: "货主",
// title: "工厂",
// field: "hzName",
// width: 180,
// },
......
......@@ -174,7 +174,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -62,7 +62,7 @@
fieldType: 'ftDate'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......@@ -169,7 +169,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzName',
span: 8,
type: 'input',
......
......@@ -114,7 +114,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......@@ -182,7 +182,7 @@
let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)]
if(hzid.length>1){
this.$warning('所选项货主不唯一,请选择相同货主的数据。')
this.$warning('所选项工厂不唯一,请选择相同工厂的数据。')
}else{
this.$emit('save',obj)
this.app.showDialog=false
......
......@@ -58,7 +58,7 @@
fieldType: 'ftDate'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......@@ -170,7 +170,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzName',
span: 8,
type: 'input',
......
......@@ -98,7 +98,7 @@
fieldType: 'float'
},
// {
// title: "货主",
// title: "工厂",
// field: "hzName",
// width: 180,
// },
......
......@@ -193,7 +193,7 @@
}
},
// {
// label: '货主',
// label: '工厂',
// prop: 'hzid',
// span: 8,
// required: true,
......
......@@ -176,7 +176,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -176,7 +176,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzName',
span: 8,
type: 'input',
......
......@@ -114,7 +114,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......
......@@ -98,7 +98,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......
......@@ -180,7 +180,7 @@
}
},
// {
// label: '货主',
// label: '工厂',
// readonly: true,
// prop: 'hzid',
// span: 8,
......
......@@ -179,7 +179,7 @@
}
},
// {
// label: '货主',
// label: '工厂',
// readonly:true,
// prop: 'hzid',
// span: 8,
......
......@@ -140,7 +140,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -150,7 +150,7 @@
}
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......@@ -215,7 +215,7 @@
let hzid = list.map(item => item.hzid)
hzid = [...new Set(hzid)]
if (hzid.length > 1) {
this.$warning('所选项货主不唯一,请选择相同货主的数据。')
this.$warning('所选项工厂不唯一,请选择相同工厂的数据。')
} else {
this.$emit('save', obj)
this.app.showDialog = false
......
......@@ -131,7 +131,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......@@ -215,7 +215,7 @@
let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)]
if(hzid.length>1){
this.$warning('所选项货主不唯一,请选择相同货主的数据。')
this.$warning('所选项工厂不唯一,请选择相同工厂的数据。')
}else{
this.$emit('save',obj)
this.app.showDialog=false
......
......@@ -76,7 +76,7 @@
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -68,7 +68,7 @@
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -287,7 +287,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -86,7 +86,7 @@
width: 100
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......@@ -178,7 +178,7 @@
value: ''
},
{
label: '货主',
label: '工厂',
prop: 'hzInfo',
span: 8,
type: 'input',
......
......@@ -76,7 +76,7 @@
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -227,7 +227,7 @@
width: 180
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -113,7 +113,7 @@
width: 180
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -136,7 +136,7 @@
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......
......@@ -87,7 +87,7 @@
width: 260
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -65,19 +65,14 @@
width: 140
},
{
title: "货主",
field: "hzName",
title: "批号",
field: "wlph",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 180
},
{
title: "物料批号",
field: "wlph",
width: 180
width: 140
},
{
title: "计量单位",
......@@ -87,28 +82,27 @@
{
title: "期初结存数量",
field: "qcjcsl",
width: 140,
width: 100,
fieldType: 'float'
},
{
title: "本期入库数量",
field: "bqrksl",
width: 140,
width: 100,
fieldType: 'float'
},
{
title: "本期出库数量",
field: "bqcksl",
width: 140,
width: 100,
fieldType: 'float'
},
{
title: "期末结存数量",
field: "qmjcsl",
width: 140,
width: 100,
fieldType: 'float'
}
],
queryParams: [
[{
......
......@@ -12,7 +12,10 @@
</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: {
......@@ -32,35 +35,40 @@
},
config: {
/* 基本配置*/
url: 'wms/jcsj/pack/queryPackDetail',
queryUrl:'wms/jcsj/pack/queryPackDetail',
url: 'lxyl/cxfx/pack/query',
queryUrl:'lxyl/cxfx/pack/query',
tableTitle: [
{
title: "唯一码",
field: "packCode",
width: 140
width: 180
},
{
title: "容器码",
field: "rqCode",
width: 140
title: "业务类型",
field: "djlx",
width: 100,
transform: {
"url": "lxyl/cxfx/pack/init/djlx",
"label": "name",
"value": "id"
}
},
{
title: "货主编码",
field: "hzCode",
width: 140
title: "入/出库单号",
field: "rcdjid",
width: 120
},
{
title: "货主",
field: "hzName",
width: 140
title: "业务单号",
field: "djid",
width: 120
},
{
title: "状态",
field: "packZt",
width: 140,
field: "zt",
width: 80,
transform: {
"url": "wms/jcsj/rq/init/zt",
"url": "wms/jcsj/pack/init/zt",
"label": "name",
"value": "id"
}
......@@ -68,47 +76,33 @@
{
title: "库存状态",
field: "packKczt",
width: 140,
width: 80,
transform: {
"url": "wms/jcsj/rq/init/kczt",
"label": "name",
"value": "id"
}
},
{
title: "容量状态",
field: "packRlzt",
width: 140,
transform: {
"url": "wms/jcsj/rq/init/rlzt",
"url": "wms/jcsj/pack/init/kczt",
"label": "name",
"value": "id"
}
},
{
title: "运输状态",
field: "packYszt",
width: 140,
transform: {
"url": "wms/jcsj/rq/init/yszt",
"label": "name",
"value": "id"
}
title: "容器码",
field: "rqCode",
width: 100
},
{
title: "物料编码",
field: "wlxxCode",
width: 140
width: 120
},
{
title: "物料批号",
field: "wlph",
title: "物料名称",
field: "wlxxName",
width: 180
},
{
title: "物料名称",
field: "wlxxName",
width: 140
title: "批号",
field: "wlph",
width: 180
},
{
title: "制令号",
......@@ -118,12 +112,7 @@
{
title: "数量",
field: "sl",
width: 140
},
{
title: "入库单号",
field: "rktzDjid",
width: 180
fieldType:"float"
}
],
queryParams: [
......
......@@ -65,7 +65,7 @@
value: ''
},
{
label: '货主',
label: '工厂',
prop: 'hz',
span: 6,
type: 'input',
......
......@@ -84,7 +84,7 @@
],
queryParams: [
[{
label: '货主信息',
label: '工厂信息',
prop: 'hzInfo',
span: 6,
type: 'input',
......
......@@ -116,7 +116,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......@@ -197,7 +197,7 @@
let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)]
if(hzid.length>1){
this.$warning('所选项货主不唯一,请选择相同货主的数据。')
this.$warning('所选项工厂不唯一,请选择相同工厂的数据。')
}else{
this.$emit('save',obj)
this.app.showDialog=false
......
......@@ -93,7 +93,7 @@
readonly: true
},
// {
// label: '货主',
// label: '工厂',
// prop: 'hzName',
// span: 12,
// type: 'input',
......
......@@ -68,7 +68,7 @@
width: 260
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -47,12 +47,12 @@
// width: 140
// },
// {
// title: "货主编码",
// title: "工厂编码",
// field: "hzCode",
// width: 140
// },
// {
// title: "货主",
// title: "工厂",
// field: "hzName",
// width: 140
// },
......
......@@ -41,7 +41,7 @@
readonly:false,
editColItemList: [
// {
// label: '货主',
// label: '工厂',
// prop: 'hzid',
// span: 12,
// type: 'AuxInput',
......
......@@ -84,7 +84,7 @@
readonly: true
},
{
label: '货主',
label: '工厂',
prop: 'hzName',
span: 12,
type: 'input',
......
......@@ -334,12 +334,12 @@
type: 'inputText',
},
// {
// title: "货主",
// title: "工厂",
// field: "hzid",
// width: 240
// },
// {
// title: "货主",
// title: "工厂",
// field: "hzid",
// width: 240,
// type: 'AuxInput',
......
......@@ -73,7 +73,7 @@
width: 180,
},
// {
// title: "货主",
// title: "工厂",
// field: "hzName",
// width: 120,
// },
......
......@@ -137,7 +137,7 @@
value: ''
}
// {
// "label": "货主",
// "label": "工厂",
// "prop": "hzid",
// "span": 6,
// "type": "RelSelect",
......
......@@ -65,7 +65,7 @@
width: 180,
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 120,
},
......
......@@ -54,7 +54,7 @@
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -77,7 +77,7 @@
width: 120,
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 120,
}
......
......@@ -68,7 +68,7 @@
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -159,7 +159,7 @@
width: 200,
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 200,
},
......
......@@ -40,12 +40,12 @@
width: 140
},
{
title: "货主编码",
title: "工厂编码",
field: "hzCode",
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -43,12 +43,12 @@
width: 140
},
{
title: "货主编码",
title: "工厂编码",
field: "hzCode",
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -98,7 +98,7 @@
fieldType: 'float'
},
// {
// title: "货主",
// title: "工厂",
// field: "hzName",
// width: 180,
// },
......
......@@ -200,7 +200,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -166,7 +166,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -65,7 +65,7 @@
fieldType: 'ftDate'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......@@ -163,7 +163,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzName',
span: 8,
type: 'input',
......
......@@ -118,7 +118,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......@@ -180,7 +180,7 @@
let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)]
if(hzid.length>1){
this.$warning('所选项货主不唯一,请选择相同货主的数据。')
this.$warning('所选项工厂不唯一,请选择相同工厂的数据。')
}else{
this.$emit('save',obj)
this.app.showDialog=false
......
......@@ -262,7 +262,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
type: 'AuxInput',
......
......@@ -57,7 +57,7 @@
// width: 140
// },
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -83,7 +83,7 @@
width: 260
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -82,7 +82,7 @@
width: 120,
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 120,
},
......
......@@ -75,7 +75,7 @@
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -151,7 +151,7 @@ import Cx from './cx.vue'
width: 200,
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 200,
},
......
......@@ -52,7 +52,7 @@
},
// {
// title: "货主",
// title: "工厂",
// field: "hzName",
// width: 140
// },
......
......@@ -72,7 +72,7 @@
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -46,12 +46,12 @@
width: 140
},
{
title: "货主编码",
title: "工厂编码",
field: "hzCode",
width: 140
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -43,13 +43,23 @@
{
title: "状态",
field: "zt",
width: 120,
width: 80,
"transform": {
"url": "lxyl/rkgl/rktz/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "包装状态",
field: "bzzt",
width: 80,
"transform": {
"url": "lxyl/rkgl/rktz/init/bzzt",
"label": "name",
"value": "id"
}
},
{
title: "物料编码",
field: "wlxxCode",
......@@ -97,14 +107,9 @@
fieldType:"float"
},
{
title: "包装状态",
field: "bzzt",
width: 80,
"transform": {
"url": "lxyl/rkgl/rktz/init/bzzt",
"label": "name",
"value": "id"
}
title: "上架数量",
field: "sjsl",
fieldType:"float"
},
{
title: "制令号",
......
......@@ -83,7 +83,7 @@
width: 260
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -66,7 +66,7 @@
fieldType: 'ftDate'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......@@ -173,7 +173,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzName',
span: 8,
type: 'input',
......
......@@ -314,7 +314,7 @@
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
type: 'AuxInput',
......
......@@ -77,7 +77,7 @@
width: 100
},
{
title: "货主",
title: "工厂",
field: "hzName",
fieldType: "ftString",
width: 100
......
......@@ -63,7 +63,7 @@
width: 100
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -51,12 +51,12 @@
// width: 140
// },
// {
// title: "货主编码",
// title: "工厂编码",
// field: "hzCode",
// width: 140
// },
// {
// title: "货主",
// title: "工厂",
// field: "hzName",
// width: 140
// },
......
......@@ -98,7 +98,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......
......@@ -118,7 +118,7 @@
fieldType: 'float'
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 180,
},
......@@ -186,7 +186,7 @@
let hzid=list.map(item=>item.hzid)
hzid=[...new Set(hzid)]
if(hzid.length>1){
this.$warning('所选项货主不唯一,请选择相同货主的数据。')
this.$warning('所选项工厂不唯一,请选择相同工厂的数据。')
}else{
this.$emit('save',obj)
this.app.showDialog=false
......
......@@ -90,7 +90,7 @@
width: 180
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -162,7 +162,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -97,7 +97,7 @@
width: 180
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -161,7 +161,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
required: true,
......
......@@ -12,7 +12,10 @@
</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: {
......@@ -70,11 +73,6 @@
field: "wlxxGg",
width: 140
},
// {
// title: "wcs任务号",
// field: "wcsCode",
// width: 140
// },
{
title: "制令号",
field: "zlh",
......@@ -85,11 +83,6 @@
field: "wlph",
width: 180
},
// {
// title: "货主",
// field: "hzName",
// width: 140
// },
{
title: "唯一码",
field: "packCode",
......@@ -98,41 +91,13 @@
{
title: "数量",
field: "sl",
width: 140
fieldType:"float"
},
{
title: "容器",
field: "rqCode",
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: [],
......
......@@ -103,7 +103,7 @@
width: 180
},
{
title: "货主",
title: "工厂",
field: "hzName",
width: 140
},
......
......@@ -162,7 +162,7 @@
}
},
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 8,
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