|
|
|
@ -78,7 +78,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="审核意见" align="center" prop="auditComments"/>
|
|
|
|
<el-table-column label="审核意见" align="center" prop="auditComments"/>
|
|
|
|
<el-table-column label="客户" align="center" prop="customerId">
|
|
|
|
<el-table-column label="客户" align="center" prop="customerName">
|
|
|
|
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<!-- <el-table-column label="入库方式" align="center" prop="inMethod">
|
|
|
|
<!-- <el-table-column label="入库方式" align="center" prop="inMethod">
|
|
|
|
@ -124,6 +124,9 @@
|
|
|
|
<!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName">-->
|
|
|
|
<!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName">-->
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
<el-table-column label="是否高价值" align="center" prop="isHighValue">
|
|
|
|
<el-table-column label="是否高价值" align="center" prop="isHighValue">
|
|
|
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
|
|
|
<dict-tag :options="is_high_value" :value="scope.row.isHighValue"/>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作" fixed="right" width="200">
|
|
|
|
<el-table-column label="操作" fixed="right" width="200">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
@ -147,8 +150,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
|
|
|
|
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
|
|
|
|
<el-card shadow="never">
|
|
|
|
<el-card shadow="never">
|
|
|
|
<el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView" ref="dialogFormRef">
|
|
|
|
<el-form :model="dialogForm" :rules="dialogFormRules" :inline="true" label-width="120px" :disabled="isView" ref="dialogFormRef">
|
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
|
<el-form-item label="仓库" prop="warehouseId" :rules="[{ required: true, message: '请选择仓库', trigger: 'change' }]">
|
|
|
|
<el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
|
|
|
|
<el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="item in baseStoreList"
|
|
|
|
v-for="item in baseStoreList"
|
|
|
|
@ -158,7 +161,7 @@
|
|
|
|
></el-option>
|
|
|
|
></el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="出库类型" prop="outstockType">
|
|
|
|
<el-form-item label="出库类型" prop="outstockType" :rules="[{ required: true, message: '请选择出库类型', trigger: 'change' }]">
|
|
|
|
<el-select v-model="dialogForm.outstockType" placeholder="请选择出库类型">
|
|
|
|
<el-select v-model="dialogForm.outstockType" placeholder="请选择出库类型">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="dict in wms_out_type"
|
|
|
|
v-for="dict in wms_out_type"
|
|
|
|
@ -197,6 +200,9 @@
|
|
|
|
<!-- />-->
|
|
|
|
<!-- />-->
|
|
|
|
<!-- </el-select>-->
|
|
|
|
<!-- </el-select>-->
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
|
|
|
<el-form-item label="订单编号" prop="orderNo" v-if="dialogForm.outstockType === '1'" :rules="dialogForm.outstockType === '1' ? [{ required: true, message: '请输入订单编号', trigger: 'blur' }] : []">
|
|
|
|
|
|
|
|
<el-input v-model="dialogForm.orderNo" placeholder="请输入销售单号" clearable/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="销售客户" prop="customerId" v-if =" dialogForm.outstockType === '1' ">
|
|
|
|
<el-form-item label="销售客户" prop="customerId" v-if =" dialogForm.outstockType === '1' ">
|
|
|
|
<el-select v-model="dialogForm.customerId" placeholder="请选择客户">
|
|
|
|
<el-select v-model="dialogForm.customerId" placeholder="请选择客户">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
@ -385,7 +391,7 @@
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="出库类型" prop="outstockType">
|
|
|
|
<el-form-item label="出库类型" prop="outstockType">
|
|
|
|
<el-select v-model="parentTableInfoForm.outstockType" placeholder="请选择出库类型">
|
|
|
|
<el-select v-model="parentTableInfoForm.outstockType" placeholder="请选择出库类型" :disabled="true">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="dict in wms_out_type"
|
|
|
|
v-for="dict in wms_out_type"
|
|
|
|
:key="dict.value"
|
|
|
|
:key="dict.value"
|
|
|
|
@ -561,8 +567,9 @@ const {
|
|
|
|
mes_material_categories,
|
|
|
|
mes_material_categories,
|
|
|
|
wms_allocate_status,
|
|
|
|
wms_allocate_status,
|
|
|
|
wms_allocate_create,
|
|
|
|
wms_allocate_create,
|
|
|
|
wms_allocate_way
|
|
|
|
wms_allocate_way,
|
|
|
|
} = toRefs<any>(proxy?.useDict('wms_out_type', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way'));
|
|
|
|
is_high_value
|
|
|
|
|
|
|
|
} = toRefs<any>(proxy?.useDict('wms_out_type', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way', 'is_high_value'));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
interface User {
|
|
|
|
interface User {
|
|
|
|
@ -584,6 +591,13 @@ const updateDialog = ref(false)
|
|
|
|
const dialogTitle = ref('添加')
|
|
|
|
const dialogTitle = ref('添加')
|
|
|
|
|
|
|
|
|
|
|
|
const dialogForm = ref({})
|
|
|
|
const dialogForm = ref({})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 表单验证规则
|
|
|
|
|
|
|
|
const dialogFormRules = ref({
|
|
|
|
|
|
|
|
warehouseId: [{ required: true, message: '请选择仓库', trigger: 'change' }],
|
|
|
|
|
|
|
|
outstockType: [{ required: true, message: '请选择出库类型', trigger: 'change' }],
|
|
|
|
|
|
|
|
orderNo: [{ required: true, message: '请输入订单编号', trigger: 'blur' }]
|
|
|
|
|
|
|
|
})
|
|
|
|
const parentTableInfoForm = ref({})
|
|
|
|
const parentTableInfoForm = ref({})
|
|
|
|
const childrenTableInfoForm = ref({})
|
|
|
|
const childrenTableInfoForm = ref({})
|
|
|
|
|
|
|
|
|
|
|
|
@ -735,7 +749,12 @@ const selectionChange = (e) => {
|
|
|
|
const parentTableAdd = () => {
|
|
|
|
const parentTableAdd = () => {
|
|
|
|
getBaseCustomerList();
|
|
|
|
getBaseCustomerList();
|
|
|
|
dialogVisible.value = true
|
|
|
|
dialogVisible.value = true
|
|
|
|
dialogForm.value = {}
|
|
|
|
dialogForm.value = {
|
|
|
|
|
|
|
|
warehouseId: '',
|
|
|
|
|
|
|
|
outstockType: '',
|
|
|
|
|
|
|
|
orderNo: '',
|
|
|
|
|
|
|
|
customerId: ''
|
|
|
|
|
|
|
|
}
|
|
|
|
dialogtable.value = []
|
|
|
|
dialogtable.value = []
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 父表格修改
|
|
|
|
// 父表格修改
|
|
|
|
|