Browse Source

修复工艺管理bug

master
LiLongLong 5 months ago
parent
commit
b1cc03bbc0
  1. 10
      src/views/History.vue
  2. 8
      src/views/matrixCraft/index.vue
  3. 7
      src/views/matrixManage/matrixList.vue

10
src/views/History.vue

@ -3,7 +3,7 @@
<div class="spurt_print_btn ml-[3rem]"> <div class="spurt_print_btn ml-[3rem]">
<el-button @click="onDel">删除</el-button> <el-button @click="onDel">删除</el-button>
</div> </div>
<div class="w-[90vw] ml-[3rem] mt-[2rem] h-[70vh]">
<div class="w-[90vw] ml-[2rem] mt-[2rem] h-[70vh] history_table">
<el-table :data="tableData" stripe style="width: 100%" ref="historyTableRef"> <el-table :data="tableData" stripe style="width: 100%" ref="historyTableRef">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="matrixName" label="基质名称" /> <el-table-column prop="matrixName" label="基质名称" />
@ -37,8 +37,6 @@
let total = ref() let total = ref()
const settingStore = useSettingStore() const settingStore = useSettingStore()
let tableData = ref<any>([]) let tableData = ref<any>([])
let currentPage = ref(1)
let pageSize = ref(20)
const defaultCraft: CraftItem = { const defaultCraft: CraftItem = {
id: 1, id: 1,
name: '', name: '',
@ -75,7 +73,7 @@
matrixInfo = JSON.parse(matrixInfo) matrixInfo = JSON.parse(matrixInfo)
item ={ item ={
...item, ...item,
...matrixInfo
...matrixInfo,
} }
} }
list.push(item) list.push(item)
@ -127,4 +125,8 @@
right: 3rem; right: 3rem;
} }
} }
.history_table{
height: 65vh;
background: #ffffff;
}
</style> </style>

8
src/views/matrixCraft/index.vue

@ -27,7 +27,7 @@
<el-button @click="getCraftList">搜索</el-button> <el-button @click="getCraftList">搜索</el-button>
</div> </div>
<div class="w-[90vw] ml-[3rem] mt-[2rem] h-[70vh]">
<div class="w-[90vw] ml-[2rem] mt-[2rem] h-[70vh] craft_table">
<el-table empty-text="无数据" :data="tableData" stripe style="width: 100%" ref="craftTableRef" v-loading="loading" > <el-table empty-text="无数据" :data="tableData" stripe style="width: 100%" ref="craftTableRef" v-loading="loading" >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="matrixName" label="基质名称" width="100" /> <el-table-column prop="matrixName" label="基质名称" width="100" />
@ -263,4 +263,10 @@
right: 3rem; right: 3rem;
} }
} }
.craft_table{
height: 65vh;
background: #ffffff;
}
</style> </style>

7
src/views/matrixManage/matrixList.vue

@ -19,7 +19,7 @@
<!-- <div v-for="(item, index) in matrixList" class="w-[8rem] h-[3rem] matrix_module" @click="toggleSelection(index)" :style="{ backgroundColor: item.isSelected ? '#65a8ff' : '#ffffff' }"> <!-- <div v-for="(item, index) in matrixList" class="w-[8rem] h-[3rem] matrix_module" @click="toggleSelection(index)" :style="{ backgroundColor: item.isSelected ? '#65a8ff' : '#ffffff' }">
{{ item.name }} {{ item.name }}
</div> --> </div> -->
<div style="padding:20px">
<div class="matrix_table">
<el-table :data="matrixList" empty-text="无数据" stripe style="width: 100%;" ref="matrixTableRef" v-loading="loading"> <el-table :data="matrixList" empty-text="无数据" stripe style="width: 100%;" ref="matrixTableRef" v-loading="loading">
<el-table-column type="selection" /> <el-table-column type="selection" />
<el-table-column prop="name" label="基质名称" /> <el-table-column prop="name" label="基质名称" />
@ -179,4 +179,9 @@
right: 3rem; right: 3rem;
} }
} }
.matrix_table{
padding:20px;
height: 65vh;
background: #ffffff;
}
</style> </style>
Loading…
Cancel
Save