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

优化页面样式，首页跳转bug等问题

This commit is contained in:
BianLzhaoMin 2024-06-12 16:16:08 +08:00
parent f4ac334d17
commit c4c2e6953d
16 changed files with 552 additions and 446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-ui/src/components/DialogModel/index.vue
View File

@ -11,7 +11,6 @@
> >
<!-- 外层弹框内容 --> <!-- 外层弹框内容 -->
<slot name="outerContent"></slot> <slot name="outerContent"></slot>
<!-- 内层对话框 --> <!-- 内层对话框 -->
<el-dialog <el-dialog
:title="dialogConfig.innerTitle" :title="dialogConfig.innerTitle"
@ -38,6 +37,10 @@
return {} return {}
}, },
}, },
height: {
type: String,
default: '500px',
},
}, },
methods: { methods: {
/* 右上角关闭外层 */ /* 右上角关闭外层 */

35
sgzb-ui/src/components/Pagination/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div :class="{'hidden':hidden}" class="pagination-container"> <div :class="{ hidden: hidden }" class="pagination-container">
<el-pagination <el-pagination
:background="background" :background="background"
:current-page.sync="currentPage" :current-page.sync="currentPage"
@ -23,47 +23,46 @@ export default {
props: { props: {
total: { total: {
required: true, required: true,
type: Number type: Number,
}, },
page: { page: {
type: Number, type: Number,
default: 1 default: 1,
}, },
limit: { limit: {
type: Number, type: Number,
default: 20 default: 20,
}, },
pageSizes: { pageSizes: {
type: Array, type: Array,
default() { default() {
return [10, 20, 30, 50] return [10, 20, 30, 50]
} },
}, },
// 移动端页码按钮的数量端默认值5 // 移动端页码按钮的数量端默认值5
pagerCount: { pagerCount: {
type: Number, type: Number,
default: document.body.clientWidth < 992 ? 5 : 7 default: document.body.clientWidth < 992 ? 5 : 7,
}, },
layout: { layout: {
type: String, type: String,
default: 'total, sizes, prev, pager, next, jumper' default: 'total, sizes, prev, pager, next, jumper',
}, },
background: { background: {
type: Boolean, type: Boolean,
default: true default: true,
}, },
autoScroll: { autoScroll: {
type: Boolean, type: Boolean,
default: true default: true,
}, },
hidden: { hidden: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
data() { data() {
return { return {}
};
}, },
computed: { computed: {
currentPage: { currentPage: {
@ -72,7 +71,7 @@ export default {
}, },
set(val) { set(val) {
this.$emit('update:page', val) this.$emit('update:page', val)
} },
}, },
pageSize: { pageSize: {
get() { get() {
@ -80,8 +79,8 @@ export default {
}, },
set(val) { set(val) {
this.$emit('update:limit', val) this.$emit('update:limit', val)
} },
} },
}, },
methods: { methods: {
handleSizeChange(val) { handleSizeChange(val) {
@ -98,8 +97,8 @@ export default {
if (this.autoScroll) { if (this.autoScroll) {
scrollTo(0, 800) scrollTo(0, 800)
} }
} },
} },
} }
</script> </script>

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

@ -102,7 +102,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-if="config.pageShow" v-show="config.pageShow"
:total="total" :total="total"
:page.sync="pageParams.pageNum" :page.sync="pageParams.pageNum"
:limit.sync="pageParams.pageSize" :limit.sync="pageParams.pageSize"

22
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -126,6 +126,7 @@
v-loading="loading" v-loading="loading"
:data="leaseAuditList" :data="leaseAuditList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
border
> >
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column <el-table-column
@ -202,9 +203,10 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="250" align="center"> <el-table-column label="操作" width="160" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text"
size="mini" size="mini"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['picking:auditing:view']" v-hasPermi="['picking:auditing:view']"
@ -212,7 +214,7 @@
> >
<el-button <el-button
size="mini" size="mini"
type="primary" type="text"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['picking:auditing:fgs']" v-hasPermi="['picking:auditing:fgs']"
v-if=" v-if="
@ -223,7 +225,7 @@
> >
<el-button <el-button
size="mini" size="mini"
type="primary" type="text"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['picking:auditing:sgb']" v-hasPermi="['picking:auditing:sgb']"
v-if=" v-if="
@ -235,9 +237,9 @@
" "
>审批</el-button >审批</el-button
> >
<el-button <!-- <el-button
size="mini" size="mini"
type="primary" type="text"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
v-if=" v-if="
@ -247,11 +249,11 @@
scope.row.leaseApplyInfoList[0].status == '6' || scope.row.leaseApplyInfoList[0].status == '6' ||
scope.row.leaseApplyInfoList[0].status == '8') scope.row.leaseApplyInfoList[0].status == '8')
" "
>审批</el-button >安监部审批</el-button
> > -->
<el-button <el-button
size="mini" size="mini"
type="primary" type="text"
@click="handleExamine(scope.row, 'jjfgs')" @click="handleExamine(scope.row, 'jjfgs')"
v-hasPermi="['picking:auditing:jjnb']" v-hasPermi="['picking:auditing:jjnb']"
v-if=" v-if="
@ -266,7 +268,7 @@
> >
<el-button <el-button
size="mini" size="mini"
type="primary" type="text"
@click="handleExamine(scope.row, 'sbfgs')" @click="handleExamine(scope.row, 'sbfgs')"
v-hasPermi="['picking:auditing:tsnb']" v-hasPermi="['picking:auditing:tsnb']"
v-if=" v-if="
@ -282,7 +284,7 @@
> >
<el-button <el-button
size="mini" size="mini"
type="info" type="text"
@click="openLld(scope.row)" @click="openLld(scope.row)"
v-hasPermi="['picking:auditing:list']" v-hasPermi="['picking:auditing:list']"
>领料单</el-button >领料单</el-button

11
sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -99,7 +99,7 @@
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="leaseList"> <el-table v-loading="loading" :data="leaseList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column <el-table-column
align="center" align="center"
@ -152,13 +152,10 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column label="操作" align="center">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text"
size="mini" size="mini"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['picking:outbound:view']" v-hasPermi="['picking:outbound:view']"
@ -166,7 +163,7 @@
> >
<el-button <el-button
size="mini" size="mini"
type="primary" type="text"
v-if="scope.row.taskStatus != 35" v-if="scope.row.taskStatus != 35"
@click="handleOut(scope.row)" @click="handleOut(scope.row)"
v-hasPermi="['picking:outbound:out']" v-hasPermi="['picking:outbound:out']"

12
sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
View File

@ -132,6 +132,7 @@
v-loading="loading" v-loading="loading"
:data="agreementList" :data="agreementList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
border
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
@ -229,16 +230,11 @@
prop="remark" prop="remark"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column label="操作" align="center" width="120">
label="操作"
align="center"
width="200"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="primary" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['picking:protocol:edit']" v-hasPermi="['picking:protocol:edit']"
@ -246,7 +242,7 @@
> >
<el-button <el-button
size="mini" size="mini"
type="danger" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['picking:protocol:del']" v-hasPermi="['picking:protocol:del']"

2
sgzb-ui/src/views/newLogin.vue
View File

@ -561,7 +561,7 @@ export default {
} }
</script> </script>
<style rel="stylesheet/scss" lang="scss"> <style rel="stylesheet/scss" lang="scss" scoped>
.login { .login {
//display: flex; //display: flex;
//justify-content: center; //justify-content: center;

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

@ -1020,7 +1020,43 @@ export default {
console.log(this.checkResultOne) console.log(this.checkResultOne)
}, },
handleDialogSelectionChange(selection) { handleDialogSelectionChange(selection) {
this.dialogIds = selection.map((item) => item) // console.log(selection, '列表选择的数据--')
// let params = {
// repairId: this.repairId,
// pageNum: 1,
// pageSize: 10,
// }
// getRepairRecord(params)
// .then((res) => {
// this.repairRecordList = res.rows
// this.repairRecordTotal = res.total
// this.openRepairRecord = true
// this.title = '维修记录'
// })
// .catch(() => {})
this.dialogIds = selection.map((item) => {
console.log(item.repairId, 'repairId------')
getRepairRecord({
repairId: item.repairId,
pageNum: 1,
pageSize: 10,
}).then((res) => {
const scrapDetails = res.rows
scrapDetails.forEach((e) => {
if (e.scrapNum >= 1) {
item.fileIds = e.fileIds
item.scrapReason = e.scrapReason
item.scrapType = e.scrapType
}
})
})
return item
})
console.log(this.dialogIds, '处理后的数据--')
this.dialogSingle = selection.length != 1 this.dialogSingle = selection.length != 1
this.dialogMultiple = !selection.length this.dialogMultiple = !selection.length
console.log(this.checkResultOne) console.log(this.checkResultOne)

62
sgzb-ui/src/views/scrapManage/component/scrapImg.vue Normal file
View File

@ -0,0 +1,62 @@
<template>
<div>
<!-- <a
href="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
target="_blank"
v-for="(item, index) in scrapImgList"
:key="index"
>查看</a
> -->
<ImagePreview
v-for="(item, index) in scrapImgList"
:key="index"
src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
:width="`20px`"
:height="`20px`"
class="img-box"
/>
</div>
</template>
<script>
export default {
props: {
scrapImg: {
type: String,
default: () => null,
},
},
data() {
return {
scrapImgList: [
{ imgUrl: '123' },
{ imgUrl: '123' },
{ imgUrl: '123' },
],
}
},
created() {
if (this.scrapImg) {
this.scrapImgList = this.scrapImg.split(',')
}
},
}
</script>
<style scoped>
a {
margin-right: 8px;
font-size: 13px;
color: #1890ff;
}
a:last-child {
margin: 0;
}
.img-box {
margin-right: 8px;
}
.img-box:last-child {
margin: 0;
}
</style>

3
sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
View File

@ -81,7 +81,8 @@ export const dialogConfig = {
{ t_width: '', t_props: 'scrapNum', t_label: '设备数量' }, { t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
{ t_width: '', t_props: 'status', t_label: '审批状态', t_slot: 't_type' }, { t_width: '', t_props: 'status', t_label: '审批状态', t_slot: 't_type' },
{ t_width: '', t_props: '', t_label: '报废原因' }, { t_width: '', t_props: '', t_label: '报废原因' },
{ t_width: '', t_props: '', t_label: '报废图片' }, { t_width: '', t_props: '', t_label: '损坏原因', t_slot: 't_damage' },
{ t_width: '', t_props: '', t_label: '报废图片', t_slot: 't_img' },
{ t_width: '', t_props: 'remark', t_label: '备注' }, { t_width: '', t_props: 'remark', t_label: '备注' },
], ],

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

@ -8,7 +8,7 @@
@getTableSelectionChange="getTableSelectionList" @getTableSelectionChange="getTableSelectionList"
> >
<template slot="export" slot-scope="{ pageParams }"> <template slot="export" slot-scope="{ pageParams }">
<el-row :gutter="10" class="mb8"> <el-row class="mb8">
<el-button <el-button
type="success" type="success"
plain plain
@ -111,6 +111,15 @@
>驳回</el-tag >驳回</el-tag
> >
</template> </template>
<!-- 损坏原因 -->
<template slot-scope="{ data }" slot="t_damage">
{{ data.scrapType == 1 ? '人为' : '自然' }}
</template>
<!-- 报废图片 -->
<template slot-scope="{ data }" slot="t_img">
<ScrapImg />
</template>
</TableModel> </TableModel>
<el-row <el-row
class="dialog-common-btn" class="dialog-common-btn"
@ -163,6 +172,7 @@
import TableModel from '@/components/TableModel' import TableModel from '@/components/TableModel'
import DialogModel from '@/components/DialogModel' import DialogModel from '@/components/DialogModel'
import ScrapSource from '../../component/scrapSource.vue' import ScrapSource from '../../component/scrapSource.vue'
import ScrapImg from '../../component/scrapImg.vue'
import { import {
getForecastWasteListApi, getForecastWasteListApi,
getDialogListApi, getDialogListApi,
@ -175,6 +185,7 @@ export default {
TableModel, TableModel,
DialogModel, DialogModel,
ScrapSource, ScrapSource,
ScrapImg,
}, },
data() { data() {
return { return {

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

@ -14,7 +14,7 @@
" "
> >
<template slot="export" slot-scope="{ pageParams }"> <template slot="export" slot-scope="{ pageParams }">
<el-row :gutter="10" class="mb8"> <el-row class="mb8">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -235,8 +235,8 @@
this.dialogConfig.outerVisible = val this.dialogConfig.outerVisible = val
this.$refs.listingTbRef.getList() this.$refs.listingTbRef.getList()
} }
this.submitScrapParams.deptIds = this.submitScrapParams.deptIds = this.submitScrapParams.taskIdList =
this.submitScrapParams.taskIdList = [] []
}, },
/* 批量提交报废按钮 */ /* 批量提交报废按钮 */
handelSubmitScrap() { handelSubmitScrap() {

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

@ -13,7 +13,7 @@
ref="tbRef" ref="tbRef"
> >
<template slot="export" slot-scope="{ pageParams }"> <template slot="export" slot-scope="{ pageParams }">
<el-row :gutter="10" class="mb8"> <el-row class="mb8">
<el-button <el-button
plain plain
size="mini" size="mini"
@ -161,7 +161,7 @@
components: { components: {
TableModel, TableModel,
DialogModel, DialogModel,
ScrapSource ScrapSource,
}, },
data() { data() {
return { return {
@ -198,8 +198,7 @@
methods: { methods: {
/* 按钮操作 */ /* 按钮操作 */
handlePreview(row) { handlePreview(row) {
this.dispositionParams.taskId = this.sendParams.taskId = this.dispositionParams.taskId = this.sendParams.taskId = row.taskId
row.taskId
this.dialogConfig.outerTitle = '查看' this.dialogConfig.outerTitle = '查看'
this.dialogConfig.outerWidth = '70%' this.dialogConfig.outerWidth = '70%'
this.dialogConfig.outerVisible = true this.dialogConfig.outerVisible = true

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

@ -3,7 +3,7 @@
<!-- 报废审核 --> <!-- 报废审核 -->
<TableModel :config="config" :sendApi="getScrapListApi" ref="tbRef"> <TableModel :config="config" :sendApi="getScrapListApi" ref="tbRef">
<template slot="export" slot-scope="{ pageParams }"> <template slot="export" slot-scope="{ pageParams }">
<el-row :gutter="10" class="mb8"> <el-row class="mb8">
<el-button <el-button
type="success" type="success"
plain plain

4
sgzb-ui/src/views/warehouseManage/warehousing/Inventory/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="app-container" id="devicesWarehousing"> <div class="app-container">
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
@ -1483,7 +1483,7 @@ export default {
* ----------------------------------------------------------------------------------------------------------------------------- * -----------------------------------------------------------------------------------------------------------------------------
*/ */
/* 查看详情 */ /* 查看详情 */
async queryDetails(row) { queryDetails(row) {
this.sendParams.kindName = row.kindName this.sendParams.kindName = row.kindName
this.dialogConfig.outerVisible = true this.dialogConfig.outerVisible = true
}, },

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

@ -43,11 +43,11 @@ 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://10.40.92.50:28080`, //超 // target: `http://10.40.92.50:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.148:28080`, //帅 // target: `http://10.40.92.148:28080`, //帅
// target: `http://10.40.92.5:28080`, //福 target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;