diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index fc53146..1a14275 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -11,8 +11,8 @@ - - + + @@ -222,7 +222,7 @@ export default { limit: 10, startTime: "", endTime: "", - inCodeStatus: 2, + inCodeStatus: 1, }, detailQuery: { orderIdFk: "", diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 7954ae2..7176b75 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -333,7 +333,7 @@ - +
@@ -1016,6 +1016,7 @@ :visible.sync="editDiDialogVisible" :close-on-click-modal="false" :close-on-press-escape="false" + :before-close="this.cancelDialog" width="70%" v-if="editDiDialogVisible" > diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue index 9af3071..5ed0ae5 100644 --- a/src/views/system/print/pdfTmpleateManage.vue +++ b/src/views/system/print/pdfTmpleateManage.vue @@ -36,7 +36,7 @@ {{ moduleNameMap[scope.row.module] }} - + @@ -593,9 +593,11 @@ export default { submitUpload() { if (this.$refs.uploadJasper.uploadFiles.length < 1 && !this.uploadDisabled) { this.$message.warning(`请选择jasper文件`); + return } if (this.$refs.uploadJrxml.uploadFiles.length < 1 && !this.uploadDisabled) { this.$message.warning(`请选择jasper文件`); + return } console.log(this.formName) this.$refs["dataForm"].validate(valid => {