kelvin/wms-dj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

优化

Browse Source
This commit is contained in:
汤锦科 2024-12-11 17:25:39 +08:00
parent 2543902e16
commit cf8ef55f8f
5 changed files with 65 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/mes/dv/Inventory/InventoryTask.vue
View File

@ -56,16 +56,16 @@
v-hasPermi="['mes:dv:checkplan:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:dv:checkplan:export']"
>导出</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['mes:dv:checkplan:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

16
src/views/mes/md/baseKnife/index.vue
View File

@ -9,7 +9,7 @@
/>
</el-form-item>
<el-form-item label="物料项" prop="mbbBdMrlId">
<el-select v-model="queryParams.mbbBdMrlId" placeholder="请选择物料项" filterable clearable>
<el-select v-model="queryParams.mbbBdMrlId" placeholder="请选择所属库位" filterable clearable>
<el-option :label="item.itemName" :value="item.itemId.toString()" v-for="item in mdItemList"
:key="item.itemId">
<span style="float: left">{{ item.itemName }}</span>
@ -17,6 +17,15 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属库位" prop="areaCode">
<el-select v-model="queryParams.areaCode" placeholder="请选择物料项" filterable clearable>
<el-option :label="item.areaName" :value="item.areaCode" v-for="item in areaList"
:key="item.areaId">
<span style="float: left">{{ item.areaName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.areaCode }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="刀具类型" prop="itemOrProduct">
<el-select v-model="queryParams.itemOrProduct" placeholder="请选择物料类型" clearable>
<el-option
@ -294,6 +303,7 @@
import {addBaseKnife, getBaseKnife, listBaseKnife, updateBaseKnife} from "@/api/mes/md/baseKnife";
import {resetBaseKnife} from "../../../../api/mes/md/baseKnife";
import {listMdItem} from "@/api/mes/md/mdItem"
import {listArea} from "@/api/mes/wm/area";
export default {
name: "BaseKnife",
@ -318,6 +328,7 @@ export default {
BaseKnifeList: [],
// 物料产品表格数据
mdItemList: [],
areaList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -327,6 +338,7 @@ export default {
pageNum: 1,
pageSize: 10,
mbbBdMrlId: null,
areaId: null,
planSheet: null,
rfid: null,
knifeCode: null,
@ -366,6 +378,8 @@ export default {
listMdItem().then(response => this.mdItemList = response.rows)
listArea().then(response => this.areaList = response.rows)
listBaseKnife(this.queryParams).then(response => {
this.BaseKnifeList = response.rows;
this.total = response.total;

20
src/views/system/role/index.vue
View File

@ -84,16 +84,16 @@
v-hasPermi="['system:role:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:role:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

40
src/views/system/user/index.vue
View File

@ -111,26 +111,26 @@
v-hasPermi="['system:user:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="info"-->
<!-- plain-->
<!-- icon="el-icon-upload2"-->
<!-- size="mini"-->
<!-- @click="handleImport"-->
<!-- v-hasPermi="['system:user:import']"-->
<!-- >导入</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:user:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>

20
src/vue/views/wm/ctBase/index.vue
View File

@ -45,16 +45,16 @@
v-hasPermi="['wm:ctBase:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['wm:ctBase:export']"
>导出</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['wm:ctBase:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>