@ -800,6 +800,21 @@
< / template >
< / template >
< / e l - t a b l e - c o l u m n >
< / e l - t a b l e - c o l u m n >
< el -table -column label = "库存数量"
v - if = "judgeShow('deliveryproductrelation-inventoryNo')" prop = "inventoryNo"
width = "200" >
< template slot = "header" >
< span class = "required-sign"
v - if = "judgeRequired('deliveryproductrelationList-inventoryNo')" > * < / span > 库存数量
< / template >
< template slot -scope = " scope " >
< JnpfInput v -model = " scope.row.inventoryNo "
@ change = "changeData('deliveryproductrelation-inventoryNo', scope.$index)"
placeholder = "请输入" : disabled = "true" clearable : style = '{ "width": "100%" }' >
< / JnpfInput >
< / template >
< / e l - t a b l e - c o l u m n >
< el -table -column label = "生产日期" v -if = " judgeShow ( ' warehousingproduct -produceDate ' ) "
< el -table -column label = "生产日期" v -if = " judgeShow ( ' warehousingproduct -produceDate ' ) "
prop = "produceDate" width = "200" >
prop = "produceDate" width = "200" >
< template slot = "header" >
< template slot = "header" >
@ -1030,6 +1045,7 @@ export default {
deliveryNum : '' ,
deliveryNum : '' ,
deliveryNumOptions : [ ] ,
deliveryNumOptions : [ ] ,
batchNo : '' ,
batchNo : '' ,
inventoryNo : '' ,
batchNoOptions : [ ] ,
batchNoOptions : [ ] ,
produceTime : '' ,
produceTime : '' ,
produceTimeOptions : [ ] ,
produceTimeOptions : [ ] ,
@ -1128,7 +1144,7 @@ export default {
transportModeProps : { "label" : "fullName" , "value" : "id" } ,
transportModeProps : { "label" : "fullName" , "value" : "id" } ,
deliveryTypeOptions : [ { "fullName" : "销售发货" , "id" : "2" } ] ,
deliveryTypeOptions : [ { "fullName" : "销售发货" , "id" : "2" } ] ,
deliveryTypeProps : { "label" : "fullName" , "value" : "id" } ,
deliveryTypeProps : { "label" : "fullName" , "value" : "id" } ,
businessIdcolumnOptions : [ { "label" : "订单编号" , "value" : "code" } , { "label" : "客户名称" , "value" : "subjectName" } , { label : "销售数量" , value : "planPurchaseNum" } , { "label" : "单据类型" , "value" : "orderType1" } , { "label" : "配送方式" , "value" : "deliveryType1" } , { "label" : "状态" , "value" : "saleStatus" } , ] ,
businessIdcolumnOptions : [ { "label" : "订单编号" , "value" : "code" } , { "label" : "客户名称" , "value" : "subjectName" } , { label : "销售数量" , value : "planPurchaseNum" } , { label : "销售金额" , value : "taxCount" } , { "label" : "单据类型" , "value" : "orderType1" } , { "label" : "配送方式" , "value" : "deliveryType1" } , { "label" : "状态" , "value" : "saleStatus" } , ] ,
reservedFields1columnOptions : [ { "label" : "业务线编码" , "value" : "code" } , { "label" : "业务线名称" , "value" : "name" } , ] ,
reservedFields1columnOptions : [ { "label" : "业务线编码" , "value" : "code" } , { "label" : "业务线名称" , "value" : "name" } , ] ,
subjectIdcolumnOptions : [ { "label" : "客户编码" , "value" : "code" } , { "label" : "客户名称" , "value" : "name" } , ] ,
subjectIdcolumnOptions : [ { "label" : "客户编码" , "value" : "code" } , { "label" : "客户名称" , "value" : "name" } , ] ,
enterpriseIdcolumnOptions : [ { "label" : "机构编码" , "value" : "f_en_code" } , { "label" : "机构名称" , "value" : "f_full_name" } , ] ,
enterpriseIdcolumnOptions : [ { "label" : "机构编码" , "value" : "f_en_code" } , { "label" : "机构名称" , "value" : "f_full_name" } , ] ,
@ -1280,6 +1296,8 @@ export default {
}
}
this . dataForm . deliveryProductRelationList [ idx ] . batchNo = val2 . batch _number
this . dataForm . deliveryProductRelationList [ idx ] . batchNo = val2 . batch _number
this . dataForm . deliveryProductRelationList [ idx ] . produceDate = val2 . produce _date
this . dataForm . deliveryProductRelationList [ idx ] . produceDate = val2 . produce _date
this . dataForm . deliveryProductRelationList [ idx ] . inventoryNo = val2 . inventory _number
this . inventoryIdList . push ( val2 . id )
this . inventoryIdList . push ( val2 . id )
} ,
} ,
/ / 选 择 数 据 弹 窗
/ / 选 择 数 据 弹 窗
@ -1701,6 +1719,7 @@ export default {
cargoId : '' ,
cargoId : '' ,
deliveryNum : undefined ,
deliveryNum : undefined ,
batchNo : undefined ,
batchNo : undefined ,
inventoryNo : undefined ,
produceTime : undefined ,
produceTime : undefined ,
returnUnit : undefined ,
returnUnit : undefined ,
tax : undefined ,
tax : undefined ,
@ -1716,6 +1735,7 @@ export default {
item . cargoId = undefined
item . cargoId = undefined
item . deliveryNum = undefined
item . deliveryNum = undefined
item . batchNo = undefined
item . batchNo = undefined
item . inventoryNo = undefined
item . produceDate = undefined
item . produceDate = undefined
this . dataForm . deliveryProductRelationList . push ( item )
this . dataForm . deliveryProductRelationList . push ( item )
this . childIndex = this . dataForm . deliveryProductRelationList . length - 1
this . childIndex = this . dataForm . deliveryProductRelationList . length - 1