From 941b7b96eb85d896a47a9457e1deb3aed1937775 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 27 十月 2025 09:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
multiple/assets/screen/LQMView.png | 0
multiple/assets/favicon/DHHBico.ico | 0
multiple/assets/favicon/HCMYico.ico | 0
multiple/assets/logo/MKZSLogo.png | 0
multiple/assets/screen/MKZSView.png | 0
multiple/config.json | 90 +++++++++
multiple/assets/favicon/HGJJico.ico | 0
multiple/assets/logo/PHMKLogo.png | 0
multiple/assets/screen/HGJJView.png | 0
src/views/salesManagement/salesLedger/index.vue | 105 ++++++++++
src/api/salesManagement/deliveryLedger.js | 39 +++
multiple/assets/favicon/QLMCico.ico | 0
multiple/assets/favicon/TYMKico.ico | 0
multiple/assets/screen/TYMKView.png | 0
multiple/assets/screen/DHHBView.png | 0
multiple/assets/logo/QLMCLogo.png | 0
multiple/assets/screen/QLMCView.png | 0
multiple/assets/logo/DHHBLogo.png | 0
multiple/assets/screen/HCMYView.png | 0
src/views/inventoryManagement/stockManagement/index.vue | 5
vite.config.js | 2
multiple/assets/favicon/HSMYico.ico | 0
multiple/assets/screen/PHMKView.png | 0
src/views/salesManagement/deliveryLedger/index.vue | 312 +++++++++++++++++++++++++++++++
multiple/assets/favicon/MKZSico.ico | 0
multiple/assets/logo/LQMLogo.png | 0
multiple/assets/logo/HSMYLogo.png | 0
multiple/assets/logo/TYMKLogo.png | 0
multiple/assets/favicon/PHMKico.ico | 0
multiple/assets/logo/HCMYLogo.png | 0
multiple/assets/logo/HGJJLogo.png | 0
multiple/assets/screen/HSMYView.png | 0
multiple/assets/favicon/LQMico.ico | 0
33 files changed, 548 insertions(+), 5 deletions(-)
diff --git a/multiple/assets/favicon/DHHBico.ico b/multiple/assets/favicon/DHHBico.ico
new file mode 100644
index 0000000..4bfd006
--- /dev/null
+++ b/multiple/assets/favicon/DHHBico.ico
Binary files differ
diff --git a/multiple/assets/favicon/HCMYico.ico b/multiple/assets/favicon/HCMYico.ico
new file mode 100644
index 0000000..d7ed334
--- /dev/null
+++ b/multiple/assets/favicon/HCMYico.ico
Binary files differ
diff --git a/multiple/assets/favicon/HGJJico.ico b/multiple/assets/favicon/HGJJico.ico
new file mode 100644
index 0000000..19b583b
--- /dev/null
+++ b/multiple/assets/favicon/HGJJico.ico
Binary files differ
diff --git a/multiple/assets/favicon/HSMYico.ico b/multiple/assets/favicon/HSMYico.ico
new file mode 100644
index 0000000..d43a485
--- /dev/null
+++ b/multiple/assets/favicon/HSMYico.ico
Binary files differ
diff --git a/multiple/assets/favicon/LQMico.ico b/multiple/assets/favicon/LQMico.ico
new file mode 100644
index 0000000..f59c6a9
--- /dev/null
+++ b/multiple/assets/favicon/LQMico.ico
Binary files differ
diff --git a/multiple/assets/favicon/MKZSico.ico b/multiple/assets/favicon/MKZSico.ico
new file mode 100644
index 0000000..559a417
--- /dev/null
+++ b/multiple/assets/favicon/MKZSico.ico
Binary files differ
diff --git a/multiple/assets/favicon/PHMKico.ico b/multiple/assets/favicon/PHMKico.ico
new file mode 100644
index 0000000..dd5b404
--- /dev/null
+++ b/multiple/assets/favicon/PHMKico.ico
Binary files differ
diff --git a/multiple/assets/favicon/QLMCico.ico b/multiple/assets/favicon/QLMCico.ico
new file mode 100644
index 0000000..8a51d67
--- /dev/null
+++ b/multiple/assets/favicon/QLMCico.ico
Binary files differ
diff --git a/multiple/assets/favicon/TYMKico.ico b/multiple/assets/favicon/TYMKico.ico
new file mode 100644
index 0000000..0fbc2d1
--- /dev/null
+++ b/multiple/assets/favicon/TYMKico.ico
Binary files differ
diff --git a/multiple/assets/logo/DHHBLogo.png b/multiple/assets/logo/DHHBLogo.png
new file mode 100644
index 0000000..0c6d832
--- /dev/null
+++ b/multiple/assets/logo/DHHBLogo.png
Binary files differ
diff --git a/multiple/assets/logo/HCMYLogo.png b/multiple/assets/logo/HCMYLogo.png
new file mode 100644
index 0000000..5910ffd
--- /dev/null
+++ b/multiple/assets/logo/HCMYLogo.png
Binary files differ
diff --git a/multiple/assets/logo/HGJJLogo.png b/multiple/assets/logo/HGJJLogo.png
new file mode 100644
index 0000000..a1bc1f1
--- /dev/null
+++ b/multiple/assets/logo/HGJJLogo.png
Binary files differ
diff --git a/multiple/assets/logo/HSMYLogo.png b/multiple/assets/logo/HSMYLogo.png
new file mode 100644
index 0000000..daec820
--- /dev/null
+++ b/multiple/assets/logo/HSMYLogo.png
Binary files differ
diff --git a/multiple/assets/logo/LQMLogo.png b/multiple/assets/logo/LQMLogo.png
new file mode 100644
index 0000000..84ef782
--- /dev/null
+++ b/multiple/assets/logo/LQMLogo.png
Binary files differ
diff --git a/multiple/assets/logo/MKZSLogo.png b/multiple/assets/logo/MKZSLogo.png
new file mode 100644
index 0000000..a7079a5
--- /dev/null
+++ b/multiple/assets/logo/MKZSLogo.png
Binary files differ
diff --git a/multiple/assets/logo/PHMKLogo.png b/multiple/assets/logo/PHMKLogo.png
new file mode 100644
index 0000000..e179c2c
--- /dev/null
+++ b/multiple/assets/logo/PHMKLogo.png
Binary files differ
diff --git a/multiple/assets/logo/QLMCLogo.png b/multiple/assets/logo/QLMCLogo.png
new file mode 100644
index 0000000..f94d826
--- /dev/null
+++ b/multiple/assets/logo/QLMCLogo.png
Binary files differ
diff --git a/multiple/assets/logo/TYMKLogo.png b/multiple/assets/logo/TYMKLogo.png
new file mode 100644
index 0000000..1da706f
--- /dev/null
+++ b/multiple/assets/logo/TYMKLogo.png
Binary files differ
diff --git a/multiple/assets/screen/DHHBView.png b/multiple/assets/screen/DHHBView.png
new file mode 100644
index 0000000..f1928d9
--- /dev/null
+++ b/multiple/assets/screen/DHHBView.png
Binary files differ
diff --git a/multiple/assets/screen/HCMYView.png b/multiple/assets/screen/HCMYView.png
new file mode 100644
index 0000000..bf0a9dc
--- /dev/null
+++ b/multiple/assets/screen/HCMYView.png
Binary files differ
diff --git a/multiple/assets/screen/HGJJView.png b/multiple/assets/screen/HGJJView.png
new file mode 100644
index 0000000..00575e8
--- /dev/null
+++ b/multiple/assets/screen/HGJJView.png
Binary files differ
diff --git a/multiple/assets/screen/HSMYView.png b/multiple/assets/screen/HSMYView.png
new file mode 100644
index 0000000..201c406
--- /dev/null
+++ b/multiple/assets/screen/HSMYView.png
Binary files differ
diff --git a/multiple/assets/screen/LQMView.png b/multiple/assets/screen/LQMView.png
new file mode 100644
index 0000000..8c0e23d
--- /dev/null
+++ b/multiple/assets/screen/LQMView.png
Binary files differ
diff --git a/multiple/assets/screen/MKZSView.png b/multiple/assets/screen/MKZSView.png
new file mode 100644
index 0000000..9033a9a
--- /dev/null
+++ b/multiple/assets/screen/MKZSView.png
Binary files differ
diff --git a/multiple/assets/screen/PHMKView.png b/multiple/assets/screen/PHMKView.png
new file mode 100644
index 0000000..3fd67ee
--- /dev/null
+++ b/multiple/assets/screen/PHMKView.png
Binary files differ
diff --git a/multiple/assets/screen/QLMCView.png b/multiple/assets/screen/QLMCView.png
new file mode 100644
index 0000000..814b628
--- /dev/null
+++ b/multiple/assets/screen/QLMCView.png
Binary files differ
diff --git a/multiple/assets/screen/TYMKView.png b/multiple/assets/screen/TYMKView.png
new file mode 100644
index 0000000..3449ceb
--- /dev/null
+++ b/multiple/assets/screen/TYMKView.png
Binary files differ
diff --git a/multiple/config.json b/multiple/config.json
index ec86d8d..75762b4 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -257,6 +257,96 @@
"logo": "logo/HXSJLogo.png",
"favicon": "favicon/HXSJico.ico"
},
+ "QLMC": {
+ "env": {
+ "VITE_APP_TITLE": "绁佽繛鐗у満淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9036",
+ "VITE_JAVA_API": "http://114.132.189.42:9037"
+ },
+ "screen": "screen/QLMCView.png",
+ "logo": "logo/QLMCLogo.png",
+ "favicon": "favicon/QLMCico.ico"
+ },
+ "HCMY": {
+ "env": {
+ "VITE_APP_TITLE": "娴╂垚鐓や笟淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9103",
+ "VITE_JAVA_API": "http://114.132.189.42:9094"
+ },
+ "screen": "screen/HCMYView.png",
+ "logo": "logo/HCMYLogo.png",
+ "favicon": "favicon/HCMYico.ico"
+ },
+ "HGJJ": {
+ "env": {
+ "VITE_APP_TITLE": "姹囧浗娲佸噣鍨嬬叅淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9107",
+ "VITE_JAVA_API": "http://114.132.189.42:9090"
+ },
+ "screen": "screen/HGJJView.png",
+ "logo": "logo/HGJJLogo.png",
+ "favicon": "favicon/HGJJico.ico"
+ },
+ "MKZS": {
+ "env": {
+ "VITE_APP_TITLE": "妯″嚡鍐嶇敓淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9111",
+ "VITE_JAVA_API": "http://114.132.189.42:9086"
+ },
+ "screen": "screen/MKZSView.png",
+ "logo": "logo/MKZSLogo.png",
+ "favicon": "favicon/MKZSico.ico"
+ },
+ "HSMY": {
+ "env": {
+ "VITE_APP_TITLE": "鍗庨『闀佷笟淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9115",
+ "VITE_JAVA_API": "http://114.132.189.42:9082"
+ },
+ "screen": "screen/HSMYView.png",
+ "logo": "logo/HSMYLogo.png",
+ "favicon": "favicon/HSMYico.ico"
+ },
+ "DHHB": {
+ "env": {
+ "VITE_APP_TITLE": "涓规捣鐜繚淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9117",
+ "VITE_JAVA_API": "http://114.132.189.42:9080"
+ },
+ "screen": "screen/DHHBView.png",
+ "logo": "logo/DHHBLogo.png",
+ "favicon": "favicon/DHHBico.ico"
+ },
+ "PHMK": {
+ "env": {
+ "VITE_APP_TITLE": "鏅鐓ょ熆淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9119",
+ "VITE_JAVA_API": "http://114.132.189.42:9078"
+ },
+ "screen": "screen/PHMKView.png",
+ "logo": "logo/PHMKLogo.png",
+ "favicon": "favicon/PHMKico.ico"
+ },
+ "TYMK": {
+ "env": {
+ "VITE_APP_TITLE": "閫氭簮鐓ょ熆淇℃伅绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://114.132.189.42:9121",
+ "VITE_JAVA_API": "http://114.132.189.42:9076"
+ },
+ "screen": "screen/TYMKView.png",
+ "logo": "logo/TYMKLogo.png",
+ "favicon": "favicon/TYMKico.ico"
+ },
+ "LQM": {
+ "env": {
+ "VITE_APP_TITLE": "鑰佺惇楹﹂鍝佷俊鎭鐞嗙郴缁�",
+ "VITE_BASE_API": "http://114.132.189.42:9123",
+ "VITE_JAVA_API": "http://114.132.189.42:9074"
+ },
+ "screen": "screen/LQMView.png",
+ "logo": "logo/LQMLogo.png",
+ "favicon": "favicon/LQMico.ico"
+ },
"screen": "/src/assets/images/login-background.png",
"logo": "/src/assets/logo/logo.png",
"favicon": "/public/favicon.ico"
diff --git a/src/api/salesManagement/deliveryLedger.js b/src/api/salesManagement/deliveryLedger.js
new file mode 100644
index 0000000..bb8689f
--- /dev/null
+++ b/src/api/salesManagement/deliveryLedger.js
@@ -0,0 +1,39 @@
+// 鍙戣揣鍙拌处椤甸潰鎺ュ彛
+import request from "@/utils/request";
+
+// 鍒嗛〉鏌ヨ
+export function deliveryLedgerListPage(query) {
+ return request({
+ url: "/shippingInfo/listPage",
+ method: "get",
+ params: query,
+ });
+}
+
+// 淇敼鍙戣揣鍙拌处
+export function addOrUpdateDeliveryLedger(query) {
+ return request({
+ url: "/shippingInfo/update",
+ method: "post",
+ data: query,
+ });
+}
+
+// 鍒犻櫎鍙戣揣鍙拌处
+export function delDeliveryLedger(query) {
+ return request({
+ url: "/shippingInfo/delete",
+ method: "delete",
+ data: query,
+ });
+}
+
+// 鏂板鍙戣揣淇℃伅
+export function addShippingInfo(data) {
+ return request({
+ url: "/shippingInfo/add",
+ method: "post",
+ data,
+ });
+}
+
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 9715478..84dc029 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -123,11 +123,11 @@
</el-select>
</el-form-item>
</el-col>
- <!-- <el-col :span="12">
+ <el-col :span="12">
<el-form-item label="鏈�浣庡簱瀛橈細" prop="minStock">
<el-input v-model="form.minStock" placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" clearable />
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -203,6 +203,7 @@
stockQuantity: '',
boundTime: '',
minStock: '', // 鏂板鏈�浣庡簱瀛樺瓧娈�
+ salesLedgerProductId: null,
},
rules: {
supplierName: [{ required: true, message: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О', trigger: 'blur' }],
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
new file mode 100644
index 0000000..b10c80e
--- /dev/null
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -0,0 +1,312 @@
+<template>
+ <div class="app-container">
+ <div class="search_form">
+ <el-form :model="searchForm" :inline="true">
+ <el-form-item label="閿�鍞鍗曞彿锛�">
+ <el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+ @change="handleQuery" />
+ </el-form-item>
+ <el-form-item label="杞︾墝鍙凤細">
+ <el-input v-model="searchForm.shippingCarNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+ @change="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="table_list">
+ <div class="actions">
+ <div></div>
+ <div>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+ </div>
+ </div>
+ <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
+ :row-key="(row) => row.id" style="width: 100%" height="calc(100vh - 18.5em)">
+ <el-table-column align="center" type="selection" width="55" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column label="閿�鍞鍗�" prop="salesContractNo" show-overflow-tooltip />
+ <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip />
+ <el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip />
+ <el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip />
+ <el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
+ <template #default="scope">
+ <el-button link type="primary" size="small" @click="openForm('edit', scope.row)">缂栬緫</el-button>
+ <el-button link type="danger" size="small" @click="handleDeleteSingle(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current" :limit="page.size" @pagination="paginationChange" />
+ </div>
+ <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍙戣揣鍙拌处' : '缂栬緫鍙戣揣鍙拌处'" width="50%"
+ @close="closeDia">
+ <el-form :model="form" label-width="120px" label-position="top" :rules="rules" ref="formRef">
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="閿�鍞鍗曪細" prop="salesContractNo">
+ <el-select v-model="form.salesContractNo" placeholder="璇烽�夋嫨" clearable filterable
+ @change="handleSalesOrderChange" style="width: 100%" :disabled="operationType === 'edit'">
+ <el-option v-for="item in salesOrderOptions" :key="item.salesContractNo"
+ :label="item.salesContractNo" :value="item.salesContractNo">
+ {{ item.salesContractNo + ' - ' + item.customerName }}
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerName">
+ <el-input v-model="form.customerName" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'edit'" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="鍙戣揣鏃堕棿锛�" prop="shippingDate">
+ <el-date-picker style="width: 100%" v-model="form.shippingDate" value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
+ <el-input v-model="form.shippingCarNumber" placeholder="璇疯緭鍏�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭</el-button>
+ <el-button @click="closeDia">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup>
+import pagination from "@/components/PIMTable/Pagination.vue";
+import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
+import { ElMessageBox } from "element-plus";
+import {
+ deliveryLedgerListPage,
+ addOrUpdateDeliveryLedger,
+ delDeliveryLedger,
+} from "@/api/salesManagement/deliveryLedger.js";
+
+
+const { proxy } = getCurrentInstance();
+const tableData = ref([]);
+const selectedRows = ref([]);
+const tableLoading = ref(false);
+const salesOrderOptions = ref([]);
+const page = reactive({
+ current: 1,
+ size: 100,
+});
+const total = ref(0);
+
+// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
+const operationType = ref("");
+const dialogFormVisible = ref(false);
+const data = reactive({
+ searchForm: {
+ salesContractNo: "", // 閿�鍞鍗曞彿
+ shippingCarNumber: "", // 杞︾墝鍙�
+ },
+ form: {
+ id: null,
+ salesContractNo: "",
+ customerName: "",
+ shippingDate: "",
+ shippingCarNumber: "",
+ },
+ rules: {
+ salesContractNo: [{ required: true, message: "璇烽�夋嫨閿�鍞鍗�", trigger: "change" }],
+ customerName: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" }],
+ shippingDate: [{ required: true, message: "璇烽�夋嫨鍙戣揣鏃堕棿", trigger: "change" }],
+ shippingCarNumber: [{ required: true, message: "璇疯緭鍏ュ彂璐ц溅鐗屽彿", trigger: "blur" }],
+ },
+});
+const { form, rules } = toRefs(data);
+const { searchForm } = toRefs(data);
+
+
+
+// 鏌ヨ鍒楄〃
+const handleQuery = () => {
+ page.current = 1;
+ getList();
+};
+
+const paginationChange = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+};
+
+const getList = () => {
+ tableLoading.value = true;
+ deliveryLedgerListPage({ ...searchForm.value, ...page })
+ .then((res) => {
+ tableLoading.value = false;
+ tableData.value = res.data.records || [];
+ total.value = res.data.total || 0;
+ })
+ .catch(() => {
+ tableLoading.value = false;
+ });
+};
+
+// 閿�鍞鍗曞彉鍖栨椂鑷姩濉厖瀹㈡埛鍚嶇О
+const handleSalesOrderChange = (value) => {
+ const selectedOrder = salesOrderOptions.value.find(item => item.salesContractNo === value);
+ if (selectedOrder) {
+ form.value.customerName = selectedOrder.customerName;
+ }
+};
+
+// 琛ㄦ牸閫夋嫨鏁版嵁
+const handleSelectionChange = (selection) => {
+ selectedRows.value = selection;
+};
+
+// 鎵撳紑寮规
+const openForm = async (type, row) => {
+ operationType.value = type;
+ if (type === 'edit' && row) {
+ form.value = {
+ id: row.id ?? null,
+ salesContractNo: row.salesContractNo ?? "",
+ customerName: row.customerName ?? "",
+ shippingDate: row.shippingDate || getCurrentDate(),
+ shippingCarNumber: row.shippingCarNumber ?? "",
+ };
+ } else {
+ form.value = {
+ id: null,
+ salesContractNo: "",
+ customerName: "",
+ shippingDate: getCurrentDate(),
+ shippingCarNumber: "",
+ };
+ }
+
+ dialogFormVisible.value = true;
+};
+
+// 鎻愪氦琛ㄥ崟
+const submitForm = () => {
+ proxy.$refs["formRef"].validate((valid) => {
+ if (valid) {
+ const payload = {
+ id: form.value.id,
+ shippingDate: form.value.shippingDate,
+ shippingCarNumber: form.value.shippingCarNumber,
+ };
+ addOrUpdateDeliveryLedger(payload).then((res) => {
+ proxy.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ closeDia();
+ getList();
+ });
+ }
+ });
+};
+
+// 鍏抽棴寮规
+const closeDia = () => {
+ proxy.resetForm("formRef");
+ dialogFormVisible.value = false;
+};
+
+// 瀵煎嚭
+const handleOut = () => {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ proxy.download("/shippingInfo/export", {}, "鍙戣揣鍙拌处.xlsx");
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+
+// 鎵归噺鍒犻櫎
+const handleDelete = () => {
+ let ids = [];
+ if (selectedRows.value.length > 0) {
+ ids = selectedRows.value.map((item) => item.id);
+ } else {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ delDeliveryLedger(ids).then((res) => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+
+// 鍗曚釜鍒犻櫎
+const handleDeleteSingle = (row) => {
+ ElMessageBox.confirm("姝ゆ搷浣滃皢鍒犻櫎璇ヨ褰曪紝鏄惁纭锛�", "鍒犻櫎", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ delDeliveryLedger([row.id]).then((res) => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+function getCurrentDate() {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = String(today.getMonth() + 1).padStart(2, "0");
+ const day = String(today.getDate()).padStart(2, "0");
+ return `${year}-${month}-${day}`;
+}
+
+onMounted(() => {
+ getList();
+});
+</script>
+
+<style scoped lang="scss">
+.table_list {
+ margin-top: unset;
+}
+
+.actions {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 10px;
+}
+</style>
+
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 7482d2e..f1fb9a2 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -70,11 +70,12 @@
<el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
<el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
- <el-table-column fixed="right" label="鎿嶄綔" min-width="140" align="center">
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="200" align="center">
<template #default="scope">
<el-button link type="primary" size="small" :disabled="scope.row.invoiceTotal>0 || scope.row.entryPersonName !== userStore.nickName" @click="openForm('edit', scope.row)">缂栬緫</el-button>
<!-- <el-button link type="primary" size="small" @click="openForm('view', scope.row)">璇︽儏</el-button>-->
<el-button link type="primary" size="small" @click="downLoadFile(scope.row)">闄勪欢</el-button>
+ <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">鍙戣揣</el-button>
</template>
</el-table-column>
</el-table>
@@ -407,6 +408,48 @@
</div>
</div>
</el-dialog>
+ <!-- 鍙戣揣寮规 -->
+ <el-dialog
+ v-model="deliveryFormVisible"
+ title="鍙戣揣淇℃伅"
+ width="40%"
+ @close="closeDeliveryDia"
+ >
+ <el-form :model="deliveryForm" label-width="120px" label-position="top" :rules="deliveryRules" ref="deliveryFormRef">
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="鍙戣揣鏃ユ湡锛�" prop="shippingDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="deliveryForm.shippingDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨鍙戣揣鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
+ <el-input
+ v-model="deliveryForm.shippingCarNumber"
+ placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitDelivery">纭鍙戣揣</el-button>
+ <el-button @click="closeDeliveryDia">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
<FileList ref="fileListRef" />
</div>
</template>
@@ -415,6 +458,7 @@
import { getToken } from "@/utils/auth";
import pagination from "@/components/PIMTable/Pagination.vue";
import {onMounted, ref} from "vue";
+import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import { userListNoPage } from "@/api/system/user.js";
@@ -544,6 +588,25 @@
// 鎵撳嵃鐩稿叧
const printPreviewVisible = ref(false);
const printData = ref([]);
+
+// 鍙戣揣鐩稿叧
+const deliveryFormVisible = ref(false);
+const currentDeliveryRow = ref(null);
+const deliveryFormData = reactive({
+ deliveryForm: {
+ shippingDate: "",
+ shippingCarNumber: "",
+ },
+ deliveryRules: {
+ shippingDate: [
+ { required: true, message: "璇烽�夋嫨鍙戣揣鏃ユ湡", trigger: "change" }
+ ],
+ shippingCarNumber: [
+ { required: true, message: "璇疯緭鍏ュ彂璐ц溅鐗屽彿", trigger: "blur" }
+ ],
+ },
+});
+const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
const changeDaterange = (value) => {
if (value) {
@@ -1460,8 +1523,46 @@
getSalesLedgerWithProducts({ id: row.id, type: 1 }).then((res) => {
fileListRef.value.open(res.salesLedgerFiles)
});
-
}
+
+// 鎵撳紑鍙戣揣寮规
+const openDeliveryForm = (row) => {
+ currentDeliveryRow.value = row;
+ deliveryForm.value = {
+ shippingDate: getCurrentDate(),
+ shippingCarNumber: "",
+ };
+ deliveryFormVisible.value = true;
+};
+
+// 鎻愪氦鍙戣揣琛ㄥ崟
+const submitDelivery = () => {
+ proxy.$refs["deliveryFormRef"].validate((valid) => {
+ if (valid) {
+ addShippingInfo({
+ salesLedgerId: currentDeliveryRow.value.id,
+ shippingDate: deliveryForm.value.shippingDate,
+ shippingCarNumber: deliveryForm.value.shippingCarNumber,
+ })
+ .then(() => {
+ proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
+ closeDeliveryDia();
+ getList();
+ })
+ .catch(() => {
+ proxy.$modal.msgError("鍙戣揣澶辫触锛岃閲嶈瘯");
+ });
+ }
+ });
+};
+
+// 鍏抽棴鍙戣揣寮规
+const closeDeliveryDia = () => {
+ proxy.resetForm("deliveryFormRef");
+ deliveryFormVisible.value = false;
+ currentDeliveryRow.value = null;
+};
+
onMounted(() => {
getList();
});
diff --git a/vite.config.js b/vite.config.js
index 540ff94..f73f535 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,7 +8,7 @@
const { VITE_APP_ENV } = env;
const baseUrl =
env.VITE_APP_ENV === "development"
- ? "http://114.132.189.42:9036"
+ ? "http://192.168.1.147:9036"
: env.VITE_BASE_API;
const javaUrl =
env.VITE_APP_ENV === "development"
--
Gitblit v1.9.3