Merge branch '20221121_sun修正项目申报&&补贴管理前端' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/btgl/glbtxm/index.vue

@@ -344,7 +344,7 @@ export default {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.glbtxmList = this.dataReplacement(this.glbtxmList, this.form.id, formData);
-                // this.getList();
+                this.getList();
               }).finally(() => this.submitFormLoading = false);
             } else {
               this.$modal.msgSuccess("修改成功");
@@ -356,13 +356,13 @@ export default {
             addGlbtxm(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
-              // this.getList();
               /****** sks 需要改动的地方 start ******/
               if (this.queryParams.pageSize === this.glbtxmList.length) {
                 this.glbtxmList.pop();
               }
               this.glbtxmList.unshift({ ...this.form, id: response.data });
               this.total++;
+              this.getList();
               /****** sks 需要改动的地方 end ******/
             }).finally(() => this.submitFormLoading = false);
           }

ruoyi-ui/src/views/business/xmsb/xmsbCommon/index.vue

@@ -91,7 +91,7 @@
 
             <el-form-item label="所在地区" prop="szdq" class="formWidth2">
               <RegionCascaderSelect endLevel="4" v-model="form.szdq" :opts="{ placeholder: '请选择所在地区' }"
-                style="width: 100%" valueProp="code"></RegionCascaderSelect>
+                style="width: 100%" valueProp="code" :isDataRoot="true"></RegionCascaderSelect>
             </el-form-item>
           </div>
           <div class="flexBox">