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

Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
liang.chao 2024-07-10 14:40:18 +08:00
parent 48826ae819 2e3f6ef8af
commit 4337996e01
10 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
View File

@ -51,30 +51,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">
AND sn.create_by like concat('%', #{createBy}, '%')
</if>
order by sn.create_time desc
</select>
<select id="selectUserIdByNoticeId" resultType="java.lang.String">
select user_id from sys_notice where notice_id = #{noticeId}
</select>
<select id="getList" resultType="com.bonus.sgzb.system.domain.SysNotice">
SELECT
notice_id,
notice_title,
notice_type,
CAST( notice_content AS CHAR ) AS notice_content,
STATUS,
create_by,
create_time,
update_by,
update_time,
remark
sn.notice_id,
sn.notice_title,
sn.notice_type,
CAST( sn.notice_content AS CHAR ) AS notice_content,
sn.STATUS,
sn.create_by,
su.nick_name,
sn.create_time,
sn.update_by,
sn.update_time,
sn.remark
FROM
sys_notice
sys_notice sn left join sys_user su on sn.create_by = su.user_name
WHERE
(
user_id IS NULL
OR user_id = ''
OR FIND_IN_SET(#{userId}, user_id) = 0
sn.user_id IS NULL
OR sn.user_id = ''
OR FIND_IN_SET(#{userId}, sn.user_id) = 0
)
AND su.user_id != #{userId}
</select>
<insert id="insertNotice" parameterType="com.bonus.sgzb.system.domain.SysNotice">

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

@ -44,13 +44,13 @@ export default {
},
updated() {
// 判断是否需要获取通知信息
// if (
// localStorage.getItem('notice') &&
// getToken() &&
// !this.noticeDialog.outerVisible
// ) {
// this.getHomeNoticeFun()
// }
if (
localStorage.getItem('notice') &&
getToken() &&
!this.noticeDialog.outerVisible
) {
this.getHomeNoticeFun()
}
},
methods: {
// 获取通知公告的信息

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

@ -1,5 +1,5 @@
<template>
<div>
<div class="notice-dialog">
<!-- 消息通知弹框 -->
<el-dialog
:title="noticeTitle"
@ -10,12 +10,18 @@
:before-close="handleCloseDialog"
:close-on-click-modal="false"
:close-on-press-escape="false"
top="0vh"
append-to-body
custom-class="center-dialog"
>
<el-button class="notice-num" type="primary"
>重要通知({{ unreadNUm }}/{{ noticeNum }})</el-button
>
<el-button class="notice-known" type="primary" @click="handleKnow()"
<el-button
class="notice-known"
type="primary"
@click="handleKnow()"
:loading="loading"
>我知道了</el-button
>
<h2 class="release-time">发布时间：{{ releaseTime }}</h2>
@ -49,6 +55,7 @@ export default {
return {
unreadNUm: 1,
noticeListDoc: [],
loading: false,
}
},
computed: {
@ -68,7 +75,7 @@ export default {
return this.noticeList[this.unreadNUm - 1].createTime.slice(0, 10)
},
releaseCreateName() {
return this.noticeList[this.unreadNUm - 1].createBy
return this.noticeList[this.unreadNUm - 1].nickName
},
},
@ -85,12 +92,14 @@ export default {
},
// 点击我知道了
async handleKnow() {
this.loading = true
const params = {
noticeId: [],
userId: sessionStorage.getItem('userId'),
}
params.noticeId.push(this.noticeList[this.unreadNUm - 1].noticeId)
const res = await setQueryNoticeApi(params)
this.loading = false
if (res.code == 200) {
if (this.noticeNum === 1) {
this.$emit('closeDialog', false)

8
sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
View File

@ -158,7 +158,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料数量"
label="待退料数量"
align="center"
:show-overflow-tooltip="true"
>
@ -250,7 +250,7 @@
append-to-body
>
<div style="margin-left: 40px; margin-bottom: 10px"
>退料数量：{{ returnNum }}</div
>待退料数量：{{ returnNum }}</div
>
<el-form
:model="codeQuery"
@ -502,7 +502,7 @@
<div v-else>
<div style="margin-left: 40px; margin-bottom: 10px"
>退料数量：{{ returnNum }}</div
>待退料数量：{{ returnNum }}</div
>
<el-row :gutter="10" class="mb8" v-if="!dialogIsView">
<el-col :span="1.5">
@ -531,7 +531,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料数量"
label="待退料数量"
align="center"
prop="backNum"
:show-overflow-tooltip="true"

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

@ -50,7 +50,7 @@
@click="handleRevoke(data)"
icon="el-icon-circle-close"
style="color: #de3115"
v-if="data.num == 0"
v-if="data.num == 0 && returnInfo.taskStatus != 40"
>
撤回
</el-button>

2
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -166,7 +166,7 @@
align="center"
:selectable="
(row) => {
return row.repairStatusCode == 44 && row.commit == 0
return row.commit == 0
}
"
/>

2
sgzb-ui/src/views/repairTest/repairScrap/index.vue
View File

@ -167,7 +167,7 @@
align="center"
:selectable="
(row) => {
return row.repairStatusCode == 44 && row.commit == 0
return row.commit == 0
}
"
/>

4
sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
View File

@ -310,7 +310,9 @@ export default {
const res = await addCompleteSetToolsApi(this.saveParams)
if (res.code == 200) {
this.$message.success('新增成功！')
this.$message.success(
!this.editInfo ? '新增成功！' : '修改成功！',
)
this.$emit('openHomePage')
}
}

4
sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
View File

@ -310,7 +310,9 @@ export default {
const res = await addCompleteSetToolsApi(this.saveParams)
if (res.code == 200) {
this.$message.success('新增成功！')
this.$message.success(
!this.editInfo ? '新增成功！' : '修改成功！',
)
this.$emit('openHomePage')
}
}

2
sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue
View File

@ -65,12 +65,10 @@ export default {
methods: {
// 新增
handleAddComplete() {
console.log('新增！')
this.$emit('handleAddComplete')
},
// 编辑
handleEdit(data) {
console.log(data, '编辑')
this.$emit('handleAddComplete', data)
},
// 删除