refactor(wms): 统一物料类型字段并添加操作状态开关
- 将各页面中的itemType字段替换为materialType,使用中文显示物料类型 - 在actflow页面添加待操作状态切换开关 - 移除废弃的warehouseId字段
This commit is contained in:
@@ -15,6 +15,9 @@
|
|||||||
<el-option v-for="item in dict.type.action_type" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in dict.type.action_type" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="只看待操作" prop="actionStatus">
|
||||||
|
<el-switch @change="switchActionStatus" v-model="queryParams.actionSwitch"/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
@@ -363,6 +366,15 @@ export default {
|
|||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
switchActionStatus(value) {
|
||||||
|
console.log(value)
|
||||||
|
if (!value) {
|
||||||
|
this.queryParams.actionStatus = null;
|
||||||
|
} else {
|
||||||
|
this.queryParams.actionStatus = 0;
|
||||||
|
}
|
||||||
|
this.getList()
|
||||||
|
},
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel() {
|
||||||
this.open = false;
|
this.open = false;
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ export default {
|
|||||||
qrcode: true,
|
qrcode: true,
|
||||||
querys: {
|
querys: {
|
||||||
dataType: 1,
|
dataType: 1,
|
||||||
itemType: 'raw_material'
|
// itemType: 'raw_material'
|
||||||
|
materialType: '原料'
|
||||||
},
|
},
|
||||||
labelType: '2',
|
labelType: '2',
|
||||||
hideType: true
|
hideType: true
|
||||||
|
|||||||
@@ -73,6 +73,11 @@
|
|||||||
<el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" />
|
<el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" />
|
||||||
<el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery"/>
|
<el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery"/>
|
||||||
<el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery"/>
|
<el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery"/>
|
||||||
|
<!-- <el-table-column label="物料类型" align="center" prop="itemType">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
{{ scope.row.itemType == 'raw_material' ? '原料' : '产品' }}
|
||||||
|
</template>
|
||||||
|
</el-table-column> -->
|
||||||
<el-table-column label="物料类型" align="center" prop="materialType"/>
|
<el-table-column label="物料类型" align="center" prop="materialType"/>
|
||||||
<el-table-column label="产品类型" align="center" prop="itemName">
|
<el-table-column label="产品类型" align="center" prop="itemName">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -450,7 +455,8 @@ export default {
|
|||||||
createTime: undefined,
|
createTime: undefined,
|
||||||
createBy: undefined,
|
createBy: undefined,
|
||||||
updateTime: undefined,
|
updateTime: undefined,
|
||||||
updateBy: undefined
|
updateBy: undefined,
|
||||||
|
materialType: '原料',
|
||||||
};
|
};
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -13,8 +13,9 @@ export default {
|
|||||||
return {
|
return {
|
||||||
qrcode: false,
|
qrcode: false,
|
||||||
querys: {
|
querys: {
|
||||||
itemType: 'product',
|
// itemType: 'product',
|
||||||
dataType: 1
|
dataType: 1,
|
||||||
|
materialType: '产品'
|
||||||
},
|
},
|
||||||
labelType: '3',
|
labelType: '3',
|
||||||
showStatus: true,
|
showStatus: true,
|
||||||
|
|||||||
@@ -14,8 +14,9 @@ export default {
|
|||||||
qrcode: false,
|
qrcode: false,
|
||||||
querys: {
|
querys: {
|
||||||
// itemType: 'rubbish',
|
// itemType: 'rubbish',
|
||||||
// dataType: 2
|
dataType: 1,
|
||||||
warehouseId: 111,
|
materialType: '废品'
|
||||||
|
// warehouseId: 111,
|
||||||
},
|
},
|
||||||
hideWarehouseQuery: true,
|
hideWarehouseQuery: true,
|
||||||
labelType: '3',
|
labelType: '3',
|
||||||
|
|||||||
Reference in New Issue
Block a user