From 2f3b2e7a2acd7f8962635367851dec28f81d27ab Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 20 八月 2025 15:25:45 +0800
Subject: [PATCH] 公司正式库修改
---
.env.staging | 4 ++--
.env.development | 4 ++--
src/views/salesManagement/invoiceLedger/index.vue | 2 +-
src/views/equipmentManagement/repair/Modal/MaintainModal.vue | 4 ++--
src/views/login.vue | 2 +-
src/main.js | 2 +-
index.html | 2 +-
package.json | 2 +-
.env.production | 4 ++--
src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue | 4 ++--
vite.config.js | 2 +-
src/views/salesManagement/invoiceRegistration/index.vue | 1 +
12 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/.env.development b/.env.development
index cb09df4..1a63995 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘
+VITE_APP_TITLE = 鑺浜戯紙绠$悊淇℃伅绯荤粺锛�
# 寮�鍙戠幆澧冮厤缃�
VITE_APP_ENV = 'development'
-# 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘/寮�鍙戠幆澧�
+# 鑺浜戯紙绠$悊淇℃伅绯荤粺锛�/寮�鍙戠幆澧�
VITE_APP_BASE_API = '/dev-api'
diff --git a/.env.production b/.env.production
index 3076c27..fa28cfc 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘
+VITE_APP_TITLE = 鑺浜戯紙绠$悊淇℃伅绯荤粺锛�
# 鐢熶骇鐜閰嶇疆
VITE_APP_ENV = 'production'
-# 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘/鐢熶骇鐜
+# 鑺浜戯紙绠$悊淇℃伅绯荤粺锛�/鐢熶骇鐜
VITE_APP_BASE_API = '/prod-api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
diff --git a/.env.staging b/.env.staging
index f446698..468abb3 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘
+VITE_APP_TITLE = 鑺浜戯紙绠$悊淇℃伅绯荤粺锛�
# 鐢熶骇鐜閰嶇疆
VITE_APP_ENV = 'staging'
-# 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘/鐢熶骇鐜
+# 鑺浜戯紙绠$悊淇℃伅绯荤粺锛�/鐢熶骇鐜
VITE_APP_BASE_API = '/stage-api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
diff --git a/index.html b/index.html
index 187ddea..c72b2b8 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="/favicon.ico">
- <title>涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘</title>
+ <title>鑺浜戯紙绠$悊淇℃伅绯荤粺锛�</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
html,
diff --git a/package.json b/package.json
index d6169e8..a2507f4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.9",
- "description": "涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘",
+ "description": "鑺浜戯紙绠$悊淇℃伅绯荤粺锛�",
"author": "鑻ヤ緷",
"license": "MIT",
"type": "module",
diff --git a/src/main.js b/src/main.js
index 00205af..ef6b2a4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -76,7 +76,7 @@
app.config.globalProperties.addDateRange = addDateRange;
app.config.globalProperties.selectDictLabel = selectDictLabel;
app.config.globalProperties.selectDictLabels = selectDictLabels;
-app.config.globalProperties.javaApi = "http://114.132.189.42:8099";
+app.config.globalProperties.javaApi = "http://114.132.189.42:7004";
app.config.globalProperties.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
diff --git a/src/views/equipmentManagement/repair/Modal/MaintainModal.vue b/src/views/equipmentManagement/repair/Modal/MaintainModal.vue
index e8adc82..309be0e 100644
--- a/src/views/equipmentManagement/repair/Modal/MaintainModal.vue
+++ b/src/views/equipmentManagement/repair/Modal/MaintainModal.vue
@@ -1,5 +1,5 @@
<template>
- <el-drawer v-model="visible" :title="modalOptions.title" direction="ltr">
+ <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr">
<MaintainForm ref="maintainFormRef" />
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
@@ -7,7 +7,7 @@
</el-button>
<el-button @click="closeModal">{{ modalOptions.cancelText }}</el-button>
</template>
- </el-drawer>
+ </el-dialog>
</template>
<script setup>
diff --git a/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue b/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
index 1edcf23..1b5a7d4 100644
--- a/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
+++ b/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
@@ -1,5 +1,5 @@
<template>
- <el-drawer v-model="visible" :title="modalOptions.title" direction="ltr">
+ <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr">
<MaintenanceForm ref="maintenanceFormRef" />
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
@@ -7,7 +7,7 @@
</el-button>
<el-button @click="closeModal">{{ modalOptions.cancelText }}</el-button>
</template>
- </el-drawer>
+ </el-dialog>
</template>
<script setup>
diff --git a/src/views/login.vue b/src/views/login.vue
index a7cd923..5300637 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -181,7 +181,7 @@
<style lang='scss' scoped>
.login {
height: 100%;
- background-image: url("../assets/indexViews/ZQHXView.png");
+ background-image: url("../assets/images/login-background.png");
background-size: cover;
position: relative;
}
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 91900fd..0dd6871 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -43,7 +43,7 @@
<el-table-column label="褰曞叆浜�" prop="invoicePerson" show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡" prop="createTime" show-overflow-tooltip :formatter="formatDate" width="180" />
<el-table-column label="寮�绁ㄦ棩鏈�" prop="invoiceDate" show-overflow-tooltip width="120" />
- <el-table-column label="鍙戠エ" prop="invoiceFileName" width="120" align="center" show-overflow-tooltip>
+ <el-table-column label="鍙戠エ" prop="invoiceFileName" width="120" align="center" show-overflow-tooltip fixed="right">
<template #default="scope">
<el-button v-if="scope.row.invoiceFileName" text bg type="primary"
@click="handleFile(scope.row.commonFiles)">
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 8ceea47..9a2add4 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -557,6 +557,7 @@
getSalesLedgerWithProducts({ id: selectedRows.value[0].id }).then((res) => {
form.value = { ...res };
form.value.createTime = dayjs().format("YYYY-MM-DD");
+ form.value.issueDate = dayjs().format("YYYY-MM-DD");
form.value.createUer = userStore.nickName;
productData.value = form.value.productData.map((item) => {
return item;
diff --git a/vite.config.js b/vite.config.js
index 26e8edc..3e5d9bc 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -9,7 +9,7 @@
const baseUrl =
VITE_APP_ENV == "development"
? "http://114.132.189.42:8089" // 寮�鍙戠幆澧冨悗绔帴鍙�
- : "http://114.132.189.42:8089"; // 鐢熶骇鐜鍚庣鎺ュ彛
+ : "http://114.132.189.42:7003"; // 鐢熶骇鐜鍚庣鎺ュ彛
return {
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
--
Gitblit v1.9.3