|
@@ -350,7 +350,7 @@
|
|
</p>
|
|
</p>
|
|
<div class="mg-t-10"></div>
|
|
<div class="mg-t-10"></div>
|
|
</div>
|
|
</div>
|
|
- <div style="flex: 1; position: relative; height: calc(100vh - 260px);overflow-y: auto;" >
|
|
|
|
|
|
+ <div style="flex: 1; position: relative; height: calc(100vh - 260px);overflow-y: auto;" v-loading="tableListByTypeLoad">
|
|
<!-- 施工方分类 -->
|
|
<!-- 施工方分类 -->
|
|
<template v-if="isNodeType">
|
|
<template v-if="isNodeType">
|
|
<template v-if="tableListByType.length > 0">
|
|
<template v-if="tableListByType.length > 0">
|
|
@@ -969,27 +969,13 @@
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 元素表排序 -->
|
|
<!-- 元素表排序 -->
|
|
- <el-dialog
|
|
|
|
- title="调整排序"
|
|
|
|
- :visible.sync="excelSortTag"
|
|
|
|
- width="50%"
|
|
|
|
- append-to-body
|
|
|
|
- >
|
|
|
|
- <ManualSorting
|
|
|
|
- v-if="excelSortTag2"
|
|
|
|
- @bianhua="bianhua2()"
|
|
|
|
- :sort="tableSortList"
|
|
|
|
|
|
+
|
|
|
|
+ <tableSortByType
|
|
|
|
+ ref="tableSortRef"
|
|
|
|
+ title="表单排序"
|
|
|
|
+ :sortProLoad="sortProLoad"
|
|
|
|
+ @confirm="editPrivateSort"
|
|
/>
|
|
/>
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
|
- <el-button @click="excelSortTag = false">取 消</el-button>
|
|
|
|
- <el-button
|
|
|
|
- type="primary"
|
|
|
|
- @click="editPrivateSort()"
|
|
|
|
- v-loading="surePrivateSortload"
|
|
|
|
- >确 定</el-button
|
|
|
|
- >
|
|
|
|
- </span>
|
|
|
|
- </el-dialog>
|
|
|
|
|
|
|
|
<!-- 关联清表 -->
|
|
<!-- 关联清表 -->
|
|
<el-dialog
|
|
<el-dialog
|
|
@@ -2584,6 +2570,7 @@ import { getTempProject,addSync,getNodeStatus,getById } from "@/api/manager/ledg
|
|
import { selectByNodeTable as findNodeTableByCondition1 } from "@/api/manager/wbstree";
|
|
import { selectByNodeTable as findNodeTableByCondition1 } from "@/api/manager/wbstree";
|
|
|
|
|
|
import { getDictionaryBiz } from "@/api/other";
|
|
import { getDictionaryBiz } from "@/api/other";
|
|
|
|
+import tableSortByType from './tableSortByType'
|
|
export default {
|
|
export default {
|
|
|
|
|
|
data() {
|
|
data() {
|
|
@@ -2784,6 +2771,9 @@ export default {
|
|
excelSortTag: false,
|
|
excelSortTag: false,
|
|
excelSortTag2: false,
|
|
excelSortTag2: false,
|
|
tableSortList: [],
|
|
tableSortList: [],
|
|
|
|
+ sortTableList: [],
|
|
|
|
+ sortProLoad:false,
|
|
|
|
+
|
|
//#endregion
|
|
//#endregion
|
|
|
|
|
|
defaultExpandedKeys: [],
|
|
defaultExpandedKeys: [],
|
|
@@ -2994,7 +2984,8 @@ export default {
|
|
isAddConceal:''
|
|
isAddConceal:''
|
|
|
|
|
|
},
|
|
},
|
|
- tableListByType:[]
|
|
|
|
|
|
+ tableListByType:[],
|
|
|
|
+ tableListByTypeLoad:false
|
|
|
|
|
|
};
|
|
};
|
|
},
|
|
},
|
|
@@ -3366,8 +3357,9 @@ export default {
|
|
updateNodeTable() {
|
|
updateNodeTable() {
|
|
|
|
|
|
if(this.isNodeType){
|
|
if(this.isNodeType){
|
|
|
|
+ this.tableListByTypeLoad=true
|
|
getGroupNodeTables(
|
|
getGroupNodeTables(
|
|
- // this.curTreeData.id, this.projectid, this.id
|
|
|
|
|
|
+
|
|
{
|
|
{
|
|
parentId: this.curTreeData.id,
|
|
parentId: this.curTreeData.id,
|
|
projectId: this.projectid,
|
|
projectId: this.projectid,
|
|
@@ -3375,10 +3367,11 @@ export default {
|
|
}
|
|
}
|
|
).then(
|
|
).then(
|
|
(res) => {
|
|
(res) => {
|
|
|
|
+ this.tableListByTypeLoad=false
|
|
if (res.data.data && res.data.data.length) {
|
|
if (res.data.data && res.data.data.length) {
|
|
- console.log(res.data.data,'res.data.data');
|
|
|
|
|
|
+
|
|
this.tableListByType = res.data.data;
|
|
this.tableListByType = res.data.data;
|
|
-
|
|
|
|
|
|
+
|
|
// this.formData = res.data.data;
|
|
// this.formData = res.data.data;
|
|
// this.formData.forEach((ele) => {
|
|
// this.formData.forEach((ele) => {
|
|
// ele.nodeType = Number(ele.nodeType);
|
|
// ele.nodeType = Number(ele.nodeType);
|
|
@@ -4110,21 +4103,35 @@ clearSearch1() {
|
|
pkeyId: form.pkeyId,
|
|
pkeyId: form.pkeyId,
|
|
};
|
|
};
|
|
});
|
|
});
|
|
- this.excelSortTag = true;
|
|
|
|
- this.excelSortTag2 = true;
|
|
|
|
- },
|
|
|
|
- editPrivateSort() {
|
|
|
|
- this.surePrivateSortload = true;
|
|
|
|
- wbsTreePrivateTableSort(this.tableSortList).then(() => {
|
|
|
|
|
|
+ // this.excelSortTag = true;
|
|
|
|
+ // this.excelSortTag2 = true;
|
|
|
|
+ this.sortTableList = JSON.parse(JSON.stringify(this.tableListByType));
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.$refs.tableSortRef.show(this.sortTableList);
|
|
|
|
+ });
|
|
|
|
+ },
|
|
|
|
+ editPrivateSort(listArr) {
|
|
|
|
+ console.log(listArr,'list');
|
|
|
|
+ let finalList=[]
|
|
|
|
+ listArr.forEach(item=>{
|
|
|
|
+ finalList.push(...item.list)
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ this.sortProLoad = true;
|
|
|
|
+ wbsTreePrivateTableSort(finalList).then(() => {
|
|
|
|
+ this.sortProLoad = false;
|
|
this.$message({
|
|
this.$message({
|
|
type: "success",
|
|
type: "success",
|
|
message: "排序成功!",
|
|
message: "排序成功!",
|
|
});
|
|
});
|
|
|
|
|
|
this.updateNodeTable();
|
|
this.updateNodeTable();
|
|
- this.surePrivateSortload = false;
|
|
|
|
- this.excelSortTag = false;
|
|
|
|
- this.excelSortTag2 = false;
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ }).finally(()=>{
|
|
|
|
+ this.sortProLoad = false;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
|
|
|
|
@@ -5793,7 +5800,7 @@ async saveLinkTab() {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
handleCheckChange1(data){
|
|
handleCheckChange1(data){
|
|
- console.log(data,'data1111111111');
|
|
|
|
|
|
+
|
|
|
|
|
|
getNodeStatus({ id:data.primaryKeyId}).then((res) => {
|
|
getNodeStatus({ id:data.primaryKeyId}).then((res) => {
|
|
if(res.data.code==200){
|
|
if(res.data.code==200){
|
|
@@ -6335,7 +6342,8 @@ async saveLinkTab() {
|
|
FormulaEdit,
|
|
FormulaEdit,
|
|
EditElement,
|
|
EditElement,
|
|
FormulaEditone,
|
|
FormulaEditone,
|
|
- CodeSet
|
|
|
|
|
|
+ CodeSet,
|
|
|
|
+ tableSortByType
|
|
},
|
|
},
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|