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

优化用户权限以及页面等样式问题

This commit is contained in:
BianLzhaoMin 2024-05-17 14:27:43 +08:00
parent ea33107e86
commit a71a21d070
16 changed files with 901 additions and 871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-ui/.env.production
View File

@ -1,6 +1,8 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 施工装备管理系统 VUE_APP_TITLE = 施工装备管理系统
NODE_ENV = production
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'

10
sgzb-ui/.env.production-nw
View File

@ -1,10 +0,0 @@
# 南网系统配置
# 页面标题
VUE_APP_TITLE = 施工装备管理系统
# 生产环境配置
ENV = 'production-nw'
# 若依管理系统/生产环境
VUE_APP_BASE_API = '/gl/dev-api'

6
sgzb-ui/.env.staging → sgzb-ui/.env.testing
View File

@ -1,10 +1,10 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 若依管理系统 VUE_APP_TITLE = 若依管理系统
NODE_ENV = production NODE_ENV = testing
# 测试环境配置 # 测试环境配置
ENV = 'staging' ENV = 'testing'
# 若依管理系统/测试环境 # 若依管理系统/测试环境
VUE_APP_BASE_API = '/stage-api' VUE_APP_BASE_API = '/dev-api'

12
sgzb-ui/bin/build-prod.bat Normal file
View File

@ -0,0 +1,12 @@
@echo off
echo.
echo [<5B><>Ϣ] <20><><EFBFBD>Web<65><62><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>dist<73>ļ<EFBFBD><C4BC><EFBFBD>
echo.
%~d0
cd %~dp0
cd ..
npm run build:prod
pause

12
sgzb-ui/bin/build-text.bat Normal file
View File

@ -0,0 +1,12 @@
@echo off
echo.
echo [<5B><>Ϣ] <20><><EFBFBD>Web<65><62><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>dist<73>ļ<EFBFBD><C4BC><EFBFBD>
echo.
%~d0
cd %~dp0
cd ..
npm run build:test
pause

3
sgzb-ui/package.json
View File

@ -7,7 +7,8 @@
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging", "build:test": "vue-cli-service build --mode testing",
"build:prod": "vue-cli-service build --mode production",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src" "lint": "eslint --ext .js,.vue src"
}, },

2
sgzb-ui/src/utils/globalUrl.js
View File

@ -4,7 +4,7 @@
// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
const qrUrl = process.env.NODE_ENV === 'production' ? 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode=' const qrUrl = process.env.NODE_ENV === 'production' ? 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
export default { export default {
qrUrl, qrUrl,

1
sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
View File

@ -168,6 +168,7 @@
type="primary" type="primary"
v-if="scope.row.taskStatus != 35" v-if="scope.row.taskStatus != 35"
@click="handleOut(scope.row)" @click="handleOut(scope.row)"
v-hasPermi="['picking:outbound']"
> >
出库 出库
</el-button> </el-button>

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

@ -238,6 +238,7 @@
icon="el-icon-setting" icon="el-icon-setting"
v-if="scope.row.repairStatusCode == '43'" v-if="scope.row.repairStatusCode == '43'"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
v-hasPermi="['service:button']"
> >
维修 维修
</el-button> </el-button>

1050
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -63,6 +63,7 @@
size="mini" size="mini"
v-if="data.taskStatus === 121 || data.taskStatus === 120" v-if="data.taskStatus === 121 || data.taskStatus === 120"
@click="handleAuditing(data)" @click="handleAuditing(data)"
v-hasPermi="['forecast:waste:auditing']"
>审核</el-button >审核</el-button
> >
</template> </template>

5
sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
View File

@ -21,9 +21,12 @@
icon="el-icon-circle-check" icon="el-icon-circle-check"
size="mini" size="mini"
@click="handelSubmitScrap" @click="handelSubmitScrap"
v-hasPermi="['submit:batch:scrap']"
>提交报废</el-button >提交报废</el-button
> >
<!-- 批量提交报废 -->
<el-button <el-button
type="success" type="success"
plain plain
@ -75,7 +78,7 @@
type="text" type="text"
size="mini" size="mini"
v-if="data.taskStatus == 124" v-if="data.taskStatus == 124"
v-hasPermi="['scrap:auditing']" v-hasPermi="['submit:scrap']"
@click="handleSubmitScrap(data)" @click="handleSubmitScrap(data)"
>提交报废</el-button >提交报废</el-button
> >

2
sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
View File

@ -18,6 +18,7 @@
plain plain
size="mini" size="mini"
@click="handleBatchDisposition()" @click="handleBatchDisposition()"
v-hasPermi="['scrap:batch:disposition']"
>批量处置</el-button >批量处置</el-button
> >
<el-button <el-button
@ -69,6 +70,7 @@
type="text" type="text"
@click="handleDisposition(data)" @click="handleDisposition(data)"
v-if="data.disposition == 0" v-if="data.disposition == 0"
v-hasPermi="['scrap:disposition']"
> >
处置 处置
</el-button> </el-button>

1
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -243,6 +243,7 @@
scope.row.manageType != '1' scope.row.manageType != '1'
" "
@click="handleCode(scope.row)" @click="handleCode(scope.row)"
v-hasPermi="['coding:manage']"
>编码管理</el-button >编码管理</el-button
> >
<el-button <el-button

663
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -184,6 +184,7 @@
scope.row.taskStatus == '105' scope.row.taskStatus == '105'
" "
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['warehousing:auditing']"
>审核</el-button >审核</el-button
> >
<el-button <el-button
@ -526,359 +527,359 @@
</template> </template>
<script> <script>
import { getTypeList } from '@/api/store/warehousing' import { getTypeList } from '@/api/store/warehousing'
import { import {
getPutInList, getPutInList,
getPutinDetailsList, getPutinDetailsList,
changePutinStatus, changePutinStatus,
warehousingEntry, warehousingEntry,
} from '@/api/store/newBuy' } from '@/api/store/newBuy'
import vueEasyPrint from 'vue-easy-print' import vueEasyPrint from 'vue-easy-print'
export default { export default {
// name: "NewDevicesWarehousing", // name: "NewDevicesWarehousing",
// dicts: ['sys_normal_disable'], // dicts: ['sys_normal_disable'],
components: { vueEasyPrint }, components: { vueEasyPrint },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 总条数 // 总条数
dialogTotal: 0, dialogTotal: 0,
//搜索下拉数据 //搜索下拉数据
typesList: [], typesList: [],
modelList: [], modelList: [],
// 表格数据 // 表格数据
tableList: [], tableList: [],
detailTableList: [], detailTableList: [],
// 弹出层标题 // 弹出层标题
title: '', title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
openPrint: false, openPrint: false,
printData: {}, printData: {},
printTableData: [], printTableData: [],
showHandle: true, showHandle: true,
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined, status: undefined,
keyWord: '', keyWord: '',
typeId: '', typeId: '',
}, },
query: { query: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
dictName: undefined, dictName: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
dictName: [ dictName: [
{ {
required: true, required: true,
message: '字典名称不能为空', message: '字典名称不能为空',
trigger: 'blur', trigger: 'blur',
}, },
], ],
dictType: [ dictType: [
{ {
required: true, required: true,
message: '字典类型不能为空', message: '字典类型不能为空',
trigger: 'blur', trigger: 'blur',
}, },
], ],
}, },
}
},
created() {
this.getTypeList()
this.getList()
},
methods: {
getTypeList() {
getTypeList({ level: '3' }).then((response) => {
this.typesList = response.data
})
},
/** 查询字典类型列表 */
getList() {
this.loading = true
getPutInList(this.queryParams).then((response) => {
this.tableList = response.rows
this.total = response.total
this.loading = false
})
},
getDialogTable() {
this.loading = true
getPutinDetailsList(this.query).then((response) => {
this.detailTableList = response.rows
this.dialogTotal = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
dictId: undefined,
dictName: undefined,
dictType: undefined,
status: '0',
remark: undefined,
} }
this.resetForm('form')
}, },
/** 搜索按钮操作 */ created() {
handleQuery() { this.getTypeList()
this.queryParams.pageNum = 1
this.getList() this.getList()
}, },
/** 搜索按钮操作 */ methods: {
handleDialogQuery() { getTypeList() {
this.query.pageNum = 1 getTypeList({ level: '3' }).then((response) => {
this.getDialogTable() this.typesList = response.data
}, })
/** 重置按钮操作 */ },
resetQuery() { /** 查询字典类型列表 */
this.resetForm('queryForm') getList() {
this.handleQuery() this.loading = true
}, getPutInList(this.queryParams).then((response) => {
//是否可用勾选框 this.tableList = response.rows
selectable(row) { this.total = response.total
console.log(row) this.loading = false
if (row.status == '0') { })
if ( },
(row.manageType == '0' && row.maCode) ||
row.manageType == '1' getDialogTable() {
) { this.loading = true
return true getPutinDetailsList(this.query).then((response) => {
this.detailTableList = response.rows
this.dialogTotal = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
dictId: undefined,
dictName: undefined,
dictType: undefined,
status: '0',
remark: undefined,
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 搜索按钮操作 */
handleDialogQuery() {
this.query.pageNum = 1
this.getDialogTable()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
//是否可用勾选框
selectable(row) {
console.log(row)
if (row.status == '0') {
if (
(row.manageType == '0' && row.maCode) ||
row.manageType == '1'
) {
return true
} else {
return false
}
} else { } else {
return false return false
} }
} else { },
return false // 多选框选中数据
} handleSelectionChange(selection) {
}, this.ids = selection.map((item) => item)
// 多选框选中数据 this.single = selection.length != 1
handleSelectionChange(selection) { this.multiple = !selection.length
this.ids = selection.map((item) => item) },
this.single = selection.length != 1 /** 修改按钮操作 */
this.multiple = !selection.length handleUpdate(row) {
}, // this.reset();
/** 修改按钮操作 */ this.query.taskId = row.taskId
handleUpdate(row) { this.query.dictName = undefined
// this.reset(); this.getDialogTable()
this.query.taskId = row.taskId this.open = true
this.query.dictName = undefined this.showHandle = true
this.getDialogTable() this.title = '审核'
this.open = true },
this.showHandle = true
this.title = '审核'
},
//通过 //通过
pass(row) { pass(row) {
console.log(row) console.log(row)
console.log(this.query.taskId) console.log(this.query.taskId)
row.taskId = this.query.taskId row.taskId = this.query.taskId
let obj = { let obj = {
taskId: this.query.taskId, taskId: this.query.taskId,
maId: row.maId, maId: row.maId,
inputNum: row.checkNum, inputNum: row.checkNum,
maCode: row.maCode, maCode: row.maCode,
typeId: row.typeId, typeId: row.typeId,
} }
let param = { let param = {
taskId: this.query.taskId, taskId: this.query.taskId,
checkResult: '1', checkResult: '1',
inputRecordList: [obj], inputRecordList: [obj],
}
changePutinStatus(param).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess('审批成功')
this.getDialogTable()
this.getList()
} else {
this.$modal.msgSuccess('审批失败')
} }
}) changePutinStatus(param).then((response) => {
}, if (response.code == 200) {
passAll() { this.$modal.msgSuccess('审批成功')
console.log(this.query.taskId) this.getDialogTable()
console.log(this.ids) this.getList()
this.ids.forEach((item) => { } else {
item.taskId = this.query.taskId this.$modal.msgSuccess('审批失败')
item.typeId = item.typeId }
item.maId = item.maId })
item.inputNum = item.checkNum },
item.maCode = item.maCode passAll() {
}) console.log(this.query.taskId)
let param = { console.log(this.ids)
taskId: this.query.taskId, this.ids.forEach((item) => {
checkResult: '1', item.taskId = this.query.taskId
inputRecordList: this.ids, item.typeId = item.typeId
} item.maId = item.maId
changePutinStatus(param).then((response) => { item.inputNum = item.checkNum
if (response.code == 200) { item.maCode = item.maCode
this.$modal.msgSuccess('审批成功') })
this.getDialogTable() let param = {
this.getList() taskId: this.query.taskId,
} else { checkResult: '1',
this.$modal.msgSuccess('审批失败') inputRecordList: this.ids,
}
changePutinStatus(param).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess('审批成功')
this.getDialogTable()
this.getList()
} else {
this.$modal.msgSuccess('审批失败')
}
})
},
//拒绝
refused(row) {
console.log(row)
console.log(this.query.taskId)
row.taskId = this.query.taskId
let obj = {
taskId: this.query.taskId,
maId: row.maId,
maCode: row.maCode,
inputNum: row.checkNum,
typeId: row.typeId,
} }
})
},
//拒绝
refused(row) {
console.log(row)
console.log(this.query.taskId)
row.taskId = this.query.taskId
let obj = {
taskId: this.query.taskId,
maId: row.maId,
maCode: row.maCode,
inputNum: row.checkNum,
typeId: row.typeId,
}
let param = { let param = {
taskId: this.query.taskId, taskId: this.query.taskId,
checkResult: '2', checkResult: '2',
inputRecordList: [obj], inputRecordList: [obj],
} }
changePutinStatus(param).then((response) => { changePutinStatus(param).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('审批成功') this.$modal.msgSuccess('审批成功')
this.getDialogTable() this.getDialogTable()
this.getList() this.getList()
} else { } else {
this.$modal.msgSuccess('审批失败') this.$modal.msgSuccess('审批失败')
}
})
},
refusedAll() {
console.log(this.query.taskId)
console.log(this.ids)
this.ids.forEach((item) => {
item.taskId = this.query.taskId
item.typeId = item.typeId
item.maId = item.maId
item.inputNum = item.checkNum
item.maCode = item.maCode
})
let param = {
taskId: this.query.taskId,
checkResult: '2',
inputRecordList: this.ids,
} }
})
},
refusedAll() {
console.log(this.query.taskId)
console.log(this.ids)
this.ids.forEach((item) => {
item.taskId = this.query.taskId
item.typeId = item.typeId
item.maId = item.maId
item.inputNum = item.checkNum
item.maCode = item.maCode
})
let param = {
taskId: this.query.taskId,
checkResult: '2',
inputRecordList: this.ids,
}
changePutinStatus(param).then((response) => { changePutinStatus(param).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('审批成功') this.$modal.msgSuccess('审批成功')
this.getDialogTable() this.getDialogTable()
this.getList() this.getList()
} else { } else {
this.$modal.msgSuccess('审批失败') this.$modal.msgSuccess('审批失败')
} }
}) })
},
//查看操作
handleView(row) {
this.query.taskId = row.taskId
this.getDialogTable()
this.open = true
this.showHandle = false
this.title = '查看'
},
//获取入库单数据
getPrintTable(taskId) {
warehousingEntry({ taskId: taskId }).then((response) => {
this.printTableData = response.data
// this.dialogTotal = response.total;
})
},
//查看入库单
handlePrint(row) {
this.query.taskId = row.taskId
this.getPrintTable(row.taskId)
this.openPrint = true
this.title = '入库单'
},
//打印
print() {
this.$refs.remarksPrintRef.print()
},
/** 导出按钮操作 */
handleExport() {
this.download(
'material/purchaseCheckInfo/putInExport',
{
...this.queryParams,
},
`新购工机具入库_${new Date().getTime()}.xlsx`,
)
},
}, },
//查看操作 }
handleView(row) {
this.query.taskId = row.taskId
this.getDialogTable()
this.open = true
this.showHandle = false
this.title = '查看'
},
//获取入库单数据
getPrintTable(taskId) {
warehousingEntry({ taskId: taskId }).then((response) => {
this.printTableData = response.data
// this.dialogTotal = response.total;
})
},
//查看入库单
handlePrint(row) {
this.query.taskId = row.taskId
this.getPrintTable(row.taskId)
this.openPrint = true
this.title = '入库单'
},
//打印
print() {
this.$refs.remarksPrintRef.print()
},
/** 导出按钮操作 */
handleExport() {
this.download(
'material/purchaseCheckInfo/putInExport',
{
...this.queryParams,
},
`新购工机具入库_${new Date().getTime()}.xlsx`,
)
},
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.print { .print {
width: 90%; width: 90%;
padding-left: 5%; padding-left: 5%;
padding-right: 1%; padding-right: 1%;
.title { .title {
text-align: center; text-align: center;
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;
} }
.info { .info {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.item { .item {
width: 50%; width: 50%;
flex-shrink: 0; flex-shrink: 0;
margin-bottom: 5px; margin-bottom: 5px;
font-size: 14px; font-size: 14px;
}
}
.fillIn {
margin-top: 15px;
display: flex;
justify-content: space-between;
} }
} }
.fillIn { ::v-deep.el-table .fixed-width .el-button--mini {
margin-top: 15px; width: 60px !important;
display: flex; margin-bottom: 10px;
justify-content: space-between;
} }
}
::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important;
margin-bottom: 10px;
}
</style> </style>

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

@ -181,6 +181,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == '入库进行中'" v-if="scope.row.taskStatus == '入库进行中'"
v-hasPermi="['repairTest:auditing']"
>审核</el-button >审核</el-button
> >
<!-- <el-button--> <!-- <el-button-->