1ce63a67 by fanguang

fix

1 parent baf35769
...@@ -98,10 +98,19 @@ ...@@ -98,10 +98,19 @@
98 </el-select> 98 </el-select>
99 </div> 99 </div>
100 <div class="table-form-item"> 100 <div class="table-form-item">
101 <el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:160px" filterable clearable :disabled="fieldsDisabled || fieldsControlDisabled"> 101 <el-select
102 v-if="item.inputTypeCode == 2"
103 v-model="item.dataTypeCode"
104 style="width:160px" filterable clearable
105 :disabled="fieldsDisabled || fieldsControlDisabled">
102 <el-option v-for="item in allDictOptions" :label="item.dictTypeName" :value="item.dictTypeName" :key="item.guid"></el-option> 106 <el-option v-for="item in allDictOptions" :label="item.dictTypeName" :value="item.dictTypeName" :key="item.guid"></el-option>
103 </el-select> 107 </el-select>
104 <el-input v-else-if="item.inputTypeCode == 3" v-model="item.validateExpression" placeholder="请输入"></el-input> 108 <el-input
109 v-else-if="item.inputTypeCode == 3"
110 v-model="item.validateExpression"
111 :disabled="fieldsDisabled || fieldsControlDisabled"
112 placeholder="请输入"
113 ></el-input>
105 </div> 114 </div>
106 <div class="table-form-operation" v-if="!fieldsDisabled && !fieldsControlDisabled"> 115 <div class="table-form-operation" v-if="!fieldsDisabled && !fieldsControlDisabled">
107 <!-- <el-icon color="#4fa1a4" @click="() => addTableItem(index)"> 116 <!-- <el-icon color="#4fa1a4" @click="() => addTableItem(index)">
...@@ -369,13 +378,14 @@ watch( ...@@ -369,13 +378,14 @@ watch(
369 (v) => { 378 (v) => {
370 if (!v) return 379 if (!v) return
371 // 上级标准:不能选自己,有数据的标准不能选 380 // 上级标准:不能选自己,有数据的标准不能选
372 fieldsControlDisabled.value = true
373 // treeSelectData.value = JSON.parse(JSON.stringify(props.standardOptions)) 381 // treeSelectData.value = JSON.parse(JSON.stringify(props.standardOptions))
374 if (props.type === 'edit') { 382 if (props.type === 'edit') {
383 fieldsControlDisabled.value = false
375 getTreeSelectOptions().then(() => { 384 getTreeSelectOptions().then(() => {
376 getDetail().then(() => formatOptions(treeSelectData.value)) 385 getDetail().then(() => formatOptions(treeSelectData.value))
377 }) 386 })
378 } else { 387 } else {
388 fieldsControlDisabled.value = true
379 form.value = { ...formTpl } 389 form.value = { ...formTpl }
380 getTreeSelectOptions().then(() => formatOptions(treeSelectData.value)) 390 getTreeSelectOptions().then(() => formatOptions(treeSelectData.value))
381 } 391 }
......
...@@ -90,10 +90,17 @@ function getTree (refresh = false, initLocate = false) { ...@@ -90,10 +90,17 @@ function getTree (refresh = false, initLocate = false) {
90 }) 90 })
91 treeInfo.value.data = data 91 treeInfo.value.data = data
92 if (!initLocate) { 92 if (!initLocate) {
93 treeInfo.value.expandedKey = [data[0].guid] 93 // treeInfo.value.expandedKey = [data[0].guid]
94 treeInfo.value.currentNodeKey = data[0].guid 94 // treeInfo.value.currentNodeKey = data[0].guid
95 console.log('data', data)
96 let firstNode = data[0]
97 if (firstNode.children) {
98 firstNode = firstNode.children[0]
99 }
100 treeInfo.value.expandedKey = [firstNode.guid]
101 treeInfo.value.currentNodeKey = firstNode.guid
102 nodeClick(firstNode)
95 } 103 }
96 nodeClick(data[0])
97 } 104 }
98 }) 105 })
99 } 106 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!