From 6b92f3ed333c4365e195e58cbeb76c3c05c63e64 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 13 五月 2025 16:53:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
.env.staging | 4 ++--
src/views/index.vue | 2 +-
.env.development | 4 ++--
src/views/procurementManagement/procurementLedger/index.vue | 16 +++++++++-------
index.html | 2 +-
src/layout/components/Navbar.vue | 2 +-
package.json | 2 +-
.env.production | 4 ++--
src/views/salesManagement/salesLedger/index.vue | 8 ++++----
9 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/.env.development b/.env.development
index 2744ed2..b5f6a61 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 鑻ヤ緷绠＄悊绯荤粺
+VITE_APP_TITLE = MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級
# 寮�鍙戠幆澧冮厤缃�
VITE_APP_ENV = 'development'
-# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
+# MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級/寮�鍙戠幆澧�
VITE_APP_BASE_API = '/dev-api'
diff --git a/.env.production b/.env.production
index d857bba..bc91821 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 鑻ヤ緷绠＄悊绯荤粺
+VITE_APP_TITLE = MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級
# 鐢熶骇鐜閰嶇疆
VITE_APP_ENV = 'production'
-# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
+# MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級/鐢熶骇鐜
VITE_APP_BASE_API = '/prod-api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
diff --git a/.env.staging b/.env.staging
index fa7c357..f759f9a 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 鑻ヤ緷绠＄悊绯荤粺
+VITE_APP_TITLE = MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級
# 鐢熶骇鐜閰嶇疆
VITE_APP_ENV = 'staging'
-# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
+# MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級/鐢熶骇鐜
VITE_APP_BASE_API = '/stage-api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
diff --git a/index.html b/index.html
index 179579b..879c6c5 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>MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級</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 cfd1616..5775249 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.9",
- "description": "鑻ヤ緷绠＄悊绯荤粺",
+ "description": "MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級",
"author": "鑻ヤ緷",
"license": "MIT",
"type": "module",
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 41bc17c..08131c3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,7 +6,7 @@
</div>
<!-- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->
<div class="center-menu">
- <span class="label">绯荤粺鍚嶇О绯荤粺鍚嶇О</span>
+ <span class="label">MIS绯荤粺锛堢鐞嗕俊鎭郴缁燂級</span>
</div>
<div class="right-menu">
<div class="avatar-container">
diff --git a/src/views/index.vue b/src/views/index.vue
index 49e380c..29280b2 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -4,7 +4,7 @@
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>鑻ヤ緷鍚庡彴绠＄悊妗嗘灦</h2>
<p>
- 涓�鐩存兂鍋氫竴娆惧悗鍙扮鐞嗙郴缁燂紝鐪嬩簡寰堝浼樼鐨勫紑婧愰」鐩絾鏄彂鐜版病鏈夊悎閫傝嚜宸辩殑銆備簬鏄埄鐢ㄧ┖闂蹭紤鎭椂闂村紑濮嬭嚜宸卞啓涓�濂楀悗鍙扮郴缁熴�傚姝ゆ湁浜嗚嫢渚濈鐞嗙郴缁燂紝濂瑰彲浠ョ敤浜庢墍鏈夌殑Web搴旂敤绋嬪簭锛屽缃戠珯绠＄悊鍚庡彴锛岀綉绔欎細鍛樹腑蹇冿紝CMS锛孋RM锛孫A绛夌瓑锛屽綋鐒讹紝鎮ㄤ篃鍙互瀵瑰ス杩涜娣卞害瀹氬埗锛屼互鍋氬嚭鏇村己绯荤粺銆傛墍鏈夊墠绔悗鍙颁唬鐮佸皝瑁呰繃鍚庡崄鍒嗙簿绠�鏄撲笂鎵嬶紝鍑洪敊姒傜巼浣庛�傚悓鏃舵敮鎸佺Щ鍔ㄥ鎴风璁块棶銆傜郴缁熶細闄嗙画鏇存柊涓�浜涘疄鐢ㄥ姛鑳姐��
+ 涓�鐩存兂鍋氫竴娆惧悗鍙扮鐞嗙郴缁燂紝鐪嬩簡寰堝浼樼鐨勫紑婧愰」鐩絾鏄彂鐜版病鏈夊悎閫傝嚜宸辩殑銆備簬鏄埄鐢ㄧ┖闂蹭紤鎭椂闂村紑濮嬭嚜宸卞啓涓�濂楀悗鍙扮郴缁熴�傚姝ゆ湁浜哅IS绯荤粺锛堢鐞嗕俊鎭郴缁燂級锛屽ス鍙互鐢ㄤ簬鎵�鏈夌殑Web搴旂敤绋嬪簭锛屽缃戠珯绠＄悊鍚庡彴锛岀綉绔欎細鍛樹腑蹇冿紝CMS锛孋RM锛孫A绛夌瓑锛屽綋鐒讹紝鎮ㄤ篃鍙互瀵瑰ス杩涜娣卞害瀹氬埗锛屼互鍋氬嚭鏇村己绯荤粺銆傛墍鏈夊墠绔悗鍙颁唬鐮佸皝瑁呰繃鍚庡崄鍒嗙簿绠�鏄撲笂鎵嬶紝鍑洪敊姒傜巼浣庛�傚悓鏃舵敮鎸佺Щ鍔ㄥ鎴风璁块棶銆傜郴缁熶細闄嗙画鏇存柊涓�浜涘疄鐢ㄥ姛鑳姐��
</p>
<p>
<b>褰撳墠鐗堟湰:</b> <span>v{{ version }}</span>
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 92e9942..504bfa5 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -48,12 +48,12 @@
</el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" show-overflow-tooltip/>
- <el-table-column label="閿�鍞悎鍚屽彿" prop="salesLedgerId" show-overflow-tooltip/>
+ <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip/>
<el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip/>
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
- <el-table-column label="褰曞叆浜�" prop="recorderId" show-overflow-tooltip/>
+ <el-table-column label="褰曞叆浜�" prop="recorderName" show-overflow-tooltip/>
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
@@ -371,6 +371,8 @@
})
total.value = res.total
expandedRowKeys.value = []
+ }).catch(() => {
+ tableLoading.value = false
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -451,6 +453,7 @@
operationType.value = type
form.value = {}
productData.value = []
+ fileList.value = []
userListNoPage().then(res => {
userList.value = res.data
})
@@ -499,11 +502,10 @@
}
// 绉婚櫎鏂囦欢
function handleRemove (file) {
- console.log('handleRemove', file)
- console.log('operationType.value', operationType.value)
+ console.log('handleRemove', file.id)
if (operationType.value === 'edit') {
let ids = []
- ids.push(file.value.id)
+ ids.push(file.id)
delLedgerFile(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
})
@@ -566,7 +568,7 @@
addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getPurchaseById({id: currentId.value, type: 2}).then(res => {
productData.value = res.productData
})
})
@@ -600,7 +602,7 @@
delProduct(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 2}).then(res => {
productData.value = res.productData
})
})
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3493cd0..ce25b37 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -382,6 +382,8 @@
item.children = []
})
total.value = res.total
+ }).catch(() => {
+ tableLoading.value = false
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -506,8 +508,6 @@
}
// 绉婚櫎鏂囦欢
function handleRemove (file) {
- console.log('handleRemove', file)
- console.log('operationType.value', operationType.value)
if (operationType.value === 'edit') {
let ids = []
ids.push(file.id)
@@ -573,7 +573,7 @@
addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
productData.value = res.productData
})
})
@@ -607,7 +607,7 @@
delProduct(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
productData.value = res.productData
})
})
--
Gitblit v1.9.3