admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-11-13 10:25:34 +08:00
parent a1dc516ec2
commit 309c529df3
9 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -2,10 +2,10 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/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_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296'
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081" 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=' # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

4
src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
View File

@ -99,8 +99,8 @@ const columns: ColumnProps[] = [
// 多级 prop // 多级 prop
{ prop: "unit", label: "单位" }, { prop: "unit", label: "单位" },
{ prop: "number", label: "数量" }, { prop: "number", label: "数量" },
{ prop: "unitPrice", label: "单价" }, { prop: "unitPrice", label: "单价(元)" },
{ prop: "totalPrice", label: "合价" } { prop: "totalPrice", label: "合价(元)" }
// { prop: "operation", label: "操作", fixed: "right", width: 120 } // { prop: "operation", label: "操作", fixed: "right", width: 120 }
]; ];
// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）

10
src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo1.vue
View File

@ -25,10 +25,10 @@
:cell-style="{ textAlign: 'center', height: '40px' }" :cell-style="{ textAlign: 'center', height: '40px' }"
> >
<el-table-column type="index" label="序号" width="80"> </el-table-column> <el-table-column type="index" label="序号" width="80"> </el-table-column>
<el-table-column prop="totalAmount" label="累计拨款金额(万元)"> </el-table-column> <el-table-column prop="totalAmount" label="累计拨款金额(元)"> </el-table-column>
<el-table-column prop="payAmount" label="付款金额(万元)"> </el-table-column> <el-table-column prop="payAmount" label="付款金额(元)"> </el-table-column>
<el-table-column prop="payTime" label="付款日期"> </el-table-column> <el-table-column prop="payTime" label="付款日期"> </el-table-column>
<el-table-column prop="unPayAmount" label="未支付工程款(万元)"> </el-table-column> <el-table-column prop="unPayAmount" label="未支付工程款(元)"> </el-table-column>
<el-table-column prop="payRatio" label="支付百分比(%)"> </el-table-column> <el-table-column prop="payRatio" label="支付百分比(%)"> </el-table-column>
<el-table-column prop="meetStandards" label="支付是否达标"> <el-table-column prop="meetStandards" label="支付是否达标">
<template #default="scope"> <template #default="scope">
@ -109,7 +109,7 @@ const addVisible = ref(false);
const formConfig = { const formConfig = {
formItemConfig: [ formItemConfig: [
{ {
label: "累计拨款金额(万元)", label: "累计拨款金额(元)",
prop: "totalAmount", prop: "totalAmount",
type: "input" type: "input"
}, },
@ -126,7 +126,7 @@ const formConfig = {
valueFormat: "YYYY-MM-DD" valueFormat: "YYYY-MM-DD"
}, },
{ {
label: "未支付工程款(万元)", label: "未支付工程款(元)",
prop: "unPayAmount", prop: "unPayAmount",
type: "input" type: "input"
}, },

4
src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
View File

@ -126,8 +126,8 @@ const columns: ColumnProps[] = [
width: 200 width: 200
}, },
// 多级 prop // 多级 prop
{ prop: "contractAmount", label: "合同金额(万元)", width: 200 }, { prop: "contractAmount", label: "合同金额(元)", width: 200 },
{ prop: "settlementAmount", label: "结算金额(万元)", width: 200 }, { prop: "settlementAmount", label: "结算金额(元)", width: 200 },
{ prop: "settlementTime", label: "结算定案日期", width: 200 }, { prop: "settlementTime", label: "结算定案日期", width: 200 },
{ prop: "applicationUnit", label: "申请单位", width: 200 }, { prop: "applicationUnit", label: "申请单位", width: 200 },
{ prop: "bidderTime", label: "中标通知书申请", width: 200 }, { prop: "bidderTime", label: "中标通知书申请", width: 200 },

10
src/views/goverment/huizhou/userManagement/roleManage/index.vue
View File

@ -113,7 +113,8 @@ import {
getTreeByIdList getTreeByIdList
} from "@/api/modules/goverment"; } from "@/api/modules/goverment";
import DialogForm from "@/components/DialogForm/index.vue"; 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 type { FormRules, FormInstance } from "element-plus";
// import { getProjectRecordPage } from "@/api/modules/project"; // import { getProjectRecordPage } from "@/api/modules/project";
@ -291,14 +292,15 @@ const getSelectData = async () => {
}; };
}); });
} else if (formData.value.roleType == 4) { } else if (formData.value.roleType == 4) {
const res = await getproNamelist({}); const res = await engineerList({});
typeList.value = res.result.map(item => { typeList.value = res.result.map(item => {
return { return {
label: item.projectName, label: item.engineeringName,
value: item.projectSn value: item.engineeringSn
}; };
}); });
} }
formData.value.sn = "";
}; };
const closeDrawer = done => { const closeDrawer = done => {
datas.length = 0; datas.length = 0;

6
src/views/hz-enterprise/progressManagement/payManagement/components/transformInfo1.vue
View File

@ -22,10 +22,10 @@
:cell-style="{ textAlign: 'center', height: '40px' }" :cell-style="{ textAlign: 'center', height: '40px' }"
> >
<el-table-column type="index" label="序号" width="80"> </el-table-column> <el-table-column type="index" label="序号" width="80"> </el-table-column>
<el-table-column prop="totalAmount" label="累计拨款金额(万元)"> </el-table-column> <el-table-column prop="totalAmount" label="累计拨款金额(元)"> </el-table-column>
<el-table-column prop="payAmount" label="付款金额(万元)"> </el-table-column> <el-table-column prop="payAmount" label="付款金额(元)"> </el-table-column>
<el-table-column prop="payTime" label="付款日期"> </el-table-column> <el-table-column prop="payTime" label="付款日期"> </el-table-column>
<el-table-column prop="unPayAmount" label="未支付工程款(万元)"> </el-table-column> <el-table-column prop="unPayAmount" label="未支付工程款(元)"> </el-table-column>
<el-table-column prop="payRatio" label="支付百分比(%)"> </el-table-column> <el-table-column prop="payRatio" label="支付百分比(%)"> </el-table-column>
<el-table-column prop="meetStandards" label="支付是否达标"> <el-table-column prop="meetStandards" label="支付是否达标">
<template #default="scope"> <template #default="scope">

10
src/views/hz-enterprise/progressManagement/payManagement/index.vue
View File

@ -120,13 +120,13 @@ const getId = ref<number | undefined>(undefined);
const columns: ColumnProps[] = [ const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 }, { type: "index", label: "序号", width: 80 },
// 多级 prop // 多级 prop
{ prop: "contractAmount", label: "合同金额(万元)" }, { prop: "contractAmount", label: "合同金额(元)" },
{ prop: "settlementAmount", label: "结算金额(万元)" }, { prop: "settlementAmount", label: "结算金额(元)" },
{ prop: "settlementTime", label: "结算定案日期" }, { prop: "settlementTime", label: "结算定案日期" },
{ prop: "applicationUnit", label: "申请单位" }, { prop: "applicationUnit", label: "申请单位" },
{ prop: "bidderTime", label: "中标通知书申请" }, { prop: "bidderTime", label: "中标通知书申请" },
// { prop: "totalAmount", label: "累计拨款金额(万元)", width: 200 }, // { prop: "totalAmount", label: "累计拨款金额(元)", width: 200 },
// { prop: "payAmount", label: "付款金额(万元)", width: 200 }, // { prop: "payAmount", label: "付款金额(元)", width: 200 },
{ {
prop: "contractTime", prop: "contractTime",
label: "合同签订日期", label: "合同签订日期",
@ -147,7 +147,7 @@ const columns: ColumnProps[] = [
width: 200, width: 200,
render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法） render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法）
}, },
// { prop: "unPayAmount", label: "未支付工程款(万元)", width: 200 }, // { prop: "unPayAmount", label: "未支付工程款(元)", width: 200 },
// { prop: "payRatio", label: "支付百分比(%)", width: 150 }, // { prop: "payRatio", label: "支付百分比(%)", width: 150 },
{ prop: "operation", label: "操作", fixed: "right", width: 120 } { prop: "operation", label: "操作", fixed: "right", width: 120 }
]; ];

6
src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
View File

@ -22,10 +22,10 @@
:cell-style="{ textAlign: 'center', height: '40px' }" :cell-style="{ textAlign: 'center', height: '40px' }"
> >
<el-table-column type="index" label="序号" width="80"> </el-table-column> <el-table-column type="index" label="序号" width="80"> </el-table-column>
<el-table-column prop="totalAmount" label="累计拨款金额(万元)"> </el-table-column> <el-table-column prop="totalAmount" label="累计拨款金额(元)"> </el-table-column>
<el-table-column prop="payAmount" label="付款金额(万元)"> </el-table-column> <el-table-column prop="payAmount" label="付款金额(元)"> </el-table-column>
<el-table-column prop="payTime" label="付款日期"> </el-table-column> <el-table-column prop="payTime" label="付款日期"> </el-table-column>
<el-table-column prop="unPayAmount" label="未支付工程款(万元)"> </el-table-column> <el-table-column prop="unPayAmount" label="未支付工程款(元)"> </el-table-column>
<el-table-column prop="payRatio" label="支付百分比(%)"> </el-table-column> <el-table-column prop="payRatio" label="支付百分比(%)"> </el-table-column>
<el-table-column prop="meetStandards" label="支付是否达标"> <el-table-column prop="meetStandards" label="支付是否达标">
<template #default="scope"> <template #default="scope">

10
src/views/hz-project/progressManagement/payManagement/index.vue
View File

@ -91,13 +91,13 @@ const getId = ref<number | undefined>(undefined);
const columns: ColumnProps[] = [ const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 }, { type: "index", label: "序号", width: 80 },
// 多级 prop // 多级 prop
{ prop: "contractAmount", label: "合同金额(万元)" }, { prop: "contractAmount", label: "合同金额(元)" },
{ prop: "settlementAmount", label: "结算金额(万元)" }, { prop: "settlementAmount", label: "结算金额(元)" },
{ prop: "settlementTime", label: "结算定案日期" }, { prop: "settlementTime", label: "结算定案日期" },
{ prop: "applicationUnit", label: "申请单位" }, { prop: "applicationUnit", label: "申请单位" },
{ prop: "bidderTime", label: "中标通知书申请" }, { prop: "bidderTime", label: "中标通知书申请" },
// { prop: "totalAmount", label: "累计拨款金额(万元)", width: 200 }, // { prop: "totalAmount", label: "累计拨款金额(元)", width: 200 },
// { prop: "payAmount", label: "付款金额(万元)", width: 200 }, // { prop: "payAmount", label: "付款金额(元)", width: 200 },
{ {
prop: "contractTime", prop: "contractTime",
label: "合同签订日期", label: "合同签订日期",
@ -118,7 +118,7 @@ const columns: ColumnProps[] = [
width: 200, width: 200,
render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法） render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法）
}, },
// { prop: "unPayAmount", label: "未支付工程款(万元)", width: 200 }, // { prop: "unPayAmount", label: "未支付工程款(元)", width: 200 },
// { prop: "payRatio", label: "支付百分比(%)", width: 150 }, // { prop: "payRatio", label: "支付百分比(%)", width: 150 },
{ prop: "operation", label: "操作", fixed: "right", width: 120 } { prop: "operation", label: "操作", fixed: "right", width: 120 }
]; ];