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-08-14 14:07:56 +08:00
parent f1d788a3a3
commit d1db264723
6 changed files with 147 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/modules/huizhou.ts
View File

@ -107,6 +107,10 @@ export const applyTimePage = (params: any) => {
export const applyTimeAdd = (params: any) => { export const applyTimeAdd = (params: any) => {
return http.post(BASEURL + `/project/investmentApply/add`, params); return http.post(BASEURL + `/project/investmentApply/add`, params);
}; };
// 申报时段编辑
export const applyTimeEdit = (params: any) => {
return http.post(BASEURL + `/gov/investmentApply/edit`, params);
};
// 投资支付管理(政务端)------ // 投资支付管理(政务端)------
// 投资支付合同工程列表 // 投资支付合同工程列表
@ -125,6 +129,10 @@ export const payGovermentList = (params: any) => {
export const payGovermentContactAdd = (params: any) => { export const payGovermentContactAdd = (params: any) => {
return http.post(BASEURL + `/gov/investmentContract/add`, params); return http.post(BASEURL + `/gov/investmentContract/add`, params);
}; };
// 投资支付合同编辑
export const payGovermentContactEdit = (params: any) => {
return http.post(BASEURL + `/gov/investmentContract/edit`, params);
};
// 投资支付合同设置结算定额日期 // 投资支付合同设置结算定额日期
export const payGovermentContactSet = (params: any) => { export const payGovermentContactSet = (params: any) => {
return http.post(BASEURL + `/gov/engineering/edit`, params); return http.post(BASEURL + `/gov/engineering/edit`, params);
@ -137,6 +145,10 @@ export const payGovermentAllList = (params: any) => {
export const payGovermentAdd = (params: any) => { export const payGovermentAdd = (params: any) => {
return http.post(BASEURL + `/gov/investmentPayment/add`, params); return http.post(BASEURL + `/gov/investmentPayment/add`, params);
}; };
// 投资支付编辑
export const payGovermentEdit = (params: any) => {
return http.post(BASEURL + `/gov/investmentPayment/edit`, params);
};
// 未支付申报时段列表 // 未支付申报时段列表
export const govermentApplyTimeList = (params: any) => { export const govermentApplyTimeList = (params: any) => {
return http.post(BASEURL + `/gov/investmentApply/unPayList`, params); return http.post(BASEURL + `/gov/investmentApply/unPayList`, params);
@ -356,6 +368,10 @@ export const entPaySubItemList = (params: any) => {
export const entPaySubItemAdd = (params: any) => { export const entPaySubItemAdd = (params: any) => {
return http.post(BASEURL + `/ent/investmentPaymentItem/add`, params); return http.post(BASEURL + `/ent/investmentPaymentItem/add`, params);
}; };
// 投资支付子项编辑
export const entPaySubItemEdit = (params: any) => {
return http.post(BASEURL + `/ent/investmentPaymentItem/edit`, params);
};
// 投资支付统计管理 // 投资支付统计管理
export const entPayCountList = (params: any) => { export const entPayCountList = (params: any) => {
return http.post(BASEURL + `/ent/investmentPaymentStat/queryByApplyId`, params); return http.post(BASEURL + `/ent/investmentPaymentStat/queryByApplyId`, params);
@ -376,6 +392,10 @@ export const entApplyTimeList = (params: any) => {
export const entSubItemDetailAdd = (params: any) => { export const entSubItemDetailAdd = (params: any) => {
return http.post(BASEURL + `/ent/investmentPaymentDetail/add`, params); return http.post(BASEURL + `/ent/investmentPaymentDetail/add`, params);
}; };
// 投资支付子项详细编辑
export const entSubItemDetailEdit = (params: any) => {
return http.post(BASEURL + `/gov/investmentPaymentDetail/edit`, params);
};
// 分页列表查询投资支付工程 // 分页列表查询投资支付工程
export const getEntApplyTimeproject = (params: User.ReqUserParams) => { export const getEntApplyTimeproject = (params: User.ReqUserParams) => {
return http.post<ResPage<User.ResUserList>>(BASEURL + `/ent/investmentApply/engineeringPage`, params); return http.post<ResPage<User.ResUserList>>(BASEURL + `/ent/investmentApply/engineeringPage`, params);

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

@ -36,10 +36,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="suggest" label="未达标整改意见"> </el-table-column> <el-table-column prop="suggest" label="未达标整改意见"> </el-table-column>
<el-table-column align="center" label="操作" width="120"> <el-table-column align="center" label="操作" width="180">
<template #default="scope"> <template #default="scope">
<el-button type="primary" link @click="handleEditItem(scope.row)"> <el-button type="primary" v-auth="'investment_payment_update'" link @click="handleEditItem(scope.row)">
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" /> <img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button type="primary" link @click="handleItemDetail(scope.row)">
<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
<span>查看</span> <span>查看</span>
</el-button> </el-button>
</template> </template>
@ -90,7 +94,13 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted, ref, watch, reactive } from "vue"; import { onMounted, ref, watch, reactive } from "vue";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import { payGovermentAllList, payGovermentAdd, subItemDetailList, govermentApplyTimeList } from "@/api/modules/huizhou"; import {
payGovermentAllList,
payGovermentAdd,
payGovermentEdit,
subItemDetailList,
govermentApplyTimeList
} from "@/api/modules/huizhou";
import transformInfo2 from "./transformInfo2.vue"; import transformInfo2 from "./transformInfo2.vue";
import Pagination from "@/components/ProTable/components/Pagination.vue"; import Pagination from "@/components/ProTable/components/Pagination.vue";
import DialogForm from "@/components/DialogForm/index.vue"; import DialogForm from "@/components/DialogForm/index.vue";
@ -254,9 +264,14 @@ const saveItem = async (form: any) => {
} else { } else {
requestData.engineeringSn = props.snValue; requestData.engineeringSn = props.snValue;
} }
const res = await payGovermentAdd(requestData); if (form.id) {
const res = await payGovermentEdit(requestData);
ElMessage.success("编辑成功");
} else {
const res = await payGovermentAdd(requestData);
ElMessage.success("新增成功");
}
getSubItemList(); getSubItemList();
ElMessage.success("新增成功");
addVisible.value = false; addVisible.value = false;
}; };
const openAdd = () => { const openAdd = () => {
@ -299,6 +314,12 @@ const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
}; };
// 修改数据按钮 // 修改数据按钮
const handleEditItem = async (row: any) => { const handleEditItem = async (row: any) => {
formData.value = reactive({ ...row });
console.log(formData.value);
addVisible.value = true;
};
// 查看数据按钮
const handleItemDetail = async (row: any) => {
console.log(row); console.log(row);
// getSubDetailList(row.id); // getSubDetailList(row.id);
relativeRowId.value = row.id; relativeRowId.value = row.id;

8
src/views/goverment/huizhou/progressManagement/investmentPayment/components/transformInfo2.vue
View File

@ -22,12 +22,12 @@
:data="recordData" :data="recordData"
class="el-table" class="el-table"
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
:row-style="{ textAlign: 'center', height: '40px' }" :row-style="{ height: '40px' }"
:header-cell-style="{ textAlign: 'center', height: '40px' }" :header-cell-style="{ height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }" :cell-style="{ 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="reportContent" label="汇报内容"> </el-table-column> <el-table-column prop="reportContent" label="汇报内容" align="left"> </el-table-column>
<el-table-column prop="totalAmount" label="总工程造价(元)"> <el-table-column prop="totalAmount" label="总工程造价(元)">
<template #default="scope"> <template #default="scope">
<el-input <el-input

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

@ -44,6 +44,9 @@
</template> </template>
<!-- 表格操作 --> <!-- 表格操作 -->
<template #operation="{ row }"> <template #operation="{ row }">
<el-button class="btnStyle" v-auth="'investment_contract_update'" type="primary" @click="handleEdit(row)">
<span>编辑</span>
</el-button>
<el-button class="btnStyle" type="primary" @click="handleItemDetail(2, row)"> <el-button class="btnStyle" type="primary" @click="handleItemDetail(2, row)">
<span>查看</span> <span>查看</span>
</el-button> </el-button>
@ -98,6 +101,7 @@ import {
payGovermentProList, payGovermentProList,
payGovermentList, payGovermentList,
payGovermentContactAdd, payGovermentContactAdd,
payGovermentContactEdit,
payGovermentContactSet payGovermentContactSet
} from "@/api/modules/huizhou"; } from "@/api/modules/huizhou";
import { sendIframeMessage } from "@/utils/util"; import { sendIframeMessage } from "@/utils/util";
@ -147,7 +151,7 @@ const columns: ColumnProps[] = [
width: 200, width: 200,
render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法） render: scope => (scope.row.meetStandards == 1 ? "是" : "否") // 自定义单元格内容渲染（tsx语法）
}, },
{ prop: "operation", label: "操作", fixed: "right", width: 120 } { prop: "operation", label: "操作", fixed: "right", width: 180 }
]; ];
// 弹窗中的配置 // 弹窗中的配置
const formConfig = { const formConfig = {
@ -295,6 +299,13 @@ const handleSetDate = () => {
dateTitle.value = "设置"; dateTitle.value = "设置";
// formData.value = reactive({}); // formData.value = reactive({});
}; };
const handleEdit = (row: any) => {
console.log(row);
formData.value = reactive({ ...row });
visible.value = true;
title.value = "编辑";
// formData.value = reactive({});
};
const handleItemDetail = (index: number, row: any) => { const handleItemDetail = (index: number, row: any) => {
console.log(row); console.log(row);
// if (index === 1) { // if (index === 1) {
@ -324,13 +335,14 @@ const handleAddItem = () => {
}; };
// 新增，编辑数据 // 新增，编辑数据
const saveItem = async (form: any) => { const saveItem = async (form: any) => {
if (active.value === 0) { form.engineeringSn = searchSn.value;
form.projectSn = searchSn.value; if (form.id) {
const res = await payGovermentContactEdit(form);
ElMessage.success("编辑成功");
} else { } else {
form.engineeringSn = searchSn.value; const res = await payGovermentContactAdd(form);
ElMessage.success("新增成功");
} }
const res = await payGovermentContactAdd(form);
ElMessage.success("新增成功");
proTable.value.getTableList(); proTable.value.getTableList();
visible.value = false; visible.value = false;
}; };

80
src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
View File

@ -42,8 +42,18 @@
<el-table-column prop="completeScheduleRatio" label="至本期末完成形象进度(%)" width="220"> </el-table-column> --> <el-table-column prop="completeScheduleRatio" label="至本期末完成形象进度(%)" width="220"> </el-table-column> -->
<el-table-column align="left" label="操作"> <el-table-column align="left" label="操作">
<template #default="scope"> <template #default="scope">
<el-button type="primary" v-if="scope.row.id" link @click="handleEditItem(scope.row)"> <el-button
type="primary"
v-auth="'investment_apply_update'"
v-if="scope.row.id"
link
@click="handleEditItem(scope.row)"
>
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" /> <img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button type="primary" v-if="scope.row.id" link @click="handleItemDetails(scope.row)">
<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
<span>查看</span> <span>查看</span>
</el-button> </el-button>
</template> </template>
@ -82,28 +92,32 @@
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
> >
<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="name" label="项目名称" /> <el-table-column prop="name" label="项目名称" width="180" />
<el-table-column prop="unit" label="单位" /> <el-table-column prop="unit" label="单位" />
<el-table-column label="合同"> <el-table-column label="合同">
<el-table-column prop="contractQuantity" label="工程量"> </el-table-column> <el-table-column prop="contractQuantity" label="工程量" width="120"> </el-table-column>
<el-table-column prop="contractUnitPrice" label="单价(元)"> </el-table-column> <el-table-column prop="contractUnitPrice" label="单价(元)" width="100"> </el-table-column>
<el-table-column prop="contractAmount" label="金额(元)"> </el-table-column> <el-table-column prop="contractAmount" label="金额(元)" width="120"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="至上期末完成"> <el-table-column label="至上期末完成">
<el-table-column prop="lastQuantity" label="工程量"> </el-table-column> <el-table-column prop="lastQuantity" label="工程量" width="120"> </el-table-column>
<el-table-column prop="lastAmount" label="金额(元)"> </el-table-column> <el-table-column prop="lastAmount" label="金额(元)" width="120"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="本期完成"> <el-table-column label="本期完成">
<el-table-column prop="nowQuantity" label="工程量"> </el-table-column> <el-table-column prop="nowQuantity" label="工程量" width="120"> </el-table-column>
<el-table-column prop="nowAmount" label="金额(元)"> </el-table-column> <el-table-column prop="nowAmount" label="金额(元)" width="120"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="截至本期末累计完成"> <el-table-column label="截至本期末累计完成">
<el-table-column prop="endQuantity" label="工程量"> </el-table-column> <el-table-column prop="endQuantity" label="工程量" width="120"> </el-table-column>
<el-table-column prop="endAmount" label="金额(元)"> </el-table-column> <el-table-column prop="endAmount" label="金额(元)" width="120"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注"> </el-table-column> <el-table-column prop="remark" label="备注"> </el-table-column>
<el-table-column align="left" label="操作"> <el-table-column align="left" label="操作" width="200">
<template #default="scope"> <template #default="scope">
<el-button type="primary" v-auth="'investment_apply_update'" link @click="handleEditItem2(scope.row)">
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button v-if="scope.row.parentId == 0" type="primary" link :icon="CirclePlus" @click="openAdd2(scope.row)" <el-button v-if="scope.row.parentId == 0" type="primary" link :icon="CirclePlus" @click="openAdd2(scope.row)"
>子分项</el-button >子分项</el-button
> >
@ -132,7 +146,7 @@
> >
</DialogForm> </DialogForm>
<DialogForm <DialogForm
title="新增" :title="subItemTitle"
:formConfig="formConfig2" :formConfig="formConfig2"
:formData="formData2" :formData="formData2"
v-model:visible="addVisible2" v-model:visible="addVisible2"
@ -154,12 +168,15 @@ import {
payGovermentSubItemCount, payGovermentSubItemCount,
payGovermentSubItemDetail, payGovermentSubItemDetail,
entPaySubItemAdd, entPaySubItemAdd,
entPaySubItemEdit,
entPayCountAdd, entPayCountAdd,
entPayCountEdit, entPayCountEdit,
entSubItemDetailAdd entSubItemDetailAdd,
entSubItemDetailEdit
} from "@/api/modules/huizhou"; } from "@/api/modules/huizhou";
import { CirclePlus } from "@element-plus/icons-vue"; import { CirclePlus } from "@element-plus/icons-vue";
import DialogForm from "@/components/DialogForm/index.vue"; import DialogForm from "@/components/DialogForm/index.vue";
const subItemTitle = ref("新增");
const addVisible = ref(false); const addVisible = ref(false);
const addVisible2 = ref(false); const addVisible2 = ref(false);
// 弹窗中的配置 // 弹窗中的配置
@ -522,20 +539,30 @@ const saveItem = async (form: any) => {
...form, ...form,
engineeringSn: props.searchSn engineeringSn: props.searchSn
}; };
const res = await entPaySubItemAdd(requestData); if (form.id) {
const res = await entPaySubItemEdit(requestData);
ElMessage.success("编辑成功");
} else {
const res = await entPaySubItemAdd(requestData);
ElMessage.success("新增成功");
}
getSubItemList(); getSubItemList();
ElMessage.success("新增成功");
addVisible.value = false; addVisible.value = false;
}; };
const saveItem2 = async (form: any) => { const saveItem2 = async (form: any) => {
let requestData = { let requestData = {
...form, ...form,
parentId: detailsData.value.id, parentId: subItemTitle.value == "编辑" ? detailsData.value.parentId : detailsData.value.id,
itemId: rowDetailId.value itemId: rowDetailId.value
}; };
const res = await entSubItemDetailAdd(requestData); if (form.id) {
const res = await entSubItemDetailEdit(requestData);
ElMessage.success("编辑成功");
} else {
const res = await entSubItemDetailAdd(requestData);
ElMessage.success("新增成功");
}
getSubDetailList(rowDetailId.value); getSubDetailList(rowDetailId.value);
ElMessage.success("新增成功");
addVisible2.value = false; addVisible2.value = false;
}; };
const getSubItemList = async () => { const getSubItemList = async () => {
@ -646,7 +673,22 @@ const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
} }
}; };
// 修改数据按钮 // 修改数据按钮
const handleEditItem2 = async (row: any) => {
console.log(row);
detailsData.value = reactive({
...row
});
formData2.value = reactive({ ...row });
subItemTitle.value = "编辑";
addVisible2.value = true;
};
// 修改数据按钮
const handleEditItem = async (row: any) => { const handleEditItem = async (row: any) => {
formData.value = reactive({ ...row });
addVisible.value = true;
};
// 查看数据按钮
const handleItemDetails = async (row: any) => {
console.log(row); console.log(row);
rowDetailId.value = row.id; rowDetailId.value = row.id;
getSubDetailList(row.id); getSubDetailList(row.id);

22
src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
View File

@ -50,8 +50,12 @@
<span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span> <span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span>
</template> </template>
<template #operation="{ row }"> <template #operation="{ row }">
<el-button type="primary" link @click="handleItemDetail(2, row)"> <el-button type="primary" v-auth="'investment_apply_update'" link @click="handleItemEdit(row)">
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" /> <img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button type="primary" link @click="handleItemDetail(2, row)">
<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
<span>查看</span> <span>查看</span>
</el-button> </el-button>
</template> </template>
@ -79,7 +83,13 @@ import { ref, onMounted, onBeforeMount, reactive, watch } from "vue";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import { ColumnProps } from "@/components/ProTable/interface"; import { ColumnProps } from "@/components/ProTable/interface";
import ProTable from "@/components/ProTable/index.vue"; import ProTable from "@/components/ProTable/index.vue";
import { applyTimeGovermentList, applyTimeAdd, payGovermentEngList, payGovermentProList } from "@/api/modules/huizhou"; import {
applyTimeGovermentList,
applyTimeAdd,
applyTimeEdit,
payGovermentEngList,
payGovermentProList
} from "@/api/modules/huizhou";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
import DialogForm from "@/components/DialogForm/index.vue"; import DialogForm from "@/components/DialogForm/index.vue";
import transformInfo1 from "./components/transformInfo1.vue"; import transformInfo1 from "./components/transformInfo1.vue";
@ -183,7 +193,7 @@ const columns: ColumnProps[] = [
width: 260 width: 260
}, },
{ prop: "investmentPaymentId", label: "支付状态" }, { prop: "investmentPaymentId", label: "支付状态" },
{ prop: "operation", label: "操作", fixed: "right", width: 120 } { prop: "operation", label: "操作", fixed: "right", width: 180 }
]; ];
const handleAddItem = () => { const handleAddItem = () => {
formData.value = reactive({ formData.value = reactive({
@ -192,6 +202,10 @@ const handleAddItem = () => {
}); });
openVisible.value = true; openVisible.value = true;
}; };
const handleItemEdit = (row: any) => {
formData.value = reactive({ ...row });
openVisible.value = true;
};
// 页面的项目名称和工程名称的div点击事件 // 页面的项目名称和工程名称的div点击事件
const onSearch = async (params: any) => { const onSearch = async (params: any) => {
console.log(params); console.log(params);
@ -230,7 +244,7 @@ const onCurChange = async (params: number) => {
const saveItem = async (form: any) => { const saveItem = async (form: any) => {
form.engineeringSn = searchSn.value; form.engineeringSn = searchSn.value;
if (form.id) { if (form.id) {
const res = await applyTimeAdd(form); const res = await applyTimeEdit(form);
proTable.value.getTableList(); proTable.value.getTableList();
ElMessage.success("编辑成功"); ElMessage.success("编辑成功");
} else { } else {