bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化页面

This commit is contained in:
BianLzhaoMin 2024-07-12 17:34:36 +08:00
parent 88a9b4fa46
commit d7f1e5bbcd
4 changed files with 70 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-ui/src/App.vue
View File

@ -7,14 +7,14 @@
:noticeDialog="noticeDialog"
:noticeList="noticeList"
@closeDialog="closeDialog"
></Notice>
/>
</div>
</template>
<script>
import ThemePicker from '@/components/ThemePicker'
import { getHomeNoticeApi } from '@/api/system/notice.js'
import Notice from '@/components/Notice'
import { getHomeNoticeApi } from '@/api/system/notice.js'
import { getToken } from '@/utils/auth'
export default {

2
sgzb-ui/src/components/Notice/index.vue
View File

@ -53,7 +53,7 @@ export default {
},
data() {
return {
unreadNUm: 1,
unreadNum: 1,
noticeListDoc: [],
loading: false,
}

43
sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
View File

@ -408,6 +408,7 @@ export default {
fileUrl: '',
},
isNumReturnNew: false,
isHandle: false,
}
},
created() {
@ -544,7 +545,6 @@ export default {
setCodeBack(param).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess('操作成功')
this.$modal.msgSuccess('操作成功')
this.dialogConfigReturn.outerVisible = false
this.$refs.homeTbRef.getList()
@ -608,31 +608,42 @@ export default {
taskId,
}
const detailsInfo = {
parentId: id,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: '',
backNum: '',
}
if (hgNum > 0) {
detailsInfo.backNum = hgNum
detailsInfo.backStatus = 1
const detailsInfo = {
parentId: id,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: 1,
backNum: hgNum,
}
numReturnParams.arr.push(detailsInfo)
}
if (wxNum > 0) {
detailsInfo.backNum = wxNum
detailsInfo.backStatus = 2
const detailsInfo = {
parentId: id,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: 2,
backNum: wxNum,
}
numReturnParams.arr.push(detailsInfo)
}
if (bfNum > 0) {
const detailsInfo = {
parentId: id,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: 3,
backNum: bfNum,
}
this.isNumReturnNew = !this.isNumReturnNew
detailsInfo.backNum = bfNum
detailsInfo.backStatus = 3
if (
this.numDetailsInfo.scrapType === '' ||
!this.numDetailsInfo.fileUrl

77
sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue
View File

@ -437,6 +437,7 @@ export default {
fileUrl: '',
},
isNumReturn: false,
isHandle: false,
}
},
created() {
@ -582,9 +583,8 @@ export default {
getScrapReturnSaveApi(param).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess('操作成功')
this.$modal.msgSuccess('操作成功')
this.dialogConfigReturn.outerVisible = false
this.$refs.homeTbRef.getList()
this.isHandle = true
this.$refs.dialogTbRef.getList()
}
})
} else {
@ -616,8 +616,9 @@ export default {
getScrapReturnSaveApi(param).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess('操作成功')
this.dialogConfigReturn.outerVisible = false
this.$refs.homeTbRef.getList()
// this.dialogConfigReturn.outerVisible = false
this.isHandle = true
this.$refs.dialogTbRef.getList()
}
})
} else {
@ -645,31 +646,41 @@ export default {
arr: [],
flag: 0,
}
const detailsInfo = {
parentId: this.parentId,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: '',
backNum: '',
}
console.log(hgNum, wxNum, bfNum, '各数量')
if (hgNum > 0) {
detailsInfo.backNum = hgNum
detailsInfo.backStatus = 1
const detailsInfo = {
parentId: this.parentId,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: 1,
backNum: hgNum,
}
numReturnParams.arr.push(detailsInfo)
}
if (wxNum > 0) {
detailsInfo.backNum = wxNum
detailsInfo.backStatus = 2
const detailsInfo = {
parentId: this.parentId,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: 2,
backNum: wxNum,
}
numReturnParams.arr.push(detailsInfo)
}
if (bfNum > 0) {
detailsInfo.backNum = bfNum
detailsInfo.backStatus = 3
const detailsInfo = {
parentId: this.parentId,
typeId,
manageType: 1,
createBy: sessionStorage.getItem('userId'),
backStatus: 3,
backNum: bfNum,
}
if (
this.numDetailsInfo.scrapType === '' ||
!this.numDetailsInfo.fileUrl
@ -684,7 +695,6 @@ export default {
detailsInfo.fileUrl = fileUrl
numReturnParams.arr.push(detailsInfo)
}
getScrapReturnSaveApi(numReturnParams).then((res) => {
this.numDetailsInfo.scrapReason = ''
this.numDetailsInfo.scrapType = ''
@ -792,8 +802,8 @@ export default {
if (response.code == 200) {
this.$modal.msgSuccess('操作成功')
this.currentRows = null
this.dialogConfigReturn.outerVisible = false
this.$refs.homeTbRef.getList()
this.isHandle = true
this.$refs.dialogTbRef.getList()
}
})
}
@ -832,8 +842,8 @@ export default {
if (response.code == 200) {
this.$modal.msgSuccess('操作成功')
this.scrapAll = false
this.dialogConfigReturn.outerVisible = false
this.$refs.homeTbRef.getList()
this.isHandle = true
this.$refs.dialogTbRef.getList()
}
})
}
@ -904,18 +914,6 @@ export default {
this.dialogConfigReturn.outerVisible = false
this.$emit('closeReturnPage')
}
console.log(res, '退料结果')
// this.submitScrapParams.deptIds = []
// const res = await submitScrapApi(this.submitScrapParams)
// if (res.code == 200) {
// this.$message.success('已提交成功')
// this.dialogConfig.outerVisible = false
// this.$refs.listingTbRef.getList()
// this.submitScrapParams.taskIdList = []
// }
// this.$refs.selDepartRef.clearNode()
},
/* 外层弹框关闭 */
closeDialogOuter() {
@ -941,6 +939,11 @@ export default {
this.imgUrlList = []
this.scrapInfoParams.fileList = []
this.dialogConfigReturn.outerWidth = '70%'
if (this.isHandle) {
this.$refs.homeTbRef.getList()
this.isHandle = false
}
}
},
deep: true,