diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
index 4a910c23..d5a1b27f 100644
--- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
+++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
@@ -967,7 +967,8 @@ export default {
});
return;
} else {
- var getbillNum = "";
+ var getbillNum = "";
+ var getTaskState="";
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
@@ -975,7 +976,21 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
+ });
+ }
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
});
+ return;
}
if (this.isEdit == true) {
this.$message({
@@ -1041,6 +1056,7 @@ export default {
return;
} else {
var getbillNum = "";
+ var getTaskState="";
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
@@ -1048,8 +1064,22 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
});
}
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
+ });
+ return;
+ }
if (this.isEdit == true) {
this.$message({
message:
diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue
index bd537c40..78b9a239 100644
--- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue
+++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue
@@ -857,7 +857,8 @@ export default {
});
return;
} else {
- var getbillNum = "";
+ var getbillNum = "";
+ var getTaskState="";
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
@@ -865,7 +866,21 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
+ });
+ }
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
});
+ return;
}
if (this.isEdit == true) {
this.$message({
@@ -930,7 +945,8 @@ export default {
});
return;
} else {
- var getbillNum = "";
+ var getbillNum = "";
+ var getTaskState="";
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
@@ -938,7 +954,21 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
+ });
+ }
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
});
+ return;
}
if (this.isEdit == true) {
this.$message({
diff --git a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue
index 1ac96886..cbbad397 100644
--- a/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue
+++ b/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue
@@ -857,7 +857,8 @@ export default {
});
return;
} else {
- var getbillNum = "";
+ var getbillNum = "";
+ var getTaskState="";
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
@@ -865,7 +866,21 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
+ });
+ }
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
});
+ return;
}
if (this.isEdit == true) {
this.$message({
@@ -930,7 +945,8 @@ export default {
});
return;
} else {
- var getbillNum = "";
+ var getbillNum = "";
+ var getTaskState="";
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
@@ -938,7 +954,21 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
+ });
+ }
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
});
+ return;
}
if (this.isEdit == true) {
this.$message({
diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
index 431c3b5e..d5ccde75 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
@@ -22,7 +22,7 @@
icon="el-icon-check"
size="mini"
@click="print()"
- >确认出库单(支持批量)确认出库单
确认出库单(支持批量)确认出库单
{
let state = element.fileName;
@@ -965,7 +966,21 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
+ });
+ }
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
});
+ return;
}
if (this.isEdit == true) {
this.$message({
@@ -1030,7 +1045,8 @@ export default {
});
return;
} else {
- var getbillNum = "";
+ var getbillNum = "";
+ var getTaskState="";
//判断已经生成出库单的不能再生成出库操作
this.multipleSelection.forEach((element) => {
let state = element.fileName;
@@ -1038,7 +1054,21 @@ export default {
this.isEdit = true;
getbillNum += state + ",";
}
+ else if(element.stateName != "Succeeded"){
+ this.isTaskSuccess=true;
+ getTaskState+=element.taskId;
+ }
+ });
+ }
+ //任务不成功的不能单击确认
+ if(this.isTaskSuccess == true){
+ this.$message({
+ message:
+ "有未成功的任务,不能单击确认!:" +
+ getTaskState.substr(0, getTaskState.length - 1),
+ type: "warning",
});
+ return;
}
if (this.isEdit == true) {
this.$message({
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
index e6ac9e7f..ac9479fe 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
@@ -22,7 +22,7 @@
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
- >确认出库单(支持批量)确认出库单
确认出库单(支持批量)确认出库单