diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index 2795f0d..cb20e7a 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -2,27 +2,34 @@
   <div class="app-container">
     <el-card>
       <el-row :gutter="24">
+        <!--表格-->
         <el-col :span="6">
           <el-card>
-            <div slot="header" class="clearfix">
-              <span style="font-size: 16px; font-weight: 700"
-                >物料检验记录表</span
-              >
-            </div>
-            <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-              >新增</el-button
+            <div
+              slot="header"
+              class="clearfix"
             >
+              <span style="font-size: 16px; font-weight: 700">物料检验记录表</span>
+            </div>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="handleCreate"
+            >
+              新增
+            </el-button>
+            <!--表格列表-->
             <el-table
+              v-el-height-adaptive-table="{ bottomOffset: 50 }"
               :data="recordformList.results"
               border
               fit
               stripe
               highlight-current-row
               height="100"
-              v-el-height-adaptive-table="{ bottomOffset: 50 }"
               @current-change="handleCurrentChange"
             >
-              <el-table-column type="index" width="50" />
+              <el-table-column type="index" width="50"/>
               <el-table-column label="表名称">
                 <template slot-scope="scope">{{ scope.row.name }}</template>
               </el-table-column>
@@ -31,22 +38,26 @@
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     @click="handleLook(scope)"
-                    >查看</el-link
+                  >查看
+                  </el-link
                   >
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     @click="handleEdit(scope)"
-                    >编辑</el-link
+                  >编辑
+                  </el-link
                   >
                   <el-link
                     v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handleDelete(scope)"
-                    >删除</el-link
+                  >删除
+                  </el-link
                   >
                 </template>
               </el-table-column>
             </el-table>
+            <!--新增、编辑记录表格-->
             <el-dialog
               :visible.sync="dialogVisible"
               :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
@@ -58,42 +69,45 @@
                 label-position="right"
               >
                 <el-form-item label="表格名称" prop="name">
-                  <el-input v-model="recordform.name" placeholder="表格名称" />
+                  <el-input v-model="recordform.name" placeholder="表格名称"/>
                 </el-form-item>
               </el-form>
               <div style="text-align: right">
                 <el-button type="danger" @click="dialogVisible = false"
-                  >取消</el-button
-                >
+                >取消
+                </el-button>
                 <el-button type="primary" @click="recordformconfirm('Forms')"
-                  >确认</el-button
-                >
+                >确认
+                </el-button>
               </div>
             </el-dialog>
+            <!--表格展示-->
             <el-dialog
-              :model="tableForm"
               :visible.sync="dialogVisibleForm"
               :title="tableForm.name"
             >
-              <el-form label-width="80px" label-position="right">
+              <el-form ref="Forms" label-width="80px" :model="checkForm">
                 <el-row
                   v-for="(item, $index) in fieldList.results"
+                  v-show="filterBlock(item.parent,item.rule_expression,item.need_judge)"
                   :key="$index"
                 >
-                  <el-form-item
-                    v-if="item.field_type === 'string'"
-                    :label="item.field_name"
-                  >
-                    <el-input placeholder="请输入" v-model="item.sort" />
+                  <el-form-item v-if="item.field_type === 'string'" :label="item.field_name">
+                    <el-input
+                      v-model="checkForm[item.field_key]"
+                      placeholder="请输入"
+                      @input="keyChange(item.field_key)"
+                    />
                   </el-form-item>
                   <el-form-item
                     v-else-if="item.field_type === 'int'"
                     :label="item.field_name"
                   >
                     <el-input
+                      v-model="checkForm[item.field_key]"
                       type="number"
                       placeholder="请输入"
-                      v-model="item.sort"
+                      @input="keyChange(item.field_key)"
                     />
                   </el-form-item>
                   <el-form-item
@@ -101,9 +115,10 @@
                     :label="item.field_name"
                   >
                     <el-input
+                      v-model="checkForm[item.field_key]"
                       type="number"
                       placeholder="请输入"
-                      v-model="item.sort"
+                      @input="keyChange(item.field_key)"
                     />
                   </el-form-item>
                   <el-form-item
@@ -111,11 +126,12 @@
                     :label="item.field_name"
                   >
                     <el-date-picker
-                      v-model="item.create_time"
+                      v-model="checkForm[item.field_key]"
                       type="date"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd"
                       style="width: 100%"
+                      @change="keyChange(item.field_key)"
                     >
                     </el-date-picker>
                   </el-form-item>
@@ -124,11 +140,12 @@
                     :label="item.field_name"
                   >
                     <el-date-picker
-                      v-model="item.create_time"
+                      v-model="checkForm[item.field_key]"
                       type="datetime"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       style="width: 100%"
+                      @change="keyChange(item.field_key)"
                     >
                     </el-date-picker>
                   </el-form-item>
@@ -137,9 +154,10 @@
                     :label="item.field_name"
                   >
                     <el-select
+                      v-model="checkForm[item.field_key]"
                       style="width: 100%"
-                      v-model="item.sort"
                       placeholder="请选择"
+                      @change="keyChange(item.field_key)"
                     >
                       <el-option
                         v-for="item1 in item.field_choice"
@@ -155,8 +173,8 @@
                     :label="item.field_name"
                   >
                     <el-select
+                      v-model="checkForm[item.field_key]"
                       style="width: 100%"
-                      v-model="optio"
                       multiple
                       placeholder="请选择"
                     >
@@ -178,6 +196,7 @@
             </el-dialog>
           </el-card>
         </el-col>
+        <!--表格字段-->
         <el-col :span="18">
           <el-card>
             <div slot="header" class="clearfix">
@@ -187,8 +206,10 @@
               type="primary"
               icon="el-icon-plus"
               @click="handlefieldCreate"
-              >新增</el-button
+            >新增
+            </el-button
             >
+            <!--表格字段列表-->
             <el-table
               :data="fieldList.results"
               border
@@ -198,23 +219,26 @@
               height="100"
               v-el-height-adaptive-table="{ bottomOffset: 50 }"
             >
-              <el-table-column type="index" width="50" />
+              <el-table-column type="index" width="50"/>
               <el-table-column label="字段名称">
                 <template slot-scope="scope">{{
                   scope.row.field_name
-                }}</template>
+                  }}
+                </template>
               </el-table-column>
 
               <el-table-column label="字段类型">
                 <template slot-scope="scope">{{
                   options_[scope.row.field_type]
-                }}</template>
+                  }}
+                </template>
               </el-table-column>
 
               <el-table-column label="字段标识">
                 <template slot-scope="scope">{{
                   scope.row.field_key
-                }}</template>
+                  }}
+                </template>
               </el-table-column>
               <!--
               <el-table-column label="上限值">
@@ -250,24 +274,27 @@
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     @click="handlefieldEdit(scope)"
-                    >编辑</el-link
+                  >编辑
+                  </el-link
                   >
                   <el-link
                     v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handlefieldDelete(scope)"
-                    >删除</el-link
+                  >删除
+                  </el-link
                   >
                 </template>
               </el-table-column>
             </el-table>
-              <pagination
-        v-show="fieldList.count > 0"
-        :total="fieldList.count"
-        :page.sync="listQueryfield.page"
-        :limit.sync="listQueryfield.page_size"
-        @pagination="fieldLists"
-      />
+            <pagination
+              v-show="fieldList.count > 0"
+              :total="fieldList.count"
+              :page.sync="listQueryfield.page"
+              :limit.sync="listQueryfield.page_size"
+              @pagination="fieldLists"
+            />
+            <!--表格字段新增编辑-->
             <el-dialog
               :visible.sync="dialogVisible1"
               :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"
@@ -294,14 +321,10 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="字段标识" prop="field_key">
-                  <el-input
-                    v-model="field.field_key"
-                    placeholder="字段标识"
-                    onkeyup="value=value.replace(/[^A-Za-z_\/]/ig,'')"
-                  />
+                  <el-input v-model="field.field_key" placeholder="字段标识" @input="checkValue"/>
                 </el-form-item>
                 <el-form-item label="字段名称" prop="field_name">
-                  <el-input v-model="field.field_name" placeholder="字段名称" />
+                  <el-input v-model="field.field_name" placeholder="字段名称"/>
                 </el-form-item>
                 <el-form-item
                   label="选项"
@@ -340,78 +363,77 @@
                     </el-col>
                   </el-row>
                 </el-form-item>
-         
+                <el-form-item label="字段父级">
+                  <treeselect v-model="field.parent" :multiple="false" :options="treeDate" placeholder="字段父级"/>
+                </el-form-item>
                 <el-form-item label="是否需要判定" prop="need_judge">
                   <el-switch v-model="field.need_judge"></el-switch>
                 </el-form-item>
-  <!--
-                <el-form-item
-                  label="上限值"
-                  v-if="field.need_judge == true"
-                  prop="high_limit"
-                >
-                  <el-input-number
-                    v-model="field.high_limit"
-                    :precision="2"
-                    :min="0"
-                  ></el-input-number>
-                </el-form-item>
-                <el-form-item
-                  label="上限规则"
-                  v-if="field.need_judge == true"
-                  prop="high_rule"
-                >
-                  <el-select
-                    style="width: 100%"
-                    v-model="field.high_rule"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in highoptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item
-                  label="下限值"
-                  v-if="field.need_judge == true"
-                  prop="low_limit"
-                >
-                  <el-input-number
-                    v-model="field.low_limit"
-                    :precision="2"
-                    :min="0"
-                  ></el-input-number>
-                </el-form-item>
-                <el-form-item
-                  label="下限规则"
-                  v-if="field.need_judge == true"
-                  prop="low_rule"
-                >
-                  <el-select
-                    style="width: 100%"
-                    v-model="field.low_rule"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in lowoptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
+                <!--
+                              <el-form-item
+                                label="上限值"
+                                v-if="field.need_judge == true"
+                                prop="high_limit"
+                              >
+                                <el-input-number
+                                  v-model="field.high_limit"
+                                  :precision="2"
+                                  :min="0"
+                                ></el-input-number>
+                              </el-form-item>
+                              <el-form-item
+                                label="上限规则"
+                                v-if="field.need_judge == true"
+                                prop="high_rule"
+                              >
+                                <el-select
+                                  style="width: 100%"
+                                  v-model="field.high_rule"
+                                  placeholder="请选择"
+                                >
+                                  <el-option
+                                    v-for="item in highoptions"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                  >
+                                  </el-option>
+                                </el-select>
+                              </el-form-item>
+                              <el-form-item
+                                label="下限值"
+                                v-if="field.need_judge == true"
+                                prop="low_limit"
+                              >
+                                <el-input-number
+                                  v-model="field.low_limit"
+                                  :precision="2"
+                                  :min="0"
+                                ></el-input-number>
+                              </el-form-item>
+                              <el-form-item
+                                label="下限规则"
+                                v-if="field.need_judge == true"
+                                prop="low_rule"
+                              >
+                                <el-select
+                                  style="width: 100%"
+                                  v-model="field.low_rule"
+                                  placeholder="请选择"
+                                >
+                                  <el-option
+                                    v-for="item in lowoptions"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                  >
+                                  </el-option>
+                                </el-select>
+                              </el-form-item>
 
-!-->
-
-
-
-                <el-form-item label="表达式"  v-if="field.need_judge == true">
-                 <el-input v-model="field.rule_expression" type="textarea"/>
+              !-->
+                <el-form-item label="表达式" v-if="field.need_judge == true">
+                  <el-input v-model="field.rule_expression" type="textarea"/>
                 </el-form-item>
 
                 <el-form-item label="排序" prop="sort">
@@ -424,10 +446,12 @@
               </el-form>
               <div style="text-align: right">
                 <el-button type="danger" @click="dialogVisible1 = false"
-                  >取消</el-button
+                >取消
+                </el-button
                 >
                 <el-button type="primary" @click="fieldconfirm('Form')"
-                  >确认</el-button
+                >确认
+                </el-button
                 >
               </div>
             </el-dialog>
@@ -439,329 +463,453 @@
 </template>
 
 <script>
-import checkPermission from "@/utils/permission";
-import { getEquipmentAll } from "@/api/equipment";
-import vueJsonEditor from "vue-json-editor";
-import { upUrl, upHeaders } from "@/api/file";
-import {
-  getrecordformList,
-  createrecordform,
-  updaterecordform,
-  deleterecordform,
-  getrffieldList,
-  createrffield,
-  updaterffield,
-  deleterffield,
-} from "@/api/mtm";
-import { genTree } from "@/utils";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-const defaultstep = {
-  name: "",
-  number: "",
-};
+  import checkPermission from "@/utils/permission";
+  import {getEquipmentAll} from "@/api/equipment";
+  import vueJsonEditor from "vue-json-editor";
+  import {upUrl, upHeaders} from "@/api/file";
+  import {
+    getrecordformList,
+    createrecordform,
+    updaterecordform,
+    deleterecordform,
+    getrffieldList,
+    createrffield,
+    updaterffield,
+    deleterffield,
+  } from "@/api/mtm";
+  import {genTree} from "@/utils";
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  import Treeselect from '@riophae/vue-treeselect'
+  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
-const defaultrecordform = {};
-const defaultfield = {};
-export default {
-  components: { Pagination, vueJsonEditor },
-  data() {
-    return {
-      step: defaultstep,
-      stepList: [],
-      upHeaders: upHeaders(),
-      upUrl: upUrl(),
-      fileList: [],
-      listLoading: true,
-      need_judge: false,
-      dialogVisibles: false,
-      dialogVisibleForm: false,
-      dialogTypes: "new",
-      field: {
-        field_type: "",
-        field_key: "",
-        field_name: "",
-        sort: "",
+  const defaultstep = {
+    name: "",
+    number: "",
+  };
+
+  const defaultrecordform = {};
+  const defaultfield = {};
+  export default {
+    components: {Pagination, vueJsonEditor, Treeselect},
+    data() {
+      return {
+        step: defaultstep,
+        stepList: [],
+        upHeaders: upHeaders(),
+        upUrl: upUrl(),
+        fileList: [],
+        listLoading: true,
+        need_judge: false,
+        dialogVisibles: false,
+        dialogVisibleForm: false,
+        dialogTypes: "new",
+        field: {
+          field_type: "",
+          field_key: "",
+          field_name: "",
+          sort: "",
+          parent: "",
+          field_choice: [""],
+        },
         field_choice: [""],
-      },
-      field_choice: [""],
-      options: [],
-      optio: [],
-      rule1: {
-        name: [{ required: true, message: "请输入", trigger: "blur" }],
-        number: [{ required: true, message: "请输入", trigger: "blur" }],
-      },
-      recordform: defaultrecordform,
-      dialogType: "new",
-      dialogVisible: false,
-      dialogType1: "new",
-      dialogVisible1: false,
-      tableForm: {
-        name: "",
-      },
-      listQueryrecordform: {
-        page: 1,
-        page_size: 20,
-      },
-      recordformList: {
-        count: 0,
-      },
-      fieldList: {
-        count: 0,
-      },
-      listQueryfield: {
-        page: 1,
-        page_size: 20,
-      },
-      highoptions: [
-        { value: 1, label: "<" },
-        { value: 2, label: "<=" },
-      ],
-      lowoptions: [
-        { value: 1, label: ">" },
-        { value: 2, label: ">=" },
-      ],
-      highoptionss_: {
-        1: "<",
-        2: "<=",
-      },
-      lowoptionss_: {
-        1: ">",
-        2: ">=",
-      },
-      options_: {
-        string: "文本",
-        int: "整数",
-        float: "小数",
-        date: "日期",
-        datetime: "日期时间",
-        select: "单选",
-        selects: "多选",
-      },
-      fieldtypeoptions: [
-        {
-          value: "string",
-          label: "文本",
+        options: [],
+        optio: [],
+        rule1: {
+          name: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入", trigger: "blur"}],
         },
-        {
-          value: "int",
-          label: "整数",
+        recordform: defaultrecordform,
+        dialogType: "new",
+        dialogVisible: false,
+        dialogType1: "new",
+        dialogVisible1: false,
+        tableForm: defaultrecordform,
+        checkForm:{
+          hhh:'',
         },
-        {
-          value: "float",
-          label: "小数",
+        listQueryrecordform: {
+          page: 1,
+          page_size: 20,
         },
-        {
-          value: "date",
-          label: "日期",
+        recordformList: {
+          count: 0,
         },
-        {
-          value: "time",
-          label: "时间",
+        fieldList: {
+          count: 0,
         },
-        {
-          value: "datetime",
-          label: "日期时间",
+        treeDate: [],
+        listQueryfield: {
+          page: 1,
+          page_size: 20,
         },
-        {
-          value: "select",
-          label: "单选",
+        highoptions: [
+          {value: 1, label: "<"},
+          {value: 2, label: "<="},
+        ],
+        lowoptions: [
+          {value: 1, label: ">"},
+          {value: 2, label: ">="},
+        ],
+        highoptionss_: {
+          1: "<",
+          2: "<=",
         },
-        {
-          value: "selects",
-          label: "多选",
+        lowoptionss_: {
+          1: ">",
+          2: ">=",
         },
-      ],
-      typeoptions: [
-        {
-          value: 1,
-          label: "生产记录",
+        options_: {
+          string: "文本",
+          int: "整数",
+          float: "小数",
+          date: "日期",
+          datetime: "日期时间",
+          select: "单选",
+          selects: "多选",
         },
-      ],
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.material = this.$route.params.id;
-    this.recordformLists();
-  },
-  methods: {
-    //添加字段选项
-    addDomain() {
-      this.field_choice.push("");
+        fieldtypeoptions: [
+          {
+            value: "string",
+            label: "文本",
+          },
+          {
+            value: "int",
+            label: "整数",
+          },
+          {
+            value: "float",
+            label: "小数",
+          },
+          {
+            value: "date",
+            label: "日期",
+          },
+          {
+            value: "time",
+            label: "时间",
+          },
+          {
+            value: "datetime",
+            label: "日期时间",
+          },
+          {
+            value: "select",
+            label: "单选",
+          },
+          {
+            value: "selects",
+            label: "多选",
+          },
+        ],
+        typeoptions: [
+          {
+            value: 1,
+            label: "生产记录",
+          },
+        ],
+      };
     },
-    //删除字段选项
-    removeDomain(index) {
-      this.field_choice.splice(index, 1);
+    computed: {},
+    watch: {},
+    created() {
+      this.material = this.$route.params.id;
+      this.recordformLists();
     },
-    handleLook(scope) {
-      debugger;
-      console.log(scope);
-      this.dialogVisibleForm = true;
-      this.tableForm = Object.assign({}, scope.row); // copy obj
-      this.formID = this.tableForm.id;
-      this.fieldLists();
-    },
-    checkPermission,
+    methods: {
+      keyChange(key){
+        let y = this.checkForm[key];
+        this.$set(this.checkForm,key,y);
+        this.fieldList.results=[...this.fieldList.results];
+        this.filterBlock();
+      },
+      filterBlock(parent,rule,judge){
+        let that = this;
+          if(parent!==''&&parent!==null&&parent!==undefined){
+                if(judge){
+                      if(rule!==''&&rule!==null&&rule!==undefined){
+                            let reg = /\{(.+?)\}/g;
+                            //let str = rule.replace(temp,'').replace('$','');//=='有'
+                            //let y = that.checkForm[key];
+                            if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
+                              let tam = '', arr = [];
+                              if(rule.indexOf('||')>-1){
+                                arr = rule.split('||');
+                              }else{
+                                arr = rule.split('&&');
+                              }
+                              for (let i = 0;i<arr.length;i++){
+                                //获取判断依据
+                                let a = '';
+                                a = arr[i].replace(/`/g,'');
+                                a = '`'+ a+'`';
+                                let tem =a.match(reg)[0];
+                                let ky = tem.replace(/\{|\}/g, '');//qipao
+                                if(that.checkForm[ky]){
+                                  //替换变量
+                                  a = a.replace(ky, 'yyy');
+                                  let yyy = "'"+that.checkForm[ky]+"'";
+                                  if(eval(eval( a))){
+                                    tam += 'true';
+                                  }else{
+                                    tam += 'false';
+                                  }
+                                }else{
+                                  tam += 'false';
+                                }
+                              }
+                              let rea = true;
+                              if(rule.indexOf('||')>-1){
+                                if( tam.indexOf('true')>-1){
+                                  rea = true;
+                                }else{
+                                  rea = false;
+                                }
+                              }else{
+                                if( tam.indexOf('false')>-1){
+                                  rea = false;
+                                }else{
+                                  rea = true;
+                                }
+                              }
+                              return rea;
+                            }else{
+                              let temp =rule.match(reg)[0];
+                              let key = temp.replace(/\{|\}/g, '');//qipao
+                              let  a = rule.replace(key, 'yy');
+                              a = a.replace(key, 'yy');
+                              let yy = "'"+that.checkForm[key]+"'";
+                              return eval(eval(a));
+                              // return eval("'"+y+"'"+str);
+                            }
+                            debugger;
+                      }else{
+                        return false;
+                      }
+                }else{
+                  return true;
+                }
+          }else{
+            return true;
+          }
+      },
+      checkValue() {
+        this.field.field_key = this.field.field_key.replace(/[^a-zA-Z]/g, '');
+      },
+      //添加字段选项
+      addDomain() {
+        this.field_choice.push("");
+      },
+      //删除字段选项
+      removeDomain(index) {
+        this.field_choice.splice(index, 1);
+      },
+      handleLook(scope) {
+        debugger;
+        // console.log(scope);
+        let that = this;
+        this.tableForm = Object.assign({}, scope.row); // copy obj
+        this.formID = this.tableForm.id;
+        this.listQueryfield.form = this.formID;
+        getrffieldList(this.listQueryfield).then((response) => {
+          if (response.data) {
+            debugger;
+            this.fieldList = response.data;
+            let list = response.data.results;
+            for(let i=0;i<list.length;i++){
+              let key = list[i].field_key;
+              that.checkForm[key]='';
+              that.$set(that.checkForm,key,'')
+            }
+            this.dialogVisibleForm = true;
+            console.log(that.checkForm);
+            debugger;
+          }
+        });
+        this.fieldLists();
+      },
+      checkPermission,
 
-    handleCurrentChange(row) {
-      this.formID = row.id;
-      this.fieldLists();
-    },
-    recordformLists() {
-      this.listQueryrecordform.material = this.material;
-      this.listQueryrecordform.type = 2;
-      getrecordformList(this.listQueryrecordform).then((response) => {
-        if (response.data) {
-          this.recordformList = response.data;
-        }
-      });
-    },
-    fieldLists() {
-      this.listQueryfield.form = this.formID;
-      getrffieldList(this.listQueryfield).then((response) => {
-        if (response.data) {
-          this.fieldList = response.data;
-        }
-      });
-    },
-    //新增记录表
-    handleCreate() {
-      this.recordform = Object.assign({}, defaultrecordform);
-      this.dialogType = "new";
-      this.dialogVisible = true;
-      this.$nextTick(() => {
-        this.$refs["Forms"].clearValidate();
-      });
-    },
-    //新增字段
-    handlefieldCreate() {
-      this.field_choice = [""];
-      this.field = Object.assign({}, defaultfield);
-      this.dialogType1 = "new";
-      this.dialogVisible1 = true;
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-    handleEdit(scope) {
-      this.recordform = Object.assign({}, scope.row); // copy obj
-      this.dialogType = "edit";
-      this.dialogVisible = true;
-      this.$nextTick(() => {
-        this.$refs["Forms"].clearValidate();
-      });
-    },
-    handlefieldEdit(scope) {
-      this.field = Object.assign({}, scope.row); // copy obj
-      this.field_choice = this.field.field_choice;
-      this.dialogType1 = "edit";
-      this.dialogVisible1 = true;
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-    handleDelete(scope) {
-      this.$confirm("确认删除?", "警告", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        type: "error",
-      })
-        .then(async () => {
-          await deleterecordform(scope.row.id);
-          this.recordformLists();
-          this.$message.success("成功");
-        })
-        .catch((err) => {
-          console.error(err);
+      handleCurrentChange(row) {
+        this.formID = row.id;
+        this.fieldLists();
+        this.fieldLists1();
+      },
+      recordformLists() {
+        this.listQueryrecordform.material = this.material;
+        this.listQueryrecordform.type = 2;
+        getrecordformList(this.listQueryrecordform).then((response) => {
+          if (response.data) {
+            this.recordformList = response.data;
+          }
         });
-    },
-    handlefieldDelete(scope) {
-      this.$confirm("确认删除?", "警告", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        type: "error",
-      })
-        .then(async () => {
-          await deleterffield(scope.row.id);
-          this.fieldLists();
-          this.$message.success("成功");
-        })
-        .catch((err) => {
-          console.error(err);
+      },
+      fieldLists() {
+        let that = this;
+        that.listQueryfield.form = that.formID;
+        getrffieldList(that.listQueryfield).then((response) => {
+          if (response.data) {
+            that.fieldList = response.data;
+            that.fieldList.results=[...that.fieldList.results]
+          }
         });
-    },
-    async recordformconfirm(form) {
-      this.$refs[form].validate((valid) => {
-        if (valid) {
-          const isEdit = this.dialogType === "edit";
-          if (isEdit) {
-            this.recordform.material = this.material;
-            this.recordform.type = 2;
-            updaterecordform(this.recordform.id, this.recordform).then(
-              (res) => {
+      },
+      fieldLists1() {
+        let params = new Object();
+        let that = this;
+        params.page = 0;
+        params.form = this.formID;
+        getrffieldList(params).then((response) => {
+          if (response.data) {
+            let data = response.data;
+            data.forEach(item => {
+              item.name = item.field_name;
+            });
+            that.treeDate = genTree(data);
+          }
+        });
+      },
+      //新增记录表
+      handleCreate() {
+        this.recordform = Object.assign({}, defaultrecordform);
+        this.dialogType = "new";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Forms"].clearValidate();
+        });
+      },
+      //新增字段
+      handlefieldCreate() {
+        this.field_choice = [""];
+        // this.field = Object.assign({}, defaultfield);
+        this.dialogType1 = "new";
+        this.dialogVisible1 = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+      handleEdit(scope) {
+        this.recordform = Object.assign({}, scope.row); // copy obj
+        this.dialogType = "edit";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Forms"].clearValidate();
+        });
+      },
+      handlefieldEdit(scope) {
+        this.field = Object.assign({}, scope.row); // copy obj
+        this.field_choice = this.field.field_choice;
+        this.dialogType1 = "edit";
+        this.dialogVisible1 = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+      handleDelete(scope) {
+        this.$confirm("确认删除?", "警告", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await deleterecordform(scope.row.id);
+            this.recordformLists();
+            this.$message.success("成功");
+          })
+          .catch((err) => {
+            console.error(err);
+          });
+      },
+      handlefieldDelete(scope) {
+        this.$confirm("确认删除?", "警告", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await deleterffield(scope.row.id);
+            this.fieldLists();
+            this.fieldLists1();
+            this.$message.success("成功");
+          })
+          .catch((err) => {
+            console.error(err);
+          });
+      },
+      async recordformconfirm(form) {
+        this.$refs[form].validate((valid) => {
+          if (valid) {
+            const isEdit = this.dialogType === "edit";
+            if (isEdit) {
+              this.recordform.material = this.material;
+              this.recordform.type = 2;
+              updaterecordform(this.recordform.id, this.recordform).then(
+                (res) => {
+                  if (res.code >= 200) {
+                    this.recordformLists();
+                    this.dialogVisible = false;
+                    this.$message.success("成功");
+                  }
+                }
+              );
+            } else {
+              this.recordform.material = this.material;
+              this.recordform.type = 2;
+              createrecordform(this.recordform).then((res) => {
                 if (res.code >= 200) {
                   this.recordformLists();
                   this.dialogVisible = false;
                   this.$message.success("成功");
                 }
-              }
-            );
+              });
+            }
           } else {
-            this.recordform.material = this.material;
-            this.recordform.type = 2;
-            createrecordform(this.recordform).then((res) => {
-              if (res.code >= 200) {
-                this.recordformLists();
-                this.dialogVisible = false;
-                this.$message.success("成功");
-              }
-            });
+            return false;
           }
-        } else {
-          return false;
-        }
-      });
-    },
-    async fieldconfirm(form) {
-      this.$refs[form].validate((valid) => {
-        if (valid) {
-          const isEdit = this.dialogType1 === "edit";
-          if (isEdit) {
-            this.field.form = this.formID;
-            this.field.field_choice = this.field_choice;
-            updaterffield(this.field.id, this.field).then((res) => {
-              if (res.code >= 200) {
-                this.fieldLists();
-                this.dialogVisible1 = false;
-                this.$message.success("成功");
-              }
-            });
+        });
+      },
+      async fieldconfirm(form) {
+        this.$refs[form].validate((valid) => {
+          if (valid) {
+            const isEdit = this.dialogType1 === "edit";
+            if (isEdit) {
+              this.field.form = this.formID;
+              this.field.field_choice = this.field_choice;
+              updaterffield(this.field.id, this.field).then((res) => {
+                if (res.code >= 200) {
+                  this.fieldLists();
+                  this.fieldLists1();
+                  this.dialogVisible1 = false;
+                  this.$message.success("成功");
+                }
+              });
+            } else {
+              this.field.form = this.formID;
+              this.field.field_choice = this.field_choice;
+              debugger;
+              console.log(this.field);
+              createrffield(this.field).then((res) => {
+                if (res.code >= 200) {
+                  this.fieldLists();
+                  this.fieldLists1();
+                  this.dialogVisible1 = false;
+                  this.$message.success("成功");
+                }
+              });
+            }
           } else {
-            this.field.form = this.formID;
-            this.field.field_choice = this.field_choice;
-            createrffield(this.field).then((res) => {
-              if (res.code >= 200) {
-                this.fieldLists();
-                this.dialogVisible1 = false;
-                this.$message.success("成功");
-              }
-            });
+            return false;
           }
-        } else {
-          return false;
-        }
-      });
+        });
+      },
     },
-  },
-};
+  };
 </script>
 <style>
-.my-label {
-  background: #e1f3d8;
-}
+  .my-label {
+    background: #e1f3d8;
+  }
 
-.my-content {
-  background: #fde2e2;
-}
+  .my-content {
+    background: #fde2e2;
+  }
 </style>