|
|
|
@ -176,8 +176,15 @@ export default { |
|
|
|
//判断是否是新增 |
|
|
|
if(this.pageData.addFlag == 'Y'){ |
|
|
|
this.labelNoReadOnly = false; |
|
|
|
this.pageData.originalLabelNo = ''; |
|
|
|
this.pageData.originalLabelType = ''; |
|
|
|
this.pageData.originalAddressNo = ''; |
|
|
|
}else{ |
|
|
|
this.labelNoReadOnly = true; |
|
|
|
// 标签编号可从列表重选。保存时仍按打开弹窗时的编号、类型、地址定位原记录 |
|
|
|
this.pageData.originalLabelNo = (this.pageData.labelNo || '').trim().toUpperCase(); |
|
|
|
this.pageData.originalLabelType = (this.pageData.labelType || '').trim(); |
|
|
|
this.pageData.originalAddressNo = (this.pageData.addressNo || '').trim().toUpperCase(); |
|
|
|
} |
|
|
|
//重置人员信息 |
|
|
|
this.pageData.username = this.userId; |
|
|
|
@ -235,6 +242,12 @@ export default { |
|
|
|
submitData.addressNo = (submitData.addressNo || '').trim().toUpperCase(); |
|
|
|
submitData.labelNo = (submitData.labelNo || '').trim().toUpperCase(); |
|
|
|
submitData.labelType = (submitData.labelType || '').trim(); |
|
|
|
submitData.originalLabelNo = (submitData.originalLabelNo || '').trim().toUpperCase(); |
|
|
|
submitData.originalLabelType = (submitData.originalLabelType || '').trim(); |
|
|
|
// 修改时必须把原地址传下去,空字符串表示原来没有地址,不能省略 |
|
|
|
if(submitData.addFlag !== 'Y'){ |
|
|
|
submitData.originalAddressNo = (submitData.originalAddressNo || '').trim().toUpperCase(); |
|
|
|
} |
|
|
|
submitData.labelName = (submitData.labelName || '').trim(); |
|
|
|
submitData.remark = (submitData.remark || '').trim(); |
|
|
|
submitData.subLabelFlag = submitData.subLabelFlag === 'Y' ? 'Y' : 'N'; |
|
|
|
|