diff --git a/src/api/modules/huizhou.ts b/src/api/modules/huizhou.ts
index 63f2cbc..d3694c0 100644
--- a/src/api/modules/huizhou.ts
+++ b/src/api/modules/huizhou.ts
@@ -372,3 +372,9 @@ export const entApplyTimePage = (params: any) => {
export const entApplyTimeAdd = (params: any) => {
return http.post(BASEURL + `/ent/investmentApply/add`, params);
};
+
+// 工程量清单----政务版
+// 工程量信息分页列表
+export const engineerInfoPage = (params: any) => {
+ return http.post(BASEURL + `/gov/projectQuantity/page`, params);
+};
diff --git a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss
new file mode 100644
index 0000000..a7f58bd
--- /dev/null
+++ b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss
@@ -0,0 +1,114 @@
+.warning-page {
+ // background-color: blue;
+ display: flex;
+ width: 100%;
+ height: 100%;
+ .leftMenu {
+ width: 300px;
+ // width: 290px;
+ // 页面的项目工程
+ :deep(.item) {
+ height: 78px !important;
+ }
+ :deep(.content) {
+ height: calc(100% - 160px) !important;
+ }
+ .leftProject {
+ // padding: 5px 8px;
+ color: #333333;
+ .projectName {
+ display: block;
+ width: 100%;
+ overflow: hidden;
+
+ // font-weight: 700;
+ font-family: "siyuan_Medium";
+ font-size: 20px;
+ color: #ffffff;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ .leftMenu_item {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 10px;
+ overflow: hidden;
+ .middleSize {
+ display: inline-block;
+ font-size: 18px;
+ color: #c4c4c4;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ .video {
+ display: flex;
+ align-items: center;
+ img {
+ width: 14px;
+ height: 14px;
+ margin: 0 4px;
+ }
+ }
+ }
+ .bottom_item {
+ .bottomSize {
+ font-size: 18px !important;
+ color: #666666;
+ }
+ }
+ }
+ }
+ .table-box {
+ width: calc(100% - 300px);
+ height: 100%;
+ .table {
+ margin-left: 20px;
+ height: 100%;
+ :deep(.table-main) {
+ height: calc(100% - 82px);
+ overflow-x: scroll;
+ }
+ }
+ }
+}
+:deep(.el-scrollbar__view) {
+ width: 100%;
+ height: 100%;
+
+ // display: flex;
+ // flex-wrap: wrap;
+}
+:deep() {
+ .el-form .el-form-item__content .el-range-editor {
+ width: 300px;
+ }
+ .el-range-separator {
+ color: var(--el-menu-text-color);
+ }
+ .el-form-item__content > :not(button) {
+ // width: 160px;
+ }
+ .el-input__wrapper {
+ color: white;
+ font-size: 20px;
+ background-color: transparent;
+ border: none;
+ box-shadow: 0 0 0 1px var(--el-color-primary, var(--el-color-primary)) inset;
+ }
+ .el-input__inner {
+ color: white;
+ font-size: 20px;
+ }
+ .el-textarea__inner {
+ color: white;
+ font-size: 20px;
+ background-color: transparent;
+ border: none;
+ box-shadow: 0 0 0 1px var(--el-color-primary, var(--el-color-primary)) inset;
+ }
+}
+// :deep(.el-dialog__body) {
+// padding: 0 0 0 0 !important;
+// background-color: pink;
+// }
diff --git a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
new file mode 100644
index 0000000..fa62894
--- /dev/null
+++ b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
index dd9c210..aa0980c 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
@@ -16,12 +16,12 @@
:data="recordData"
class="el-table"
:span-method="arraySpanMethod"
- :row-style="{ textAlign: 'center', height: '40px' }"
- :header-cell-style="{ textAlign: 'center', height: '40px' }"
- :cell-style="{ textAlign: 'center', height: '40px' }"
+ :row-style="{ height: '40px' }"
+ :header-cell-style="{ height: '40px' }"
+ :cell-style="{ height: '40px' }"
>
-
+
-
-
-
+
+
+
diff --git a/src/views/hz-project/progressManagement/planFinishSituation/index.vue b/src/views/hz-project/progressManagement/planFinishSituation/index.vue
index ff099ca..95fdd57 100644
--- a/src/views/hz-project/progressManagement/planFinishSituation/index.vue
+++ b/src/views/hz-project/progressManagement/planFinishSituation/index.vue
@@ -18,6 +18,9 @@
{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}
+
+ {{ row.applyStartTime + "-" + row.applyEndTime }}
+
@@ -113,7 +116,11 @@ const columns: ColumnProps[] = [
// 多级 prop
{ prop: "projectName", label: "项目名称" },
{ prop: "name", label: "申报时段名称", search: { el: "input" } },
- { prop: "applyTime", label: "申报时段" },
+ { prop: "applyTime", label: "申报日期" },
+ {
+ label: "申报时段",
+ prop: "applyStartTime"
+ },
{ prop: "investmentPaymentId", label: "支付状态" },
// {
// prop: "contractTime",