优化页面样式，首页跳转bug等问题
This commit is contained in:
BianLzhaoMin
parent
f4ac334d17
commit
c4c2e6953d
|
|
@ -11,7 +11,6 @@
|
|||
>
|
||||
<!-- 外层弹框内容 -->
|
||||
<slot name="outerContent"></slot>
|
||||
|
||||
<!-- 内层对话框 -->
|
||||
<el-dialog
|
||||
:title="dialogConfig.innerTitle"
|
||||
|
|
@ -29,7 +28,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
export default {
|
||||
props: {
|
||||
/* 配置项 */
|
||||
dialogConfig: {
|
||||
|
|
@ -38,6 +37,10 @@
|
|||
return {}
|
||||
},
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '500px',
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
/* 右上角关闭外层 */
|
||||
|
|
@ -51,5 +54,5 @@
|
|||
this.$emit('closeDialogInner', false)
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div :class="{'hidden':hidden}" class="pagination-container">
|
||||
<div :class="{ hidden: hidden }" class="pagination-container">
|
||||
<el-pagination
|
||||
:background="background"
|
||||
:current-page.sync="currentPage"
|
||||
|
|
@ -23,47 +23,46 @@ export default {
|
|||
props: {
|
||||
total: {
|
||||
required: true,
|
||||
type: Number
|
||||
type: Number,
|
||||
},
|
||||
page: {
|
||||
type: Number,
|
||||
default: 1
|
||||
default: 1,
|
||||
},
|
||||
limit: {
|
||||
type: Number,
|
||||
default: 20
|
||||
default: 20,
|
||||
},
|
||||
pageSizes: {
|
||||
type: Array,
|
||||
default() {
|
||||
return [10, 20, 30, 50]
|
||||
}
|
||||
},
|
||||
},
|
||||
// 移动端页码按钮的数量端默认值5
|
||||
pagerCount: {
|
||||
type: Number,
|
||||
default: document.body.clientWidth < 992 ? 5 : 7
|
||||
default: document.body.clientWidth < 992 ? 5 : 7,
|
||||
},
|
||||
layout: {
|
||||
type: String,
|
||||
default: 'total, sizes, prev, pager, next, jumper'
|
||||
default: 'total, sizes, prev, pager, next, jumper',
|
||||
},
|
||||
background: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
default: true,
|
||||
},
|
||||
autoScroll: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
default: true,
|
||||
},
|
||||
hidden: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
};
|
||||
return {}
|
||||
},
|
||||
computed: {
|
||||
currentPage: {
|
||||
|
|
@ -72,7 +71,7 @@ export default {
|
|||
},
|
||||
set(val) {
|
||||
this.$emit('update:page', val)
|
||||
}
|
||||
},
|
||||
},
|
||||
pageSize: {
|
||||
get() {
|
||||
|
|
@ -80,8 +79,8 @@ export default {
|
|||
},
|
||||
set(val) {
|
||||
this.$emit('update:limit', val)
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
handleSizeChange(val) {
|
||||
|
|
@ -98,8 +97,8 @@ export default {
|
|||
if (this.autoScroll) {
|
||||
scrollTo(0, 800)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-if="config.pageShow"
|
||||
v-show="config.pageShow"
|
||||
:total="total"
|
||||
:page.sync="pageParams.pageNum"
|
||||
:limit.sync="pageParams.pageSize"
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@
|
|||
v-loading="loading"
|
||||
:data="leaseAuditList"
|
||||
@selection-change="handleSelectionChange"
|
||||
border
|
||||
>
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column
|
||||
|
|
@ -202,9 +203,10 @@
|
|||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="250" align="center">
|
||||
<el-table-column label="操作" width="160" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
@click="handleView(scope.row)"
|
||||
v-hasPermi="['picking:auditing:view']"
|
||||
|
|
@ -212,7 +214,7 @@
|
|||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
@click="handleExamine(scope.row)"
|
||||
v-hasPermi="['picking:auditing:fgs']"
|
||||
v-if="
|
||||
|
|
@ -223,7 +225,7 @@
|
|||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
@click="handleExamine(scope.row)"
|
||||
v-hasPermi="['picking:auditing:sgb']"
|
||||
v-if="
|
||||
|
|
@ -235,9 +237,9 @@
|
|||
"
|
||||
>审批</el-button
|
||||
>
|
||||
<el-button
|
||||
<!-- <el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
@click="handleExamine(scope.row)"
|
||||
v-hasPermi="['receive:examine:ajb']"
|
||||
v-if="
|
||||
|
|
@ -247,11 +249,11 @@
|
|||
scope.row.leaseApplyInfoList[0].status == '6' ||
|
||||
scope.row.leaseApplyInfoList[0].status == '8')
|
||||
"
|
||||
>审批</el-button
|
||||
>
|
||||
>安监部审批</el-button
|
||||
> -->
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
@click="handleExamine(scope.row, 'jjfgs')"
|
||||
v-hasPermi="['picking:auditing:jjnb']"
|
||||
v-if="
|
||||
|
|
@ -266,7 +268,7 @@
|
|||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
@click="handleExamine(scope.row, 'sbfgs')"
|
||||
v-hasPermi="['picking:auditing:tsnb']"
|
||||
v-if="
|
||||
|
|
@ -282,7 +284,7 @@
|
|||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="info"
|
||||
type="text"
|
||||
@click="openLld(scope.row)"
|
||||
v-hasPermi="['picking:auditing:list']"
|
||||
>领料单</el-button
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
></right-toolbar>
|
||||
</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
|
||||
align="center"
|
||||
|
|
@ -152,13 +152,10 @@
|
|||
:show-overflow-tooltip="true"
|
||||
></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<el-table-column label="操作" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
@click="handleView(scope.row)"
|
||||
v-hasPermi="['picking:outbound:view']"
|
||||
|
|
@ -166,7 +163,7 @@
|
|||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
v-if="scope.row.taskStatus != 35"
|
||||
@click="handleOut(scope.row)"
|
||||
v-hasPermi="['picking:outbound:out']"
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@
|
|||
v-loading="loading"
|
||||
:data="agreementList"
|
||||
@selection-change="handleSelectionChange"
|
||||
border
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column
|
||||
|
|
@ -229,16 +230,11 @@
|
|||
prop="remark"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
width="200"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<el-table-column label="操作" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['picking:protocol:edit']"
|
||||
|
|
@ -246,7 +242,7 @@
|
|||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['picking:protocol:del']"
|
||||
|
|
|
|||
|
|
@ -561,7 +561,7 @@ export default {
|
|||
}
|
||||
</script>
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss">
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
.login {
|
||||
//display: flex;
|
||||
//justify-content: center;
|
||||
|
|
|
|||
|
|
@ -1020,7 +1020,43 @@ export default {
|
|||
console.log(this.checkResultOne)
|
||||
},
|
||||
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.dialogMultiple = !selection.length
|
||||
console.log(this.checkResultOne)
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -81,7 +81,8 @@ export const dialogConfig = {
|
|||
{ t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
|
||||
{ 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_slot: 't_damage' },
|
||||
{ t_width: '', t_props: '', t_label: '报废图片', t_slot: 't_img' },
|
||||
{ t_width: '', t_props: 'remark', t_label: '备注' },
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
@getTableSelectionChange="getTableSelectionList"
|
||||
>
|
||||
<template slot="export" slot-scope="{ pageParams }">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-row class="mb8">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
|
|
@ -111,6 +111,15 @@
|
|||
>驳回</el-tag
|
||||
>
|
||||
</template>
|
||||
|
||||
<!-- 损坏原因 -->
|
||||
<template slot-scope="{ data }" slot="t_damage">
|
||||
{{ data.scrapType == 1 ? '人为' : '自然' }}
|
||||
</template>
|
||||
<!-- 报废图片 -->
|
||||
<template slot-scope="{ data }" slot="t_img">
|
||||
<ScrapImg />
|
||||
</template>
|
||||
</TableModel>
|
||||
<el-row
|
||||
class="dialog-common-btn"
|
||||
|
|
@ -163,6 +172,7 @@
|
|||
import TableModel from '@/components/TableModel'
|
||||
import DialogModel from '@/components/DialogModel'
|
||||
import ScrapSource from '../../component/scrapSource.vue'
|
||||
import ScrapImg from '../../component/scrapImg.vue'
|
||||
import {
|
||||
getForecastWasteListApi,
|
||||
getDialogListApi,
|
||||
|
|
@ -175,6 +185,7 @@ export default {
|
|||
TableModel,
|
||||
DialogModel,
|
||||
ScrapSource,
|
||||
ScrapImg,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
"
|
||||
>
|
||||
<template slot="export" slot-scope="{ pageParams }">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-row class="mb8">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
|
|
@ -145,19 +145,19 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import TableModel from '@/components/TableModel'
|
||||
import DialogModel from '@/components/DialogModel'
|
||||
import SelDepart from '../../component/selDepart.vue'
|
||||
import ScrapSource from '../../component/scrapSource.vue'
|
||||
import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面
|
||||
import AuditingDetails from '../../component/auditingDetails.vue'
|
||||
import {
|
||||
import TableModel from '@/components/TableModel'
|
||||
import DialogModel from '@/components/DialogModel'
|
||||
import SelDepart from '../../component/selDepart.vue'
|
||||
import ScrapSource from '../../component/scrapSource.vue'
|
||||
import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面
|
||||
import AuditingDetails from '../../component/auditingDetails.vue'
|
||||
import {
|
||||
getPreScrapListApi,
|
||||
getDialogListApi,
|
||||
submitScrapApi,
|
||||
} from '@/api/scrap/forecastWaste.js'
|
||||
import { config, dialogConfig, getSelList, getTypeListSel } from './config'
|
||||
export default {
|
||||
} from '@/api/scrap/forecastWaste.js'
|
||||
import { config, dialogConfig, getSelList, getTypeListSel } from './config'
|
||||
export default {
|
||||
name: 'scrapListing',
|
||||
components: {
|
||||
TableModel,
|
||||
|
|
@ -235,8 +235,8 @@
|
|||
this.dialogConfig.outerVisible = val
|
||||
this.$refs.listingTbRef.getList()
|
||||
}
|
||||
this.submitScrapParams.deptIds =
|
||||
this.submitScrapParams.taskIdList = []
|
||||
this.submitScrapParams.deptIds = this.submitScrapParams.taskIdList =
|
||||
[]
|
||||
},
|
||||
/* 批量提交报废按钮 */
|
||||
handelSubmitScrap() {
|
||||
|
|
@ -281,5 +281,5 @@
|
|||
console.log('数据导出', data)
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
ref="tbRef"
|
||||
>
|
||||
<template slot="export" slot-scope="{ pageParams }">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-row class="mb8">
|
||||
<el-button
|
||||
plain
|
||||
size="mini"
|
||||
|
|
@ -148,20 +148,20 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
import {
|
||||
getDispositionListApi,
|
||||
submitDispositionApi,
|
||||
getDialogListApi,
|
||||
} from '@/api/scrap/forecastWaste.js'
|
||||
import TableModel from '@/components/TableModel'
|
||||
import DialogModel from '@/components/DialogModel'
|
||||
import ScrapSource from '../../component/scrapSource.vue'
|
||||
import { config, dialogConfig, getSelList } from './config.js'
|
||||
export default {
|
||||
} from '@/api/scrap/forecastWaste.js'
|
||||
import TableModel from '@/components/TableModel'
|
||||
import DialogModel from '@/components/DialogModel'
|
||||
import ScrapSource from '../../component/scrapSource.vue'
|
||||
import { config, dialogConfig, getSelList } from './config.js'
|
||||
export default {
|
||||
components: {
|
||||
TableModel,
|
||||
DialogModel,
|
||||
ScrapSource
|
||||
ScrapSource,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -198,8 +198,7 @@
|
|||
methods: {
|
||||
/* 按钮操作 */
|
||||
handlePreview(row) {
|
||||
this.dispositionParams.taskId = this.sendParams.taskId =
|
||||
row.taskId
|
||||
this.dispositionParams.taskId = this.sendParams.taskId = row.taskId
|
||||
this.dialogConfig.outerTitle = '查看'
|
||||
this.dialogConfig.outerWidth = '70%'
|
||||
this.dialogConfig.outerVisible = true
|
||||
|
|
@ -319,5 +318,5 @@
|
|||
console.log('数据导出', data)
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<!-- 报废审核 -->
|
||||
<TableModel :config="config" :sendApi="getScrapListApi" ref="tbRef">
|
||||
<template slot="export" slot-scope="{ pageParams }">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-row class="mb8">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="app-container" id="devicesWarehousing">
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
ref="queryForm"
|
||||
|
|
@ -1483,7 +1483,7 @@ export default {
|
|||
* -----------------------------------------------------------------------------------------------------------------------------
|
||||
*/
|
||||
/* 查看详情 */
|
||||
async queryDetails(row) {
|
||||
queryDetails(row) {
|
||||
this.sendParams.kindName = row.kindName
|
||||
this.dialogConfig.outerVisible = true
|
||||
},
|
||||
|
|
|
|||
|
|
@ -43,11 +43,11 @@ module.exports = {
|
|||
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
|
||||
// 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.74:8080`,//旭/
|
||||
// target: `http://10.40.92.148:28080`, //帅
|
||||
// target: `http://10.40.92.5:28080`, //福
|
||||
target: `http://10.40.92.253:28080`, //福
|
||||
|
||||
//******** 注意事项 ********* */
|
||||
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
|
||||
|
|
|
|||
Loading…
Reference in New Issue