From 3b73c6d15fc65c777e63eb06cf128f7799120bc5 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期五, 27 六月 2025 10:52:18 +0800
Subject: [PATCH] fix: 销售台账采购台账修复表格无法展开问题。
---
src/views/procurementManagement/procurementLedger/index.vue | 19 ++++++
src/views/salesManagement/salesLedger/index.vue | 23 ++++++-
vite.config.js | 77 +++++++++++++------------
src/views/salesManagement/invoiceRegistration/index.vue | 4 +
4 files changed, 81 insertions(+), 42 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 5ac4a96..be2cac7 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -94,6 +94,11 @@
show-overflow-tooltip
/>
<el-table-column
+ label="浠樻鏂瑰紡"
+ prop="paymentMethod"
+ show-overflow-tooltip
+ />
+ <el-table-column
label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
show-overflow-tooltip
@@ -231,6 +236,17 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="浠樻鏂瑰紡">
+ <el-input
+ v-model="form.paymentMethod"
+ placeholder="璇疯緭鍏�"
clearable
/>
</el-form-item>
@@ -553,6 +569,7 @@
productData: [],
supplierName: "",
supplierId: "",
+ paymentMethod: "",
},
rules: {
purchaseContractNumber: [
@@ -673,7 +690,7 @@
productList({ salesLedgerId: row.id, type: 2 }).then((res) => {
const index = tableData.value.findIndex((item) => item.id === row.id);
if (index > -1) {
- tableData.value[index].children = res;
+ tableData.value[index].children = res.data;
}
expandedRowKeys.value.push(row.id);
});
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 402e93c..528ba0c 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -230,6 +230,8 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
/>
</el-form-item>
</el-col>
@@ -420,6 +422,8 @@
salesman: "",
projectName: "",
productData: [],
+ invoiceNo: "",
+ createUer: "",
},
rules: {
salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index c401650..a1554bd 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -136,6 +136,11 @@
show-overflow-tooltip
/>
<el-table-column
+ label="浠樻鏂瑰紡"
+ prop="paymentMethod"
+ show-overflow-tooltip
+ />
+ <el-table-column
label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
width="180"
@@ -307,6 +312,17 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="浠樻鏂瑰紡">
+ <el-input
+ v-model="form.paymentMethod"
+ placeholder="璇疯緭鍏�"
clearable
/>
</el-form-item>
@@ -615,8 +631,8 @@
searchForm: {
customerName: "", // 瀹㈡埛鍚嶇О
customerContractNo: "", // 瀹㈡埛鍚堝悓缂栧彿
- salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
- projectName: "", // 椤圭洰鍚嶇О
+ salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
+ projectName: "", // 椤圭洰鍚嶇О
},
form: {
salesContractNo: "",
@@ -629,6 +645,7 @@
maintenanceTime: "",
productData: [],
executionDate: "",
+ paymentMethod: "",
},
rules: {
salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -786,7 +803,7 @@
productList({ salesLedgerId: row.id, type: 1 }).then((res) => {
const index = tableData.value.findIndex((item) => item.id === row.id);
if (index > -1) {
- tableData.value[index].children = res;
+ tableData.value[index].children = res.data;
}
expandedRowKeys.value.push(row.id);
});
diff --git a/vite.config.js b/vite.config.js
index 2c84c9f..0100f5c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,46 +1,47 @@
-import { defineConfig, loadEnv } from 'vite'
-import path from 'path'
-import createVitePlugins from './vite/plugins'
+import { defineConfig, loadEnv } from "vite";
+import path from "path";
+import createVitePlugins from "./vite/plugins";
// https://vitejs.dev/config/
export default defineConfig(({ mode, command }) => {
- const env = loadEnv(mode, process.cwd())
- const { VITE_APP_ENV } = env
- const baseUrl = VITE_APP_ENV == 'development'
- ? 'http://192.168.10.2:7003' // 寮�鍙戠幆澧冨悗绔帴鍙�
- : 'http://114.132.189.42:7004' // 鐢熶骇鐜鍚庣鎺ュ彛
+ const env = loadEnv(mode, process.cwd());
+ const { VITE_APP_ENV } = env;
+ const baseUrl =
+ VITE_APP_ENV == "development"
+ ? "http://192.168.10.2:7003" // 寮�鍙戠幆澧冨悗绔帴鍙�
+ : "http://114.132.189.42:7003"; // 鐢熶骇鐜鍚庣鎺ュ彛
return {
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
// 榛樿鎯呭喌涓嬶紝vite 浼氬亣璁句綘鐨勫簲鐢ㄦ槸琚儴缃插湪涓�涓煙鍚嶇殑鏍硅矾寰勪笂
// 渚嬪 https://www.ruoyi.vip/銆傚鏋滃簲鐢ㄨ閮ㄧ讲鍦ㄤ竴涓瓙璺緞涓婏紝浣犲氨闇�瑕佺敤杩欎釜閫夐」鎸囧畾杩欎釜瀛愯矾寰勩�備緥濡傦紝濡傛灉浣犵殑搴旂敤琚儴缃插湪 https://www.ruoyi.vip/admin/锛屽垯璁剧疆 baseUrl 涓� /admin/銆�
- base: VITE_APP_ENV === 'production' ? '/' : '/',
- plugins: createVitePlugins(env, command === 'build'),
+ base: VITE_APP_ENV === "production" ? "/" : "/",
+ plugins: createVitePlugins(env, command === "build"),
resolve: {
// https://cn.vitejs.dev/config/#resolve-alias
alias: {
// 璁剧疆璺緞
- '~': path.resolve(__dirname, './'),
+ "~": path.resolve(__dirname, "./"),
// 璁剧疆鍒悕
- '@': path.resolve(__dirname, './src')
+ "@": path.resolve(__dirname, "./src"),
},
// https://cn.vitejs.dev/config/#resolve-extensions
- extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
+ extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],
},
// 鎵撳寘閰嶇疆
build: {
// https://vite.dev/config/build-options.html
- sourcemap: command === 'build' ? false : 'inline',
- outDir: 'dist',
- assetsDir: 'assets',
+ sourcemap: command === "build" ? false : "inline",
+ outDir: "dist",
+ assetsDir: "assets",
chunkSizeWarningLimit: 2000,
rollupOptions: {
output: {
- chunkFileNames: 'static/js/[name]-[hash].js',
- entryFileNames: 'static/js/[name]-[hash].js',
- assetFileNames: 'static/[ext]/[name]-[hash].[ext]'
- }
- }
+ chunkFileNames: "static/js/[name]-[hash].js",
+ entryFileNames: "static/js/[name]-[hash].js",
+ assetFileNames: "static/[ext]/[name]-[hash].[ext]",
+ },
+ },
},
// vite 鐩稿叧閰嶇疆
server: {
@@ -49,33 +50,33 @@
open: true,
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
- '/dev-api': {
+ "/dev-api": {
target: baseUrl,
changeOrigin: true,
- rewrite: (p) => p.replace(/^\/dev-api/, '')
+ rewrite: (p) => p.replace(/^\/dev-api/, ""),
},
- // springdoc proxy
- '^/v3/api-docs/(.*)': {
+ // springdoc proxy
+ "^/v3/api-docs/(.*)": {
target: baseUrl,
changeOrigin: true,
- }
- }
+ },
+ },
},
css: {
postcss: {
plugins: [
{
- postcssPlugin: 'internal:charset-removal',
+ postcssPlugin: "internal:charset-removal",
AtRule: {
charset: (atRule) => {
- if (atRule.name === 'charset') {
- atRule.remove()
+ if (atRule.name === "charset") {
+ atRule.remove();
}
- }
- }
- }
- ]
- }
- }
- }
-})
+ },
+ },
+ },
+ ],
+ },
+ },
+ };
+});
--
Gitblit v1.9.3