|
|
|
@ -61,18 +61,16 @@ |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-row> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item class="customer-item"> |
|
|
|
<el-checkbox v-model="pageData.printStandardOuterLabel"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item class="customer-item" :label=" ' ' "> |
|
|
|
<el-checkbox v-model="pageData.printStandardOuterLabel" :disabled="!canPrintStandardOuterLabel"> |
|
|
|
{{ $t('labelSetting.fields.standardOuterLabel') }} |
|
|
|
</el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-row> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item class="customer-item" :label=labels.remark> |
|
|
|
<el-input v-model="pageData.remark" style="width: 310px;" ></el-input> |
|
|
|
<el-input v-model="pageData.remark" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
@ -173,6 +171,11 @@ export default { |
|
|
|
}, |
|
|
|
} |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
canPrintStandardOuterLabel() { |
|
|
|
return (this.pageData.labelType || '').trim() === '外箱标签' && this.pageData.subLabelFlag === 'N'; |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
//初始化组件的参数 |
|
|
|
init(currentRow) { |
|
|
|
@ -180,7 +183,7 @@ export default { |
|
|
|
this.pageData = Object.assign({ printStandardOuterLabel: false }, JSON.parse(JSON.stringify(currentRow))); |
|
|
|
//统一子报表标识和值,避免页面展示为* |
|
|
|
this.pageData.subLabelFlag = this.pageData.subLabelFlag === 'Y' ? 'Y' : 'N'; |
|
|
|
this.pageData.printStandardOuterLabel = this.pageData.printStandardOuterLabel === true; |
|
|
|
this.pageData.printStandardOuterLabel = this.canPrintStandardOuterLabel && this.pageData.printStandardOuterLabel === true; |
|
|
|
this.pageData.parentLabelNo = this.getDisplayParentLabelNo(this.pageData.parentLabelNo, this.pageData.subLabelFlag); |
|
|
|
//打开页面 |
|
|
|
this.visible = true; |
|
|
|
@ -262,7 +265,8 @@ export default { |
|
|
|
submitData.labelName = (submitData.labelName || '').trim(); |
|
|
|
submitData.remark = (submitData.remark || '').trim(); |
|
|
|
submitData.subLabelFlag = submitData.subLabelFlag === 'Y' ? 'Y' : 'N'; |
|
|
|
submitData.printStandardOuterLabel = submitData.printStandardOuterLabel === true; |
|
|
|
submitData.printStandardOuterLabel = submitData.labelType === '外箱标签' |
|
|
|
&& submitData.subLabelFlag === 'N' && submitData.printStandardOuterLabel === true; |
|
|
|
let parentLabelNo = (submitData.parentLabelNo || '').trim().toUpperCase(); |
|
|
|
submitData.parentLabelNo = submitData.subLabelFlag === 'Y' ? parentLabelNo : '*'; |
|
|
|
return submitData; |
|
|
|
@ -395,6 +399,9 @@ export default { |
|
|
|
pageData: { |
|
|
|
deep: true, |
|
|
|
handler: function (newV, oldV) { |
|
|
|
if (!this.canPrintStandardOuterLabel && this.pageData.printStandardOuterLabel) { |
|
|
|
this.pageData.printStandardOuterLabel = false; |
|
|
|
} |
|
|
|
let labelNo = (this.pageData.labelNo || '').toUpperCase(); |
|
|
|
let parentLabelNo = (this.pageData.parentLabelNo || '').toUpperCase(); |
|
|
|
if(this.pageData.labelNo !== labelNo){ |
|
|
|
|