|
|
|
@ -10,7 +10,12 @@
|
|
|
|
<el-option v-for="dict in wms_instock_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
|
<el-option v-for="dict in wms_instock_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="仓库ID" prop="warehouseId">
|
|
|
|
<el-form-item label="审核状态" prop="auditStatus">
|
|
|
|
|
|
|
|
<el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable >
|
|
|
|
|
|
|
|
<el-option v-for="dict in approve_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
|
<el-select v-model="queryForm.warehouseId" placeholder="请选择所属仓库">
|
|
|
|
<el-select v-model="queryForm.warehouseId" placeholder="请选择所属仓库">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="item in baseStoreList"
|
|
|
|
v-for="item in baseStoreList"
|
|
|
|
@ -53,7 +58,7 @@
|
|
|
|
@selection-change="selectionChange" ref="parentTableRef">
|
|
|
|
@selection-change="selectionChange" ref="parentTableRef">
|
|
|
|
<el-table-column type="selection" width="55"/>
|
|
|
|
<el-table-column type="selection" width="55"/>
|
|
|
|
<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="instockId"/>
|
|
|
|
<!-- <el-table-column label="入库单 主键" align="center" prop="instockId"/> -->
|
|
|
|
<el-table-column label="入库单号" align="center" prop="instockCode"/>
|
|
|
|
<el-table-column label="入库单号" align="center" prop="instockCode"/>
|
|
|
|
<el-table-column label="物料大类" align="center" prop="materialCategories">
|
|
|
|
<el-table-column label="物料大类" align="center" prop="materialCategories">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
@ -84,11 +89,14 @@
|
|
|
|
<dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
|
|
|
|
<dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column> -->
|
|
|
|
</el-table-column> -->
|
|
|
|
<el-table-column label="操作" fixed="right" width="200">
|
|
|
|
<el-table-column label="操作" align="center" width="200">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<!-- <el-button size="small" @click.stop="viewDetails(scope.row)">-->
|
|
|
|
<!-- <el-button size="small" @click.stop="viewDetails(scope.row)">-->
|
|
|
|
<!-- 查看-->
|
|
|
|
<!-- 查看-->
|
|
|
|
<!-- </el-button>-->
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
|
|
|
<el-button size="small" @click.stop="parentTableApprove(scope.row)" v-if="scope.row.auditStatus==0&&scope.row.auditBy!=''">
|
|
|
|
|
|
|
|
审批
|
|
|
|
|
|
|
|
</el-button>
|
|
|
|
<el-button size="small" @click.stop="parentTableUpdate(scope.row)">
|
|
|
|
<el-button size="small" @click.stop="parentTableUpdate(scope.row)">
|
|
|
|
修改
|
|
|
|
修改
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
@ -170,7 +178,7 @@
|
|
|
|
<!-- <el-form-item label="订单编号" prop="orderNo">
|
|
|
|
<!-- <el-form-item label="订单编号" prop="orderNo">
|
|
|
|
<el-input v-model="form.orderNo" placeholder="请输入订单编号" />
|
|
|
|
<el-input v-model="form.orderNo" placeholder="请输入订单编号" />
|
|
|
|
</el-form-item> -->
|
|
|
|
</el-form-item> -->
|
|
|
|
<el-form-item label="审核人" prop="auditBy">
|
|
|
|
<!-- <el-form-item label="审核人" prop="auditBy">
|
|
|
|
<el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">
|
|
|
|
<el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="item in userList"
|
|
|
|
v-for="item in userList"
|
|
|
|
@ -179,7 +187,7 @@
|
|
|
|
:value="item.userName"
|
|
|
|
:value="item.userName"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item> -->
|
|
|
|
<el-form-item label="仓库ID" prop="warehouseId">
|
|
|
|
<el-form-item label="仓库ID" prop="warehouseId">
|
|
|
|
<el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
|
|
|
|
<el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
@ -362,11 +370,50 @@
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-dialog>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<el-dialog v-model="parentTableApproveVisible" title="审批" width="40%">
|
|
|
|
|
|
|
|
<el-form :model="parentTableApproveForm" label-width="120px">
|
|
|
|
|
|
|
|
<el-form-item label="审核人" prop="auditBy">
|
|
|
|
|
|
|
|
<el-select v-model="parentTableApproveForm.auditBy" placeholder="请选择审核人" style="width:100px;" :disabled="true">
|
|
|
|
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
v-for="item in userList"
|
|
|
|
|
|
|
|
:key="item.userId"
|
|
|
|
|
|
|
|
:label="item.userName"
|
|
|
|
|
|
|
|
:value="item.userName"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="审核状态" prop="auditStatus">
|
|
|
|
|
|
|
|
<el-radio-group v-model='parentTableApproveForm.auditStatus'>
|
|
|
|
|
|
|
|
<el-radio
|
|
|
|
|
|
|
|
v-for='dict in audit_behave'
|
|
|
|
|
|
|
|
:key='dict.value'
|
|
|
|
|
|
|
|
:value='dict.value'
|
|
|
|
|
|
|
|
>{{ dict.label }}
|
|
|
|
|
|
|
|
</el-radio>
|
|
|
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="审核意见" prop="auditComments">
|
|
|
|
|
|
|
|
<el-input
|
|
|
|
|
|
|
|
v-model='parentTableApproveForm.auditComments'
|
|
|
|
|
|
|
|
style="width: 500px"
|
|
|
|
|
|
|
|
:autosize="{ minRows: 2, maxRows: 4 }"
|
|
|
|
|
|
|
|
type="textarea"
|
|
|
|
|
|
|
|
placeholder="Please input"/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
<template #footer>
|
|
|
|
|
|
|
|
<div class="dialog-footer">
|
|
|
|
|
|
|
|
<el-button @click="parentTableApproveVisible = false">关闭</el-button>
|
|
|
|
|
|
|
|
<el-button type="primary" @click="parentTableApproveSubmit">
|
|
|
|
|
|
|
|
确定
|
|
|
|
|
|
|
|
</el-button>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-dialog>
|
|
|
|
<el-dialog v-model="childrenTableInfoVisible" title="条码生成" width="40%">
|
|
|
|
<el-dialog v-model="childrenTableInfoVisible" title="条码生成" width="40%">
|
|
|
|
<el-form :model="childrenTableInfoForm" label-width="120px">
|
|
|
|
<el-form :model="childrenTableInfoForm" label-width="120px">
|
|
|
|
<el-form-item label="物料" prop="materialCode">
|
|
|
|
<el-form-item label="物料" prop="materialCode">
|
|
|
|
<el-select v-model="childrenTableInfoForm.materialId" placeholder="请选择物料" :disabled="true">
|
|
|
|
<el-select v-model="childrenTableInfoForm.materialCode" placeholder="请选择物料" :disabled="true">
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
v-for="item in materialList"
|
|
|
|
v-for="item in materialList"
|
|
|
|
:key="item.materialId"
|
|
|
|
:key="item.materialId"
|
|
|
|
@ -410,7 +457,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
|
|
<script setup name="Linkage" lang="ts">
|
|
|
|
<script setup name="Linkage" lang="ts">
|
|
|
|
import { listInstockOrder, getInstockOrder, delInstockOrder, addInstockOrder, updateInstockOrder } from '@/api/wms/instockOrder';
|
|
|
|
import { listInstockOrder, getInstockOrder, delInstockOrder, addInstockOrder, updateInstockOrder, approveInstockOrder } from '@/api/wms/instockOrder';
|
|
|
|
import { InstockOrderVO, InstockOrderQuery, InstockOrderForm } from '@/api/wms/instockOrder/types';
|
|
|
|
import { InstockOrderVO, InstockOrderQuery, InstockOrderForm } from '@/api/wms/instockOrder/types';
|
|
|
|
import {reactive} from 'vue'
|
|
|
|
import {reactive} from 'vue'
|
|
|
|
import {ElMessage, ElMessageBox} from 'element-plus'
|
|
|
|
import {ElMessage, ElMessageBox} from 'element-plus'
|
|
|
|
@ -424,7 +471,7 @@ import {
|
|
|
|
} from '@/api/wms/linkage'
|
|
|
|
} from '@/api/wms/linkage'
|
|
|
|
|
|
|
|
|
|
|
|
const {proxy} = getCurrentInstance() as ComponentInternalInstance;
|
|
|
|
const {proxy} = getCurrentInstance() as ComponentInternalInstance;
|
|
|
|
const {
|
|
|
|
const {audit_behave,
|
|
|
|
wms_barcode_if,
|
|
|
|
wms_barcode_if,
|
|
|
|
wms_instock_type,
|
|
|
|
wms_instock_type,
|
|
|
|
approve_status,
|
|
|
|
approve_status,
|
|
|
|
@ -434,7 +481,7 @@ const {
|
|
|
|
wms_allocate_status,
|
|
|
|
wms_allocate_status,
|
|
|
|
wms_allocate_create,
|
|
|
|
wms_allocate_create,
|
|
|
|
wms_allocate_way
|
|
|
|
wms_allocate_way
|
|
|
|
} = toRefs<any>(proxy?.useDict('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'));
|
|
|
|
} = toRefs<any>(proxy?.useDict('audit_behave', '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'));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
interface User {
|
|
|
|
interface User {
|
|
|
|
@ -446,12 +493,14 @@ interface User {
|
|
|
|
const parentTableTotal = ref(0)
|
|
|
|
const parentTableTotal = ref(0)
|
|
|
|
const dialogVisible = ref(false)
|
|
|
|
const dialogVisible = ref(false)
|
|
|
|
const parentTableInfoVisible = ref(false)
|
|
|
|
const parentTableInfoVisible = ref(false)
|
|
|
|
|
|
|
|
const parentTableApproveVisible = ref(false)
|
|
|
|
const childrenTableInfoVisible = ref(false)
|
|
|
|
const childrenTableInfoVisible = ref(false)
|
|
|
|
// const childrenTableInfoSubmit = ref(false)
|
|
|
|
// const childrenTableInfoSubmit = ref(false)
|
|
|
|
const updateDialog = ref(false)
|
|
|
|
const updateDialog = ref(false)
|
|
|
|
const dialogTitle = ref('添加')
|
|
|
|
const dialogTitle = ref('添加')
|
|
|
|
const dialogForm = ref({})
|
|
|
|
const dialogForm = ref({})
|
|
|
|
const parentTableInfoForm = ref({})
|
|
|
|
const parentTableInfoForm = ref({})
|
|
|
|
|
|
|
|
const parentTableApproveForm = ref({})
|
|
|
|
const childrenTableInfoForm = ref({})
|
|
|
|
const childrenTableInfoForm = ref({})
|
|
|
|
|
|
|
|
|
|
|
|
const queryForm = ref({
|
|
|
|
const queryForm = ref({
|
|
|
|
@ -484,8 +533,9 @@ listUser().then(e => {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
/** 提交按钮 */
|
|
|
|
/** 提交按钮 */
|
|
|
|
const submitForm = () => {
|
|
|
|
const submitForm = () => {
|
|
|
|
updateInstockDetail(childrenTableInfoForm.value).finally(() => childrenTableInfoVisible.value = false);
|
|
|
|
updateInstockDetail(childrenTableInfoForm.value);
|
|
|
|
getChildrenTable({instockId: partntTableSelectCell.value.instockId})
|
|
|
|
getChildrenTable({instockId: partntTableSelectCell.value.instockId});
|
|
|
|
|
|
|
|
childrenTableInfoVisible.value = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 获取父表格数据
|
|
|
|
// 获取父表格数据
|
|
|
|
@ -538,6 +588,7 @@ const reset = () => {
|
|
|
|
queryForm.value = {
|
|
|
|
queryForm.value = {
|
|
|
|
instockId: ''
|
|
|
|
instockId: ''
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
getParentTable()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 父表格行点击
|
|
|
|
// 父表格行点击
|
|
|
|
@ -565,6 +616,13 @@ const parentTableAdd = () => {
|
|
|
|
dialogForm.value = {}
|
|
|
|
dialogForm.value = {}
|
|
|
|
dialogtable.value = []
|
|
|
|
dialogtable.value = []
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 父表格审批
|
|
|
|
|
|
|
|
const parentTableApprove = async (e) => {
|
|
|
|
|
|
|
|
parentTableApproveForm.value = (await getInstockOrder(e.instockId)).data
|
|
|
|
|
|
|
|
parentTableApproveVisible.value = true
|
|
|
|
|
|
|
|
updateDialog.value = true
|
|
|
|
|
|
|
|
}
|
|
|
|
// 父表格修改
|
|
|
|
// 父表格修改
|
|
|
|
const parentTableUpdate = async (e) => {
|
|
|
|
const parentTableUpdate = async (e) => {
|
|
|
|
let id = ref(null)
|
|
|
|
let id = ref(null)
|
|
|
|
@ -640,7 +698,29 @@ const dialogSubmit = () => {
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 入库单审批
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
const parentTableApproveSubmit = () =>{
|
|
|
|
|
|
|
|
approveInstockOrder(parentTableApproveForm.value).then(e=>{
|
|
|
|
|
|
|
|
console.log(e)
|
|
|
|
|
|
|
|
if(e.data==0){
|
|
|
|
|
|
|
|
ElMessage({
|
|
|
|
|
|
|
|
type: 'error',
|
|
|
|
|
|
|
|
message: '请通知对应负责人审批',
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(e.data!=0){
|
|
|
|
|
|
|
|
ElMessage({
|
|
|
|
|
|
|
|
type: 'success',
|
|
|
|
|
|
|
|
message: '审批完成',
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
parentTableApproveVisible.value = false
|
|
|
|
|
|
|
|
getParentTable()
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
const parentTableInfoSubmit = () =>{
|
|
|
|
const parentTableInfoSubmit = () =>{
|
|
|
|
updateInstockOrder(parentTableInfoForm.value).then(e=>{
|
|
|
|
updateInstockOrder(parentTableInfoForm.value).then(e=>{
|
|
|
|
ElMessage({
|
|
|
|
ElMessage({
|
|
|
|
|
夜笙歌
5 months ago