|
|
@@ -40,13 +40,13 @@
|
|
|
<!--清表列表-->
|
|
|
<el-scrollbar ref="ListItemScrollRef" v-if="ListItemDatas.length > 0">
|
|
|
<ListItem ref="ListItemsRef"
|
|
|
- :datas="ListItemDatas"
|
|
|
- :status="NodeStatus"
|
|
|
+ :datas="ListItemDatas"
|
|
|
+ :status="NodeStatus"
|
|
|
:classify="authBtnTabKey"
|
|
|
- @offsetTop="ListItemOffsetTop"
|
|
|
- :projectInfo="projectInfo"
|
|
|
- :primaryKeyId="primaryKeyId"
|
|
|
- :contractId="contractId"
|
|
|
+ @offsetTop="ListItemOffsetTop"
|
|
|
+ :projectInfo="projectInfo"
|
|
|
+ :primaryKeyId="primaryKeyId"
|
|
|
+ :contractId="contractId"
|
|
|
@renew="getTableDataAll"
|
|
|
:drawType="isDrawType"
|
|
|
/>
|
|
|
@@ -108,28 +108,28 @@
|
|
|
<el-scrollbar>
|
|
|
<KeepAlive>
|
|
|
<template v-if="isSearchTree">
|
|
|
- <HcTreeData
|
|
|
- :datas="searchTreeData"
|
|
|
- :menus="ElTreeMenu"
|
|
|
- :isMark="TreeMark"
|
|
|
- :autoExpandKeys="TreeAutoExpandKeys"
|
|
|
+ <HcTreeData
|
|
|
+ :datas="searchTreeData"
|
|
|
+ :menus="ElTreeMenu"
|
|
|
+ :isMark="TreeMark"
|
|
|
+ :autoExpandKeys="TreeAutoExpandKeys"
|
|
|
:searchTreeVal="searchTreeVal" isColor @nodeTap="wbsElTreeClick"
|
|
|
- @menuTap="ElTreeMenuClick"
|
|
|
- @changeSearch="changeisSearch"
|
|
|
+ @menuTap="ElTreeMenuClick"
|
|
|
+ @changeSearch="changeisSearch"
|
|
|
:submitCounts="false"
|
|
|
/>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<WbsTree
|
|
|
- :submitCounts="false"
|
|
|
- :menus="ElTreeMenu"
|
|
|
- :isMark="TreeMark"
|
|
|
- :autoExpandKeys="TreeAutoExpandKeys"
|
|
|
- :projectId="projectId"
|
|
|
- :contractId="contractId"
|
|
|
+ :submitCounts="false"
|
|
|
+ :menus="ElTreeMenu"
|
|
|
+ :isMark="TreeMark"
|
|
|
+ :autoExpandKeys="TreeAutoExpandKeys"
|
|
|
+ :projectId="projectId"
|
|
|
+ :contractId="contractId"
|
|
|
:classifyType="authBtnTabKey"
|
|
|
- isColor
|
|
|
- @nodeTap="wbsElTreeClick"
|
|
|
+ isColor
|
|
|
+ @nodeTap="wbsElTreeClick"
|
|
|
@menuTap="ElTreeMenuClick"
|
|
|
@nodeLoading="ElTreeNodeLoading"
|
|
|
ref="wbstree"
|
|
|
@@ -151,7 +151,7 @@
|
|
|
<div class="horizontal-drag-line" @mousedown="onmousedown"/>
|
|
|
</div>
|
|
|
<div class="hc-layout-content-box">
|
|
|
- <!-- <div class="hc-layout-content-box-lefticon" v-if="isShowLefticon">
|
|
|
+ <!-- <div class="hc-layout-content-box-lefticon" v-if="isShowLefticon">
|
|
|
<el-icon><CaretLeft @click="isHiddenleftbox" /></el-icon>
|
|
|
</div>
|
|
|
<div class="hc-layout-content-box-righticon" v-else>
|
|
|
@@ -187,16 +187,16 @@
|
|
|
</template>
|
|
|
<!--清表列表-->
|
|
|
<el-scrollbar ref="ListItemScrollRef" v-loading="ListItemLoading" v-if="ListItemDatas.length > 0">
|
|
|
- <ListItem
|
|
|
- ref="ListItemRef"
|
|
|
- :datas="ListItemDatas"
|
|
|
- :status="NodeStatus"
|
|
|
- :classify="authBtnTabKey"
|
|
|
+ <ListItem
|
|
|
+ ref="ListItemRef"
|
|
|
+ :datas="ListItemDatas"
|
|
|
+ :status="NodeStatus"
|
|
|
+ :classify="authBtnTabKey"
|
|
|
:authBtnTabKey="authBtnTabKey"
|
|
|
- @offsetTop="ListItemOffsetTop"
|
|
|
- :projectInfo="projectInfo"
|
|
|
- :primaryKeyId="primaryKeyId"
|
|
|
- :contractId="contractId"
|
|
|
+ @offsetTop="ListItemOffsetTop"
|
|
|
+ :projectInfo="projectInfo"
|
|
|
+ :primaryKeyId="primaryKeyId"
|
|
|
+ :contractId="contractId"
|
|
|
@renew="getTableDataAll"
|
|
|
:drawType="!isDrawType"
|
|
|
:wbsTempId="projectInfo?.referenceWbsTemplateIdTrial" :wbsType="2" :tenantId="userInfo?.tenant_id"
|
|
|
@@ -208,18 +208,18 @@
|
|
|
<!--底部按钮区域-->
|
|
|
<template #action >
|
|
|
<el-alert title="完善资料填写后记得一定要保存哦"
|
|
|
- show-icon
|
|
|
+ show-icon
|
|
|
type="warning"
|
|
|
- :closable="false"
|
|
|
+ :closable="false"
|
|
|
style="background-color:#f1f5f8;display: inline;vertical-align: middle;"/>
|
|
|
|
|
|
<HcTooltip keys="wbs_save" v-if="NodeStatus !== '3'">
|
|
|
- <el-button
|
|
|
+ <el-button
|
|
|
type="primary"
|
|
|
- style="width:150px;font-weight: bold;font-size:large"
|
|
|
- hc-btn
|
|
|
- :disabled="NodeStatus === '3' || ListItemDatas.length <= 0"
|
|
|
- :loading="tableFormSaveLoading"
|
|
|
+ style="width:150px;font-weight: bold;font-size:large"
|
|
|
+ hc-btn
|
|
|
+ :disabled="NodeStatus === '3' || ListItemDatas.length <= 0"
|
|
|
+ :loading="tableFormSaveLoading"
|
|
|
@click="tableFormSaveClick">
|
|
|
<HcIcon name="save"/>
|
|
|
<span>保存</span>
|
|
|
@@ -243,13 +243,13 @@
|
|
|
<span>撤回上报流程</span>
|
|
|
</el-button>
|
|
|
</HcTooltip>
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
</template>
|
|
|
</HcCard>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<!--上传图纸-->
|
|
|
<div class="upload-drawing">
|
|
|
<el-upload :action="action" :accept="accept" :headers="getTokenHeader()" :before-upload="beforeUpload" :on-success="uploadFinish" :on-error="uploadError">
|
|
|
@@ -286,7 +286,7 @@
|
|
|
<template #append>
|
|
|
<el-button :icon="DocumentCopy" @click="copyText"/>
|
|
|
</template>
|
|
|
-
|
|
|
+
|
|
|
</el-input>
|
|
|
</el-form-item> -->
|
|
|
</el-form>
|
|
|
@@ -313,7 +313,7 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div class="copy-node-many-box" v-if="copyNodeTabKey !== '1'">
|
|
|
-
|
|
|
+
|
|
|
<div class="copy-node-many-tree">
|
|
|
<el-scrollbar>
|
|
|
<WbsTree :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" idPrefix="tree-node-copy-" :isAutoClick="false" :isAutoKeys="false" @nodeTap="copyNodeElTreeClick"/>
|
|
|
@@ -417,11 +417,11 @@
|
|
|
</HcDialog>
|
|
|
|
|
|
<!--批量上报审批-->
|
|
|
- <HcReportModal title="批量上报审批" url="informationWriteQuery/taskOne"
|
|
|
- :show="showReportModal"
|
|
|
- :projectId="projectId"
|
|
|
+ <HcReportModal title="批量上报审批" url="informationWriteQuery/taskOne"
|
|
|
+ :show="showReportModal"
|
|
|
+ :projectId="projectId"
|
|
|
:contractId="contractInfo?.contractType==2?nodeDataInfo?.contractIdRelation:contractId"
|
|
|
- type="wbs"
|
|
|
+ type="wbs"
|
|
|
:typeData="reportTypeData"
|
|
|
:taskName="reportTaskName" :ids="reportIds" :addition="reportAddition" @hide="showReportModal = false" @finish="showReportFinish"/>
|
|
|
</div>
|
|
|
@@ -484,21 +484,21 @@ const getSearchTreeData=async()=>{
|
|
|
treeLoading.value = false
|
|
|
searchTreeData.value = []
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
//监听
|
|
|
watch(() => [
|
|
|
useAppState.getCollapse,
|
|
|
], ([Collapse]) => {
|
|
|
isCollapse.value = Collapse
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
watch(projectId, (val) => {
|
|
|
console.log(val,'val')
|
|
|
if(val){
|
|
|
getSearchTreeData()
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
|
|
|
{immediate:true}
|
|
|
@@ -509,7 +509,7 @@ onMounted(()=> {
|
|
|
treeLoading.value = typeName === 'tree';
|
|
|
setContractType(contractInfo.value?.contractType)
|
|
|
getDictionaryApi()
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
|
|
|
//身份按钮切换数据
|
|
|
@@ -524,8 +524,8 @@ const authBtnTabClick = (val) => {
|
|
|
authBtnTabKey.value = val['key']
|
|
|
// wbstreeKey.value=new Date().toString()
|
|
|
getTableDataAll()
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
//contractType, 1施工，2监理
|
|
|
@@ -539,7 +539,7 @@ const setContractType = (contractType) => {
|
|
|
}
|
|
|
|
|
|
const getTableDataAll = () => {
|
|
|
-
|
|
|
+
|
|
|
searchNodeAllTable()
|
|
|
queryNodeStatus()
|
|
|
// wbstree.value.resetNode().then((res)=>{
|
|
|
@@ -547,10 +547,10 @@ const getTableDataAll = () => {
|
|
|
// searchNodeAllTable()
|
|
|
// queryNodeStatus()
|
|
|
// }
|
|
|
-
|
|
|
+
|
|
|
// })
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//结构类型tab数据和相关处理
|
|
|
@@ -746,7 +746,7 @@ const setTreeMenuDataClick = ({key,node,data}) => {
|
|
|
copyNodeTabKey.value = '1'
|
|
|
copyNodeTable.value = []
|
|
|
copyNodeLoading.value = false
|
|
|
-
|
|
|
+
|
|
|
copyNodeModal.value = true
|
|
|
} else if (key === 'add') {
|
|
|
addTreeNodeId.value = data?.id
|
|
|
@@ -756,13 +756,13 @@ const setTreeMenuDataClick = ({key,node,data}) => {
|
|
|
} else if (key === 'upload') {
|
|
|
document.getElementById('upload-drawing').click()
|
|
|
} else if (key === 'del') {
|
|
|
-
|
|
|
+
|
|
|
if(data['colorStatus']===1||data['colorStatus']===2){
|
|
|
delModalClick()
|
|
|
}else{
|
|
|
window?.$message?.warning('该节点已存在上报数据，不允许删除')
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
} else if (key === 'sort') {
|
|
|
let nodes = [], childNodes = []
|
|
|
if (tabKey === 'tree') {
|
|
|
@@ -984,16 +984,16 @@ const copyNodeElTreeClick = ({data}) => {
|
|
|
let oldarr= copyNodeTable.value
|
|
|
let result = oldarr.some(item => item.primaryKeyId===data['primaryKeyId']) //true
|
|
|
//限制点工序节点的时候，只能加一个，只针对复制数据
|
|
|
-
|
|
|
+
|
|
|
if(!result){
|
|
|
setCopyNodeTable(data, data?.title)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}else{
|
|
|
setCopyNodeTable(data, data?.title)
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1007,7 +1007,7 @@ const setCopyNodeTable = (data, title) => {
|
|
|
title: data?.title || '',
|
|
|
nodeName: title || '',
|
|
|
primaryKeyId: data?.primaryKeyId || '',
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
}
|
|
|
|
|
|
@@ -1064,7 +1064,7 @@ const copyNodeClick = async () => {
|
|
|
}
|
|
|
} else if (type === '3') {
|
|
|
if (table.length > 0&&classify.length>0) {
|
|
|
-
|
|
|
+
|
|
|
await copyContractNodeSubmitBusinessData(form,table,classify)
|
|
|
} else {
|
|
|
window?.$message?.warning('请先在左侧选择要复制的节点或选择所属方')
|
|
|
@@ -1106,8 +1106,8 @@ const copyContractTreeNode = async (type, form,table) => {
|
|
|
window?.location?.reload() //刷新页面
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
//复制数据
|
|
|
const copyContractNodeSubmitBusinessData = async (form,table,classify) => {
|
|
|
@@ -1311,8 +1311,9 @@ const queryNodeStatus = async () => {
|
|
|
if (contractInfo.value?.contractType==1) {
|
|
|
const {error, code, data} = await wbsApi.queryNodeStatus({
|
|
|
primaryKeyId:info['primaryKeyId'],
|
|
|
- classify:1
|
|
|
- })
|
|
|
+ //classify:1
|
|
|
+ classify: authBtnTabKey.value
|
|
|
+ })
|
|
|
//1 未填报，2待上报，3已上报
|
|
|
if (!error && code === 200) {
|
|
|
NodeStatus.value = data ?? '1'
|
|
|
@@ -1323,7 +1324,8 @@ const queryNodeStatus = async () => {
|
|
|
const {error, code, data} = await wbsApi.queryNodeStatusJl({
|
|
|
// primaryKeyId: info['contractIdRelation'] ? info['id'] : info['primaryKeyId'],
|
|
|
primaryKeyId: info['primaryKeyId'],
|
|
|
- classify: 1
|
|
|
+ //classify: 1
|
|
|
+ classify: authBtnTabKey.value
|
|
|
})
|
|
|
//1 未填报，2待上报，3已上报
|
|
|
if (!error && code === 200) {
|
|
|
@@ -1332,10 +1334,6 @@ const queryNodeStatus = async () => {
|
|
|
NodeStatus.value = '1'
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
//批量上报
|
|
|
@@ -1531,8 +1529,8 @@ const isHiddenleftbox = () => {
|
|
|
let item = document.getElementById("wbs-left-tree");
|
|
|
item.style.display="none"
|
|
|
isShowLefticon.value=false
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
//左右拖动，改变树形结构宽度
|
|
|
const leftWidth = ref(382);
|
|
|
@@ -1656,7 +1654,7 @@ html.theme-dark {
|
|
|
color: var(--el-color-primary);
|
|
|
cursor:pointer;
|
|
|
// float: left;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
.hc-layout-content-box-righticon {
|
|
|
position: absolute;
|
|
|
@@ -1667,7 +1665,7 @@ html.theme-dark {
|
|
|
color: var(--el-color-primary);
|
|
|
cursor:pointer;
|
|
|
// float: left;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
.hc-arrow-icon {
|
|
|
width: 28px;
|
|
|
@@ -1679,7 +1677,7 @@ html.theme-dark {
|
|
|
cursor: pointer;
|
|
|
transition: color 0.2s;
|
|
|
border-radius: 50%;
|
|
|
-
|
|
|
+
|
|
|
box-shadow: var(--hc-shadow);
|
|
|
background:var(--el-color-primary-light-9);
|
|
|
&:hover {
|
liuyc