This commit is contained in:
parent
b02e96b49b
commit
6bc7d0fc3b
|
|
@ -184,11 +184,11 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="pagination-wrapper">
|
||||
<!-- <div class="pagination-wrapper"> -->
|
||||
<!-- 分页 -->
|
||||
<pagination :total="total" @pagination="handlePageChange" :page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize" />
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
|
||||
</el-card>
|
||||
</el-form>
|
||||
|
|
|
|||
|
|
@ -82,10 +82,10 @@
|
|||
</div>
|
||||
|
||||
<!-- 分页 -->
|
||||
<div class="pagination-wrapper">
|
||||
<!-- <div class="pagination-wrapper"> -->
|
||||
<pagination :total="total" @pagination="handlePageChange" :page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize" />
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
</el-card>
|
||||
</el-form>
|
||||
</div>
|
||||
|
|
@ -321,7 +321,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -309,14 +309,14 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="pagination-wrapper">
|
||||
<!-- <div class="pagination-wrapper"> -->
|
||||
<pagination
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
/>
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
</el-card>
|
||||
<EquipmentEntryEditDialog
|
||||
:is-visible.sync="isEditVisible"
|
||||
|
|
@ -532,7 +532,7 @@ export default {
|
|||
// 返回上一页
|
||||
goBack() {
|
||||
// this.$router.go(-1)
|
||||
this.$router.push({ path: '/equipment/equipmentEntry/equipment-entry-apply' })
|
||||
this.$router.push({ path: '/equipment/equipment-entry-apply' })
|
||||
},
|
||||
async approval(row, status) {
|
||||
equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then(res => {
|
||||
|
|
@ -626,7 +626,7 @@ export default {
|
|||
message: '提交成功'
|
||||
})
|
||||
// this.goBack()
|
||||
this.$router.push({ path: '/equipment/equipmentEntry/equipment-entry-apply' })
|
||||
this.$router.push({ path: '/equipment/equipment-entry-apply' })
|
||||
}
|
||||
}).finally(() => {
|
||||
this.isSubmit = false
|
||||
|
|
@ -817,7 +817,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<div class="pagination-wrapper">
|
||||
<!-- <div class="pagination-wrapper"> -->
|
||||
<!-- 分页 -->
|
||||
<pagination
|
||||
:total="total"
|
||||
|
|
@ -270,7 +270,7 @@
|
|||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
/>
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
</el-card>
|
||||
<!-- 弹框 -->
|
||||
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
|
||||
|
|
@ -620,7 +620,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ export default {
|
|||
methods: {
|
||||
goBack() {
|
||||
// this.$router.go(-1)
|
||||
this.$router.push({ path: '/equipment/equipmentEntry/equipment-entry-approval' })
|
||||
this.$router.push({ path: '/equipment/equipment-entry-approval' })
|
||||
},
|
||||
/**
|
||||
* 获取装备申请列表
|
||||
|
|
|
|||
|
|
@ -145,14 +145,14 @@
|
|||
</el-table-column>-->
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="pagination-wrapper">
|
||||
<!-- <div class="pagination-wrapper"> -->
|
||||
<pagination
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getRetireList"
|
||||
/>
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
</el-card>
|
||||
</el-row>
|
||||
</div>
|
||||
|
|
@ -343,7 +343,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
<el-col :span="4">
|
||||
<span style="font-size: 20px; font-weight: 800">退役审核列表</span>
|
||||
</el-col>
|
||||
<el-table :data="tableData" style="width: 100%" border stripe fit height="546">
|
||||
<el-table :data="tableData" style="width: 100%" border stripe fit height="545">
|
||||
<el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
|
||||
<el-table-column align="center" show-overflow-tooltip prop="code" label="退役单号" />
|
||||
<el-table-column align="center" show-overflow-tooltip prop="equipmentNum" label="退役装备数" />
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -349,7 +349,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -937,7 +937,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1169,7 +1169,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -806,7 +806,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2309,7 +2309,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -954,7 +954,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,14 +53,14 @@
|
|||
</el-table>
|
||||
</div>
|
||||
|
||||
<div class="pagination-wrapper">
|
||||
<pagination
|
||||
:total="total"
|
||||
@pagination="getLeaseListData"
|
||||
:page.sync="searchParams.pageNum"
|
||||
:limit.sync="searchParams.pageSize"
|
||||
/>
|
||||
</div>
|
||||
<!-- <div class="pagination-wrapper">
|
||||
</div> -->
|
||||
</el-card>
|
||||
<!-- 新增修改对话框 -->
|
||||
<el-dialog
|
||||
|
|
@ -506,7 +506,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,14 +112,14 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="pagination-wrapper">
|
||||
<!-- <div class="pagination-wrapper"> -->
|
||||
<pagination
|
||||
:total="total"
|
||||
@pagination="getContractListData"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
/>
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
</el-card>
|
||||
<!-- 新增和修改弹框 -->
|
||||
<el-dialog
|
||||
|
|
@ -500,7 +500,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2833,10 +2833,10 @@ export default {
|
|||
this.$router.push({ path: '/business/equipmentRepair/repairList' })
|
||||
} else if (nodeId === 'equipmentEntry') {
|
||||
// 装备录入
|
||||
this.$router.push({ path: '/equipment/equipmentEntry/equipment-entry-apply' })
|
||||
this.$router.push({ path: '/equipment/equipment-entry-apply' })
|
||||
} else if (nodeId === 'entryAudit') {
|
||||
// 装备录入审核
|
||||
this.$router.push({ path: '/equipment/equipmentEntry/equipment-entry-approval' })
|
||||
this.$router.push({ path: '/equipment/equipment-entry-approval' })
|
||||
} else if (nodeId === 'equipmentOffShelf') {
|
||||
this.$router.push({ path: '/equipment/equipment-ledger' })
|
||||
} else if (nodeId === 'selfUseOut') {
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -525,7 +525,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1214,7 +1214,7 @@ export default {
|
|||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1048,11 +1048,11 @@ export default {
|
|||
flex-shrink: 0;
|
||||
padding-top: 6px;
|
||||
margin-top: auto;
|
||||
text-align: right;
|
||||
text-align: right;equipment-retire
|
||||
|
||||
::v-deep .pagination-container {
|
||||
padding: 0px 20px !important;
|
||||
margin-bottom: 30px;
|
||||
/* margin-bottom: 30px; */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue