|
|
@@ -1,15 +1,15 @@
|
|
|
<template>
|
|
|
- <el-dialog
|
|
|
- :close-on-click-modal="false"
|
|
|
- :close-on-press-escape="false"
|
|
|
- :title="title"
|
|
|
+ <el-dialog
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :close-on-press-escape="false"
|
|
|
+ :title="title"
|
|
|
:append-to-body="true"
|
|
|
- :visible.sync="isVisible"
|
|
|
- width="960px"
|
|
|
+ :visible.sync="isVisible"
|
|
|
+ width="960px"
|
|
|
top="50px"
|
|
|
>
|
|
|
<el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
|
|
|
-
|
|
|
+
|
|
|
<!-- 搜索模块 -->
|
|
|
<!--<div class="filter-container">
|
|
|
<span>
|
|
|
@@ -31,7 +31,7 @@
|
|
|
</el-button>
|
|
|
</span>
|
|
|
</div>-->
|
|
|
-
|
|
|
+
|
|
|
<!-- 列表数据 -->
|
|
|
<el-table
|
|
|
:key="tableKey"
|
|
|
@@ -74,7 +74,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+
|
|
|
<!-- 【分页组件】-->
|
|
|
<pagination
|
|
|
v-show="tableData.total > 0"
|
|
|
@@ -83,7 +83,7 @@
|
|
|
:total="Number(tableData.total)"
|
|
|
@pagination="mToolPageList"
|
|
|
/>
|
|
|
-
|
|
|
+
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button plain type="warning" @click="isVisible = false">{{ $t('common.cancel') }}</el-button>
|
|
|
@@ -120,7 +120,7 @@ export default {
|
|
|
key: ''
|
|
|
},
|
|
|
category: { // 02：夹具，03：托盘，04：原材料
|
|
|
- key: '02'
|
|
|
+ key: '02'
|
|
|
},
|
|
|
dicts: {
|
|
|
METERIAL_BRAND: {}, //工具材料品牌
|
|
|
@@ -363,7 +363,7 @@ export default {
|
|
|
return true
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
// 工装夹具列表
|
|
|
mToolPageList(params = {}) {
|
|
|
this.loading = true
|
|
|
@@ -371,9 +371,9 @@ export default {
|
|
|
this.queryParams.current = params.current ? params.current : this.queryParams.current;
|
|
|
this.queryParams.size = params.size ? params.size : this.queryParams.size;
|
|
|
// 搜索条件添加
|
|
|
- this.queryParams.model.brand = this.brand;
|
|
|
+ //this.queryParams.model.brand = this.brand;
|
|
|
// 分类，【原材料】固定，查询原材，分类就是：04
|
|
|
- this.queryParams.model.category = this.category;
|
|
|
+ //this.queryParams.model.category = this.category;
|
|
|
trayMgrApi.mToolPageList(this.queryParams).then(response => {
|
|
|
const res = response.data;
|
|
|
console.log("工装夹具列表 = ", res);
|
|
|
@@ -394,7 +394,7 @@ export default {
|
|
|
// eslint-disable-next-line no-return-assign
|
|
|
}).finally(() => this.loading = false)
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
// 夹具分页列表
|
|
|
fetch (params = {}) {
|
|
|
this.loading = true
|
|
|
@@ -405,7 +405,7 @@ export default {
|
|
|
this.queryParams.model.brand = this.brand
|
|
|
// 分类，【原材料】固定，查询原材，分类就是：04
|
|
|
this.queryParams.model.category = this.category
|
|
|
-
|
|
|
+
|
|
|
toolsMaterialApi.page(this.queryParams).then(response => {
|
|
|
const res = response.data
|
|
|
if (res.isSuccess) {
|
laoyao