|
|
|
|
@ -75,7 +75,9 @@
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="审核意见" align="center" prop="auditComments"/>
|
|
|
|
|
<el-table-column label="客户" align="center" prop="customerId" v-if ="routeOutstockTypeValue == 1 "/>
|
|
|
|
|
<el-table-column label="客户" align="center" prop="customerId">
|
|
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- <el-table-column label="入库方式" align="center" prop="inMethod">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
|
|
|
|
|
@ -172,7 +174,7 @@
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="工单类型" prop="orderType">
|
|
|
|
|
<el-select v-model="dialogForm.orderType" placeholder="请选择工单类型(字典:1销售订单,2生产订单,3手工,4系统生成)">
|
|
|
|
|
<el-select v-model="dialogForm.orderType" placeholder="请选择工单类型">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in wms_instock_type"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
@ -181,16 +183,27 @@
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="审核人" prop="auditBy">
|
|
|
|
|
<el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">
|
|
|
|
|
<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="auditBy">-->
|
|
|
|
|
<!-- <el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">-->
|
|
|
|
|
<!-- <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="customerId" v-if ="dialogForm.outstockType === '1' ">
|
|
|
|
|
<el-select v-model="dialogForm.customerId" placeholder="请选择客户">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in baseCustomerList"
|
|
|
|
|
:key="item.customerId"
|
|
|
|
|
:label="item.customerName"
|
|
|
|
|
:value="item.customerId"
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
</el-card>
|
|
|
|
|
<el-card style="margin-top: 8px" shadow="never">
|
|
|
|
|
@ -202,7 +215,7 @@
|
|
|
|
|
<el-table :data="dialogtable" style="width: 100%">
|
|
|
|
|
<el-table-column label="物料大类" prop="materialCategoryId">
|
|
|
|
|
<el-select v-model="dialogForm.materialCategoryId" placeholder="" :disabled="true">
|
|
|
|
|
<el-option v-for="item in mategoryOptions"
|
|
|
|
|
<el-option v-for="item in mategoryOptions"
|
|
|
|
|
:key="item.materialCategoryId"
|
|
|
|
|
:label="item.materialCategoryName"
|
|
|
|
|
:value="item.materialCategoryId"
|
|
|
|
|
|