From 309c529df35890ab48097474cc7b14b9b066b6ab Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 13 Nov 2023 10:25:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 ++--
.../progressManagement/engineerInventory/index.vue | 4 ++--
.../investmentPayment/components/transformInfo1.vue | 10 +++++-----
.../progressManagement/investmentPayment/index.vue | 4 ++--
.../huizhou/userManagement/roleManage/index.vue | 10 ++++++----
.../payManagement/components/transformInfo1.vue | 6 +++---
.../progressManagement/payManagement/index.vue | 10 +++++-----
.../payManagement/components/transformInfo1.vue | 6 +++---
.../progressManagement/payManagement/index.vue | 10 +++++-----
9 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/.env.development b/.env.development
index efed31d..deec6c5 100644
--- a/.env.development
+++ b/.env.development
@@ -2,10 +2,10 @@
NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用)
-VITE_API_URL = 'http://192.168.34.155:6688'
+# VITE_API_URL = 'http://192.168.34.155:6688'
# VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296'
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
-# VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
+VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
# 上传
# VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
diff --git a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
index 5087532..8133d1b 100644
--- a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
@@ -99,8 +99,8 @@ const columns: ColumnProps[] = [
// 多级 prop
{ prop: "unit", label: "单位" },
{ prop: "number", label: "数量" },
- { prop: "unitPrice", label: "单价" },
- { prop: "totalPrice", label: "合价" }
+ { prop: "unitPrice", label: "单价(元)" },
+ { prop: "totalPrice", label: "合价(元)" }
// { prop: "operation", label: "操作", fixed: "right", width: 120 }
];
// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue
index 7ab629e..f3e87f8 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue
@@ -25,10 +25,10 @@
:cell-style="{ textAlign: 'center', height: '40px' }"
>
-
-
+
+
-
+
@@ -109,7 +109,7 @@ const addVisible = ref(false);
const formConfig = {
formItemConfig: [
{
- label: "累计拨款金额(万元)",
+ label: "累计拨款金额(元)",
prop: "totalAmount",
type: "input"
},
@@ -126,7 +126,7 @@ const formConfig = {
valueFormat: "YYYY-MM-DD"
},
{
- label: "未支付工程款(万元)",
+ label: "未支付工程款(元)",
prop: "unPayAmount",
type: "input"
},
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
index 664904a..d0c8a0b 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
@@ -126,8 +126,8 @@ const columns: ColumnProps[] = [
width: 200
},
// 多级 prop
- { prop: "contractAmount", label: "合同金额(万元)", width: 200 },
- { prop: "settlementAmount", label: "结算金额(万元)", width: 200 },
+ { prop: "contractAmount", label: "合同金额(元)", width: 200 },
+ { prop: "settlementAmount", label: "结算金额(元)", width: 200 },
{ prop: "settlementTime", label: "结算定案日期", width: 200 },
{ prop: "applicationUnit", label: "申请单位", width: 200 },
{ prop: "bidderTime", label: "中标通知书申请", width: 200 },
diff --git a/src/views/goverment/huizhou/userManagement/roleManage/index.vue b/src/views/goverment/huizhou/userManagement/roleManage/index.vue
index bf423e0..2ff227e 100644
--- a/src/views/goverment/huizhou/userManagement/roleManage/index.vue
+++ b/src/views/goverment/huizhou/userManagement/roleManage/index.vue
@@ -113,7 +113,8 @@ import {
getTreeByIdList
} from "@/api/modules/goverment";
import DialogForm from "@/components/DialogForm/index.vue";
-import { getentNamelist, getproNamelist } from "@/api/modules/goverment";
+import { getentNamelist } from "@/api/modules/goverment";
+import { engineerList } from "@/api/modules/huizhou";
import type { FormRules, FormInstance } from "element-plus";
// import { getProjectRecordPage } from "@/api/modules/project";
@@ -291,14 +292,15 @@ const getSelectData = async () => {
};
});
} else if (formData.value.roleType == 4) {
- const res = await getproNamelist({});
+ const res = await engineerList({});
typeList.value = res.result.map(item => {
return {
- label: item.projectName,
- value: item.projectSn
+ label: item.engineeringName,
+ value: item.engineeringSn
};
});
}
+ formData.value.sn = "";
};
const closeDrawer = done => {
datas.length = 0;
diff --git a/src/views/hz-enterprise/progressManagement/payManagement/components/transformInfo1.vue b/src/views/hz-enterprise/progressManagement/payManagement/components/transformInfo1.vue
index 4b8e042..802ad8f 100644
--- a/src/views/hz-enterprise/progressManagement/payManagement/components/transformInfo1.vue
+++ b/src/views/hz-enterprise/progressManagement/payManagement/components/transformInfo1.vue
@@ -22,10 +22,10 @@
:cell-style="{ textAlign: 'center', height: '40px' }"
>
-
-
+
+
-
+
diff --git a/src/views/hz-enterprise/progressManagement/payManagement/index.vue b/src/views/hz-enterprise/progressManagement/payManagement/index.vue
index be25c4c..58f9158 100644
--- a/src/views/hz-enterprise/progressManagement/payManagement/index.vue
+++ b/src/views/hz-enterprise/progressManagement/payManagement/index.vue
@@ -120,13 +120,13 @@ const getId = ref(undefined);
const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 },
// 多级 prop
- { prop: "contractAmount", label: "合同金额(万元)" },
- { prop: "settlementAmount", label: "结算金额(万元)" },
+ { prop: "contractAmount", label: "合同金额(元)" },
+ { prop: "settlementAmount", label: "结算金额(元)" },
{ prop: "settlementTime", label: "结算定案日期" },
{ prop: "applicationUnit", label: "申请单位" },
{ prop: "bidderTime", label: "中标通知书申请" },
- // { prop: "totalAmount", label: "累计拨款金额(万元)", width: 200 },
- // { prop: "payAmount", label: "付款金额(万元)", width: 200 },
+ // { prop: "totalAmount", label: "累计拨款金额(元)", width: 200 },
+ // { prop: "payAmount", label: "付款金额(元)", width: 200 },
{
prop: "contractTime",
label: "合同签订日期",
@@ -147,7 +147,7 @@ const columns: ColumnProps[] = [
width: 200,
render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法）
},
- // { prop: "unPayAmount", label: "未支付工程款(万元)", width: 200 },
+ // { prop: "unPayAmount", label: "未支付工程款(元)", width: 200 },
// { prop: "payRatio", label: "支付百分比(%)", width: 150 },
{ prop: "operation", label: "操作", fixed: "right", width: 120 }
];
diff --git a/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue b/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
index fad1d7f..145ce89 100644
--- a/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
+++ b/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
@@ -22,10 +22,10 @@
:cell-style="{ textAlign: 'center', height: '40px' }"
>
-
-
+
+
-
+
diff --git a/src/views/hz-project/progressManagement/payManagement/index.vue b/src/views/hz-project/progressManagement/payManagement/index.vue
index 8c0aa68..d1789bc 100644
--- a/src/views/hz-project/progressManagement/payManagement/index.vue
+++ b/src/views/hz-project/progressManagement/payManagement/index.vue
@@ -91,13 +91,13 @@ const getId = ref(undefined);
const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 },
// 多级 prop
- { prop: "contractAmount", label: "合同金额(万元)" },
- { prop: "settlementAmount", label: "结算金额(万元)" },
+ { prop: "contractAmount", label: "合同金额(元)" },
+ { prop: "settlementAmount", label: "结算金额(元)" },
{ prop: "settlementTime", label: "结算定案日期" },
{ prop: "applicationUnit", label: "申请单位" },
{ prop: "bidderTime", label: "中标通知书申请" },
- // { prop: "totalAmount", label: "累计拨款金额(万元)", width: 200 },
- // { prop: "payAmount", label: "付款金额(万元)", width: 200 },
+ // { prop: "totalAmount", label: "累计拨款金额(元)", width: 200 },
+ // { prop: "payAmount", label: "付款金额(元)", width: 200 },
{
prop: "contractTime",
label: "合同签订日期",
@@ -118,7 +118,7 @@ const columns: ColumnProps[] = [
width: 200,
render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法）
},
- // { prop: "unPayAmount", label: "未支付工程款(万元)", width: 200 },
+ // { prop: "unPayAmount", label: "未支付工程款(元)", width: 200 },
// { prop: "payRatio", label: "支付百分比(%)", width: 150 },
{ prop: "operation", label: "操作", fixed: "right", width: 120 }
];