Selaa lähdekoodia

底层节点修改

duy 9 kuukautta sitten
vanhempi
commit
8936acdb64
3 muutettua tiedostoa jossa 541 lisäystä ja 409 poistoa
  1. 412 375
      src/views/data-fill/collapse-form/index.vue
  2. 35 0
      src/views/data-fill/division.vue
  3. 94 34
      src/views/data-fill/wbs.vue

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 412 - 375
src/views/data-fill/collapse-form/index.vue


+ 35 - 0
src/views/data-fill/division.vue

@@ -39,6 +39,26 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box hc-division-page">
+            <div style="height: 50px" class="mb-2">
+                <hc-card class="text-right">
+                    <!-- <el-button
+                        hc-btn
+                        type="warning"
+                        @click="divisionClick"
+                    >
+                        <HcIcon name="git-merge" />
+                        <span>节点划分</span>
+                    </el-button>
+                    <el-button
+                        hc-btn
+                        type="primary"
+                        @click="divisionImportClick"
+                    >
+                        <HcIcon name="folder-received" />
+                        <span>节点导入</span>
+                    </el-button> -->
+                </hc-card>
+            </div>
             <div class="basic-info">
                 <HcNewCard title="当前节点基础信息">
                     <template #extra>
@@ -77,6 +97,14 @@
                             <HcIcon name="add" />
                             <span>引用元素表</span>
                         </el-button>
+                        <!-- <el-button
+                            hc-btn
+                            color="#3EB1A5"
+                            class="text-white"
+                        >
+                            <HcIcon name="edit-2" />
+                            <span>节点命名配置</span>
+                        </el-button> -->
                     </template>
                     <HcTable
                         :column="tableProjectColumn"
@@ -2506,6 +2534,13 @@ const onmousedown = () => {
         document.onmouseup = null
     }
 }
+//节点划分
+const divisionClick = ()=>{
+
+}
+//节点导入
+const divisionImportClick = ()=>{
+}
 </script>
 
 <style lang="scss" scoped>

+ 94 - 34
src/views/data-fill/wbs.vue

@@ -145,6 +145,20 @@
                     @change="authBtnTabClick"
                 >
                     <template #extra>
+                        <div v-if="ListItemDatas.length > 0" class="mr-2 flex items-center justify-center whitespace-nowrap">
+                            <div>  文件题名</div>
+                            <div class="title-input">{{ titleInput }}</div>
+                        </div>
+                        
+                        <!-- <HcTooltip keys="node_base_data">
+                            <el-button
+                                hc-btn
+                                type="primary"
+                                @click="nodeBaseDataClick"
+                            >
+                                节点基础数据
+                            </el-button>
+                        </HcTooltip> -->
                         <HcTooltip keys="wbs_views_sort_btn">
                             <el-button
                                 v-if="nodeDataInfo?.nodeClass !== 2"
@@ -674,8 +688,6 @@
                         </el-checkbox-group>
                     </el-form-item>
                 </el-form>
-                <!-- HcNewSwitch :datas="authBtnTabdata" :keys="classifyType" :round="false" size="default"
-                             @change="classifyTypeTabClick"/ -->
             </div>
             <div v-if="copyNodeTabKey === '1'" class="copy-node-form-box">
                 <el-form
@@ -963,6 +975,12 @@
                         />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="编号" prop="number">
+                    <el-input
+                        v-model="formWaterNodeModel.number"
+                        placeholder="请输入编号"
+                    />
+                </el-form-item>
             </el-form>
         </hc-new-dialog>
         <!-- 新增自定义节点-数字化文件 -->
@@ -1291,6 +1309,44 @@
                 </el-button>
             </template>
         </hc-new-dialog>
+        <!-- 节点基础数据 -->
+        <hc-new-dialog
+            v-model="nodeBaseDataModalDialog"
+            title="节点基础数据"
+            widths="800px"
+            is-footer-center
+            @close="nodeBaseDataModalClose"
+        >
+            <template #header>
+                <div class="flex justify-between text-orange">
+                    <span>提示: 若填写框没有内容,则没有该节点类型。编保存后,需再次保存后才能生效。</span>
+                    <el-button type="success" size="small" @click="resetForm">刷新</el-button>
+                </div>
+            </template>
+            <el-form :model="autoFormData" :rules="rules" label-width="120px" inline>
+                <el-form-item label="单位工程:" prop="unitProject">
+                    <el-input v-model="autoFormData.unitProject" />
+                </el-form-item>
+                <el-form-item label="子单位工程:" prop="subUnitProject">
+                    <el-input v-model="autoFormData.subUnitProject" />
+                </el-form-item>
+                <el-form-item label="分部工程:" prop="divisionProject">
+                    <el-input v-model="autoFormData.divisionProject" />
+                </el-form-item>
+                <el-form-item label="子分部工程:" prop="subDivisionProject">
+                    <el-input v-model="autoFormData.subDivisionProject" />
+                </el-form-item>
+                <el-form-item label="分项工程:" prop="itemProject">
+                    <el-input v-model="autoFormData.itemProject" />
+                </el-form-item>
+                <el-form-item label="子分项工程:" prop="subItemProject">
+                    <el-input v-model="autoFormData.subItemProject" />
+                </el-form-item>
+                <el-form-item label="工序:" prop="process">
+                    <el-input v-model="autoFormData.process" />
+                </el-form-item>
+            </el-form>
+        </hc-new-dialog>
     </div>
 </template>
 
@@ -1313,7 +1369,6 @@ import {
     getArrValue,
     getObjVal,
     getObjValue,
-    isArrIndex,
     isNullES,
     isString,
     setCopyText,
@@ -1358,8 +1413,6 @@ const TreeAutoExpandKeys = ref(getStoreValue('wbsTreeExpandKeys') || [])
 
 //树搜索
 const isSearchTree = ref(false)
-const wbstreeKey = ref(Math.random())
-const searchElTreeLoadNode = ref(true)
 const searchTreeHeight = ref()
 const getSearchTreeData = async () => {
     treeLoading.value = true
@@ -1457,12 +1510,6 @@ const setContractType = (contractType) => {
 const getTableDataAll = async (key) => {
     await searchNodeAllTable()
     await queryNodeStatus()
-    //     wbstree.value.resetNode().then((res)=>{
-    //         if(res){
-    //             searchNodeAllTable()
-    //             queryNodeStatus()
-    //         }
-    //  })
     //保存后自动展开到当前表单
     if (!isNullES(key)) {
         console.log(key)
@@ -1724,9 +1771,7 @@ const ElTreeMenuClick = async ({ key, node, data, keys }) => {
     TreeAutoExpandKeys.value = keys || []
     setTreeMenuDataClick({ key, node, data })
 }
-const treeMenuClick = (data) => {
-    console.log(data, 'data1')
-}
+
 //导图结构数据
 const NodeTreeRef = ref(null)
 
@@ -2190,9 +2235,7 @@ const copyNodeTableDel = (index) => {
 }
 
 const classifyType = ref(authBtnTabKey.value)
-const classifyTypeTabClick = ({ key }) => {
-    classifyType.value = key
-}
+
 
 //复制节点
 const copyNodeClick = async () => {
@@ -3212,23 +3255,6 @@ const hideTreeNode = async () => {
 const loadMenu = ({ node, item, level }, resolve) => {
     setElTreeMenu(contractInfo.value?.contractType)
     let menusArr = ElTreeMenu.value
-    //const { isCustomChild, notExsitChild } = item //isCustomChild===1//代表子级是自定义节点
-    // const { isCustom } = item
-    // if (isCustom === 1 && isCustomChild === 0 && notExsitChild) {//无子级,显示两个按钮
-    //     menusArr.unshift( { icon: 'add-circle', label: '新增自定义节点', key: 'add1' })
-    //     resolve(menusArr)
-    // } else if (isCustom === 1 && isCustomChild === 1) {//自定义节点类型下如果有自定义节点,就不允许新增节点
-    //     menusArr.unshift( { icon: 'add-circle', label: '新增自定义节点', key: 'add1' })
-    //     let menusArr1 = arrDelKey(menusArr, 'label', '新增节点') // [{id:1}]
-    //     resolve(menusArr1)
-    // } else if (isCustom === 1 && isCustomChild === 0 && !notExsitChild) { //自定义节点类型下如果有划分节点,就不允许新增自定义节点
-    //     resolve(menusArr)
-    // } else if (level === 1) {
-    //     menusArr = [ { icon: 'add-circle', label: '新增自定义节点', key: 'add1' }]
-    //     resolve(menusArr)
-    // } else {
-    //     resolve(menusArr)
-    // }
     if (level === 1) {
         menusArr = [
             {
@@ -3352,10 +3378,44 @@ const sortFormSubmit = async () => {
         window?.location?.reload() //刷新页面
     } 
 }
+
+//文件题名
+const titleInput = ref('ZP106(1204)喷播绿化分项工程质量检验评定表')
+
+//节点基础数据
+const nodeBaseDataModalDialog = ref(false)
+const nodeBaseDataClick = ()=>{
+    nodeBaseDataModalDialog.value = true
+}
+const nodeBaseDataModalClose = ()=>{
+    nodeBaseDataModalDialog.value = false
+}
+const autoFormData = ref(
+    {
+        unitProject: '',
+        subUnitProject: '',
+        divisionProject: '',
+        subDivisionProject: '',
+        itemProject: '',
+        subItemProject: '',
+        process: '',
+      },
+)
+const resetForm = ()=>{
+    
+}
 </script>
 
 <style lang="scss" scoped>
 @import "../../styles/data-fill/wbs.scss";
+.title-input{
+    height: 30px;
+    padding: 10px;
+    border: 1px solid #dcdfe6;
+    background-color: #dcdfe6;
+    line-height: 13px;
+    border-radius: 5px;
+}
 .hc-add-node-modal-foot-box {
     position: relative;
     display: flex;

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä