Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/smartaccess/form/guest.vue

src/views/smartaccess/form/guest.vue

@@ -52,7 +52,8 @@
         option: {
           detail: true,
           labelWidth: 110,
-          column: [{
+          column: [
+            {
             label: "",
             prop: "imageUri",
             labelWidth: '43.5%',
@@ -71,10 +72,12 @@
             },
             action: "/api/blade-resource/oss/endpoint/put-file",
           }],
-          group: [{
+          group: [
+            {
               label: '基本信息',
               prop: 'group1',
-              column: [{
+              column: [
+                {
                   label: '姓名',
                   prop: 'guestName',
                   rules: [{
@@ -143,7 +146,8 @@
             {
               label: '访问信息',
               prop: 'group2',
-              column: [{
+              column: [
+                {
                   label: "预约开始时间",
                   prop: "beginTime",
                   type: "datetime",
@@ -289,29 +293,32 @@
             }, {
               label: '其他信息',
               prop: 'group3',
-              column: [{
-                  size: 'mini',
-                  gutter: 10,
-                  label: '拜访缘由',
-                  prop: 'guestReason',
-                  span: 12
-                },
-                //   {
-                //   readonly: true,
-                //   size: 'mini',
-                //   gutter: 10,
-                //   label: '审核意见',
-                //   prop: 'opinion',
-                //   span: 12
-                // }
+              column: [
+                {
+                size: 'mini',
+                gutter: 10,
+                label: '拜访缘由',
+                prop: 'guestReason',
+                span: 12
+              },
+                {
+                readonly: true,
+                size: 'mini',
+                gutter: 10,
+                label: '审核意见',
+                prop: 'opinion',
+                span: 12
+              }
               ]
             }
           ],
         },
-        detailGroup: [{
+        detailGroup:[
+          {
             label: '基本信息',
             prop: 'group1',
-            column: [{
+            column: [
+              {
                 label: '姓名',
                 prop: 'guestName',
                 rules: [{
@@ -326,9 +333,9 @@
                 prop: 'guestSex',
                 type: 'select',
                 dicData: [{
-                    label: '男',
-                    value: 1
-                  },
+                  label: '男',
+                  value: 1
+                },
                   {
                     label: '女',
                     value: 2
@@ -362,9 +369,9 @@
                 addDisplay: false,
                 type: 'select',
                 dicData: [{
-                    label: '后台录入',
-                    value: 2
-                  },
+                  label: '后台录入',
+                  value: 2
+                },
                   {
                     label: '小程序录入',
                     value: 1
@@ -380,7 +387,8 @@
           {
             label: '访问信息',
             prop: 'group2',
-            column: [{
+            column: [
+              {
                 label: "预约开始时间",
                 prop: "beginTime",
                 type: "datetime",
@@ -526,28 +534,31 @@
           }, {
             label: '其他信息',
             prop: 'group3',
-            column: [{
+            column: [
+              {
                 size: 'mini',
                 gutter: 10,
                 label: '拜访缘由',
                 prop: 'guestReason',
                 span: 12
               },
-              //   {
-              //   readonly: true,
-              //   size: 'mini',
-              //   gutter: 10,
-              //   label: '审核意见',
-              //   prop: 'opinion',
-              //   span: 12
-              // }
+                {
+                readonly: true,
+                size: 'mini',
+                gutter: 10,
+                label: '审核意见',
+                prop: 'opinion',
+                span: 12
+              }
             ]
           }
         ],
-        addGroup: [{
+        addGroup:[
+          {
             label: '基本信息',
             prop: 'group1',
-            column: [{
+            column: [
+              {
                 label: '姓名',
                 prop: 'guestName',
                 rules: [{
@@ -562,9 +573,9 @@
                 prop: 'guestSex',
                 type: 'select',
                 dicData: [{
-                    label: '男',
-                    value: 1
-                  },
+                  label: '男',
+                  value: 1
+                },
                   {
                     label: '女',
                     value: 2
@@ -597,7 +608,8 @@
           {
             label: '访问信息',
             prop: 'group2',
-            column: [{
+            column: [
+              {
                 label: "预约开始时间",
                 prop: "beginTime",
                 type: "datetime",
@@ -743,13 +755,15 @@
           }, {
             label: '其他信息',
             prop: 'group3',
-            column: [{
-              size: 'mini',
-              gutter: 10,
-              label: '拜访缘由',
-              prop: 'guestReason',
-              span: 12
-            }]
+            column: [
+              {
+                size: 'mini',
+                gutter: 10,
+                label: '拜访缘由',
+                prop: 'guestReason',
+                span: 12
+              }
+            ]
           }
         ]
       }
@@ -800,14 +814,14 @@
         this.dialogShow = true;
         this.option.group = this.detailGroup;
       },
-      showAddForm: function() {
+      showAddForm: function () {
         this.isAdd = true
         this.dialogShow = true
         this.option.detail = false
-        setTimeout(() => {
+        setTimeout(()=>{
           this.$refs.avueForm.resetForm()
           this.model = {}
-        }, 20)
+        },20)
         this.option.group = this.addGroup;
       },
       async submit(form, done) {