ZaiZai 1 ano atrás
pai
commit
fbcc0857a3

+ 2 - 2
src/config/index.json

@@ -1,7 +1,7 @@
 {
     "version": "20230607160059",
-    "target1": "http://192.168.0.109:8090",
-    "target": "http://192.168.0.125:8090",
+    "target": "http://192.168.0.109:8090",
+    "target1": "http://192.168.0.125:8090",
     "smsPhone": "",
     "vite": {
         "port": 5180,

+ 26 - 26
src/views/project/debit/contract/components/unit/tree-form.vue

@@ -13,12 +13,12 @@
                         </div>
                     </div>
                     <div v-else>
-                        <HcDataTree 
+                        <HcDataTree
                             ref="leftTree"
-                            tree-key="id" 
-                            show-checkbox  
-                            :datas="leftTreeData" 
-                            :h-props="lefttreeProps" 
+                            tree-key="id"
+                            show-checkbox
+                            :datas="leftTreeData"
+                            :h-props="lefttreeProps"
                             :default-expand-all="defaultExpandAll"
                             :check-strictly="checkStrictly"
                             :default-checked-keys="defaultCheckedKeys"
@@ -61,7 +61,7 @@
 
 <script setup>
 import { nextTick, ref, watch } from 'vue'
-import { arrToId, arrUnion, getArrValue, getRandom, isArrItem } from 'js-fast-way'
+import { arrToId, arrUnion, getArrValue, getRandom } from 'js-fast-way'
 import unitApi from '~api/project/debit/contract/unit.js'
 import { useAppStore } from '~src/store'
 
@@ -114,7 +114,7 @@ const getTreeDataList = async ()=>{
     const { error, code, data } = await unitApi.getLeftList({
       id:ids.value,
     })
-   
+
     if (!error && code === 200) {
         treeDataList.value = getArrValue(data)
     } else {
@@ -138,15 +138,15 @@ const getLeftTreeData = async (id) => {
     const { error, code, data } = await unitApi.getCurrentNodeTree({
         id,
        contractId:contractId.value,
-  
+
     })
     treeLoading.value = false
     if (!error && code === 200) {
         leftTreeData.value = getArrValue(data)
-     
+
     } else {
         leftTreeData.value = []
-    
+
     }
 }
 //监听
@@ -195,9 +195,9 @@ watch(isShow, (val) => {
     if (val) {
         setSplitRef()
         checkStrictly.value = false
-      
-       
-      
+
+
+
     }
 })
 
@@ -246,14 +246,14 @@ const modalSave = async () => {
             requestType:menuType.value === 'add' ? 1 : 2, //请求类型 1=节点新增 2=增补单元新增
             templateId: templateId.value,
             dataList:tableData.value,
-      
+
         })
         //判断状态
         addNodeLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
             tableData.value = []
-     
+
         } else {
              window.$message.error(msg)
          }
@@ -264,22 +264,22 @@ const modalSave = async () => {
             contractId:contractId.value,
             id:ids.value,
             vo2s:tableData.value,
-      
+
         })
         //判断状态
         addNodeLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
             tableData.value = []
-     
+
         } else {
              window.$message.error(msg)
          }
         emit('finish')
     }
 
-   
-    
+
+
 }
 const closeAddModal = ()=>{
     tableData.value = []
@@ -333,7 +333,7 @@ const treeNodeCheck = (checkdata, { checkedNodes, halfCheckedNodes }) => {
             const uniqueArray = alarr.reduce((acc, current) => {
             // 检查当前对象的某个字段是否已存在于累积数组中
             const x = acc.find(item => item.id === current.id)
-            
+
             // 如果不存在,则将其添加到累积数组中
             if (!x) {
                 return acc.concat([current])
@@ -341,12 +341,12 @@ const treeNodeCheck = (checkdata, { checkedNodes, halfCheckedNodes }) => {
                 return acc
             }
             }, [])
-        
+
             tableData.value = uniqueArray
 
-    
+
     }
-  
+
 }
 const checkStrictly = ref(false)
 const defaultCheckedKeys = ref([])
@@ -359,7 +359,7 @@ const changeIsAdd = (val, row, index)=>{
             let delKeys = arrToId(rowTreeData.data.children).split(',')
             nextTick(()=>{
                 delKeys.forEach((ele)=>{
-               
+
                     leftTree.value.treeRef.setChecked(ele, false, true)
                     leftTree.value.treeRef.setChecked(row.id, true, false)
                     let checkKeys = leftTree.value.treeRef.getCheckedKeys()
@@ -372,7 +372,7 @@ const changeIsAdd = (val, row, index)=>{
                         })
                     })
                     tableData.value = arr
-                  
+
                 })
                 const isIdExist = tableData.value.some(obj => obj.id === parentData.value.id)
                 if (!isIdExist) {
@@ -388,7 +388,7 @@ const changeIsAdd = (val, row, index)=>{
                             },
                  )
                 }
-                
+
             })
         } else if (isParent && val === 1) {
             checkStrictly.value = false

+ 2 - 2
src/views/project/debit/contract/unit.vue

@@ -25,7 +25,7 @@
             <hc-new-card scrollbar title="合同计量单元">
                 <template #extra>
                     <el-button hc-btn type="primary" @click="editModalShow = true">修改</el-button>
-                    <el-button hc-btn type="danger">删除</el-button>
+                    <el-button hc-btn type="danger" @click="delModalClick">删除</el-button>
                     <el-button hc-btn type="warning" @click="supplyClick">增补单元</el-button>
                     <el-button hc-btn type="success" @click="leadModal">导入</el-button>
                 </template>
@@ -413,7 +413,7 @@ const treeMenuTap = ({ key, node, data, keys }) => {
         }
         if (key === 'edit') {
             editModalShow.value = true
-      
+
         }
         if (key === 'sort') {
             let nodes = [], childNodes = []