Merge remote-tracking branch 'origin/master'

ruoyi-ui/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = ''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-ui/src/api/system/config.js

@@ -10,7 +10,7 @@ export function listConfig(query) {
 }
 export function listConfigfieu(query) {
   return request({
-    url: '/system/dept/deptList',
+    url: '/system/dept/treeselect',
     method: 'get',
     params: query
   })

ruoyi-ui/src/components/FileUpload/index.vue

@@ -63,7 +63,7 @@ export default {
   },
   data() {
     return {
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/prod-api/common/upload", // 上传的图片服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -43,7 +43,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/prod-api/common/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -121,7 +121,7 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="82px" label="土地证:" class="elItem" prop="landPhoto">
-            <el-upload class="upload-demo" list-type="picture" :limit="1" :file-list="fileListTdz" :on-success="upl_fn" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :limit="1" :file-list="fileListTdz" :on-remove="resetPhoto" :on-success="upl_fn" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -143,14 +143,14 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="119px" label="土地流转合同:" class="elItem" prop="circulationDoc">
-            <el-upload class="upload-demo" :file-list="fileListTdls" :limit="1" :on-success="upl_fn_lzht" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto1" :file-list="fileListTdls" :limit="1" :on-success="upl_fn_lzht" :action="defaultSettings.urls+process+'/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="94px" label="产权证:" class="elItem" prop="circulationPhoto">
-            <el-upload class="upload-demo" :limit="1" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto2" :limit="1" :file-list="fileListCqz" :on-success="upl_fn_cqz" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -172,14 +172,14 @@
         </el-col>
         <el-col :span="3">
           <el-form-item label-width="94px" label="租赁合同:" class="elItem" prop="leasePlantDoc">
-            <el-upload class="upload-demo" :limit="1" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto3" :limit="1" :file-list="fileListZht" :on-success="upl_fn_zlht" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label-width="94px" label="产权证:" class="elItem" prop="leasePlantPhoto">
-            <el-upload class="upload-demo" :limit="1" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" list-type="picture" :on-remove="resetPhoto4" :limit="1" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -264,7 +264,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="合同文本:" class="elItem" prop="agreementUrl">
-            <el-upload class="upload-demo" ref="upload" :file-list="flieListHt" :action="defaultSettings.urls + '/prod-api/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="upload" list-type="picture" :file-list="flieListHt" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
               :on-success="up_loat_htwb" :on-remove="handleRemove" :auto-upload="false">
               <el-button slot="trigger" size="small" type="primary">选择图片</el-button>
               <el-button style="margin-left: 10px" size="small" type="success" @click="submitUpload">开始上传</el-button>
@@ -308,7 +308,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label-width="173px" label="营业执照复印件:" class="elItem" prop="bussinessUrl">
-            <el-upload class="upload-demo" :limit="1" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + '/prod-api/common/upload'">
+            <el-upload class="upload-demo" :limit="1" :on-remove='resetPhoto5'  list-type="picture" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -384,7 +384,7 @@
       <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="备案表:" class="elItem" prop="recordUrl">
-            <el-upload class="upload-demo" ref="bAupload" :file-list="flieListBa" :action="defaultSettings.urls + '/prod-api/common/upload'" :on-preview="handlePreview"
+            <el-upload class="upload-demo" ref="bAupload" list-type="picture" :file-list="flieListBa" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
               :on-success="up_loat_bab" :on-remove="handleRemove_bab" :auto-upload="false">
               <el-button slot="trigger" size="small" type="primary">选择图片</el-button>
               <el-button style="margin-left: 10px" size="small" type="success" @click="submitUpload_bab">开始上传</el-button>
@@ -439,14 +439,14 @@
           <el-input v-model="sharData.idcard" placeholder="请输入身份证号码" />
         </el-form-item>
         <el-form-item label="身份证(正面)" prop="idcardFront">
-          <el-upload class="upload-demo" :file-list="idcardFrontFlie" :on-remove="upl_remove_sfzzm" :on-success="upl_fn_sfzzm"
-            :action="defaultSettings.urls + '/prod-api/common/upload'">
+          <el-upload class="upload-demo" :file-list="idcardFrontFlie" list-type="picture" :on-remove="upl_remove_sfzzm" :on-success="upl_fn_sfzzm"
+            :action="defaultSettings.urls + process + '/common/upload'">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
         <el-form-item label="身份证(反面)" prop="idcardBack">
-          <el-upload class="upload-demo" :file-list="idcardBackFlie" :on-remove="upl_remove_sfzfm" :on-success="upl_fn_sfzfm"
-            :action="defaultSettings.urls + '/prod-api/common/upload'">
+          <el-upload class="upload-demo" :file-list="idcardBackFlie" list-type="picture" :on-remove="upl_remove_sfzfm" :on-success="upl_fn_sfzfm"
+            :action="defaultSettings.urls + process + '/common/upload'">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
@@ -479,6 +479,7 @@
   export default {
     data() {
       return {
+        process: process.env.VUE_APP_BASE_API,
         fileListZcq: [],
         fileListZht: [],
         fileListCqz: [],
@@ -891,6 +892,24 @@
         this.idcardBackFlie = [];
         this.resetForm("forms");
       },
+      resetPhoto() {
+        this.form.landPhoto = ''
+      },
+      resetPhoto1() {
+        this.form.circulationDoc = ''
+      },
+      resetPhoto2() {
+        this.form.circulationPhoto = ''
+      },
+      resetPhoto3() {
+        this.form.leasePlantDoc = ''
+      },
+      resetPhoto4() {
+        this.form.leasePlantPhoto = ''
+      },
+      resetPhoto5() {
+        this.form.bussinessUrl = ''
+      },
       upl_fn(res, file) {
         this.form.landPhoto = res.url;
       },
@@ -1024,32 +1043,43 @@
               })
             }
             this.flieListBa = arrs
+            if(data.bussinessUrl){
+              this.flieListYzz = [{
+                name: data.bussinessUrl,
+                url: data.bussinessUrl,
+              }]
+            }
+            if(data.leasePlantPhoto){
+              this.fileListZcq = [{
+                name: data.leasePlantPhoto,
+                url: data.leasePlantPhoto,
+              }]
+            }
+            if(data.leasePlantDoc){
+              this.fileListZht = [{
+                name: data.leasePlantDoc,
+                url: data.leasePlantDoc,
+              }]
+            }
+            if(data.circulationPhoto){
+              this.fileListCqz = [{
+                name: data.circulationPhoto,
+                url: data.circulationPhoto,
+              }]
+            }
+            if(data.circulationDoc){
+              this.fileListTdls = [{
+                name: data.circulationDoc,
+                url: data.circulationDoc,
+              }]
+            }
+           if(data.landPhoto){
+             this.fileListTdz = [{
+               name: data.landPhoto,
+               url: data.landPhoto,
+             }]
+           }
 
-            this.flieListYzz = [{
-              name: data.bussinessUrl,
-              url: data.bussinessUrl,
-            }]
-            this.fileListZcq = [{
-              name: data.leasePlantPhoto,
-              url: data.leasePlantPhoto,
-            }]
-            this.fileListZht = [{
-              name: data.leasePlantDoc,
-              url: data.leasePlantDoc,
-            }]
-            this.fileListCqz = [{
-              name: data.circulationPhoto,
-              url: data.circulationPhoto,
-            }]
-            this.fileListTdls = [{
-              name: data.circulationDoc,
-              url: data.circulationDoc,
-            }]
-            this.fileListTdz = [{
-              name: data.landPhoto,
-              url: data.landPhoto,
-            }]
-            
             data.isOutInvestment = Boolean(data.isOutInvestment - 0)
             data.agreementUrl = data.agreementUrl.split(',')
             data.recordUrl = data.recordUrl.split(',')
@@ -1097,15 +1127,28 @@
           });
       },
       handleRemove(file, fileList) {
+        let urls = ""
+        if(file.response){
+          this.form.agreementUrl =  file.response.url
+        }else{
+          urls = file.url
+        }
         for (let i = this.form.agreementUrl.length - 1; i >= 0; i--) {
-          if (this.form.agreementUrl[i] == file.response.url) {
-            this.form.agreementUrl.splice(i, 1);
+          if (this.form.agreementUrl[i] == urls) {
+             this.form.agreementUrl.splice(i, 1);
           }
         }
+        console.log(this.form.agreementUrl)
       },
       handleRemove_bab(file, fileList) {
+        let urls = ""
+        if(file.response){
+          urls = file.response.url
+        }else{
+          urls = file.url
+        }
         for (let i = this.form.recordUrl.length - 1; i >= 0; i--) {
-          if (this.form.recordUrl[i] == file.response.url) {
+          if (this.form.recordUrl[i] == urls) {
             this.form.recordUrl.splice(i, 1);
           }
         }

ruoyi-ui/src/settings.js

@@ -2,6 +2,7 @@ module.exports = {
   title: '招商引资管理系统',
   urls: 'http://192.168.101.11:8010',
   // urls: 'http://47.99.82.249:80',
+  
 
 
   /**

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -116,6 +116,7 @@
                         slot="trigger"
                         size="small"
                         type="primary"
+                        :disabled = "disfal"
                         >选择图片</el-button
                       >
                       <!-- margin-top: 15%; transform: translateY(-50%); -->
@@ -127,6 +128,7 @@
                       style="margin-left: 10px; height: 32px"
                       size="small"
                       type="primary"
+                      :disabled = "disfal"
                       @click="submitUploaduccpermit"
                       >开始上传</el-button
                     >
@@ -137,8 +139,9 @@
             <el-form-item label="是否开工建设:" prop="isConstruction">
               <el-select
                 v-model="queryParamstwr.isConstruction"
-                placeholder="系统内置"
+                placeholder="请选择"
                 clearable
+                :disabled = "disfal"
                 size="small"
                 style="width: 458px"
               >
@@ -154,6 +157,7 @@
               <el-date-picker
                 type="date"
                 placeholder="选择日期"
+                :disabled = "disfal"
                 v-model="queryParamstwr.constructionStartdate"
                 style="width: 335px"
               ></el-date-picker>
@@ -161,6 +165,7 @@
             <el-form-item label="预计完工日期:">
               <el-date-picker
                 type="date"
+                :disabled = "disfal"
                 placeholder="选择日期"
                 v-model="queryParamstwr.constructionEnddate"
                 style="width: 335px"
@@ -189,6 +194,7 @@
                         slot="trigger"
                         size="small"
                         type="primary"
+                        :disabled = "disfal"
                         >选择图片</el-button
                       >
                       <!-- margin-top: 15%; transform: translateY(-50%); -->
@@ -200,6 +206,7 @@
                       style="margin-left: 10px; height: 32px"
                       size="small"
                       type="primary"
+                      :disabled = "disfal"
                       @click="submitUploaduccontract"
                       >开始上传</el-button
                     >
@@ -230,6 +237,7 @@
                         slot="trigger"
                         size="small"
                         type="primary"
+                        :disabled = "disfal"
                         >选择图片</el-button
                       >
                       <!-- margin-top: 15%; transform: translateY(-50%); -->
@@ -242,6 +250,7 @@
                       size="small"
                       type="primary"
                       @click="submitUpload"
+                      :disabled = "disfal"
                       >开始上传</el-button
                     >
                   </div>
@@ -407,6 +416,7 @@
           <el-form-item label=" 入统时间:">
             <el-date-picker
               type="date"
+              :disabled = "disfal"
               placeholder="选择日期"
               v-model="queryParamstheyr.statisticsDate"
               style="width: 335px"
@@ -434,7 +444,7 @@
                   <!-- <i slot="default" class="el-icon-plus"></i> -->
 
                   <div class="ijeut">
-                    <el-button plain slot="trigger" size="small" type="primary"
+                    <el-button plain slot="trigger" :disabled = "disfal" size="small" type="primary"
                       >选择图片</el-button
                     >
                     <!-- margin-top: 15%; transform: translateY(-50%); -->
@@ -446,6 +456,7 @@
                     style="margin-left: 10px; height: 32px"
                     size="small"
                     type="primary"
+                    :disabled = "disfal"
                     @click="submitUpload"
                     >开始上传</el-button
                   >
@@ -469,8 +480,9 @@
         <el-form-item label="进度" prop="configKey">
           <el-select
             v-model="form.rateType"
-            placeholder="系统内置"
+            placeholder="选择进度"
             clearable
+            :disabled = "disfal"
             size="small"
             style="width: 458px"
           >
@@ -494,13 +506,14 @@
             :auto-upload="false"
             :multiple="true"
           >
-            <el-button slot="trigger" size="small" type="primary"
+            <el-button slot="trigger" :disabled = "disfal" size="small" type="primary"
               >选取文件</el-button
             >
             <el-button
               style="margin-left: 10px"
               size="small"
               type="success"
+              :disabled = "disfal"
               @click="submitUploadther"
               >上传到服务器</el-button
             >
@@ -535,8 +548,9 @@
         <el-form-item label="进度" prop="configKey">
           <el-select
             v-model="formtwo.eqType"
-            placeholder="系统内置"
+            placeholder="选择进度"
             clearable
+            :disabled = "disfal"
             size="small"
             style="width: 458px"
           >
@@ -560,13 +574,14 @@
             :auto-upload="false"
             :multiple="true"
           >
-            <el-button slot="trigger" size="small" type="primary"
+            <el-button slot="trigger" :disabled = "disfal" size="small" type="primary"
               >选取文件</el-button
             >
             <el-button
               style="margin-left: 10px"
               size="small"
               type="success"
+              :disabled = "disfal"
               @click="submitUploadther"
               >上传到服务器</el-button
             >
@@ -598,9 +613,10 @@
         <el-form-item label="到资类型" prop="payForType">
           <el-select
             v-model="formther.payForType"
-            placeholder="系统内置"
+            placeholder="选择到资类型"
             clearable
             size="small"
+            :disabled = "disfal"
             style="width: 458px"
           >
             <el-option
@@ -616,6 +632,7 @@
             v-model="formther.payForMoney"
             placeholder="输入数字"
             clearable
+            :disabled = "disfal"
             size="small"
             style="width: 458px"
             @keyup.enter.native="handleQuery"
@@ -633,13 +650,14 @@
             :auto-upload="false"
             :multiple="true"
           >
-            <el-button slot="trigger" size="small" type="primary"
+            <el-button slot="trigger" :disabled = "disfal"  size="small" type="primary"
               >选取文件</el-button
             >
             <el-button
               style="margin-left: 10px"
               size="small"
               type="success"
+              :disabled = "disfal"
               @click="submitUploadther"
               >上传到服务器</el-button
             >
@@ -694,6 +712,7 @@ export default {
   data() {
     return {
       defaultSettings,
+      disfal:false,
       // 遮罩层
       loading: true,
       //步骤条
@@ -820,6 +839,9 @@ export default {
     this.bmProjectId = this.$route.query.setid;
     this.bmjdeu.bmProjectId = this.$route.query.setid;
     this.setrd = this.$route.query.setrd;
+    if(this.setrd !== 5){
+      this.disfal = true
+    }
     console.log(this.bmjdeu);
     this.getList();
     this.getListtoi();

ruoyi-ui/src/views/management/roduction/index.vue

@@ -84,7 +84,7 @@
                 <div class="forieu" style="width: 618px">
                   <div class="bure burert">
                     <el-upload
-                      :action="defaultSettings.urls+'/prod-api/common/upload'"
+                      :action="defaultSettings.urls+process+'/common/upload'"
                       list-type="picture-card"
                       :on-preview="handlePictureCardPreview"
                       :on-remove="handleRemove"
@@ -161,6 +161,7 @@ export default {
   name: "production",
   data() {
     return {
+      process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       //父级项目id
       bmProjectId: -1,

ruoyi-ui/src/views/management/row/index.vue

@@ -338,13 +338,34 @@ export default {
     changeTab(index) {
       console.log(34);
       this.tabIndex = index.index;
-      
+
       this.currentContent = index.component;
       // this.$router.push('/tab');
     },
   },
 };
 </script>
+
+  <style  >
+
+
+  .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__head.is-finish {
+      color: #EB6F67 !important;
+      border-color: #EB6F67 !important;
+    }
+  
+    .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__title.is-finish {
+      color: #666666;
+    }
+    .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/.el-step__description.is-finish {
+      color: #999999;
+    }
+
+ </style>
+
+
+
+
 <style rel="stylesheet/scss" lang="scss" scoped>
 .manager_form {
   .manager_lab {

ruoyi-ui/src/views/system/notice/index.vue

@@ -178,7 +178,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item  label="缩略图" class="elItem" prop="je">
-              <el-upload class="upload-demo" ref="upload" :action="defaultSettings.urls+'/prod-api/common/upload'"
+              <el-upload class="upload-demo" ref="upload" :action="defaultSettings.urls+process+'/common/upload'"
                 :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSucc" :file-list="fileList" :auto-upload="false" :multiple="true">
                 <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
@@ -214,6 +214,7 @@ export default {
   },
   data() {
     return {
+      process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       // 遮罩层
       loading: true,

ruoyi-ui/src/views/under/index.vue

@@ -170,21 +170,11 @@
           :key="index"
           v-if="queryParams.referralList !== null"
         >
-          <el-form-item label="引荐单位:" prop="sysDeptId">
-            <el-select
-              v-model="item.sysDeptId"
-              placeholder="系统内置"
-              clearable
-              size="small"
-              style="width: 188px"
-            >
-              <el-option
-                v-for="dict in typeOptionstwo"
-                :key="dict.deptId"
-                :label="dict.deptName"
-                :value="dict.deptId"
-              />
-            </el-select>
+          <el-form-item label="引荐单位:" prop="sysDeptIdse">
+            <el-cascader
+                v-model="valuess"
+                :options="typeOptionstwoss"
+                @change="handleChangess"></el-cascader>
           </el-form-item>
           <el-form-item label="投资分配额:" prop="investmentAllcocation">
             <el-input
@@ -220,21 +210,11 @@
           </el-form-item>
         </div>
         <div v-if="queryParams.referralList == null">
-          <el-form-item label="引荐单位:" prop="sysDeptId">
-            <el-select
-              v-model="queryParams.referralList[0].sysDeptId"
-              placeholder="系统内置"
-              clearable
-              size="small"
-              style="width: 188px"
-            >
-              <el-option
-                v-for="dict in typeOptionstwo"
-                :key="dict.deptId"
-                :label="dict.deptName"
-                :value="dict.deptId"
-              />
-            </el-select>
+          <el-form-item label="引荐单位:" prop="sysDeptIdrt">
+            <el-cascader
+               :show-all-levels="false"
+               :options="typeOptionstwo"
+                ></el-cascader>
           </el-form-item>
           <el-form-item label="投资分配额:" prop="investmentAllcocation">
             <el-input
@@ -269,20 +249,9 @@
             />
           </el-form-item>
           <el-form-item label="引荐单位:" prop="sysDeptId">
-            <el-select
-              v-model="queryParams.referralList[1].sysDeptId"
-              placeholder="系统内置"
-              clearable
-              size="small"
-              style="width: 188px"
-            >
-              <el-option
-                v-for="dict in typeOptionstwo"
-                :key="dict.deptId"
-                :label="dict.deptName"
-                :value="dict.deptId"
-              />
-            </el-select>
+            <el-cascader
+                :options="typeOptionstwo"
+                @change="handleChangete"></el-cascader>
           </el-form-item>
           <el-form-item label="投资分配额:" prop="investmentAllcocation">
             <el-input
@@ -739,6 +708,8 @@ export default {
       // 类型数据字典
       typeOptions: [],
       typeOptionstwo: [],
+      typeOptionstwos:[],
+      typeOptionstwoss:[],
       // 日期范围
       dateRange: [],
       setrd: 0,
@@ -880,8 +851,11 @@ export default {
       sbuen: 0, //0  新增   1  修改
       jeutu:{
         bmProjectId:0
-      }
+      },
       // id:0
+      value: [],
+      valuess:[],
+      values:[]
     };
   },
   created() {
@@ -899,6 +873,15 @@ export default {
     console.log(this.queryParams);
   },
   methods: {
+    handleChange(){
+
+    },
+    handleChangete(){
+
+    },
+    handleChangess(){
+
+    },
     //审核
     applyBtn() {
       var that=this
@@ -1075,12 +1058,52 @@ export default {
       this.loading = true;
       listConfigfieu().then((response) => {
         console.log(response);
-        this.typeOptionstwo = response.data;
+
+        if(response.data !== undefined){
+          this.typeOptionstwo = response.data;
+          this.dietj(this.typeOptionstwo)
+        }
+        this.typeOptionstwos= response.data ,
+        this.typeOptionstwoss= response.data,
+        // this.typeOptionstwo.filter((route) => {
+        //   route.value = route.id
+        //   route.children.filter((router) =>{
+        //     router.value = router.id
+        //      // this.getListthuy()
+        //     // router.children.filter((routers) =>{
+        //     //   routers.value = routers.id
+
+        //     // })
+        //   })
+
+        // });
+
+
         // this.fileList =  this.queryParams.attachment
         // this.total = response.total;
         this.loading = false;
       });
     },
+    //递归
+    dietj(index){
+       console.log(index)
+       let iuy = []
+      for(var i = 0 ; i < index.length; i++){
+        index[i].value = index[i].id
+        iuy = index[i].children
+        // this.dietj(index[i].children)
+         console.log(iuy)
+         if(index[i].children !== undefined){
+           if(index[i].children != 0){
+             console.log(index[i].children)
+             this.dietj(index[i].children)
+           }else{
+             return
+           }
+         }
+
+      }
+    },
     // 参数系统内置字典翻译
     typeFormat(row, column) {
       return this.selectDictLabel(this.typeOptions, row.configType);
@@ -1130,7 +1153,7 @@ export default {
       this.reset();
       this.open = true;
       // this.opentwo =  true
-      this.title = "添加参数";
+      this.title = "添加信息";
       // this.titletwo = "添加参数";
     },
     handleAddtwo() {
@@ -1138,7 +1161,7 @@ export default {
       // this.open = true;
       this.opentwo = true;
       // this.title = "添加参数";
-      this.titletwo = "添加参数";
+      this.titletwo = "添加信息";
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1156,7 +1179,7 @@ export default {
         this.form = response.data;
 
         // this.opentwo = true
-        this.title = "修改参数";
+        this.title = "修改信息";
         // this.titletwo = "修改参数";
       });
     },
@@ -1169,7 +1192,7 @@ export default {
         // this.open = true;
         this.opentwo = true;
         // this.title = "修改参数";
-        this.titletwo = "修改参数";
+        this.titletwo = "修改信息";
       });
     },
     /** 提交按钮 */