|
|
|
@ -10,10 +10,7 @@
|
|
|
|
<!-- <el-form-item label="物料ID" prop="materialId">
|
|
|
|
<!-- <el-form-item label="物料ID" prop="materialId">
|
|
|
|
<el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item> -->
|
|
|
|
</el-form-item> -->
|
|
|
|
<el-form-item label="物料大类" prop="materialCategoryId">
|
|
|
|
<!-- <el-form-item label="物料大类" prop="materialCategoryId">
|
|
|
|
<!-- <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
|
|
|
|
|
|
|
|
<el-option v-for="dict in material_mategories" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
|
|
|
|
|
</el-select>-->
|
|
|
|
|
|
|
|
<el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
|
|
|
|
<el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
|
|
|
|
<el-option v-for="item in mategoryOptions"
|
|
|
|
<el-option v-for="item in mategoryOptions"
|
|
|
|
:key="item.materialCategoryId"
|
|
|
|
:key="item.materialCategoryId"
|
|
|
|
@ -21,7 +18,7 @@
|
|
|
|
:value="item.materialCategoryId"
|
|
|
|
:value="item.materialCategoryId"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>-->
|
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
|
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库" clearable>
|
|
|
|
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库" clearable>
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
@ -32,17 +29,17 @@
|
|
|
|
></el-option>
|
|
|
|
></el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="计划库位" prop="planLocationCode">
|
|
|
|
<!-- <el-form-item label="原库位" prop="planLocationCode">
|
|
|
|
<el-input v-model="queryParams.planLocationCode" placeholder="请输入计划库位" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.planLocationCode" placeholder="请输入计划库位" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>-->
|
|
|
|
<!-- <el-form-item label="工单状态(0执行中,1完成,2关闭)" prop="orderStatus">
|
|
|
|
<!-- <el-form-item label="工单状态(0执行中,1完成,2关闭)" prop="orderStatus">
|
|
|
|
<el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态(0执行中,1完成,2关闭)" clearable >
|
|
|
|
<el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态(0执行中,1完成,2关闭)" clearable >
|
|
|
|
<el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
|
<el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item> -->
|
|
|
|
</el-form-item> -->
|
|
|
|
<el-form-item label="目标库位" prop="targetLocationCode">
|
|
|
|
<!-- <el-form-item label="目标库位" prop="targetLocationCode">
|
|
|
|
<el-input v-model="queryParams.targetLocationCode" placeholder="请输入目标库位" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.targetLocationCode" placeholder="请输入目标库位" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>-->
|
|
|
|
<!-- <el-form-item label="审核人" prop="auditBy">
|
|
|
|
<!-- <el-form-item label="审核人" prop="auditBy">
|
|
|
|
<el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item> -->
|
|
|
|
</el-form-item> -->
|
|
|
|
@ -82,7 +79,7 @@
|
|
|
|
<el-card shadow="never">
|
|
|
|
<el-card shadow="never">
|
|
|
|
<template #header>
|
|
|
|
<template #header>
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<!-- <el-col :span="1.5">
|
|
|
|
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:moveOrder:add']">新增</el-button>
|
|
|
|
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:moveOrder:add']">新增</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
@ -93,7 +90,7 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:moveOrder:export']">导出</el-button>
|
|
|
|
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:moveOrder:export']">导出</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-col>-->
|
|
|
|
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
|
|
|
|
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
@ -101,18 +98,19 @@
|
|
|
|
<el-table v-loading="loading" :data="moveOrderList" @selection-change="handleSelectionChange">
|
|
|
|
<el-table v-loading="loading" :data="moveOrderList" @selection-change="handleSelectionChange">
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
<!-- <el-table-column label="表主键" align="center" prop="moveId" v-if="columns[0].visible"/> -->
|
|
|
|
<!-- <el-table-column label="表主键" align="center" prop="moveId" v-if="columns[0].visible"/> -->
|
|
|
|
<el-table-column label="物料" align="center" prop="materialCode" v-if="columns[2].visible"/>
|
|
|
|
<el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[6].visible"/>
|
|
|
|
<el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[3].visible">
|
|
|
|
<el-table-column label="物料" align="center" prop="materialCode" v-if="columns[0].visible"/>
|
|
|
|
</el-table-column>
|
|
|
|
<!-- <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[3].visible">
|
|
|
|
<el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[4].visible"/>
|
|
|
|
</el-table-column>-->
|
|
|
|
<el-table-column label="计划库位" align="center" prop="planLocationCode" v-if="columns[5].visible"/>
|
|
|
|
<el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[1].visible"/>
|
|
|
|
<el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[6].visible">
|
|
|
|
<el-table-column label="原库位" align="center" prop="planLocationCode" v-if="columns[2].visible"/>
|
|
|
|
|
|
|
|
<!-- <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[6].visible">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<dict-tag :options="wms_order_status" :value="scope.row.orderStatus"/>
|
|
|
|
<dict-tag :options="wms_order_status" :value="scope.row.orderStatus"/>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>-->
|
|
|
|
<el-table-column label="目标库位" align="center" prop="targetLocationCode" v-if="columns[7].visible"/>
|
|
|
|
<el-table-column label="目标库位" align="center" prop="targetLocationCode" v-if="columns[3].visible"/>
|
|
|
|
<el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[8].visible"/>
|
|
|
|
<!-- <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[8].visible"/>
|
|
|
|
<el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[9].visible">
|
|
|
|
<el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[9].visible">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
<span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
@ -123,14 +121,14 @@
|
|
|
|
<dict-tag :options="approve_status" :value="scope.row.auditStatus"/>
|
|
|
|
<dict-tag :options="approve_status" :value="scope.row.auditStatus"/>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[11].visible"/>
|
|
|
|
<el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[11].visible"/>-->
|
|
|
|
<el-table-column label="同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[16].visible">
|
|
|
|
<el-table-column label="同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[4].visible">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/>
|
|
|
|
<dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="同步数量" align="center" prop="erpSynchronousQty" v-if="columns[17].visible"/>
|
|
|
|
<el-table-column label="同步数量" align="center" prop="erpSynchronousQty" v-if="columns[5].visible"/>
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<el-tooltip content="修改" placement="top">
|
|
|
|
<el-tooltip content="修改" placement="top">
|
|
|
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:moveOrder:edit']"></el-button>
|
|
|
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:moveOrder:edit']"></el-button>
|
|
|
|
@ -139,7 +137,7 @@
|
|
|
|
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:moveOrder:remove']"></el-button>
|
|
|
|
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:moveOrder:remove']"></el-button>
|
|
|
|
</el-tooltip>
|
|
|
|
</el-tooltip>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>-->
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
|
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
|
|
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
|
|
|
@ -152,7 +150,7 @@
|
|
|
|
<el-input v-model="form.moveId" placeholder="请输入表主键" />
|
|
|
|
<el-input v-model="form.moveId" placeholder="请输入表主键" />
|
|
|
|
</el-form-item> -->
|
|
|
|
</el-form-item> -->
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item label="物料大类" prop="materialCategoryId">
|
|
|
|
<!-- <el-form-item label="物料大类" prop="materialCategoryId">
|
|
|
|
<el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">
|
|
|
|
<el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">
|
|
|
|
<el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
|
|
|
|
<el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
|
|
|
|
<el-option v-for="item in mategoryOptions"
|
|
|
|
<el-option v-for="item in mategoryOptions"
|
|
|
|
@ -162,7 +160,7 @@
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>-->
|
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
|
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库" @change="getLocationList">
|
|
|
|
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库" @change="getLocationList">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
@ -295,24 +293,13 @@ const dialog = reactive<DialogOption>({
|
|
|
|
|
|
|
|
|
|
|
|
// 列显隐信息
|
|
|
|
// 列显隐信息
|
|
|
|
const columns = ref<FieldOption[]>([
|
|
|
|
const columns = ref<FieldOption[]>([
|
|
|
|
{ key: 0, label: `表主键`, visible: true },
|
|
|
|
{ key: 0, label: `物料`, visible: true },
|
|
|
|
{ key: 1, label: `租户号`, visible: true },
|
|
|
|
{ key: 1, label: `仓库`, visible: true },
|
|
|
|
{ key: 2, label: `物料ID`, visible: true },
|
|
|
|
{ key: 2, label: `原库位`, visible: true },
|
|
|
|
{ key: 3, label: `物料大类`, visible: true },
|
|
|
|
{ key: 3, label: `目标库位`, visible: true },
|
|
|
|
{ key: 4, label: `仓库`, visible: true },
|
|
|
|
{ key: 4, label: `erp同步状态`, visible: true },
|
|
|
|
{ key: 5, label: `计划库位`, visible: true },
|
|
|
|
{ key: 5, label: `erp同步数量`, visible: true },
|
|
|
|
{ key: 6, label: `工单状态(0执行中,1完成,2关闭)`, visible: true },
|
|
|
|
{ key: 6, label: `批次条码`, visible: true}
|
|
|
|
{ key: 7, label: `目标库位`, visible: true },
|
|
|
|
|
|
|
|
{ key: 8, label: `审核人`, visible: true },
|
|
|
|
|
|
|
|
{ key: 9, label: `审核时间`, visible: true },
|
|
|
|
|
|
|
|
{ key: 10, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
|
|
|
|
|
|
|
|
{ key: 11, label: `审核意见`, visible: true },
|
|
|
|
|
|
|
|
{ key: 12, label: `工单创建人`, visible: true },
|
|
|
|
|
|
|
|
{ key: 13, label: `工单创建时间`, visible: true },
|
|
|
|
|
|
|
|
{ key: 14, label: `实际接收人`, visible: true },
|
|
|
|
|
|
|
|
{ key: 15, label: `实际接收时间`, visible: true },
|
|
|
|
|
|
|
|
{ key: 16, label: `erp同步状态`, visible: true },
|
|
|
|
|
|
|
|
{ key: 17, label: `erp同步数量`, visible: true },
|
|
|
|
|
|
|
|
]);
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
|
|
const initFormData: MoveOrderForm = {
|
|
|
|
const initFormData: MoveOrderForm = {
|
|
|
|
@ -329,7 +316,8 @@ const initFormData: MoveOrderForm = {
|
|
|
|
auditStatus: undefined,
|
|
|
|
auditStatus: undefined,
|
|
|
|
auditComments: undefined,
|
|
|
|
auditComments: undefined,
|
|
|
|
erpSynchronousStatus: undefined,
|
|
|
|
erpSynchronousStatus: undefined,
|
|
|
|
erpSynchronousQty: undefined
|
|
|
|
erpSynchronousQty: undefined,
|
|
|
|
|
|
|
|
batchCode: undefined,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
|
|
|
|
const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
|
|
|
|
form: {...initFormData},
|
|
|
|
form: {...initFormData},
|
|
|
|
@ -350,11 +338,12 @@ const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
|
|
|
|
auditComments: undefined,
|
|
|
|
auditComments: undefined,
|
|
|
|
erpSynchronousStatus: undefined,
|
|
|
|
erpSynchronousStatus: undefined,
|
|
|
|
erpSynchronousQty: undefined,
|
|
|
|
erpSynchronousQty: undefined,
|
|
|
|
|
|
|
|
batchCode: undefined,
|
|
|
|
params: {
|
|
|
|
params: {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
rules: {
|
|
|
|
rules: {
|
|
|
|
moveId: [
|
|
|
|
/* moveId: [
|
|
|
|
{ required: true, message: "表主键不能为空", trigger: "blur" }
|
|
|
|
{ required: true, message: "表主键不能为空", trigger: "blur" }
|
|
|
|
],
|
|
|
|
],
|
|
|
|
materialId: [
|
|
|
|
materialId: [
|
|
|
|
@ -392,7 +381,7 @@ const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
|
|
|
|
],
|
|
|
|
],
|
|
|
|
erpSynchronousQty: [
|
|
|
|
erpSynchronousQty: [
|
|
|
|
{ required: true, message: "erp同步数量不能为空", trigger: "blur" }
|
|
|
|
{ required: true, message: "erp同步数量不能为空", trigger: "blur" }
|
|
|
|
]
|
|
|
|
]*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|