sr před 4 roky
rodič
revize
d869561166

+ 7 - 8
ruoyi-ui/src/components/DynamicForms/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
+  <el-form-item label-width="120px" :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
     <!-- 输入框 -->
     <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
       clearable @keyup.enter.native="handleQuery"  :disabled="formConfig.disabshow" />
@@ -13,9 +13,9 @@
         :value="itemChild.dictValue">
       </el-option>
     </el-select>
-    <!-- 下拉框搜索 -->
+    <!-- 下拉框搜索 -->
     <el-select :disabled="formConfig.disabshow" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(formConfig.fkInfo)"
-      filterable remote :remote-method="remoteMethod" :loading="loading" :placeholder="'请输入'+formConfig.columnComment">
+      filterable remote :remote-method="remoteMethod" :loading="loading" :placeholder="'请输入'+formConfig.columnComment">
       <el-option v-for="itemChild in filterList" :key="itemChild.id" :label="itemChild.table_name" :value="itemChild.id">
       </el-option>
     </el-select>
@@ -35,13 +35,13 @@
       :placeholder="'请输入'+formConfig.columnComment">
     </el-date-picker>
     <!-- 上传图片 -->
-    <el-upload  :disabled="formConfig.disabshow" v-if="formConfig.htmlType == 'imageUpload'" :headers="{Authorization: 'Bearer ' + getToken()}" :action="process + '/boman-file/upload'"
+    <el-upload :disabled="formConfig.disabshow" v-if="formConfig.htmlType == 'imageUpload'" :headers="{Authorization: 'Bearer ' + getToken()}" :action="process + '/boman-file/upload'"
       :file-list="config" list-type="picture-card" :on-preview="handlePictureCardPreview" :on-success="upImageFn"
       :on-remove="reseImage">
       <i class="el-icon-plus"></i>
     </el-upload>
     <el-dialog :disabled="formConfig.disabshow" :visible.sync="dialogVisible" v-if="formConfig.htmlType == 'imageUpload'">
-      <img width="100%" :src="dialogImageUrl" alt="">
+      <img :src="dialogImageUrl" alt="">
     </el-dialog>
     <!-- 上传文件 -->
     <el-upload :disabled="formConfig.disabshow" class="upload-demo" :headers="{Authorization: 'Bearer ' + getToken()}" v-if="formConfig.htmlType == 'fileUpload'"
@@ -51,7 +51,7 @@
       <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
     </el-upload>
     <!-- 富文本 -->
-    <editor  :disabled="formConfig.disabshow" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'editor'" :min-height="192" />
+    <editor :disabled="formConfig.disabshow" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'editor'" :min-height="192" />
   </el-form-item>
 </template>
 
@@ -105,8 +105,6 @@
     },
     created() {
       this.config = {}
-      // console.log(this.formConfig.mask.slice(3,4),876454)
-      console.log(this.formConfig)
       if(this.type){
         if(this.formConfig.readonly == true){
           this.formConfig.disabshow = true
@@ -160,6 +158,7 @@
         }
         if(this.formConfig.fkInfo){
           this.aliemg.table = this.formConfig.fkInfo.fkTableName
+          this.listIndexfouFn()
         }
       },
       handleChange(file, fileList) {

+ 1 - 1
ruoyi-ui/src/views/system/table/index.vue

@@ -15,7 +15,7 @@
     <!-- 内容 -->
     <div class="table_nav headertable_nav" >
       <el-collapse v-model="activeNames" @change="handleChange">
-        <el-form :model="queryParams" :rules="queryData.rules" ref="queryForm" :inline="true" label-width="120px">
+        <el-form :label-width="150" :model="queryParams" :rules="queryData.rules" ref="queryForm" :inline="true" label-width="120px">
           <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index">
             <el-row>
               <el-col :span="24" :key="index">