diff --git a/sgzb-ui/src/App.vue b/sgzb-ui/src/App.vue
index bbe64e14..42825bf0 100644
--- a/sgzb-ui/src/App.vue
+++ b/sgzb-ui/src/App.vue
@@ -44,18 +44,17 @@ export default {
},
updated() {
// 判断是否需要获取通知信息
- if (
- localStorage.getItem('notice') &&
- getToken() &&
- !this.noticeDialog.outerVisible
- ) {
- this.getHomeNoticeFun()
- }
+ // if (
+ // localStorage.getItem('notice') &&
+ // getToken() &&
+ // !this.noticeDialog.outerVisible
+ // ) {
+ // this.getHomeNoticeFun()
+ // }
},
methods: {
// 获取通知公告的信息
async getHomeNoticeFun() {
- console.log('获取公告！！！')
const res = await getHomeNoticeApi()
if (res.code == 200) {
if (res.data.length > 0) {
@@ -80,16 +79,3 @@ export default {
}
-
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
index 03030565..acea28fa 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
@@ -1188,7 +1188,7 @@ export default {
}
arr.push(obj)
- if (!obj.scrapType || !obj.fileUrl) {
+ if (obj.scrapType === '' || !obj.fileUrl) {
this.$message.error('请编辑报废信息！')
isScrapInfo = true
return
diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
index 4b068eed..aee77ed4 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
@@ -407,7 +407,7 @@ export default {
scrapType: '', // 损坏原因
fileUrl: '',
},
- isNumReturn: false,
+ isNumReturnNew: false,
}
},
created() {
@@ -629,6 +629,7 @@ export default {
}
if (bfNum > 0) {
+ this.isNumReturnNew = !this.isNumReturnNew
detailsInfo.backNum = bfNum
detailsInfo.backStatus = 3
if (
@@ -636,7 +637,6 @@ export default {
!this.numDetailsInfo.fileUrl
) {
this.$message.error('请编辑报废信息！')
- this.isNumReturn = true
return
}
const { scrapReason, scrapType, fileUrl } = this.numDetailsInfo
@@ -663,6 +663,7 @@ export default {
this.$message.error('报废数量已超过剩余待退料数量')
return
}
+ this.isNumReturnNew = true
this.dialogConfigReturn.innerVisible = true
},
// 批量撤回
@@ -709,7 +710,7 @@ export default {
this.$refs.scrapInfoRef.validate((valid) => {
if (valid) {
// this.isNumReturn 为true则未数量退料
- if (this.isNumReturn) {
+ if (this.isNumReturnNew) {
this.numDetailsInfo.scrapReason =
this.scrapInfoParams.scrapReason
this.numDetailsInfo.scrapType =
@@ -844,7 +845,7 @@ export default {
this.scrapInfoParams.fileUrl = ''
this.scrapInfoParams.fileList = []
this.codeDetails = true
- this.isNumReturn = false
+ this.isNumReturnNew = false
this.imgUrlList = []
}
},
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index ff09638e..10940fa2 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -160,7 +160,16 @@
@selection-change="handleSelectionChange"
border
>
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -375,12 +375,12 @@
@@ -623,8 +623,8 @@ export default {
// 列信息
columns: [
{ key: 0, label: `用户编号`, visible: true },
- { key: 1, label: `用户名称`, visible: true },
- { key: 2, label: `用户昵称`, visible: true },
+ { key: 1, label: `账号名`, visible: true },
+ { key: 2, label: `用户姓名`, visible: true },
{ key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
@@ -635,20 +635,20 @@ export default {
userName: [
{
required: true,
- message: '用户名称不能为空',
+ message: '账号名不能为空',
trigger: 'blur',
},
{
min: 2,
max: 20,
- message: '用户名称长度必须介于 2 和 20 之间',
+ message: '账号名长度必须介于 2 和 20 之间',
trigger: 'blur',
},
],
nickName: [
{
required: true,
- message: '用户昵称不能为空',
+ message: '用户姓名不能为空',
trigger: 'blur',
},
],
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
index c1e51094..4b579f72 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
@@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+