17747bf8 by fanguang

fix

1 parent a5726829
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 <el-col :span="24"> 75 <el-col :span="24">
76 <el-form-item label="自定义字段选择" v-if="form.fieldRQVOS && form.fieldRQVOS.length" required> 76 <el-form-item label="自定义字段选择" v-if="form.fieldRQVOS" required>
77 <div class="table-form"> 77 <div class="table-form">
78 <div class="table-form-wrapper" v-for="item,index in form.fieldRQVOS" :key="index"> 78 <div class="table-form-wrapper" v-for="item,index in form.fieldRQVOS" :key="index">
79 <div class="table-form-item"> 79 <div class="table-form-item">
...@@ -233,7 +233,7 @@ const formTpl = { ...@@ -233,7 +233,7 @@ const formTpl = {
233 publishingUnitCode: '', 233 publishingUnitCode: '',
234 parentGuid: '', 234 parentGuid: '',
235 description: '', 235 description: '',
236 fieldRQVOS: [] 236 fieldRQVOS: null
237 } 237 }
238 const form = ref({...formTpl}) 238 const form = ref({...formTpl})
239 const formRules = { 239 const formRules = {
...@@ -254,7 +254,7 @@ function parentGuidChange (val) { ...@@ -254,7 +254,7 @@ function parentGuidChange (val) {
254 } 254 }
255 } 255 }
256 function parentGuidCheck (node, {checkedKeys}) { 256 function parentGuidCheck (node, {checkedKeys}) {
257 let fieldRQVOS = [] 257 let fieldRQVOS = null
258 if (checkedKeys.length) { 258 if (checkedKeys.length) {
259 fieldRQVOS = [{...tableFormTpl}] 259 fieldRQVOS = [{...tableFormTpl}]
260 } 260 }
...@@ -337,11 +337,8 @@ watch( ...@@ -337,11 +337,8 @@ watch(
337 () => visible.value, 337 () => visible.value,
338 (v) => { 338 (v) => {
339 if (!v) return 339 if (!v) return
340
341 // 上级标准:不能选自己,有数据的标准不能选 340 // 上级标准:不能选自己,有数据的标准不能选
342 treeSelectData.value = JSON.parse(JSON.stringify(props.standardOptions)) 341 treeSelectData.value = JSON.parse(JSON.stringify(props.standardOptions))
343
344
345 if (props.type === 'edit') { 342 if (props.type === 'edit') {
346 getDetail().then(() => formatOptions(treeSelectData.value)) 343 getDetail().then(() => formatOptions(treeSelectData.value))
347 } else { 344 } else {
......
...@@ -180,7 +180,7 @@ const formItems: any = ref([ ...@@ -180,7 +180,7 @@ const formItems: any = ref([
180 default: '', 180 default: '',
181 maxlength: 30, 181 maxlength: 30,
182 clearable: true, 182 clearable: true,
183 required: true 183 // required: true
184 }, 184 },
185 { 185 {
186 label: '标准号', 186 label: '标准号',
...@@ -283,7 +283,7 @@ const formItems: any = ref([ ...@@ -283,7 +283,7 @@ const formItems: any = ref([
283 const formRules: any = ref({ 283 const formRules: any = ref({
284 standardTypeCode: { required: true, message: '请选择标准类型' }, 284 standardTypeCode: { required: true, message: '请选择标准类型' },
285 codeName: { required: true, message: '请输入代码名称' }, 285 codeName: { required: true, message: '请输入代码名称' },
286 code: { required: true, message: '请输入代码编码' }, 286 // code: { required: true, message: '请输入代码编码' },
287 standard: { required: true, message: '请输入标准号' }, 287 standard: { required: true, message: '请输入标准号' },
288 standardName: { required: true, message: '请输入标准名称' }, 288 standardName: { required: true, message: '请输入标准名称' },
289 publishingUnitCode: { required: true, message: '请选择发布单位' }, 289 publishingUnitCode: { required: true, message: '请选择发布单位' },
......
...@@ -489,6 +489,7 @@ const viewGraph = () => { ...@@ -489,6 +489,7 @@ const viewGraph = () => {
489 </Tree> 489 </Tree>
490 </div> 490 </div>
491 <div class="main_wrap"> 491 <div class="main_wrap">
492 <div class="header" style="font-size:16px;font-weight:bold;margin-top:8px;color:#212121">{{ treeInfo.currentObj.standardName }}</div>
492 <div class="table_tool_wrap"> 493 <div class="table_tool_wrap">
493 <div class="tools_btns"> 494 <div class="tools_btns">
494 <el-button type="primary" 495 <el-button type="primary"
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!