解决冲突

liuyg

2021-11-03 bc76c2de5632fe1433acd92dddc5842b99a06890

 src/views/zc/zc.vue

@@ -108,6 +108,7 @@
            {
              label: "性别",
              display: false,
              width:55,
              searchSpan: 4,
              search: true,
              disabled: true,
@@ -125,9 +126,17 @@
              ],
            },
            {
              label: "身份证号",
              disabled: true,
              width:140,
              display: false,
              prop: "cardid",
            },
            {
              label: "手机号码",
              disabled: true,
              display: false,
              width:95,
              prop: "phone",
            },
            {
@@ -181,6 +190,7 @@
              slot: true,
              search: true,
              searchSpan: 4,
              width:70,
              display: false,
              type: "select",
              dicData: [