|
@@ -21,13 +21,24 @@
|
|
|
]"
|
|
|
@get-list="getList"
|
|
|
>
|
|
|
- <template #slotName="{ item }">
|
|
|
- {{ item.createTime }}
|
|
|
+ <template #code="{ item }">
|
|
|
+ <div
|
|
|
+ style="cursor: pointer; color: #409eff"
|
|
|
+ @click="getDtl(item, 'detail')"
|
|
|
+ >
|
|
|
+ {{ item.code }}
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</byTable>
|
|
|
</div>
|
|
|
<el-dialog
|
|
|
- :title="modalType == 'add' ? '新增调仓' : '调仓接收'"
|
|
|
+ :title="
|
|
|
+ modalType == 'add'
|
|
|
+ ? '新增调仓'
|
|
|
+ : modalType == 'edit'
|
|
|
+ ? '调仓接收'
|
|
|
+ : '调仓详情'
|
|
|
+ "
|
|
|
v-model="dialogVisible"
|
|
|
width="800"
|
|
|
v-loading="loading"
|
|
@@ -45,33 +56,47 @@
|
|
|
type="primary"
|
|
|
@click="openProduct = true"
|
|
|
style="margin-bottom: 10px"
|
|
|
+ v-if="modalType == 'add'"
|
|
|
>
|
|
|
添加物品
|
|
|
</el-button>
|
|
|
- <el-table :data="formData.data.stockWaitDetailsList">
|
|
|
- <el-table-column prop="name" label="物品编码" />
|
|
|
- <el-table-column prop="name" label="物品名称" />
|
|
|
- <el-table-column prop="name" label="规格型号" />
|
|
|
+ <el-table :data="formData.data.stockTransferDetailsList">
|
|
|
+ <el-table-column prop="productCode" label="物品编码" />
|
|
|
+ <el-table-column prop="productName" label="物品名称" />
|
|
|
+ <el-table-column prop="productSpec" label="规格型号" />
|
|
|
+ <el-table-column
|
|
|
+ prop="outQuantity"
|
|
|
+ label="调仓数量"
|
|
|
+ v-if="modalType == 'detail'"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ prop="inQuantity"
|
|
|
+ label="接收数量"
|
|
|
+ v-if="modalType == 'detail'"
|
|
|
+ />
|
|
|
+
|
|
|
<el-table-column
|
|
|
- prop="name"
|
|
|
+ prop="outQuantity"
|
|
|
label="调仓数量"
|
|
|
v-if="modalType == 'edit'"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="quantity"
|
|
|
+ prop="outQuantity"
|
|
|
label="调仓数量"
|
|
|
min-width="150"
|
|
|
v-if="modalType == 'add'"
|
|
|
>
|
|
|
<template #default="{ row, $index }">
|
|
|
<el-form-item
|
|
|
- :prop="'stockWaitDetailsList.' + $index + '.quantity'"
|
|
|
- :rules="rules.quantity"
|
|
|
+ :prop="
|
|
|
+ 'stockTransferDetailsList.' + $index + '.outQuantity'
|
|
|
+ "
|
|
|
+ :rules="rules.outQuantity"
|
|
|
:inline-message="true"
|
|
|
>
|
|
|
<el-input-number
|
|
|
- v-model="row.quantity"
|
|
|
- :precision="4"
|
|
|
+ v-model="row.outQuantity"
|
|
|
+ :precision="2"
|
|
|
:controls="false"
|
|
|
:min="0"
|
|
|
/>
|
|
@@ -79,20 +104,20 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="quantity"
|
|
|
+ prop="inQuantity"
|
|
|
label="接收数量"
|
|
|
min-width="150"
|
|
|
v-if="modalType == 'edit'"
|
|
|
>
|
|
|
<template #default="{ row, $index }">
|
|
|
<el-form-item
|
|
|
- :prop="'stockWaitDetailsList.' + $index + '.quantity'"
|
|
|
- :rules="rules.quantity"
|
|
|
+ :prop="'stockTransferDetailsList.' + $index + '.inQuantity'"
|
|
|
+ :rules="rules.inQuantity"
|
|
|
:inline-message="true"
|
|
|
>
|
|
|
<el-input-number
|
|
|
- v-model="row.quantity"
|
|
|
- :precision="4"
|
|
|
+ v-model="row.inQuantity"
|
|
|
+ :precision="2"
|
|
|
:controls="false"
|
|
|
:min="0"
|
|
|
/>
|
|
@@ -100,7 +125,12 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column prop="zip" label="操作" width="100">
|
|
|
+ <el-table-column
|
|
|
+ prop="zip"
|
|
|
+ label="操作"
|
|
|
+ width="100"
|
|
|
+ v-if="modalType == 'add'"
|
|
|
+ >
|
|
|
<template #default="{ $index }">
|
|
|
<el-button type="primary" link @click="handleRemove($index)"
|
|
|
>删除</el-button
|
|
@@ -111,7 +141,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</byForm>
|
|
|
- <template #footer>
|
|
|
+ <template #footer v-if="modalType != 'detail'">
|
|
|
<el-button @click="dialogVisible = false" size="large">取 消</el-button>
|
|
|
<el-button
|
|
|
type="primary"
|
|
@@ -144,7 +174,7 @@
|
|
|
import { ElMessage, ElMessageBox } from "element-plus";
|
|
|
import byTable from "@/components/byTable/index";
|
|
|
import byForm from "@/components/byForm/index";
|
|
|
-import { computed, defineComponent, ref } from "vue";
|
|
|
+import { computed, defineComponent, ref, watch } from "vue";
|
|
|
import useUserStore from "@/store/modules/user";
|
|
|
import SelectProduct from "@/components/WDLY/product/SelectProduct";
|
|
|
|
|
@@ -156,41 +186,50 @@ const sourceList = ref({
|
|
|
total: 3,
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
+ outWarehouseId: "",
|
|
|
+ inWarehouseId: "",
|
|
|
+ inStatus: "",
|
|
|
},
|
|
|
});
|
|
|
let dialogVisible = ref(false);
|
|
|
let openProduct = ref(false);
|
|
|
-
|
|
|
let roomDialogVisible = ref(false);
|
|
|
let modalType = ref("add");
|
|
|
let rules = ref({
|
|
|
- code: [{ required: true, message: "请输入spu编码", trigger: "blur" }],
|
|
|
- name: [{ required: true, message: "请输入spu名称", trigger: "blur" }],
|
|
|
+ outWarehouseId: [
|
|
|
+ { required: true, message: "请选择调出仓库", trigger: "change" },
|
|
|
+ ],
|
|
|
+ inWarehouseId: [
|
|
|
+ { required: true, message: "请选择调入仓库", trigger: "change" },
|
|
|
+ ],
|
|
|
+ outQuantity: [{ required: true, message: "请输入调仓数量", trigger: "blur" }],
|
|
|
+ inQuantity: [{ required: true, message: "请输入接收数量", trigger: "blur" }],
|
|
|
});
|
|
|
const { proxy } = getCurrentInstance();
|
|
|
const selectConfig = reactive([
|
|
|
{
|
|
|
label: "调出仓库",
|
|
|
- prop: "type",
|
|
|
+ prop: "outWarehouseId",
|
|
|
data: [],
|
|
|
},
|
|
|
{
|
|
|
label: "调入仓库",
|
|
|
- prop: "type",
|
|
|
+ prop: "inWarehouseId",
|
|
|
data: [],
|
|
|
},
|
|
|
{
|
|
|
label: "接收状态",
|
|
|
- prop: "type",
|
|
|
+ prop: "inStatus",
|
|
|
data: [
|
|
|
{
|
|
|
label: "待接收",
|
|
|
- value: "1",
|
|
|
+ value: "0",
|
|
|
},
|
|
|
{
|
|
|
label: "部分接收",
|
|
|
- value: "2",
|
|
|
+ value: "1",
|
|
|
},
|
|
|
+
|
|
|
{
|
|
|
label: "已接收",
|
|
|
value: "2",
|
|
@@ -203,50 +242,53 @@ const config = computed(() => {
|
|
|
return [
|
|
|
{
|
|
|
attrs: {
|
|
|
+ slot: "code",
|
|
|
label: "单号",
|
|
|
- prop: "code",
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "调出仓库",
|
|
|
- prop: "name",
|
|
|
+ prop: "outWarehouseName",
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "调出人",
|
|
|
- prop: "remark",
|
|
|
+ prop: "outUserName",
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "调出时间",
|
|
|
- prop: "remark",
|
|
|
+ prop: "createTime",
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "接收状态",
|
|
|
- prop: "remark",
|
|
|
+ prop: "inStatus",
|
|
|
+ },
|
|
|
+ render(inStatus) {
|
|
|
+ return inStatus == 0 ? "待接收" : inStatus == 1 ? "部分接收" : "已接收";
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "调入仓库",
|
|
|
- prop: "remark",
|
|
|
+ prop: "inWarehouseName",
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "接收人",
|
|
|
- prop: "remark",
|
|
|
+ prop: "inUserName",
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "接收时间",
|
|
|
- prop: "remark",
|
|
|
+ prop: "inTime",
|
|
|
},
|
|
|
},
|
|
|
|
|
@@ -264,10 +306,11 @@ const config = computed(() => {
|
|
|
label: "接收",
|
|
|
type: "primary",
|
|
|
text: true,
|
|
|
+ disabled: row.inStatus > 1,
|
|
|
},
|
|
|
el: "button",
|
|
|
click() {
|
|
|
- getDtl(row);
|
|
|
+ getDtl(row, "edit");
|
|
|
},
|
|
|
},
|
|
|
{
|
|
@@ -278,7 +321,7 @@ const config = computed(() => {
|
|
|
},
|
|
|
el: "button",
|
|
|
click() {
|
|
|
- getDtl(row);
|
|
|
+ // getDtl(row);
|
|
|
},
|
|
|
},
|
|
|
];
|
|
@@ -289,7 +332,6 @@ const config = computed(() => {
|
|
|
|
|
|
let formData = reactive({
|
|
|
data: {},
|
|
|
- treeData: [],
|
|
|
});
|
|
|
const formOption = reactive({
|
|
|
inline: true,
|
|
@@ -298,7 +340,6 @@ const formOption = reactive({
|
|
|
rules: [],
|
|
|
});
|
|
|
const byform = ref(null);
|
|
|
-const treeData = ref([]);
|
|
|
const formConfig = reactive([
|
|
|
{
|
|
|
type: "title",
|
|
@@ -306,26 +347,26 @@ const formConfig = reactive([
|
|
|
},
|
|
|
{
|
|
|
type: "select",
|
|
|
- prop: "warehouseId",
|
|
|
+ prop: "outWarehouseId",
|
|
|
label: "调出仓库",
|
|
|
itemWidth: 33,
|
|
|
- disabled: modalType.value === "edit",
|
|
|
+ disabled: false,
|
|
|
data: [],
|
|
|
},
|
|
|
{
|
|
|
type: "select",
|
|
|
- prop: "warehouseId",
|
|
|
+ prop: "inWarehouseId",
|
|
|
label: "调入仓库",
|
|
|
itemWidth: 33,
|
|
|
- disabled: modalType.value === "edit",
|
|
|
+ disabled: false,
|
|
|
data: [],
|
|
|
},
|
|
|
{
|
|
|
type: "input",
|
|
|
- prop: "name",
|
|
|
+ prop: "remark",
|
|
|
label: "调拨说明",
|
|
|
itemType: "textarea",
|
|
|
- disabled: modalType.value === "edit",
|
|
|
+ disabled: false,
|
|
|
},
|
|
|
{
|
|
|
type: "title",
|
|
@@ -336,11 +377,12 @@ const formConfig = reactive([
|
|
|
slotName: "products",
|
|
|
},
|
|
|
]);
|
|
|
+
|
|
|
const getList = async (req) => {
|
|
|
sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
|
loading.value = true;
|
|
|
proxy
|
|
|
- .post("/productSpu/page", sourceList.value.pagination)
|
|
|
+ .post("/stockTransfer/page", sourceList.value.pagination)
|
|
|
.then((message) => {
|
|
|
console.log(message);
|
|
|
sourceList.value.data = message.rows;
|
|
@@ -350,42 +392,86 @@ const getList = async (req) => {
|
|
|
}, 200);
|
|
|
});
|
|
|
};
|
|
|
+
|
|
|
const openModal = () => {
|
|
|
dialogVisible.value = true;
|
|
|
modalType.value = "add";
|
|
|
formData.data = {
|
|
|
- stockWaitDetailsList: [],
|
|
|
+ stockTransferDetailsList: [],
|
|
|
};
|
|
|
};
|
|
|
|
|
|
const submitForm = () => {
|
|
|
- console.log(byform.value);
|
|
|
byform.value.handleSubmit((valid) => {
|
|
|
- submitLoading.value = true;
|
|
|
- proxy.post("/productSpu/" + modalType.value, formData.data).then(
|
|
|
- (res) => {
|
|
|
- ElMessage({
|
|
|
- message: modalType.value == "add" ? "添加成功" : "编辑成功",
|
|
|
- type: "success",
|
|
|
+ if (modalType.value == "add") {
|
|
|
+ if (formData.data.outWarehouseId === formData.data.inWarehouseId)
|
|
|
+ return ElMessage({
|
|
|
+ message: "调出仓库和调入仓库不可一致!",
|
|
|
+ type: "info",
|
|
|
});
|
|
|
- dialogVisible.value = false;
|
|
|
- submitLoading.value = false;
|
|
|
- getList();
|
|
|
- },
|
|
|
- (err) => (submitLoading.value = false)
|
|
|
- );
|
|
|
+
|
|
|
+ if (!formData.data.stockTransferDetailsList.length > 0)
|
|
|
+ return ElMessage({
|
|
|
+ message: "请添加调仓明细",
|
|
|
+ type: "info",
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ const list = formData.data.stockTransferDetailsList;
|
|
|
+ for (let i = 0; i < list.length; i++) {
|
|
|
+ const e = list[i];
|
|
|
+ if (Number(e.inQuantity) > Number(e.outQuantity)) {
|
|
|
+ return ElMessage({
|
|
|
+ message: `接收数量不可大于调出数量!`,
|
|
|
+ type: "info",
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ const requestUrl =
|
|
|
+ modalType.value == "add"
|
|
|
+ ? "/stockTransfer/add"
|
|
|
+ : "/stockTransfer/receive";
|
|
|
+ submitLoading.value = true;
|
|
|
+ const data = {
|
|
|
+ id: formData.data.id,
|
|
|
+ stockTransferDetailsList: formData.data.stockTransferDetailsList,
|
|
|
+ };
|
|
|
+ proxy
|
|
|
+ .post(requestUrl, modalType.value == "add" ? formData.data : data)
|
|
|
+ .then(
|
|
|
+ (res) => {
|
|
|
+ ElMessage({
|
|
|
+ message: modalType.value == "add" ? "添加成功" : "接收成功",
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ dialogVisible.value = false;
|
|
|
+ submitLoading.value = false;
|
|
|
+ getList();
|
|
|
+ },
|
|
|
+ (err) => (submitLoading.value = false)
|
|
|
+ );
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-const getDtl = (row) => {
|
|
|
- modalType.value = "edit";
|
|
|
- proxy.post("/productSpu/detail", { id: row.id }).then((res) => {
|
|
|
- res.stockWaitDetailsList = res.productInfoList;
|
|
|
+const getDtl = (row, type) => {
|
|
|
+ modalType.value = type;
|
|
|
+ proxy.post("/stockTransfer/detail", { id: row.id }).then((res) => {
|
|
|
+ if (type == "edit") {
|
|
|
+ res.stockTransferDetailsList.forEach(
|
|
|
+ (x) => (x.inQuantity = x.outQuantity)
|
|
|
+ );
|
|
|
+ }
|
|
|
formData.data = res;
|
|
|
dialogVisible.value = true;
|
|
|
});
|
|
|
};
|
|
|
|
|
|
+watch(modalType, () => {
|
|
|
+ formConfig[1].disabled = modalType.value != "add" ? true : false;
|
|
|
+ formConfig[2].disabled = modalType.value != "add" ? true : false;
|
|
|
+ formConfig[3].disabled = modalType.value != "add" ? true : false;
|
|
|
+});
|
|
|
+
|
|
|
const warehouseList = ref([]);
|
|
|
const warehouseListData = () => {
|
|
|
// // 币种数据
|
|
@@ -418,16 +504,19 @@ getList();
|
|
|
warehouseListData();
|
|
|
|
|
|
const handleSelect = (row) => {
|
|
|
- const flag = formData.data.stockWaitDetailsList.some((x) => x.id === row.id);
|
|
|
+ const flag = formData.data.stockTransferDetailsList.some(
|
|
|
+ (x) => x.productId === row.id
|
|
|
+ );
|
|
|
if (flag)
|
|
|
return ElMessage({
|
|
|
message: "该物品已选择",
|
|
|
type: "info",
|
|
|
});
|
|
|
- formData.data.stockWaitDetailsList.push({
|
|
|
- name: row.name,
|
|
|
- code: row.code,
|
|
|
- id: row.id,
|
|
|
+ formData.data.stockTransferDetailsList.push({
|
|
|
+ productSpec: row.spec,
|
|
|
+ productName: row.name,
|
|
|
+ productCode: row.code,
|
|
|
+ productId: row.id,
|
|
|
});
|
|
|
return ElMessage({
|
|
|
message: "选择成功",
|
|
@@ -436,7 +525,7 @@ const handleSelect = (row) => {
|
|
|
};
|
|
|
|
|
|
const handleRemove = (index) => {
|
|
|
- formData.data.stockWaitDetailsList.splice(index, 1);
|
|
|
+ formData.data.stockTransferDetailsList.splice(index, 1);
|
|
|
return ElMessage({
|
|
|
message: "删除成功",
|
|
|
type: "success",
|