diff --git a/src/views/projectFront/progressManagementAg/divisionSubManage.vue b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
index 3ba5a3fe..feaebd38 100644
--- a/src/views/projectFront/progressManagementAg/divisionSubManage.vue
+++ b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
@@ -24,25 +24,11 @@
>
-->
-
+
-
+
@@ -52,35 +38,23 @@
承包商列表
-
+
-
+
-
+
-
+
- 查询
- 刷新
+ 查询
+ v-permission="{ key: 'fbfx_refreshi', menuPath: '/project/progressManagementAg/divisionSubManage' }"
+ type="warning" plain @click="refreshBtn" :disabled="!treeData.id">刷新
+
新增
+ v-permission="{ key: 'fbfx_DownloadTemplate', menuPath: '/project/progressManagementAg/divisionSubManage' }"
+ class="expintBtn" size="medium" type="primary" :disabled="!treeData.id" @click="downloadFn(1)">
下载模板
导入
+ v-permission="{ key: 'fbfx_lmport', menuPath: '/project/progressManagementAg/divisionSubManage' }"
+ size="medium" type="primary" :disabled="!treeData.id" @click="uploadShow = true">导入
-
-
+
+
-
+
{{ scope.row.taskName }}
-
+
-
+
-
+
-
+
-
-
-
+
+
+
{{
scope.row.progressRatio + "%"
}}
@@ -242,35 +138,28 @@
- {{
- scope.row.status == 0
+ ? 'no-start' : scope.row.status == 1
+ ? 'is-pending' : scope.row.status == 2
+ ? 'is-finshed' : 'no-start'">
+ {{
+ scope.row.status == 0
? "未开始"
: scope.row.status == 1
- ? "进行中"
- : scope.row.status == 2
- ? "已完成"
- : "未开始"
- }}
+ ? "进行中"
+ : scope.row.status == 2
+ ? "已完成"
+ : "未开始"
+ }}
-
+
-
+
{{
scope.row.beginWarning == 1
- ? "提前"
- : scope.row.beginWarning == 2
+ ? "提前"
+ : scope.row.beginWarning == 2
? "正常"
: "逾期"
}}
@@ -278,28 +167,21 @@
{{
scope.row.beginWarning == 1
- ? "提前"
- : scope.row.beginWarning == 2
+ ? "提前"
+ : scope.row.beginWarning == 2
? "正常"
: "逾期"
}}
-
+
-
+
{{
scope.row.endWarning == 1
- ? "提前"
- : scope.row.endWarning == 2
+ ? "提前"
+ : scope.row.endWarning == 2
? "正常"
: "逾期"
}}
@@ -307,8 +189,8 @@
{{
scope.row.endWarning == 1
- ? "提前"
- : scope.row.endWarning == 2
+ ? "提前"
+ : scope.row.endWarning == 2
? "正常"
: "逾期"
}}
@@ -318,79 +200,43 @@
+ v-permission="{ key: 'fbfx_subltem', menuPath: '/project/progressManagementAg/divisionSubManage' }"
+ @click.native.stop="addBefore(2, scope.row)" size="mini" type="text"
+ icon="el-icon-circle-plus-outline">
子分项
+ v-permission="{ key: 'fbfx_details', menuPath: '/project/progressManagementAg/divisionSubManage' }"
+ size="mini" type="text" icon="el-icon-document" @click.native.stop="showDetail(scope.row)">
详情
+ v-permission="{ key: 'fbfx_edit', menuPath: '/project/progressManagementAg/divisionSubManage' }"
+ size="mini" type="text" icon="el-icon-edit" @click.native.stop="editBefore(scope.row)">
编辑
删除
+ v-permission="{ key: 'fbfx_delete', menuPath: '/project/progressManagementAg/divisionSubManage' }"
+ size="mini" type="text" class="delete-btn" icon="el-icon-delete"
+ @click.native.stop="deleteBefore(scope.row)">删除
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- 用户需要先下载excel文件,再将数据填写到Project文件中,选择所需要的一种更新方式,然后通过选择文件按钮上传Project文件,点击确定即可完成分部分项数据更新。
+ 用户需要先下载excel文件,再将数据填写到Project文件中,选择所需要的一种更新方式,然后通过选择文件按钮上传Project文件,点击确定即可完成分部分项数据更新。
现有数据excel下载
- 下载
+ 下载
更新方式
-
+
覆盖更新
根据名称替换更新
@@ -583,39 +334,19 @@
*上传Project文件
-
+
选择
{{ fileName }}
@@ -624,12 +355,7 @@
-
+
diff --git a/src/views/projectFront/progressManagementAg/ganttChart.vue b/src/views/projectFront/progressManagementAg/ganttChart.vue
index d907da72..e1181101 100644
--- a/src/views/projectFront/progressManagementAg/ganttChart.vue
+++ b/src/views/projectFront/progressManagementAg/ganttChart.vue
@@ -109,9 +109,10 @@
type="primary"
size="medium"
@click="updateProgressFn(1)"
- :disabled="![5, 10].includes($store.state.userInfo.accountType)"
+
>更新项目总进度
+
驳回原因:
- {{ item.rejectReason }}
+ {{ item.rejectReason }}