mt-fe-group/wms-njlm
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新

Browse Source
This commit is contained in:
朱文强
2023-11-10 11:14:13 +08:00
parent 51635013b1
commit 67a21b43e6
16 changed files with 972 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/asrs/agvLog/index.vue
View File

@@ -66,7 +66,7 @@ export default {
label: '订单出货日期',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',

2
src/views/asrs/heavenlyEyeLog/index.vue
View File

@@ -94,7 +94,7 @@ export default {
label: '订单出货日期',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',

2
src/views/asrs/jobMainTask/index.vue
View File

@@ -191,7 +191,7 @@ export default {
label: '选择日期',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',

2
src/views/asrs/jobMainTaskHistory/index.vue
View File

@@ -200,7 +200,7 @@ export default {
label: '选择日期',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',

2
src/views/asrs/mesLog/index.vue
View File

@@ -66,7 +66,7 @@ export default {
label: '订单出货日期',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',

67
src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue
View File

@@ -32,7 +32,9 @@
<el-table-column prop="process" label="工序" width="110">
<template slot-scope="scope">
<span>
{{ scope.row.process>=0 ? processArr[scope.row.process].name : '' }}
{{
scope.row.process >= 0 ? processArr[scope.row.process].name : ''
}}
</span>
</template>
</el-table-column>
@@ -41,11 +43,14 @@
<span>{{ scope.row.cacheLocation === 0 ? '否' : '是' }}</span>
</template>
</el-table-column>
<el-table-column prop="warehouseStorehouseState" label="库位状态" width="100">
<el-table-column
prop="warehouseStorehouseState"
label="库位状态"
width="100">
<template slot-scope="scope">
<span>
{{
scope.row.warehouseStorehouseState>=0
scope.row.warehouseStorehouseState >= 0
? warehouseStorehouseState[scope.row.warehouseStorehouseState]
.name
: ''
@@ -55,16 +60,29 @@
</el-table-column>
<el-table-column label="操作" width="70">
<template v-slot="scope">
<el-button
size="mini"
type="text"
:disabled="scope.row.warehouseStorehouseState===1"
@click="handleClick({ data: {id:scope.row}, type: 'edit' })"
v-hasPermi="[
'asrs:warehouse-storehouse-goods-specification:update',
]">
<span class="iconfont icon-edit primary-color"></span>
</el-button>
<span v-if="scope.row.deactivate === 1">
<el-button
size="mini"
type="text"
:disabled="scope.row.warehouseStorehouseState === 1"
@click="handleClick({ data: { id: scope.row }, type: 'edit' })"
v-hasPermi="[
'asrs:warehouse-storehouse-goods-specification:update',
]">
<span class="iconfont icon-edit primary-color"></span>
</el-button>
</span>
<span v-else>
<el-button
size="mini"
type="text"
@click="handleClick({ data: { id: scope.row }, type: 'restore' })"
v-hasPermi="[
'asrs:warehouse-storehouse-goods-specification:update',
]">
启用库位
</el-button>
</span>
</template>
</el-table-column>
</el-table>
@@ -85,7 +103,10 @@ import AddOrUpdate from './add-or-updata';
import product from '../product-mini';
import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter';
import { getWarehouseStorehousePage, } from "@/api/asrs/warehouseStorehouse";
import {
getWarehouseStorehousePage,
updateWarehouseStorehouse,
} from '@/api/asrs/warehouseStorehouse';
const processArr = [
{
@@ -208,7 +229,8 @@ export default {
this.listQuery.goodName = val.pname;
this.listQuery.goodCode = val.pcode;
this.listQuery.process = val.processId;
this.listQuery.warehouseStorehouseState = val.warehouseStorehouseStateId;
this.listQuery.warehouseStorehouseState =
val.warehouseStorehouseStateId;
this.getDataList();
break;
case 'reset':
@@ -232,6 +254,21 @@ export default {
console.log(val);
}
},
otherMethods(val) {
if (val.type === 'restore') {
const dataForm = {
id: val.data.id.id,
deactivate: 1,
trayCode: val.data.id.trayCode ? val.data.id.trayCode : '',
};
updateWarehouseStorehouse(dataForm).then((response) => {
this.$modal.msgSuccess('启用成功');
this.getDataList();
});
} else {
console.log(11);
}
},
},
};
</script>

54
src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue
View File

@@ -53,17 +53,31 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" width="70">
<el-table-column label="操作" width="80">
<template v-slot="scope">
<el-button
size="mini"
type="text"
@click="handleClick({ data: {id:scope.row}, type: 'edit' })"
v-hasPermi="[
'asrs:warehouse-storehouse-goods-specification:update',
]">
<span class="iconfont icon-edit primary-color"></span>
</el-button>
<span v-if="scope.row.deactivate === 1">
<el-button
size="mini"
type="text"
:disabled="scope.row.warehouseStorehouseState === 1"
@click="handleClick({ data: { id: scope.row }, type: 'edit' })"
v-hasPermi="[
'asrs:warehouse-storehouse-goods-specification:update',
]">
<span class="iconfont icon-edit primary-color"></span>
</el-button>
</span>
<span v-else>
<el-button
size="mini"
type="text"
@click="handleClick({ data: { id: scope.row }, type: 'restore' })"
v-hasPermi="[
'asrs:warehouse-storehouse-goods-specification:update',
]">
启用库位
</el-button>
</span>
</template>
</el-table-column>
</el-table>
@@ -84,7 +98,10 @@ import AddOrUpdate from './add-or-updata';
import product from '../product-mini';
import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter';
import { getWarehouseStorehousePage, } from "@/api/asrs/warehouseStorehouse";
import {
getWarehouseStorehousePage,
updateWarehouseStorehouse,
} from '@/api/asrs/warehouseStorehouse';
const processArr = [
{
@@ -234,6 +251,21 @@ export default {
console.log(val);
}
},
otherMethods(val) {
if (val.type === 'restore') {
const dataForm = {
id: val.data.id.id,
deactivate: 1,
trayCode: val.data.id.trayCode ? val.data.id.trayCode : '',
};
updateWarehouseStorehouse(dataForm).then((response) => {
this.$modal.msgSuccess('启用成功');
this.getDataList();
});
} else {
console.log(11);
}
},
},
};
</script>

4
src/views/asrs/warehouseStorehouseStorageHistory/index.vue
View File

@@ -138,7 +138,7 @@ export default {
},
{
type: 'select',
label: '库位状态',
label: '出入库状态',
selectOptions: warehouseStorehouseStorageState,
param: 'state',
defaultSelect: '',
@@ -149,7 +149,7 @@ export default {
label: '出入库时间',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',

6
src/views/asrs/warehouseStorehouseStorageHistory/indexb.vue
View File

@@ -138,7 +138,7 @@ export default {
},
{
type: 'select',
label: '库位状态',
label: '出入库状态',
selectOptions: warehouseStorehouseStorageState,
param: 'state',
defaultSelect: '',
@@ -149,11 +149,11 @@ export default {
label: '出入库时间',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'searchTime2',
param: 'searchTime',
},
{
type: 'button',