zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库管理页面字段修改

Browse Source
This commit is contained in:
liuhanqing
2026-01-07 11:43:29 +08:00
parent a71caaef81
commit 2c6f0fea94
10 changed files with 260 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -2,16 +2,19 @@
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<!-- <el-form-item :label="'仓库'" prop="warehouseId" required>&lt;!&ndash;仓库&ndash;&gt;-->
<!-- <el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in warehouseOptions"-->
<!-- :key="dict.warehouseId"-->
<!-- :label="dict.warehouseName"-->
<!-- :value="dict.warehouseId"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="'仓库'" prop="warehouseId" required><!--仓库-->
<el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="项目号" prop="departmentNo">
<el-input v-model="formData.departmentNo" placeholder="请输入项目号"/>
</el-form-item>
<el-form-item :label="'单据类型'" prop="outType" required><!--单据类型-->
<el-select v-model="formData.outType" :placeholder="'请选择单据类型'" clearable>
<el-option
@@ -22,16 +25,30 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="'客户'" prop="customerNo" required><!--客户-->
<el-form-item :label="'出库方式'" prop="carNumber" required><!--出库方式-->
<el-select v-model="formData.carNumber" :placeholder="'请选择出库方式'" clearable>
<el-option
v-for="dict in dict.type.out_method"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="'客商'" prop="customerNo" required><!--客商-->
<el-input
v-model="formData.customerName"
:placeholder="'请输入客户编号'"
v-model="formData.classNowId"
:placeholder="'请输入客商编号'"
clearable
@click.native="openCustomerSelector"
readonly
/>
</el-form-item>
<el-form-item label="备注" prop="spare5">
<el-input v-model="formData.spare5" placeholder="请输入备注"/>
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{'重置'}}<!--重置--></el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['out:outStockout:saveBill']">{{'保存单据'}}<!--保存单据--></el-button>
@@ -39,7 +56,7 @@
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials" v-hasPermi="['out:productAndStock:list']">{{'选择物资'}}<!--选择物资--></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials" v-hasPermi="['out:productAndStock:list']">{{'选择存货'}}<!--选择物资--></el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{'重新建单'}}<!--重新建单--></el-button>
</div>
@@ -48,8 +65,8 @@
<el-table-column label="存货编码" align="center" prop="productId" /><!--物资编号-->
<el-table-column label="存货名称" align="center" prop="productName" /><!--品名-->
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="仓库编码" align="center" prop="warehouse_id" />
<el-table-column label="层次关系" align="center" prop="spare1" />
<el-table-column label="仓库编码" align="center" prop="warehouseId" />
<el-table-column label="层级关系" align="center" prop="spare1" />
<el-table-column label="上层物料" align="center" prop="spare2" />
<el-table-column label="顶层物料" align="center" prop="spare3" />
<el-table-column label="项目号" align="center" prop="spare4" />
@@ -72,8 +89,8 @@
</el-table-column>
</el-table>
<!-- 选择物资弹窗 -->
<el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资-->
<!-- 选择存货弹窗 -->
<el-dialog :title="'选择存货'" :visible.sync="materialDialog" width="70%" append-to-body><!--选择存货-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="存货编码" prop="productId"><!--品号-->
@@ -92,32 +109,46 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="规格" prop="spare1">
<el-input v-model="queryParams.spare1" placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"/>
<el-form-item label="层级关系" prop="spare1"><!--品名-->
<el-input
v-model="queryParams.spare1"
:placeholder="'请输入层级关系'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单位" prop="spare3">
<el-input v-model="queryParams.spare3" placeholder="请输入单位"
clearable
@keyup.enter.native="handleQuery"/>
<el-form-item label="上层物料" prop="spare2"><!--品名-->
<el-input
v-model="queryParams.spare2"
:placeholder="'请输入上层物料'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="型号" prop="spare4">
<el-input v-model="queryParams.spare4" placeholder="请输入型号"
clearable
@keyup.enter.native="handleQuery"/>
<el-form-item label="顶层物料" prop="spare3"><!--品名-->
<el-input
v-model="queryParams.spare3"
:placeholder="'请输入顶层物料'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="power"><!--品名-->
<el-input
v-model="queryParams.power"
:placeholder="'请输入规格型号'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计量单位" prop="phase"><!--品名-->
<el-input
v-model="queryParams.phase"
:placeholder="'请输入计量单位'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="序列号" prop="spare6">
<el-input v-model="queryParams.spare6" placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>-->
<!-- <el-form-item label="订单号" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}<!--搜索--></el-button>
@@ -134,7 +165,7 @@
<el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="仓库编码" align="center" prop="warehouseId" />
<el-table-column label="供应商名称" align="center" prop="stackingId" />
<el-table-column label="层次关系" align="center" prop="spare1" />
<el-table-column label="层级关系" align="center" prop="spare1" />
<el-table-column label="上层物料" align="center" prop="spare2" />
<el-table-column label="顶层物料" align="center" prop="spare3" />
<el-table-column label="项目号" align="center" prop="spare4" />
@@ -159,21 +190,21 @@
</div>
</el-dialog>
<!-- 选择客户弹窗 -->
<el-dialog :title="'客户管理'" :visible.sync="customerDialog" width="800px" append-to-body>
<!-- 选择客商弹窗 -->
<el-dialog :title="'客商管理'" :visible.sync="customerDialog" width="70%" append-to-body>
<el-form :model="customerQueryParams" ref="customerQueryForm" size="small" :inline="true" label-width="100px">
<el-form-item :label="'客户编号'" prop="customerNo"><!--客户编号-->
<el-form-item :label="'客商编号'" prop="customerNo"><!--客商编号-->
<el-input
v-model="customerQueryParams.customerNo"
:placeholder="'请输入客户编号'"
:placeholder="'请输入客商编号'"
clearable
@keyup.enter.native="handleCustomerQuery"
/>
</el-form-item>
<el-form-item :label="'客户名称'" prop="customerName"><!--客户名称-->
<el-form-item :label="'客商名称'" prop="customerName"><!--客商名称-->
<el-input
v-model="customerQueryParams.customerName"
:placeholder="'请输入客户名称'"
:placeholder="'请输入客商名称'"
clearable
@keyup.enter.native="handleCustomerQuery"
/>
@@ -185,9 +216,9 @@
</el-form>
<el-table ref="customerTable" v-loading="customerLoading" :data="customerList" @row-click="handleCustomerRowClick" highlight-current-row>
<el-table-column :label="'客户编号'" align="left" prop="customerNo" /><!--客户编号-->
<el-table-column :label="'客户名称'" align="left" prop="customerName" /><!--客户名称-->
<!-- <el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" />客户简称 -->
<el-table-column :label="'客商编号'" align="left" prop="customerNo" /><!--客商编号-->
<el-table-column :label="'客商名称'" align="left" prop="customerName" /><!--客商名称-->
<!-- <el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" />客商简称 -->
<el-table-column :label="'是否可用'" align="left" prop="useable">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
@@ -219,7 +250,7 @@ import Pagination from "@/components/Pagination";
export default {
name: "AddOutStock",
dicts: ['out_bill_type', 'bill_status', 'is_available'],
dicts: ['out_bill_type', 'bill_status', 'is_available','out_method'],
components: {
Pagination
},
@@ -234,28 +265,38 @@ export default {
customerTotal: 0,
// 表单验证规则
rules: {
// warehouseId: [
// { required: true, message: '请选择仓库', trigger: "change" }
// ],
warehouseId: [
{ required: true, message: '请选择仓库', trigger: "change" }
],
customerNo: [
{ required: true, message: '请输入客户编号', trigger: "blur" }
{ required: true, message: '请输入客商编号', trigger: "blur" }
],
outType: [
{ required: true, message: '请选择单据类型', trigger: "change" }
],
outMethod: [
{ required: true, message: '请选择出库方式', trigger: "change" }
],
departmentNo: [
{ required: true, message: '请输入项目号', trigger: "change" }
]
},
// 主表数据
formData: {
// warehouseId: null,
warehouseId: null,
customerNo: null,
customerName: null, // 添加客户名称字段，用于显示
outType: null
customerName: null, // 添加客商名称字段，用于显示
outType: null,
carNumber:null,
departmentNo:null,
classNowId:null,
spare5:null
},
// 仓库选项
warehouseOptions: [],
// 物资明细列表
materialList: [],
// 选择物资弹窗
// 选择存货弹窗
materialDialog: false,
// 物资选项数据
materialOptions: [],
@@ -285,19 +326,19 @@ export default {
model: null,
orderId: null
},
// 客户选择弹窗
// 客商选择弹窗
customerDialog: false,
// 客户列表数据
// 客商列表数据
customerList: [],
// 当前选中的客户
// 当前选中的客商
selectedCustomer: null,
// 客户查询参数
// 客商查询参数
customerQueryParams: {
pageNum: 1,
pageSize: 10,
customerNo: null,
customerName: null,
useable: '1' // 默认只查询可用的客户
useable: '1' // 默认只查询可用的客商
}
};
},
@@ -315,12 +356,12 @@ export default {
this.warehouseOptions = response.rows;
});
},
/** 打开客户选择弹窗 */
/** 打开客商选择弹窗 */
openCustomerSelector() {
this.customerDialog = true;
this.getCustomerList();
},
/** 获取客户列表 */
/** 获取客商列表 */
getCustomerList() {
this.customerLoading = true;
listBasCustomer(this.customerQueryParams).then(response => {
@@ -329,45 +370,50 @@ export default {
this.customerLoading = false;
});
},
/** 客户搜索按钮操作 */
/** 客商搜索按钮操作 */
handleCustomerQuery() {
this.customerQueryParams.pageNum = 1;
this.getCustomerList();
},
/** 客户重置按钮操作 */
/** 客商重置按钮操作 */
resetCustomerQuery() {
this.resetForm("customerQueryForm");
this.customerQueryParams.useable = '1'; // 保持默认只查询可用的客户
this.customerQueryParams.useable = '1'; // 保持默认只查询可用的客商
this.handleCustomerQuery();
},
/** 客户行点击事件 */
/** 客商行点击事件 */
handleCustomerRowClick(row) {
this.selectedCustomer = row;
this.$refs['customerTable']?.setCurrentRow(row);
},
/** 确认选择客户 */
/** 确认选择客商 */
confirmSelectCustomer() {
if (!this.selectedCustomer) {
this.$modal.msgError('请选择客户');
this.$modal.msgError('请选择客商');
return;
}
this.formData.customerNo = this.selectedCustomer.customerNo;
this.formData.customerName = this.selectedCustomer.customerName;
this.formData.classNowId = this.selectedCustomer.customerName;
this.customerDialog = false;
},
/** 取消选择客户 */
/** 取消选择客商 */
cancelSelectCustomer() {
this.selectedCustomer = null;
this.customerDialog = false;
},
/** 打开选择物资弹窗 */
/** 打开选择存货弹窗 */
handleSelectMaterials() {
// if (!this.formData.warehouseId) {
// this.$modal.msgError('请选择仓库');
// return;
// }
if (!this.formData.warehouseId) {
this.$modal.msgError('请选择仓库');
return;
}
if (!this.formData.departmentNo) {
this.$modal.msgError('请输入项目号');
return;
}
this.materialDialog = true;
// this.queryParams.warehouseId = this.formData.warehouseId;
this.queryParams.warehouseId = this.formData.warehouseId;
this.queryParams.spare4 = this.formData.departmentNo;
this.getMaterialList();
},
/** 获取物资列表 */
@@ -383,10 +429,10 @@ export default {
handleSelectionChange(selection) {
this.selectedMaterials = selection;
},
/** 确认选择物资 */
/** 确认选择存货 */
confirmSelectMaterials() {
if (this.selectedMaterials.length === 0) {
this.$modal.msgError('请选择物资');
this.$modal.msgError('请选择存货');
return;
}
// 过滤掉已经存在的物资
@@ -421,7 +467,7 @@ export default {
this.materialDialog = false;
this.selectedMaterials = [];
},
/** 取消选择物资 */
/** 取消选择存货 */
cancelSelectMaterials() {
this.selectedMaterials = [];
this.materialDialog = false;
@@ -458,7 +504,7 @@ export default {
this.$refs.formRef.validate(valid => {
if (valid) {
if (this.materialList.length === 0) {
this.$modal.msgError('请选择物资');
this.$modal.msgError('请选择存货选择存货');
return;
}
const data = {