diff --git a/vue/src/components/ImportExcel-normal/index.vue b/vue/src/components/ImportExcel-normal/index.vue index 7fe9b85..6025313 100644 --- a/vue/src/components/ImportExcel-normal/index.vue +++ b/vue/src/components/ImportExcel-normal/index.vue @@ -146,22 +146,19 @@ export default { .then(async (res) => { this.loading = false; if (res.status) { - this.$message({ - message: "导入成功！", - type: "success", - }); - this.$parent.importNormalCallback() + this.$parent.importNormalCallback(res,fileuploadList,fd) } else { this.$message({ message: res.message, type: "error", + showClose:true }); } }) .catch(() => { this.loading = false; this.$message({ - message: "导入失败！", + message: "导入失败！2222", type: "error", }); }); diff --git a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue index a34bc0c..138a923 100644 --- a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue +++ b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue @@ -459,14 +459,14 @@ export default { getDefaultField() { var tempsTabs = []; //tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); - tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); + tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 }); // tempsTabs.push({ // label: "底盘号", // prop: "vin", // width: 130, // }); tempsTabs.push({ - label: "KNR", + label: "车身号", prop: "knr", width: 150, }); diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue index 465ad2e..193f6d0 100644 --- a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue +++ b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue @@ -411,6 +411,10 @@ }, // 导入后回调 importNormalCallback(){ + this.$message({ + message: "导入成功！", + type: "success", + }); this.importCloseNormal() this.getList(); }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/detail.vue b/vue/src/views/pg-fis/basedate/m100Online/detail.vue index 97d3fd1..9ee19e3 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/detail.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/detail.vue @@ -21,9 +21,10 @@ @selection-change="handleSelectionChange" @row-click="handleRowClick" :row-key="getRowKeys" - :expand-row-keys="expands" - @expand-change="exChange" > + + + - + @@ -692,14 +692,14 @@ export default { getDefaultField() { var tempsTabs = []; //tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); - tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); + tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 }); // tempsTabs.push({ // label: "底盘号", // prop: "vin", // width: 130, // }); tempsTabs.push({ - label: "KNR", + label: "车身号", prop: "knr", width: 150, }); @@ -1537,7 +1537,7 @@ export default { //门板 if ( parseInt(this.form.endHostSN) - - parseInt(this.form.beginHostSN) <= + parseInt(this.form.beginHostSN) < 0 ) { this.$message({ diff --git a/vue/src/views/pg-fis/basedate/planControl/index.vue b/vue/src/views/pg-fis/basedate/planControl/index.vue index b971bc5..e269e42 100644 --- a/vue/src/views/pg-fis/basedate/planControl/index.vue +++ b/vue/src/views/pg-fis/basedate/planControl/index.vue @@ -232,7 +232,7 @@ @@ -268,6 +268,7 @@ mixins: [message_table], data() { return { + importExcelURL:'/api/newjit/import-record/import', tipper:"", showExcelImport: false, form: {}, @@ -403,9 +404,51 @@ this.showExcelImport = false; }, // 导入后回调 - importNormalCallback(){ - this.importClose() - this.getList(); + importNormalCallback(res,fileuploadList){ + // 导入功能，第一次调用时 ret.Status = true 并且 ret.Message 不为空时， 弹出确认对话框，显示ret.Message, + // 如果选择是， 调用api/newjit/import-record/import，并且第二个参数forceExecute 传入true，选择否关闭 + if(res.status && res.message && res.message.length > 0){ + this.$confirm(`${res.message}, 是否确定继续导入`, '提示', { + confirmButtonText: '继续导入', + cancelButtonText: '取消导入', + type: 'warning' + }) + .then(() => { + this.listLoading = true + let fd = new FormData(); + fileuploadList.forEach((file) => { + fd.append("files", file); // 添加文件 + }); + fd.append("forceExecute", true); + this.$axios.posts(this.importExcelURL, fd) + .then(async (res) => { + this.listLoading = false + this.$message({ + message: "导入成功！", + type: "success", + }); + this.importClose() + this.getList(); + }) + .catch(() => { + this.listLoading = false + this.$message({ + message: res.message, + type: "error", + showClose:true + }); + this.importClose() + this.getList(); + }); + }) + .catch(() => { + this.importClose() + this.getList(); + }) + }else{ + this.importClose() + this.getList(); + } }, /** 刷新列表 */ handleHandle(data) { diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/vue/src/views/pg-fis/basedate/repeatR100/index.vue index 2d33550..842d5a1 100644 --- a/vue/src/views/pg-fis/basedate/repeatR100/index.vue +++ b/vue/src/views/pg-fis/basedate/repeatR100/index.vue @@ -460,10 +460,10 @@ export default { computed: { getDefaultField() { var tempsTabs = []; - tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); - tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); + // tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); + tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 }); tempsTabs.push({ - label: "KNR", + label: "车身号", prop: "knr", width: 120, }); diff --git a/vue/src/views/pg-fis/basedate/select/detail.vue b/vue/src/views/pg-fis/basedate/select/detail.vue index 8f84588..59d357f 100644 --- a/vue/src/views/pg-fis/basedate/select/detail.vue +++ b/vue/src/views/pg-fis/basedate/select/detail.vue @@ -42,7 +42,7 @@ class="two-list" --> - + - + { - if (index === 0) { - this.listQuery.state.push(element.id); - } - }); + // this.billState.forEach((element, index) => { + // if (index === 0) { + // this.listQuery.state.push(element.id); + // } + // }); this.getProductLine(); }, computed: { getDefaultField() { var tempsTabs = []; - tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); - tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 }); + // tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 }); + tempsTabs.push({ label: "流水号", prop: "hostSN", width: 120 }); // tempsTabs.push({ // label: "底盘号", // prop: "vin", // width: 130, // }); tempsTabs.push({ - label: "KNR", + label: "车身号", prop: "knr", width: 150, }); @@ -886,9 +886,9 @@ export default { this.listQuery.ZHBBillStatus = null; } else { this.listQuery.canNotPrint = null; - if (this.listQuery.state !== undefined) { - this.listQuery.billStatus = this.listQuery.state[0]; - } + // if (this.listQuery.state !== undefined) { + // this.listQuery.billStatus = this.listQuery.state[0]; + // } if (this.listQuery.productType === 2) { this.listQuery.ZHBBillStatus = this.listQuery.billStatus; @@ -1573,7 +1573,7 @@ export default { this.$refs.btn1.$el.innerText = "打印门板发货排序单"; this.$refs.btn2.$el.innerText = "重新打印门板发货排序单"; this.$refs.btn3.$el.innerText = "补打门板发货排序单"; - this.listQuery.state.push(this.billState[0].id); + // this.listQuery.state.push(this.billState[0].id); this.isShowState = true; } else if (this.listQuery.productType === 2) { this.listQuery.GroupName = this.PLChildGroupList[0] diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue index f859c51..eabf29a 100644 --- a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue +++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue @@ -9,13 +9,22 @@ v-show="showSearch" :inline="true" > - + + - + @@ -213,7 +222,7 @@ >