|
@@ -71,12 +71,6 @@
|
|
></el-table-column>
|
|
></el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
</div>
|
|
</div>
|
|
-
|
|
|
|
- <!-- SelectBatchNoDialog -->
|
|
|
|
- <select-batch-no-dialog
|
|
|
|
- ref="SelectBatchNoDialog"
|
|
|
|
- @confirm="saveScanData"
|
|
|
|
- ></select-batch-no-dialog>
|
|
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -93,7 +87,6 @@ import { evokeScanner } from "../../../plugins/scanner";
|
|
|
|
|
|
import FileTypeSelect from "@/components/base/FileTypeSelect.vue";
|
|
import FileTypeSelect from "@/components/base/FileTypeSelect.vue";
|
|
import RoomClassSelect from "@/components/base/RoomClassSelect.vue";
|
|
import RoomClassSelect from "@/components/base/RoomClassSelect.vue";
|
|
-import SelectBatchNoDialog from "../components/SelectBatchNoDialog.vue";
|
|
|
|
|
|
|
|
import timeMixins from "@/mixins/setTimeMixins";
|
|
import timeMixins from "@/mixins/setTimeMixins";
|
|
import log4js from "@/plugins/logger";
|
|
import log4js from "@/plugins/logger";
|
|
@@ -103,7 +96,7 @@ const logger = log4js.getLogger("scan");
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "scan-other",
|
|
name: "scan-other",
|
|
- components: { RoomClassSelect, FileTypeSelect, SelectBatchNoDialog },
|
|
|
|
|
|
+ components: { RoomClassSelect, FileTypeSelect },
|
|
mixins: [timeMixins],
|
|
mixins: [timeMixins],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -310,15 +303,12 @@ export default {
|
|
|
|
|
|
await db.saveUploadInfo(fileInfo);
|
|
await db.saveUploadInfo(fileInfo);
|
|
},
|
|
},
|
|
- toSave() {
|
|
|
|
|
|
+ async toSave() {
|
|
if (!this.scanStageList.length) {
|
|
if (!this.scanStageList.length) {
|
|
this.$message.error("当前无要保存的数据!");
|
|
this.$message.error("当前无要保存的数据!");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- this.$refs.SelectBatchNoDialog.open();
|
|
|
|
- },
|
|
|
|
- async saveScanData(batchNo) {
|
|
|
|
if (this.saving) return;
|
|
if (this.saving) return;
|
|
this.saving = true;
|
|
this.saving = true;
|
|
|
|
|
|
@@ -326,7 +316,7 @@ export default {
|
|
logger.info(`04-1开始保存数据`);
|
|
logger.info(`04-1开始保存数据`);
|
|
for (let i = 0, len = this.scanStageList.length; i < len; i++) {
|
|
for (let i = 0, len = this.scanStageList.length; i < len; i++) {
|
|
const fileInfo = this.scanStageList[i];
|
|
const fileInfo = this.scanStageList[i];
|
|
- fileInfo.batchNo = batchNo;
|
|
|
|
|
|
+ fileInfo.batchNo = "other";
|
|
|
|
|
|
let res = true;
|
|
let res = true;
|
|
await this.saveScanItem(fileInfo).catch((err) => {
|
|
await this.saveScanItem(fileInfo).catch((err) => {
|