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-09 17:40:41 +08:00
parent 6a2023bd4b 8e07744e10
commit e70ec91271
12 changed files with 90 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,18 +44,17 @@ export default {
}, },
updated() { updated() {
// 判断是否需要获取通知信息 // 判断是否需要获取通知信息
if ( // if (
localStorage.getItem('notice') && // localStorage.getItem('notice') &&
getToken() && // getToken() &&
!this.noticeDialog.outerVisible // !this.noticeDialog.outerVisible
) { // ) {
this.getHomeNoticeFun() // this.getHomeNoticeFun()
} // }
}, },
methods: { methods: {
// 获取通知公告的信息 // 获取通知公告的信息
async getHomeNoticeFun() { async getHomeNoticeFun() {
console.log('获取公告！！！')
const res = await getHomeNoticeApi() const res = await getHomeNoticeApi()
if (res.code == 200) { if (res.code == 200) {
if (res.data.length > 0) { if (res.data.length > 0) {
@ -80,16 +79,3 @@ export default {
} }
</style> </style>
<style lang="scss">
.el-notification {
width: 440px;
}
.el-notification__title {
font-size: 18px;
}
.el-notification__content {
margin: 15px 0;
font-size: 16px;
line-height: 1.5;
}
</style>

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

@ -1188,7 +1188,7 @@ export default {
} }
arr.push(obj) arr.push(obj)
if (!obj.scrapType || !obj.fileUrl) { if (obj.scrapType === '' || !obj.fileUrl) {
this.$message.error('请编辑报废信息！') this.$message.error('请编辑报废信息！')
isScrapInfo = true isScrapInfo = true
return return

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

@ -407,7 +407,7 @@ export default {
scrapType: '', // 损坏原因 scrapType: '', // 损坏原因
fileUrl: '', fileUrl: '',
}, },
isNumReturn: false, isNumReturnNew: false,
} }
}, },
created() { created() {
@ -629,6 +629,7 @@ export default {
} }
if (bfNum > 0) { if (bfNum > 0) {
this.isNumReturnNew = !this.isNumReturnNew
detailsInfo.backNum = bfNum detailsInfo.backNum = bfNum
detailsInfo.backStatus = 3 detailsInfo.backStatus = 3
if ( if (
@ -636,7 +637,6 @@ export default {
!this.numDetailsInfo.fileUrl !this.numDetailsInfo.fileUrl
) { ) {
this.$message.error('请编辑报废信息！') this.$message.error('请编辑报废信息！')
this.isNumReturn = true
return return
} }
const { scrapReason, scrapType, fileUrl } = this.numDetailsInfo const { scrapReason, scrapType, fileUrl } = this.numDetailsInfo
@ -663,6 +663,7 @@ export default {
this.$message.error('报废数量已超过剩余待退料数量') this.$message.error('报废数量已超过剩余待退料数量')
return return
} }
this.isNumReturnNew = true
this.dialogConfigReturn.innerVisible = true this.dialogConfigReturn.innerVisible = true
}, },
// 批量撤回 // 批量撤回
@ -709,7 +710,7 @@ export default {
this.$refs.scrapInfoRef.validate((valid) => { this.$refs.scrapInfoRef.validate((valid) => {
if (valid) { if (valid) {
// this.isNumReturn 为true则未数量退料 // this.isNumReturn 为true则未数量退料
if (this.isNumReturn) { if (this.isNumReturnNew) {
this.numDetailsInfo.scrapReason = this.numDetailsInfo.scrapReason =
this.scrapInfoParams.scrapReason this.scrapInfoParams.scrapReason
this.numDetailsInfo.scrapType = this.numDetailsInfo.scrapType =
@ -844,7 +845,7 @@ export default {
this.scrapInfoParams.fileUrl = '' this.scrapInfoParams.fileUrl = ''
this.scrapInfoParams.fileList = [] this.scrapInfoParams.fileList = []
this.codeDetails = true this.codeDetails = true
this.isNumReturn = false this.isNumReturnNew = false
this.imgUrlList = [] this.imgUrlList = []
} }
}, },

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

@ -160,7 +160,16 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
border border
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column
type="selection"
width="55"
align="center"
:selectable="
(row) => {
return row.repairStatusCode == 44
}
"
/>
<el-table-column <el-table-column
align="center" align="center"
label="序号" label="序号"

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

@ -161,7 +161,16 @@
:data="typeList" :data="typeList"
border border
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column
type="selection"
width="55"
align="center"
:selectable="
(row) => {
return row.repairStatusCode == 44
}
"
/>
<el-table-column <el-table-column
align="center" align="center"
label="序号" label="序号"

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

@ -697,6 +697,7 @@ export default {
this.$message.error('报废数量已超过剩余待退料数量') this.$message.error('报废数量已超过剩余待退料数量')
return return
} }
this.isNumReturn = true
this.dialogConfigReturn.innerVisible = true this.dialogConfigReturn.innerVisible = true
}, },
// 批量撤回 // 批量撤回

9
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -18,7 +18,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="维修时间"> <el-form-item label="维修时间" prop="wxTime">
<el-date-picker <el-date-picker
v-model="queryParams.wxTime" v-model="queryParams.wxTime"
style="width: 240px" style="width: 240px"
@ -343,7 +343,12 @@
align="center" align="center"
width="80" width="80"
type="index" type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" :index="
indexContinuation(
queryParams.pageNum,
queryParams.pageSize,
)
"
> >
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ <span>{{

26
sgzb-ui/src/views/system/user/index.vue
View File

@ -37,10 +37,10 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="用户名称" prop="userName"> <el-form-item label="账号名" prop="userName">
<el-input <el-input
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入账号名"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -192,7 +192,7 @@
" "
/> />
<el-table-column <el-table-column
label="用户名称" label="账号名"
align="center" align="center"
key="userName" key="userName"
prop="userName" prop="userName"
@ -200,7 +200,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="用户昵称" label="用户姓名"
align="center" align="center"
key="nickName" key="nickName"
prop="nickName" prop="nickName"
@ -332,10 +332,10 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户昵称" prop="nickName"> <el-form-item label="用户姓名" prop="nickName">
<el-input <el-input
v-model="form.nickName" v-model="form.nickName"
placeholder="请输入用户昵称" placeholder="请输入用户姓名"
maxlength="30" maxlength="30"
/> />
</el-form-item> </el-form-item>
@ -375,12 +375,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
v-if="form.userId == undefined" v-if="form.userId == undefined"
label="用户名称" label="账号名"
prop="userName" prop="userName"
> >
<el-input <el-input
v-model="form.userName" v-model="form.userName"
placeholder="请输入用户名称" placeholder="请输入账号名"
maxlength="30" maxlength="30"
/> />
</el-form-item> </el-form-item>
@ -623,8 +623,8 @@ export default {
// 列信息 // 列信息
columns: [ columns: [
{ key: 0, label: `用户编号`, visible: true }, { key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true }, { key: 1, label: `账号名`, visible: true },
{ key: 2, label: `用户昵称`, visible: true }, { key: 2, label: `用户姓名`, visible: true },
{ key: 3, label: `部门`, visible: true }, { key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true }, { key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true }, { key: 5, label: `状态`, visible: true },
@ -635,20 +635,20 @@ export default {
userName: [ userName: [
{ {
required: true, required: true,
message: '用户名称不能为空', message: '账号名不能为空',
trigger: 'blur', trigger: 'blur',
}, },
{ {
min: 2, min: 2,
max: 20, max: 20,
message: '用户名称长度必须介于 2 和 20 之间', message: '账号名长度必须介于 2 和 20 之间',
trigger: 'blur', trigger: 'blur',
}, },
], ],
nickName: [ nickName: [
{ {
required: true, required: true,
message: '用户昵称不能为空', message: '用户姓名不能为空',
trigger: 'blur', trigger: 'blur',
}, },
], ],

2
sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
View File

@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="提交入库时间"> <el-form-item label="提交入库时间" prop="submitStorageTime">
<el-date-picker <el-date-picker
v-model="queryParams.submitStorageTime" v-model="queryParams.submitStorageTime"
style="width: 240px" style="width: 240px"

19
sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
View File

@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="维修时间"> <el-form-item label="维修时间" prop="wxTime">
<el-date-picker <el-date-picker
v-model="queryParams.wxTime" v-model="queryParams.wxTime"
style="width: 240px" style="width: 240px"
@ -346,7 +346,12 @@
align="center" align="center"
width="80" width="80"
type="index" type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" :index="
indexContinuation(
queryParams.pageNum,
queryParams.pageSize,
)
"
> >
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ <span>{{
@ -411,13 +416,19 @@
size="mini" size="mini"
type="text" type="text"
@click="pass(scope.row)" @click="pass(scope.row)"
v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)" v-if="
scope.row.status == '进行中' &&
scope.row.userIds.includes(userId)
"
>通过</el-button >通过</el-button
> >
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)" v-if="
scope.row.status == '进行中' &&
scope.row.userIds.includes(userId)
"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button >不通过</el-button
> >

9
sgzb-ui/src/views/warehouseManage/warehousing/return/index.vue
View File

@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="提交入库时间"> <el-form-item label="提交入库时间" prop="submitStorageTime">
<el-date-picker <el-date-picker
v-model="queryParams.submitStorageTime" v-model="queryParams.submitStorageTime"
style="width: 240px" style="width: 240px"
@ -338,7 +338,12 @@
align="center" align="center"
width="80" width="80"
type="index" type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" :index="
indexContinuation(
queryParams.pageNum,
queryParams.pageSize,
)
"
> >
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ <span>{{

4
sgzb-ui/vue.config.js
View File

@ -43,10 +43,10 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
// target: `http://192.168.2.122:28080`, //超 target: `http://192.168.2.122:28080`, //超
// target: `http://10.40.92.81:28080`, //韩/ // target: `http://10.40.92.81:28080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
target: `http://192.168.2.248:28080`, //帅 // target: `http://192.168.2.248:28080`, //帅
// target: `http://192.168.2.209:28080`, //福 // target: `http://192.168.2.209:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */