曹睿
18 小时以前 3b73c6d15fc65c777e63eb06cf128f7799120bc5
fix: 销售台账采购台账修复表格无法展开问题。
已修改4个文件
123 ■■■■■ 文件已修改
src/views/procurementManagement/procurementLedger/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceRegistration/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vite.config.js 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
      });
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" }],
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);
      });
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 {
    // 部署生产环境和开发环境下的URL。
    // 默认情况下,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();
                }
              }
            }
          }
        ]
      }
    }
  }
})
              },
            },
          },
        ],
      },
    },
  };
});