|
@@ -212,10 +212,7 @@
|
|
|
>
|
|
>
|
|
|
</span>
|
|
</span>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
- <printQRCode
|
|
|
|
|
- ref="printQRCodeRef"
|
|
|
|
|
-
|
|
|
|
|
- ></printQRCode>
|
|
|
|
|
|
|
+ <printQRCode ref="printQRCodeRef"></printQRCode>
|
|
|
<importDialog
|
|
<importDialog
|
|
|
:defModule="moudleName"
|
|
:defModule="moudleName"
|
|
|
ref="importDialogRef"
|
|
ref="importDialogRef"
|
|
@@ -256,7 +253,14 @@
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
mixins: [tabMixins],
|
|
mixins: [tabMixins],
|
|
|
- components: { ItemSearch, print, allot, importDialog, exportButton,printQRCode },
|
|
|
|
|
|
|
+ components: {
|
|
|
|
|
+ ItemSearch,
|
|
|
|
|
+ print,
|
|
|
|
|
+ allot,
|
|
|
|
|
+ importDialog,
|
|
|
|
|
+ exportButton,
|
|
|
|
|
+ printQRCode
|
|
|
|
|
+ },
|
|
|
props: {
|
|
props: {
|
|
|
// 机构id
|
|
// 机构id
|
|
|
organizationId: [Number, String],
|
|
organizationId: [Number, String],
|
|
@@ -490,7 +494,7 @@
|
|
|
}
|
|
}
|
|
|
: '',
|
|
: '',
|
|
|
|
|
|
|
|
- this.selectedDime == 3||this.selectedDime == 2
|
|
|
|
|
|
|
+ this.selectedDime == 3 || this.selectedDime == 2
|
|
|
? {
|
|
? {
|
|
|
prop: 'warehouseName',
|
|
prop: 'warehouseName',
|
|
|
label: '仓库名称',
|
|
label: '仓库名称',
|
|
@@ -573,7 +577,8 @@
|
|
|
width: 120,
|
|
width: 120,
|
|
|
showOverflowTooltip: true
|
|
showOverflowTooltip: true
|
|
|
},
|
|
},
|
|
|
- this.selectedDime != 1
|
|
|
|
|
|
|
+
|
|
|
|
|
+ this.selectedDime == 1
|
|
|
? {
|
|
? {
|
|
|
prop: 'provenance',
|
|
prop: 'provenance',
|
|
|
label: '产地',
|
|
label: '产地',
|
|
@@ -586,8 +591,17 @@
|
|
|
label: '单价',
|
|
label: '单价',
|
|
|
showOverflowTooltip: true
|
|
showOverflowTooltip: true
|
|
|
}
|
|
}
|
|
|
|
|
+ : '',
|
|
|
|
|
+ this.selectedDime == 2
|
|
|
|
|
+ ? {
|
|
|
|
|
+ prop: 'createTime',
|
|
|
|
|
+ width: 120,
|
|
|
|
|
+ label: '入库时间',
|
|
|
|
|
+ showOverflowTooltip: true
|
|
|
|
|
+ }
|
|
|
: ''
|
|
: ''
|
|
|
];
|
|
];
|
|
|
|
|
+
|
|
|
if (this.selectedDime == 1) {
|
|
if (this.selectedDime == 1) {
|
|
|
return arr.filter((item) => item != '').concat(this.newColumns);
|
|
return arr.filter((item) => item != '').concat(this.newColumns);
|
|
|
} else {
|
|
} else {
|
|
@@ -599,8 +613,7 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
-
|
|
|
|
|
- openQRCode(row, type) {
|
|
|
|
|
|
|
+ openQRCode(row, type) {
|
|
|
this.$refs.printQRCodeRef.open(row, type);
|
|
this.$refs.printQRCodeRef.open(row, type);
|
|
|
},
|
|
},
|
|
|
|
|
|