|
@@ -26,84 +26,95 @@
|
|
|
</byTable>
|
|
|
</div>
|
|
|
<el-dialog
|
|
|
- title="到货通知"
|
|
|
+ :title="modalType === 'add' ? '发货登记' : '到货通知'"
|
|
|
v-model="dialogVisible"
|
|
|
width="800"
|
|
|
v-loading="loading"
|
|
|
>
|
|
|
- <el-form
|
|
|
- :model="formData.data"
|
|
|
+ <byForm
|
|
|
+ :formConfig="formConfig"
|
|
|
+ :formOption="formOption"
|
|
|
+ v-model="formData.data"
|
|
|
:rules="rules"
|
|
|
- ref="formDom"
|
|
|
- label-position="top"
|
|
|
+ ref="byform"
|
|
|
>
|
|
|
- <div style="margin-bottom: 10px; font-size: 14px">基础信息</div>
|
|
|
- <el-row>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="供应商" prop="supplyId">
|
|
|
- <el-select
|
|
|
- v-model="formData.data.supplyId"
|
|
|
- placeholder="请选择"
|
|
|
- style="width: 100%"
|
|
|
- disabled
|
|
|
+ <template #detailSlot>
|
|
|
+ <div style="width: 100%">
|
|
|
+ <el-table
|
|
|
+ :data="
|
|
|
+ modalType === 'add' ? formData.data.deliverGoodsDetailsList : []
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <el-table-column
|
|
|
+ prop="productType"
|
|
|
+ label="货品类型"
|
|
|
+ :formatter="(row) => (row.productType == 1 ? '产品' : '物料')"
|
|
|
+ />
|
|
|
+ <el-table-column prop="productCode" label="货品编码" />
|
|
|
+ <el-table-column prop="productName" label="货品名称" />
|
|
|
+ <el-table-column prop="productSpec" label="规格型号" />
|
|
|
+ <el-table-column prop="productUnit" label="单位" />
|
|
|
+ <el-table-column prop="count" label="采购数量" />
|
|
|
+ <el-table-column
|
|
|
+ prop="alreadyDeliverGoodsQuantity"
|
|
|
+ label="累计发货"
|
|
|
+ v-if="modalType === 'add'"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ prop="deliverGoodsQuantity"
|
|
|
+ label="本次发货"
|
|
|
+ min-width="150"
|
|
|
+ v-if="modalType === 'add'"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="item in supplierData"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="采购单号" prop="code">
|
|
|
- <el-input
|
|
|
- v-model="formData.data.code"
|
|
|
- placeholder="请输入"
|
|
|
- disabled
|
|
|
+ <template #default="{ row, $index }">
|
|
|
+ <el-form-item
|
|
|
+ :prop="
|
|
|
+ 'deliverGoodsDetailsList.' +
|
|
|
+ $index +
|
|
|
+ '.deliverGoodsQuantity'
|
|
|
+ "
|
|
|
+ :rules="rules.deliverGoodsQuantity"
|
|
|
+ :inline-message="true"
|
|
|
+ >
|
|
|
+ <el-input-number
|
|
|
+ v-model="row.deliverGoodsQuantity"
|
|
|
+ :precision="4"
|
|
|
+ :controls="false"
|
|
|
+ :min="0"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="sumArrivalCount"
|
|
|
+ label="剩余在途"
|
|
|
+ v-if="modalType === 'edit'"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ prop="count"
|
|
|
+ label="本次到货"
|
|
|
+ min-width="150"
|
|
|
+ v-if="modalType === 'edit'"
|
|
|
>
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
-
|
|
|
- <div style="margin-bottom: 10px; font-size: 14px">到货明细</div>
|
|
|
- <el-form-item>
|
|
|
- <el-table :data="formData.data.arrivalDetailList">
|
|
|
- <el-table-column
|
|
|
- prop="goodType"
|
|
|
- label="货品类型"
|
|
|
- :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')"
|
|
|
- />
|
|
|
- <el-table-column prop="productCode" label="货品编码" />
|
|
|
- <el-table-column prop="productName" label="货品名称" />
|
|
|
- <el-table-column prop="productSpec" label="规格型号" />
|
|
|
- <el-table-column prop="productUnit" label="单位" />
|
|
|
- <el-table-column prop="purchaseCount" label="采购数量" />
|
|
|
- <el-table-column prop="sumArrivalCount" label="已到货" />
|
|
|
- <el-table-column prop="count" label="本次到货" min-width="150">
|
|
|
- <template #default="{ row, $index }">
|
|
|
- <el-form-item
|
|
|
- :prop="'arrivalDetailList.' + $index + '.count'"
|
|
|
- :rules="rules.count"
|
|
|
- :inline-message="true"
|
|
|
- >
|
|
|
- <el-input-number
|
|
|
- v-model="row.count"
|
|
|
- :precision="4"
|
|
|
- :controls="false"
|
|
|
- :min="0"
|
|
|
- @change="handleChangeAmount"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
+ <template #default="{ row, $index }">
|
|
|
+ <el-form-item
|
|
|
+ :prop="'arrivalDetailList.' + $index + '.count'"
|
|
|
+ :rules="rules.count"
|
|
|
+ :inline-message="true"
|
|
|
+ >
|
|
|
+ <el-input-number
|
|
|
+ v-model="row.count"
|
|
|
+ :precision="4"
|
|
|
+ :controls="false"
|
|
|
+ :min="0"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </byForm>
|
|
|
|
|
|
<template #footer>
|
|
|
<el-button @click="dialogVisible = false" size="large">取 消</el-button>
|
|
@@ -138,7 +149,13 @@ const sourceList = ref({
|
|
|
let dialogVisible = ref(false);
|
|
|
let modalType = ref("add");
|
|
|
let rules = ref({
|
|
|
- count: [{ required: true, message: "请输入本次到货", trigger: "blur" }],
|
|
|
+ logisticsCompanyCode: [
|
|
|
+ { required: true, message: "请选择物流公司", trigger: "change" },
|
|
|
+ ],
|
|
|
+ code: [{ required: true, message: "请输入物流/快递单号", trigger: "blur" }],
|
|
|
+ deliverGoodsQuantity: [
|
|
|
+ { required: true, message: "请输入本次发货", trigger: "blur" },
|
|
|
+ ],
|
|
|
});
|
|
|
const { proxy } = getCurrentInstance();
|
|
|
const selectConfig = reactive([
|
|
@@ -263,13 +280,13 @@ const config = computed(() => {
|
|
|
return [
|
|
|
{
|
|
|
attrs: {
|
|
|
- label: "发货通知",
|
|
|
+ label: "发货登记",
|
|
|
type: "primary",
|
|
|
text: true,
|
|
|
},
|
|
|
el: "button",
|
|
|
click() {
|
|
|
- handleArrival(row);
|
|
|
+ handleArrival(row, "add");
|
|
|
},
|
|
|
},
|
|
|
{
|
|
@@ -280,7 +297,7 @@ const config = computed(() => {
|
|
|
},
|
|
|
el: "button",
|
|
|
click() {
|
|
|
- handleArrival(row);
|
|
|
+ handleArrival(row, "edit");
|
|
|
},
|
|
|
},
|
|
|
{
|
|
@@ -312,61 +329,84 @@ const config = computed(() => {
|
|
|
});
|
|
|
|
|
|
let formData = reactive({
|
|
|
- data: {
|
|
|
- type: "1",
|
|
|
- },
|
|
|
+ data: {},
|
|
|
});
|
|
|
const formOption = reactive({
|
|
|
inline: true,
|
|
|
labelWidth: 100,
|
|
|
itemWidth: 100,
|
|
|
- rules: [],
|
|
|
});
|
|
|
-const formDom = ref(null);
|
|
|
-const formConfig = computed(() => {
|
|
|
- return [
|
|
|
+const byform = ref(null);
|
|
|
+let formConfig = reactive();
|
|
|
+const configData = [
|
|
|
+ [
|
|
|
{
|
|
|
- type: "radio",
|
|
|
- prop: "name",
|
|
|
- label: "供应商类型",
|
|
|
- required: true,
|
|
|
- border: true,
|
|
|
- data: [
|
|
|
- { label: "贸易商", value: "1" },
|
|
|
- { label: "工厂", value: "2" },
|
|
|
- ],
|
|
|
+ type: "input",
|
|
|
+ prop: "supplyName",
|
|
|
+ label: "供应商",
|
|
|
+ disabled: true,
|
|
|
+ itemWidth: 50,
|
|
|
},
|
|
|
{
|
|
|
type: "input",
|
|
|
- prop: "name",
|
|
|
- label: "供应商名称",
|
|
|
- required: true,
|
|
|
+ prop: "purchaseCode",
|
|
|
+ label: "采购单号",
|
|
|
+ disabled: true,
|
|
|
+ itemWidth: 50,
|
|
|
},
|
|
|
{
|
|
|
- type: "slot",
|
|
|
- slotName: "address",
|
|
|
- label: "地址",
|
|
|
- required: true,
|
|
|
+ type: "select",
|
|
|
+ label: "物流信息",
|
|
|
+ prop: "logisticsCompanyCode",
|
|
|
+ itemWidth: 50,
|
|
|
+ style: {
|
|
|
+ width: "100%",
|
|
|
+ },
|
|
|
},
|
|
|
{
|
|
|
- type: "slot",
|
|
|
- slotName: "contact",
|
|
|
- label: "联系信息",
|
|
|
- required: true,
|
|
|
+ type: "input",
|
|
|
+ label: " ",
|
|
|
+ prop: "code",
|
|
|
+ itemWidth: 50,
|
|
|
},
|
|
|
{
|
|
|
type: "slot",
|
|
|
- slotName: "fileSlot",
|
|
|
- label: "上传附件",
|
|
|
+ slotName: "detailSlot",
|
|
|
+ label: "发货明细",
|
|
|
},
|
|
|
+ ],
|
|
|
+ [
|
|
|
{
|
|
|
type: "input",
|
|
|
- label: "备注",
|
|
|
- prop: "remakes",
|
|
|
- itemType: "textarea",
|
|
|
+ prop: "name",
|
|
|
+ label: "供应商",
|
|
|
+ disabled: true,
|
|
|
+ itemWidth: 50,
|
|
|
},
|
|
|
- ];
|
|
|
-});
|
|
|
+ {
|
|
|
+ type: "input",
|
|
|
+ prop: "name",
|
|
|
+ label: "采购单号",
|
|
|
+ disabled: true,
|
|
|
+ itemWidth: 50,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ type: "select",
|
|
|
+ label: "物流/快递单号",
|
|
|
+ prop: "name",
|
|
|
+ itemWidth: 50,
|
|
|
+ style: {
|
|
|
+ width: "100%",
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ type: "slot",
|
|
|
+ slotName: "detailSlot",
|
|
|
+ label: "发货明细",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+];
|
|
|
+
|
|
|
const getList = async (req) => {
|
|
|
sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
|
loading.value = true;
|
|
@@ -380,34 +420,52 @@ const getList = async (req) => {
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-const submitForm = async () => {
|
|
|
- formDom.value.validate((vaild) => {
|
|
|
- if (vaild) {
|
|
|
- const list = formData.data.arrivalDetailList;
|
|
|
- const total = list.reduce((total, x) => (total += Number(x.count)));
|
|
|
+const submitForm = () => {
|
|
|
+ byform.value.handleSubmit((valid) => {
|
|
|
+ if (modalType.value === "add") {
|
|
|
+ const list = formData.data.deliverGoodsDetailsList;
|
|
|
+ const total = list.reduce(
|
|
|
+ (total, x) => (total += Number(x.deliverGoodsQuantity)),
|
|
|
+ 0
|
|
|
+ );
|
|
|
if (total < 1) {
|
|
|
return ElMessage({
|
|
|
- message: `本次到货不能为0!`,
|
|
|
+ message: `本次发货不能为0!`,
|
|
|
type: "info",
|
|
|
});
|
|
|
}
|
|
|
- let sum = 0;
|
|
|
for (let i = 0; i < list.length; i++) {
|
|
|
const e = list[i];
|
|
|
if (
|
|
|
- Number(e.sumArrivalCount) + Number(e.count) >=
|
|
|
- Number(e.purchaseCount)
|
|
|
+ Number(e.alreadyDeliverGoodsQuantity) +
|
|
|
+ Number(e.deliverGoodsQuantity) >=
|
|
|
+ Number(e.count)
|
|
|
) {
|
|
|
- sum += 1;
|
|
|
+ return ElMessage({
|
|
|
+ message: `本次发货加累计发货不可大于采购数量!`,
|
|
|
+ type: "info",
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
- formData.data.arrivalStatus = sum === list.length ? "20" : "10";
|
|
|
+ formData.data.deliverGoodsDetailsList = list.map((x) => ({
|
|
|
+ purchaseDetailId: x.purchaseDetailId,
|
|
|
+ deliverGoodsQuantity: x.deliverGoodsQuantity,
|
|
|
+ }));
|
|
|
+ proxy.post("/deliverGoods/add", formData.data).then((res) => {
|
|
|
+ ElMessage({
|
|
|
+ message: `操作成功!`,
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ dialogVisible.value = false;
|
|
|
+ getList();
|
|
|
+ });
|
|
|
+ } else if (modalType.value === "edit") {
|
|
|
proxy.post("/arrival/add", formData.data).then((res) => {
|
|
|
ElMessage({
|
|
|
message: `操作成功!`,
|
|
|
type: "success",
|
|
|
});
|
|
|
- dialogVisible.value = true;
|
|
|
+ dialogVisible.value = false;
|
|
|
getList();
|
|
|
});
|
|
|
}
|
|
@@ -459,35 +517,65 @@ const getSupplierList = async (req) => {
|
|
|
supplierData.value = res.rows;
|
|
|
});
|
|
|
};
|
|
|
-const handleArrival = (row) => {
|
|
|
- proxy.post("/purchase/detail", { id: row.id }).then((res) => {
|
|
|
- formData.data = {
|
|
|
- purchaseId: row.id,
|
|
|
- code: res.code,
|
|
|
- supplyId: res.supplyId,
|
|
|
- arrivalDetailList: res.purchaseDetailList.map((x) => ({
|
|
|
- ...x,
|
|
|
- purchaseDetailId: x.id,
|
|
|
- purchaseCount: x.count,
|
|
|
- count: 0,
|
|
|
- })),
|
|
|
- arrivalStatus: "",
|
|
|
- };
|
|
|
- dialogVisible.value = true;
|
|
|
+
|
|
|
+const logisticsData = ref([]);
|
|
|
+const getLogisticsData = (row) => {
|
|
|
+ proxy.post("/companyInfo/list", { pageNum: 1, pageSize: 999 }).then((res) => {
|
|
|
+ logisticsData.value = res.reverse().slice(0, 100); //截取前100
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-getList();
|
|
|
-getSupplierList();
|
|
|
-const start = () => {
|
|
|
- proxy.$router.replace({
|
|
|
- path: "/platform_manage/process/processApproval",
|
|
|
- query: {
|
|
|
- isSubscribe: "20",
|
|
|
- ids: "",
|
|
|
- },
|
|
|
- });
|
|
|
+const handleArrival = (row, type) => {
|
|
|
+ modalType.value = type;
|
|
|
+ if (type === "add") {
|
|
|
+ formConfig = configData[0];
|
|
|
+ formConfig[2].data = logisticsData.value.map((x) => ({
|
|
|
+ label: x.name,
|
|
|
+ value: x.code,
|
|
|
+ }));
|
|
|
+ proxy.post("/deliverGoodsDetails/detail", { id: row.id }).then((res) => {
|
|
|
+ formData.data = {
|
|
|
+ purchaseId: row.id,
|
|
|
+ supplyName: row.supplyName,
|
|
|
+ purchaseCode: row.code,
|
|
|
+ supplyId: res.supplyId,
|
|
|
+ code: "",
|
|
|
+ logisticsCompanyCode: "",
|
|
|
+ deliverGoodsDetailsList: res.map((x) => ({
|
|
|
+ ...x,
|
|
|
+ purchaseDetailId: x.id,
|
|
|
+ alreadyDeliverGoodsQuantity: x.deliverGoodsQuantity,
|
|
|
+ deliverGoodsQuantity: 0,
|
|
|
+ })),
|
|
|
+ };
|
|
|
+ dialogVisible.value = true;
|
|
|
+ });
|
|
|
+ } else if (type === "edit") {
|
|
|
+ formConfig = configData[1];
|
|
|
+ proxy.post("/deliverGoods/list", { id: row.id }).then((res) => {
|
|
|
+ console.log(res, "wss");
|
|
|
+ });
|
|
|
+ proxy.post("/deliverGoods/detail", { id: row.id }).then((res) => {
|
|
|
+ console.log(res, "wss");
|
|
|
+ formData.data = {
|
|
|
+ purchaseId: row.id,
|
|
|
+ code: res.code,
|
|
|
+ supplyId: res.supplyId,
|
|
|
+ arrivalDetailList: res.purchaseDetailList.map((x) => ({
|
|
|
+ ...x,
|
|
|
+ purchaseDetailId: x.id,
|
|
|
+ purchaseCount: x.count,
|
|
|
+ count: 0,
|
|
|
+ })),
|
|
|
+ arrivalStatus: "",
|
|
|
+ };
|
|
|
+ dialogVisible.value = true;
|
|
|
+ });
|
|
|
+ }
|
|
|
};
|
|
|
+
|
|
|
+getList();
|
|
|
+getLogisticsData();
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|