Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

src/views/components/resiForm.vue

@@ -479,7 +479,7 @@ export default {
         {
           label: '国籍',
           itemType: "select",
-          requiredFlag: true,
+          rules: [{ required: true, message: '国籍不能为空' }],
           formName: 'nationality',
           opction: [],
         },

src/views/components/resiSearch.vue

@@ -833,12 +833,11 @@ export default {
       } else {
         agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1]
       }
-      const gridIdQuery = '';
-      const agencyIdQuery = this.form.agencyId[0];
+      var gridIdQuery = '';
+      var agencyIdQuery = this.form.agencyId[0];
       if (this.form.agencyId.length >= 2) {
-         lastIndex = this.form.agencyId.length - 1;
-         agencyIdQuery= this.form.agencyId[lastIndex - 1];
-         gridIdQuery = this.form.agencyId[lastIndex];
+         agencyIdQuery= this.form.agencyId[this.form.agencyId.length - 2];
+         gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1];
       }
       
       this.$http

src/views/modules/satisfaction/detail/eventInfo.vue

@@ -243,7 +243,7 @@ export default {
                 const data = res.data.data;
                 if (res.status === 200) {
                     this.total = data.total || 0;
-                    this.provinceList = data.childData;
+                    this.provinceList = data.list;
                 }
             })).catch((err => {
                 this.$message.error(err);

src/views/modules/satisfaction/satisfactionProvince/formList.vue

@@ -136,7 +136,7 @@ export default {
                 let url = '/governance/provinceEvaluationRecord/pageInfo'
                 const { data, code, msg } = await requestPost(url, params)
                 if (code == 0) {
-                    this.tableData = data.childData;
+                    this.tableData = data.list;
                     this.total = data.total;
                 } else {
                     console.log(err);