duy 1 anno fa
parent
commit
3672c035cf

+ 15 - 5
src/views/project/debit/contract/components/unit/row-data.vue

@@ -22,15 +22,13 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="工程类型:">
-                            <el-select v-model="formModel.engineeringTypeName" placeholder="工程类型" disabled block>
-                                <el-option label="总则" :value="1" />
-                            </el-select>
+                            <el-input v-model="formModel.engineeringTypeName" placeholder="工程类型:" disabled />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="桩号类型:">
-                            <el-select v-model="formModel.key5" block placeholder="桩号类型">
-                                <el-option label="总则" :value="1" />
+                            <el-select v-model="formModel.stakeType" block placeholder="桩号类型">
+                                <el-option v-for="item in stakeOptions" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -165,6 +163,17 @@ const getNodeType = async () => {
         ele.dictKey = Number(ele.dictKey)
     })
 }
+//获取桩号类型
+const stakeOptions = ref([])
+const getStakeype = async () => {
+    const { data } = await getDictionary({
+        code: 'meter_stake_type',
+    })
+    stakeOptions.value = getArrValue(data)
+    stakeOptions.value.forEach((ele)=>{
+        ele.dictKey = Number(ele.dictKey)
+    })
+}
 //监听
 watch(() => [
     props.ids,
@@ -183,6 +192,7 @@ watch(isShow, (val) => {
     if (val) {
         console.log('isShow', val)
         getNodeType()
+        getStakeype()
     }
 })
 

+ 18 - 4
src/views/project/debit/project/unit.vue

@@ -42,9 +42,10 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="工程类型">
-                    <el-select v-model="formModel.engineeringType" disabled block>
+                    <el-input v-model="formModel.engineeringTypeName" disabled />
+                    <!-- <el-select v-model="formModel.engineeringTypeName" disabled block>
                         <el-option label="总则" :value="1" />
-                    </el-select>
+                    </el-select> -->
                 </el-form-item>
                 <!-- el-form-item label="显示类型:">
                     <el-select v-model="formModel.key5" block>
@@ -82,7 +83,7 @@
 
 <script setup>
 import { nextTick, onMounted, ref, watch } from 'vue'
-import { arrToId, getArrValue, getObjValue, getRandom } from 'js-fast-way'
+import { arrToId, getArrValue, getObjVal, getObjValue, getRandom } from 'js-fast-way'
 import unitApi from '~api/project/debit/project/unit.js'
 import { useAppStore } from '~src/store'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
@@ -202,6 +203,7 @@ const treeMenuTap = ({ key, node, data, keys }) => {
         treeModalTitle.value = '新增下级节点'
         treeModalShow.value = true
         formModel.value = {}
+        getEngineerName(data.id)
         formModel.value.nodeType = data.nodeType
         formModel.value.parentId = data.id
         formModel.value.ancestor = data.ancestor
@@ -231,7 +233,19 @@ const treeMenuTap = ({ key, node, data, keys }) => {
             // sortTableData.value = data.children
         }
 }
-
+//获取工程名称
+const getEngineerName = async (id)=>{
+    const { error, code, data } = await unitApi.getEngineeringTypeName({
+       id,
+    })
+    if (!error && code === 200) {
+        formModel.value.engineeringTypeName = getObjVal(data) ? data : ''
+   
+    } else {
+        formModel.value.engineeringTypeName = ''
+        
+}
+}
 
 //分页
 const pageChange = ({ current, size }) => {