diff --git a/src/views/masterDataOptions/dataOrigin/sonTable.vue b/src/views/masterDataOptions/dataOrigin/sonTable.vue
index 8769261..e40d68b 100644
--- a/src/views/masterDataOptions/dataOrigin/sonTable.vue
+++ b/src/views/masterDataOptions/dataOrigin/sonTable.vue
@@ -2,36 +2,36 @@
   <div class="sonTable">
     <div class="optionForm">
       <baseNewForm
-        ref="optionForm"
-        :spanNumber="24"
-        :isFunBtn="false"
-        :formRow="optionFormRow"
-        :ruleForm="optionRuleForm"
-        :labelPosition="'top'"
-        @onSelect="selectChangeHanlde"
-        @inputBlur="optionFormInputBlur"
-        @onSubmit="optionOnSubmit"
+          ref="optionForm"
+          :spanNumber="24"
+          :isFunBtn="false"
+          :formRow="optionFormRow"
+          :ruleForm="optionRuleForm"
+          :labelPosition="'top'"
+          @onSelect="selectChangeHanlde"
+          @inputBlur="optionFormInputBlur"
+          @onSubmit="optionOnSubmit"
       >
       </baseNewForm>
       <baseNewForm
-        ref="typeOptionForm"
-        :spanNumber="24"
-        :isFunBtn="false"
-        :formRow="typeOptionFormRow"
-        :ruleForm="typeOptionRuleForm"
-        :labelPosition="'top'"
-        @onSelect="typeSelectChangeHanlde"
-        @onSubmit="typeOptionOnSubmit"
+          ref="typeOptionForm"
+          :spanNumber="24"
+          :isFunBtn="false"
+          :formRow="typeOptionFormRow"
+          :ruleForm="typeOptionRuleForm"
+          :labelPosition="'top'"
+          @onSelect="typeSelectChangeHanlde"
+          @onSubmit="typeOptionOnSubmit"
       >
       </baseNewForm>
       <baseNewForm
-        ref="propertyForm"
-        :spanNumber="24"
-        :isFunBtn="false"
-        :formRow="propertyFormRow"
-        :ruleForm="propertyRuleForm"
-        :labelPosition="'top'"
-        @onSubmit="propertyOnSubmit"
+          ref="propertyForm"
+          :spanNumber="24"
+          :isFunBtn="false"
+          :formRow="propertyFormRow"
+          :ruleForm="propertyRuleForm"
+          :labelPosition="'top'"
+          @onSubmit="propertyOnSubmit"
 
       >
       </baseNewForm>
@@ -100,7 +100,7 @@ export default {
               required: true,
               fontSize: 16,
               pattern: /^[a-z][a-z0-9_]{0,50}$/,
-              message: "必须以小写字母开头，只能包含小写字母、数字和下划线，不能包含中文字符或其他符号。",
+              message: '必须以小写字母开头，只能包含小写字母、数字和下划线，不能包含中文字符或其他符号。',
               disabledOfId: true
             }
           ]
@@ -232,7 +232,8 @@ export default {
                 }, {
                   label: 'treeselect',
                   id: 'treeselect'
-                }, {
+                },
+                {
                   label: 'number',
                   id: 'num'
                 }
@@ -504,6 +505,7 @@ export default {
           }, true)
         }
         this.selectChangeHanlde(this.optionRuleForm.type, '', '', { id: 'type' }, true)
+        this.selectChangeHanlde(this.optionRuleForm.filedType, '', '', { id: 'filedType' }, true)
         this.propertyActiveList = propertyRuleForm
         this.propertyActiveListChangeHanlde(this.propertyActiveList)
 
@@ -535,17 +537,77 @@ export default {
           })
         }
       }
-    },
+      //字段类型下啦改变时 将数据类型下啦重置
+      if (row.id === 'filedType') {
+        if (val) {
+          let dist = {
+            1: [
+              {
+                label: 'number',
+                id: 'num'
+              }
+            ],
+            2: [
+              {
+                label: 'number',
+                id: 'num'
+              }
+            ],
+            3: [
+              {
+                label: 'input',
+                id: 'input'
+              },
+              {
+                label: 'radio',
+                id: 'radio'
+              },
+              {
+                label: 'textrea',
+                id: 'textrea'
+              },
+              {
+                label: 'select',
+                id: 'select'
+              },
+              {
+                label: 'treeselect',
+                id: 'treeselect'
+              }
+            ],
+            4: [
+              {
+                label: 'datepick',
+                id: 'datepick'
+              }, {
+                label: 'daterange',
+                id: 'daterange'
+              }
+            ]
+          }
+          this.optionFormRow[7].elCol[0].options = dist[val]
+        }
+        if (!init) {
+          this.$set(this.optionRuleForm, 'type', '')
+          this.typeOptionFormRow = []
+          this.typeOptionRuleForm = {}
+        }
+
+      }
+    }
+    ,
     //表单输入框失焦事件（为了让中文名称可以给显示名）
     optionFormInputBlur(id, row) {
       if (id === 'chName' && !row.title) {
         this.$set(row, 'title', row['chName'])
       }
-    },
+    }
+    ,
     //配置项表通过
     optionOnSubmit() {
       this.$refs.typeOptionForm.submitForm()
-    },
+    }
+    ,
     //type表下拉触发（目的是为了服务名称下拉后拿到label
     async typeSelectChangeHanlde(val, index, indexRow, row, initFlag = false) {
       if (row.id === 'service') {
@@ -579,11 +641,13 @@ export default {
           }
         })
       }
-    },
+    }
+    ,
     //type表通过
     typeOptionOnSubmit() {
       this.$refs.propertyForm.submitForm()
-    },
+    }
+    ,
     //可选属性表通过校验 准备开始保存
     propertyOnSubmit() {
       console.log('进入保存方法', this.activedTableRow)
@@ -604,7 +668,7 @@ export default {
         width: true
       }
       let tempArr = []
-      let disabledWords = ['id', 'formmain_id', 'data_status', 'sorts', 'create_user_id', 'create_time', 'modify_user_id', 'modify_time', 'sts', 'org_id', 'company_id','data_id']
+      let disabledWords = ['id', 'formmain_id', 'data_status', 'sorts', 'create_user_id', 'create_time', 'modify_user_id', 'modify_time', 'sts', 'org_id', 'company_id', 'data_id']
       if (disabledWords.includes(this.optionRuleForm.enName)) {
         this.$vmNews(`暂存失败，英文名${this.optionRuleForm.enName}不合法。`)
         return
@@ -662,7 +726,8 @@ export default {
       console.log(params)
       this.$emit('sonSaveHandle', params)
 
-    },
+    }
+    ,
     // 可选属性表变更方法
     propertyActiveListChangeHanlde(val) {
       this.propertyFormRow = []