diff --git a/sgzb-ui/src/components/Notice/index.vue b/sgzb-ui/src/components/Notice/index.vue
index 97941d7a..47105fec 100644
--- a/sgzb-ui/src/components/Notice/index.vue
+++ b/sgzb-ui/src/components/Notice/index.vue
@@ -2,7 +2,7 @@
重要通知({{ unreadNUm }}/{{ noticeNum }})重要通知({{ unreadNum }}/{{ noticeNum }})
this.noticeNum) {
+ if (this.unreadNum > this.noticeNum) {
this.$emit('closeDialog', false)
}
}
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index 656b0c65..41bebc4a 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -152,6 +152,7 @@
size="mini"
v-if="isAdd || isEdit"
@click="handleAdd"
+ :loading="submitLoading"
>
保存
@@ -497,6 +498,7 @@ export default {
selDeviceTypeChangeValue: '',
deviceTypeTreeNew: [],
completeSetList: [],
+ submitLoading: false,
}
},
@@ -769,7 +771,7 @@ export default {
if (this.rejectTaskStatus == 100) {
this.queryParams.souceByRefuse = 1
}
-
+ this.submitLoading = true
const params = {
...this.queryParams,
taskId: this.taskId,
@@ -786,6 +788,8 @@ export default {
this.$message.error('机具类型库存量为零无法领料')
return
}
+
+ this.submitLoading = true
res = await submitLeaseApply(this.queryParams)
}
if (res.code == 200) {
@@ -793,11 +797,13 @@ export default {
type: 'success',
message: res.msg,
})
+ this.submitLoading = false
// this.$tab.closeOpenPage({
// path: '/claimAndRefund/receive/receiveApply',
// })
-
this.$emit('goBackPage')
+ } else {
+ this.submitLoading = false
}
}
})
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
index def11236..819a3aa1 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
@@ -134,6 +134,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
+ :loading="submitLoading"
>保存
@@ -488,6 +489,7 @@ export default {
rowId: '',
selDeviceTypeChangeValue: '',
deviceTypeTreeNew: [],
+ submitLoading: false,
}
},
mounted() {
@@ -762,6 +764,7 @@ export default {
backApplyDetails:
this.queryParams.leaseApplyDetails,
}
+ this.submitLoading = true
const res = await submitRefuseBackApply(params)
if (res.code == 200) {
this.$message({ type: 'success', message: res.msg })
@@ -773,6 +776,8 @@ export default {
// })
// }, 1000)
}
+
+ this.submitLoading = false
} else {
let params = {
companyId: this.companyId,
@@ -783,6 +788,7 @@ export default {
backApplyDetails:
this.queryParams.leaseApplyDetails,
}
+ this.submitLoading = true
const res = await submitBackApplyApi(params)
if (res.code == 200) {
this.$message({ type: 'success', message: res.msg })
@@ -793,6 +799,7 @@ export default {
// })
// }, 1000)
}
+ this.submitLoading = false
}
}
})
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
index 87e5e8bc..147b20a0 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
@@ -159,7 +159,7 @@
- -->
查看附件