ZaiZai 2 ay önce
ebeveyn
işleme
fa532d6019

+ 4 - 2
src/views/project/list/edit-formula.vue

@@ -1,6 +1,6 @@
 <template>
     <hc-drawer v-model="isShow" ui="hc-project-list-edit-formula-drawer" to-id="hc-layout-box" is-close @close="drawerClose">
-        <hc-card is-action-btn :scrollbar="isScrollBar">
+        <hc-card is-action-btn :title="cardFormulaTitle" :scrollbar="isScrollBar">
             <div class="hc-project-list-edit-formula-card" :class="isScrollBar ? '' : 'is-no-scroll'">
                 <!-- 顶部操作 -->
                 <div class="hc-formula-card-box border-dashed-card hc-flex mb-14px h-58px">
@@ -484,8 +484,10 @@ const startFCRegExp = /^FC\.([a-zA-Z\d]+)\(/ //匹配开始的FC.xxx(
 const isScrollBar = ref(true)
 
 //获取数据
+const cardFormulaTitle = ref('')
 const getDataApi = async () => {
-    console.log(dataInfo.value)
+    const { cardTitle } = getObjValue(dataInfo.value)
+    cardFormulaTitle.value = cardTitle
     await getTypeMapApi()
     await getWbsFormElementData()
     await getFormulaStringToArrayApi()

+ 56 - 47
src/views/project/list/wbs-tree.vue

@@ -12,19 +12,25 @@
                         <template #dropdown>
                             <el-dropdown-menu>
                                 <template v-for="item in dataSyncMenu" :key="item.key">
-                                    <el-dropdown-item @click="dataSyncMenuClick(item)">{{ item.name }}</el-dropdown-item>
+                                    <el-dropdown-item @click="dataSyncMenuClick(item)">
+                                        {{
+                                            item.name
+                                        }}
+                                    </el-dropdown-item>
                                 </template>
                             </el-dropdown-menu>
                         </template>
                     </el-dropdown>
-                    <el-button v-if="isFormSet" class="ml-3" hc-btn type="primary" @click="setIsFormSetValue">表单设置</el-button>
+                    <el-button v-if="isFormSet" class="ml-3" hc-btn type="primary" @click="setIsFormSetValue">
+                        表单设置
+                    </el-button>
                     <el-button v-else class="ml-3" hc-btn type="primary" @click="setIsFormSetValue">
                         元素设置
                     </el-button>
                     <el-button hc-btn type="danger" @click="nodeParamClick">
                         节点参数
                     </el-button>
-                    <el-button hc-btn color="#626aef" @click="toIndependent">
+                    <el-button color="#626aef" hc-btn @click="toIndependent">
                         独立表单库
                     </el-button>
                     <el-button hc-btn type="warning" @click="archiveClick">
@@ -33,13 +39,13 @@
                 </div>
             </div>
             <div class="body">
-                <hc-body split padding="8px">
+                <hc-body padding="8px" split>
                     <template #left>
                         <hc-card
                             v-loading="isTreeLoading"
-                            title="工程节点信息"
-                            scrollbar
                             class="is-tree"
+                            scrollbar
+                            title="工程节点信息"
                         >
                             <template #search>
                                 <hc-search-input
@@ -60,20 +66,20 @@
                             </template>
                             <hc-data-tree
                                 v-if="isSearchTree"
-                                :h-props="treeProps"
-                                :datas="treeLoadData"
-                                tree-key="id"
                                 :auto-expand-keys="treeExpandKeys"
+                                :datas="treeLoadData"
+                                :h-props="treeProps"
                                 :menus="treeMenus"
+                                tree-key="id"
                                 @menu-tap="treeMenuClick"
                                 @node-tap="treeNodeClick"
                             />
                             <hc-lazy-tree
                                 v-else
-                                :h-props="treeProps"
-                                tree-key="id"
                                 :auto-expand-keys="treeExpandKeys"
+                                :h-props="treeProps"
                                 :menus="treeMenus"
+                                tree-key="id"
                                 @load="treeLoadNode"
                                 @menu-tap="treeMenuClick"
                                 @node-tap="treeNodeClick"
@@ -84,9 +90,9 @@
                         <div class="body-top">
                             <hc-card title="节点信息">
                                 <hc-table
-                                    :is-index="false"
                                     :column="nodeTableColumn"
                                     :datas="nodeTableData"
+                                    :is-index="false"
                                 >
                                     <template #nodeType="{ row }">
                                         {{
@@ -104,17 +110,17 @@
                             <hc-card title="当前项目信息表">
                                 <template #extra>
                                     <el-button
+                                        :disabled="infoTableData.length <= 0"
                                         hc-btn
                                         type="primary"
-                                        :disabled="infoTableData.length <= 0"
                                         @click="editRowClick(row)"
                                     >
                                         编辑
                                     </el-button>
                                     <el-button
+                                        :disabled="infoTableData.length <= 0"
                                         hc-btn
                                         type="success"
-                                        :disabled="infoTableData.length <= 0"
                                         @click="sortClick"
                                     >
                                         排序
@@ -122,9 +128,9 @@
                                 </template>
                                 <hc-table
                                     v-loading="infoTableLoading"
-                                    :is-index="false"
                                     :column="infoTableColumn"
                                     :datas="infoTableData"
+                                    :is-index="false"
                                 >
                                     <template #tableType="{ row }">
                                         {{
@@ -186,9 +192,9 @@
                         <hc-card>
                             <hc-table
                                 v-loading="infoTableLoading"
-                                :is-index="false"
                                 :column="infoTableColumn1"
                                 :datas="infoTableData"
+                                :is-index="false"
                             >
                                 <template #tableType="{ row }">
                                     {{
@@ -201,7 +207,7 @@
                                 </template>
                                 <template #isLinkTable="{ row }">
                                     {{
-                                        row.isLinkTable === 2 ? "是" : "否"
+                                        row.isLinkTable === 2 ? '是' : '否'
                                     }}
                                 </template>
                                 <template #tableOwner="{ row }">
@@ -222,22 +228,22 @@
                                     </el-link>
                                     <el-link
                                         v-loading="editElementLoading"
-                                        type="primary"
                                         :disabled="
                                             row.excelId === -1
                                                 || isNullES(row.excelId)
                                         "
+                                        type="primary"
                                         @click="editElement(row)"
                                     >
                                         编辑元素
                                     </el-link>
                                     <el-link
                                         v-loading="adjustExcelLoading"
-                                        type="warning"
                                         :disabled="
                                             row.excelId === -1
                                                 || isNullES(row.excelId)
                                         "
+                                        type="warning"
                                         @click="adjustExcelClick(row)"
                                     >
                                         调整表单
@@ -281,53 +287,53 @@
         <!-- 编辑节点 -->
         <TreeNodeEditDialog
             v-model="isTreeNodeEditShow"
+            :major-type="majorDataTypeList"
             :node="treeInfo"
-            :type="Number(isType)"
-            :wid="wbsId"
+            :node-type="nodeTypelist"
             :pid="projectInfo.id"
             :tree-props="treeProps"
-            :node-type="nodeTypelist"
-            :major-type="majorDataTypeList"
-            @close="treeNodeEditClose"
+            :type="Number(isType)"
+            :wid="wbsId"
             @change="treeNodeEditChange"
+            @close="treeNodeEditClose"
         />
         <!-- 节点排序 -->
         <hc-new-dialog
             v-model="nodeSortModalShow"
             is-table
-            widths="1100px"
             title="调整排序"
+            widths="1100px"
             @save="nodeSortModalSave"
         >
             <hc-table
-                ui="hc-table-row-drop"
                 :column="nodeSortTableColumn"
                 :datas="nodeSortTableData"
+                :index-style="{ width: 80 }"
                 :loading="nodeSortNodeLoading"
                 is-row-drop
                 quick-sort
-                :index-style="{ width: 80 }"
+                ui="hc-table-row-drop"
                 @row-drop="nodeSortTableRowDrop"
                 @row-sort="nodeSortTableRowDrop"
             >
                 <template #action="{ row, index }">
                     <span
-                        class="text-xl"
                         :class="index === 0 ? 'text-gray' : 'text-link'"
+                        class="text-xl"
                         @click="upNodeSortClick(row, index)"
                     >
-                        <hc-icon name="arrow-up" fill />
+                        <hc-icon fill name="arrow-up" />
                     </span>
                     <span
-                        class="ml-2 text-xl"
                         :class="
                             index === nodeSortTableData.length - 1
                                 ? 'text-gray'
                                 : 'text-link'
                         "
+                        class="ml-2 text-xl"
                         @click="downNodeSortClick(row, index)"
                     >
-                        <hc-icon name="arrow-down" fill />
+                        <hc-icon fill name="arrow-down" />
                     </span>
                 </template>
             </hc-table>
@@ -341,8 +347,8 @@
         <!-- 编辑元素 -->
         <HcEditElement
             v-model="isEditElementShow"
-            :info="editElementInfo"
             :data="editElementData"
+            :info="editElementInfo"
             @to-page="editElementToPage"
         />
         <!-- 调整表单 -->
@@ -350,10 +356,10 @@
         <!-- 编辑元素公式 -->
         <hc-dialog
             v-model="elementFormulasShow"
+            :footer="false"
+            :title="elementFormulasName"
             is-table
             widths="600px"
-            :title="elementFormulasName"
-            :footer="false"
             @close="elementFormulasClose"
         >
             <template #search>
@@ -364,10 +370,10 @@
             </template>
             <hc-table
                 v-loading="formulaTableLoading"
-                :is-index="false"
-                :is-current-row="false"
                 :column="formulaTableColumn"
                 :datas="formulaTableData"
+                :is-current-row="false"
+                :is-index="false"
             >
                 <template #action="{ row }">
                     <el-link
@@ -404,9 +410,9 @@
         <!-- 独立表单库 -->
         <independentPage
             v-model="independentShow"
-            :wbs-type="isType"
             :project-id="projectInfo.id"
             :wbs-id="wbsId"
+            :wbs-type="isType"
             @close="independentClose"
         />
         <!-- 归档文件时间 -->
@@ -415,9 +421,9 @@
         <!-- 编辑元素表信息 -->
         <editElePage
             v-model="editEleShow"
-            :table-typelist="tableTypelist"
             :owner-type-list="ownerTypeList"
             :tab="infoTableData"
+            :table-typelist="tableTypelist"
             @close="editClose"
         />
         <!-- 表单调整排序 -->
@@ -432,26 +438,26 @@
         <!-- 创建新的元素表 -->
         <createNewExcel
             v-model="isCreateShow"
+            :e-key="eKey"
+            :init-table-id="initTableId"
+            :init-table-name="initTableName"
             :node="treeItem"
-            :wid="wbsId"
-            :table-typelist="tableTypelist"
             :owner-type-list="ownerTypeList"
-            :title="modalTitle"
-            :init-table-name="initTableName"
-            :init-table-id="initTableId"
             :table-id="tableId"
-            :e-key="eKey"
+            :table-typelist="tableTypelist"
+            :title="modalTitle"
             :type="0"
+            :wid="wbsId"
             @close="createClose"
         />
 
         <!-- 分配WBS -->
         <allocateWbs
             v-model="isAllocateShow"
-            :wbs-type="isType"
-            :project-id="projectInfo.id"
             :data="allocateWbsInfo"
+            :project-id="projectInfo.id"
             :type="1"
+            :wbs-type="isType"
         />
     </hc-drawer>
 </template>
@@ -1168,6 +1174,8 @@ const toFormulaGlobal = async (row) => {
 //节点公式,20
 const toFormulaNodes = async (row) => {
     elementFormulasClose()
+    const formulasObj = elementFormulasObj.value
+    const title = `${formulasObj.tableName ? formulasObj.tableName + ' 元素公式(元素库)' : '元素公式(元素库)'}`
     editFormulaData.value = {
         node: treeItem.value,
         pid: projectInfo.value.id,
@@ -1176,6 +1184,7 @@ const toFormulaNodes = async (row) => {
         eleId: row.id,
         tableType: false,
         globalType: 20,
+        cardTitle: title,
     }
     await nextTick()
     isEditFormulaShow.value = true
@@ -1298,7 +1307,7 @@ const linkNodeClick = (row) => {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .hc-project-wbs-tree {
     position: relative;
     background: #ececec;