|
|
@@ -722,45 +722,35 @@
|
|
|
:formatter="formatOwner"
|
|
|
label="所属方"
|
|
|
></el-table-column>
|
|
|
- <el-table-column label="操作" align="center" width="500" v-if="leftType == 4">
|
|
|
+ <el-table-column label="操作" align="center" width="450" v-if="leftType == 4">
|
|
|
<template slot-scope="scope">
|
|
|
<el-link type="primary" @click="Associationlist(scope)"
|
|
|
>关联清表
|
|
|
</el-link>
|
|
|
- <el-link
|
|
|
- class="mg-l-10"
|
|
|
- type="primary"
|
|
|
- :disabled="
|
|
|
- scope.row.excelId == -1 || scope.row.excelId == null
|
|
|
- "
|
|
|
- @click="
|
|
|
- rightClick(
|
|
|
- scope.row.pkeyId,
|
|
|
- scope.row.excelId,
|
|
|
- scope.row.id,
|
|
|
- scope.row.initTableName,
|
|
|
- scope.row.initTableId
|
|
|
- )
|
|
|
- "
|
|
|
- >编辑元素
|
|
|
+ <el-dropdown @command="handleCommandRow($event,scope.row)">
|
|
|
+ <span class="el-dropdown-link">
|
|
|
+ 表单配置<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
+ </span>
|
|
|
+ <el-dropdown-menu slot="dropdown">
|
|
|
+ <el-dropdown-item command="a" :disabled="scope.row.excelId == -1 || scope.row.excelId == null " >编辑元素</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="b" :disabled="scope.row.excelId == -1 || scope.row.excelId == null">调整表单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="c">公式配置</el-dropdown-item>
|
|
|
+ </el-dropdown-menu>
|
|
|
+ </el-dropdown>
|
|
|
+ <el-link type="primary" @click="Associationlist(scope)" class="mg-l-10"
|
|
|
+ >保存表单配置方案
|
|
|
</el-link>
|
|
|
-
|
|
|
+ <el-dropdown @command="handleCommand($event,scope.row)" v-if="isNodeType">
|
|
|
+ <el-button type="text" class="mg-l-10">
|
|
|
+ 表单同步<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
+ </el-button>
|
|
|
+ <el-dropdown-menu slot="dropdown">
|
|
|
+ <el-dropdown-item command="a">同步到项目下所有表单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="b">同步其他表单配置</el-dropdown-item>
|
|
|
+ </el-dropdown-menu>
|
|
|
+ </el-dropdown>
|
|
|
+
|
|
|
|
|
|
- <el-link
|
|
|
- class="mg-l-10"
|
|
|
- type="primary"
|
|
|
- :disabled="
|
|
|
- scope.row.excelId == -1 || scope.row.excelId == null
|
|
|
- "
|
|
|
- @click="adjustExcel(scope.row.pkeyId, scope.row.excelId)"
|
|
|
- >调整表单
|
|
|
- </el-link>
|
|
|
- <el-link
|
|
|
- class="mg-l-10"
|
|
|
- type="primary"
|
|
|
- @click="handleEditFormula(scope.$index, scope.row)"
|
|
|
- >编辑元素公式
|
|
|
- </el-link>
|
|
|
|
|
|
<el-link
|
|
|
class="mg-l-10"
|
|
|
@@ -770,7 +760,7 @@
|
|
|
</el-link>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" align="center" width="500" v-if="leftType == 5">
|
|
|
+ <el-table-column label="操作" align="center" width="300" v-if="leftType == 5">
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
<el-button
|
|
|
@@ -878,8 +868,16 @@
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ <el-dropdown @command="handleCommand($event,scope.row)" v-if="isNodeType">
|
|
|
+ <el-button type="text" class="mg-l-10">
|
|
|
+ 表单同步<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
+ </el-button>
|
|
|
+ <el-dropdown-menu slot="dropdown">
|
|
|
+ <el-dropdown-item command="a">同步到项目下所有表单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="b">同步其他表单配置</el-dropdown-item>
|
|
|
+ </el-dropdown-menu>
|
|
|
+ </el-dropdown>
|
|
|
+
|
|
|
|
|
|
|
|
|
<el-link
|
|
|
@@ -1413,7 +1411,9 @@
|
|
|
<el-form-item label="参数掩码" v-if="wbsType !== 5">
|
|
|
<el-input v-model="nodeDetail.uniqueCode" placeholder="可填写分部评定权值/试验编号配置"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="含附件类型" >
|
|
|
+
|
|
|
+ <template v-if="nodeDetail.nodeType == 6">
|
|
|
+ <el-form-item label="含附件类型" >
|
|
|
<el-select
|
|
|
v-model="nodeDetail.tableFileType"
|
|
|
placeholder="请选择"
|
|
|
@@ -1429,7 +1429,6 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <template v-if="nodeDetail.nodeType == 6">
|
|
|
<el-form-item label="是否有混凝土">
|
|
|
<el-radio-group v-model="nodeDetail.isConcrete" size="small">
|
|
|
<el-radio :label="0" border>无</el-radio>
|
|
|
@@ -2745,6 +2744,78 @@
|
|
|
</el-dialog>
|
|
|
<!-- 编号设置弹窗 -->
|
|
|
<CodeSet ref="codeSetRef" ></CodeSet>
|
|
|
+ <!-- 筛选弹窗 -->
|
|
|
+ <el-dialog
|
|
|
+ title="筛选"
|
|
|
+ :visible.sync="filterDialog"
|
|
|
+ width="25%"
|
|
|
+ append-to-body
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ @close="handleCancel"
|
|
|
+ class="project-dialog"
|
|
|
+ >
|
|
|
+ <div class="filter-dialog">
|
|
|
+ <el-form ref="filterForm" :model="filterForm" label-width="120px">
|
|
|
+ <el-form-item label="节点类型">
|
|
|
+ <el-select v-model="filterForm.nodeType" placeholder="请选择节点类型" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="item in nodeTypelist"
|
|
|
+ :key="item.dictKey"
|
|
|
+ :label="item.dictValue"
|
|
|
+ :value="item.dictKey"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="内业资料类型">
|
|
|
+ <el-select v-model="filterForm.majorDataType" placeholder="请选择内业资料类型" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="item in majorDataTypeList"
|
|
|
+ :key="item.dictKey"
|
|
|
+ :label="item.dictValue"
|
|
|
+ :value="item.dictKey"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="标准分类">
|
|
|
+ <el-select v-model="filterForm.className" placeholder="请选择标准分类" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="item in standardTypeOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.dictValue"
|
|
|
+ :value="item.dictKey"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="单元名称">
|
|
|
+ <el-select v-model="filterForm.unitName" placeholder="请选择单元名称" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="item in unitOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="是否新增中隐藏"
|
|
|
+
|
|
|
+
|
|
|
+ >
|
|
|
+ <el-radio-group v-model="filterForm.isAddConceal" size="small">
|
|
|
+ <el-radio :label="1" border>是</el-radio>
|
|
|
+ <el-radio :label="0" border>否</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="handleCancel" size="small">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="handleConfirm" size="small">确 定</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -3221,6 +3292,15 @@ export default {
|
|
|
typeTem:'',
|
|
|
isShowTree1:true,
|
|
|
cachedNodes: new Map(), // 缓存已加载的节点数据
|
|
|
+ filterDialog:false,
|
|
|
+ filterForm: {
|
|
|
+ nodeType: '',
|
|
|
+ majorDataType: '',
|
|
|
+ className: '',
|
|
|
+ unitName: '',
|
|
|
+ isAddConceal:''
|
|
|
+
|
|
|
+ },
|
|
|
|
|
|
};
|
|
|
},
|
|
|
@@ -4116,25 +4196,52 @@ clearSearch1() {
|
|
|
|
|
|
|
|
|
filterSearchClick(){
|
|
|
+ this.filterDialog=true;
|
|
|
+
|
|
|
|
|
|
- this.isSearch = true;
|
|
|
- this.searchtreeLoad = true;
|
|
|
- getQueryValueByNodeType({
|
|
|
- queryValue: this.filterText,
|
|
|
- wbsId: this.id,
|
|
|
- projectId: this.projectid,
|
|
|
- }).then((res) => {
|
|
|
- let arr = [];
|
|
|
- if (Array.isArray(res.data.data)) {
|
|
|
- arr = res.data.data;
|
|
|
- this.searchTreeData = arr;
|
|
|
- } else {
|
|
|
- this.searchTreeData = [];
|
|
|
- }
|
|
|
- });
|
|
|
+ //this.isSearch = true;
|
|
|
+ // this.searchtreeLoad = true;
|
|
|
+ // getQueryValueByNodeType({
|
|
|
+ // queryValue: this.filterText,
|
|
|
+ // wbsId: this.id,
|
|
|
+ // projectId: this.projectid,
|
|
|
+ // }).then((res) => {
|
|
|
+ // let arr = [];
|
|
|
+ // if (Array.isArray(res.data.data)) {
|
|
|
+ // arr = res.data.data;
|
|
|
+ // this.searchTreeData = arr;
|
|
|
+ // } else {
|
|
|
+ // this.searchTreeData = [];
|
|
|
+ // }
|
|
|
+ // });
|
|
|
|
|
|
|
|
|
- this.searchtreeLoad = false;
|
|
|
+ // this.searchtreeLoad = false;
|
|
|
+ },
|
|
|
+ handleCancel() {
|
|
|
+
|
|
|
+ this.filterDialog = false;
|
|
|
+ },
|
|
|
+ handleConfirm() {
|
|
|
+ // this.isSearch = true;
|
|
|
+ // this.searchtreeLoad = true;
|
|
|
+ // getQueryValueByNodeType({
|
|
|
+ // queryValue: this.filterText,
|
|
|
+ // wbsId: this.id,
|
|
|
+ // projectId: this.projectid,
|
|
|
+ // }).then((res) => {
|
|
|
+ // let arr = [];
|
|
|
+ // if (Array.isArray(res.data.data)) {
|
|
|
+ // arr = res.data.data;
|
|
|
+ // this.searchTreeData = arr;
|
|
|
+ // } else {
|
|
|
+ // this.searchTreeData = [];
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+
|
|
|
+
|
|
|
+ // this.searchtreeLoad = false;
|
|
|
+ this.filterDialog = false;
|
|
|
},
|
|
|
clearSearch() {
|
|
|
this.isSearch = false;
|
|
|
@@ -6737,4 +6844,22 @@ async saveLinkTab() {
|
|
|
color: #409EFF;
|
|
|
margin-left: 8px;
|
|
|
}
|
|
|
+
|
|
|
+.project-dialog {
|
|
|
+ .el-dialog__body {
|
|
|
+ color: black;
|
|
|
+ padding: 10px 20px 20px 20px !important;
|
|
|
+ }
|
|
|
+ .el-dialog__header {
|
|
|
+
|
|
|
+ border-bottom: 1px solid #e6e6e6;
|
|
|
+ }
|
|
|
+ .dialog-footer{
|
|
|
+ padding-top: 15px;
|
|
|
+ text-align: center;
|
|
|
+ border-top: #e6e6e6 solid 1px;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
|
|
</style>
|
