wangmengwei 3 лет назад
Родитель
Сommit
67c1638702
1 измененных файлов с 20 добавлено и 21 удалено
  1. 20 21
      ruoyi-ui/src/views/system/queryConfig/index.vue

+ 20 - 21
ruoyi-ui/src/views/system/queryConfig/index.vue

@@ -40,9 +40,9 @@
     <el-table v-loading="loading" :data="queryConfigList" @selection-change="handleSelectionChange"
       :max-height="tableMaxHeight">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="查询次数" align="center" prop="queryNumber" v-if="!shouede" />
-      <el-table-column label="二维码失效时间" align="center" prop="qrTime" v-if="shouede" />
-      <el-table-column label="二维码失效单位" align="center" prop="qrUnit" v-if="shouede">
+      <el-table-column label="查询次数" align="center" prop="queryNumber"  />
+      <el-table-column label="二维码失效时间" align="center" prop="qrTime"  />
+      <el-table-column label="二维码失效单位" align="center" prop="qrUnit" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.qr_unit" :value="scope.row.qrUnit" />
         </template>
@@ -52,17 +52,17 @@
           <dict-tag :options="dict.type.query_type" :value="scope.row.queryType" />
         </template>
       </el-table-column>
-      <el-table-column label="查询方式" align="center" prop="queryMode" v-if="!shouede">
+      <el-table-column label="查询方式" align="center" prop="queryMode" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.query_mode" :value="scope.row.queryMode" />
         </template>
       </el-table-column>
-      <el-table-column label="是否启用" align="center" prop="status" v-if="!shouede">
+      <el-table-column label="是否启用" align="center" prop="status" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" v-if="!shouede" />
+      <el-table-column label="备注" align="center" prop="remark"  />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -80,34 +80,38 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row>
-         <el-col :span="12"><el-form-item label="查询方式" prop="queryMode">
-          <el-select @change="ndhiwed" v-model="form.queryMode" placeholder="请选择查询方式">
+         <el-col :span="12">
+           <el-form-item label="查询方式" prop="queryMode">
+          <el-select style="width: 100%;" @change="ndhiwed" v-model="form.queryMode" placeholder="请选择查询方式">
             <el-option  v-for="dict in dict.type.query_mode" :key="dict.value" :label="dict.label" :value="dict.value">
             </el-option>
           </el-select>
         </el-form-item></el-col>
          <el-col :span="12"><el-form-item label="查询主体" prop="queryType">
-          <el-select v-model="form.queryType" placeholder="请选择查询主体">
+          <el-select style="width: 100%;" v-model="form.queryType" placeholder="请选择查询主体">
             <el-option v-for="dict in dict.type.query_type" :key="dict.value" :label="dict.label" :value="dict.value">
             </el-option>
           </el-select>
-        </el-form-item></el-col>
+        </el-form-item>
+        </el-col>
          <el-col :span="12"><el-form-item label="查询次数" prop="queryNumber" v-if="!shouede">
           <el-input v-model="form.queryNumber" placeholder="请输入查询次数" />
         </el-form-item></el-col>
+        <el-col :span="12">
+           <el-form-item label="二维码失效时间" prop="qrTime" v-if="shouede">
+          <el-input v-model="form.qrTime" placeholder="请输入二维码失效时间" />
+        </el-form-item>
+         </el-col>
          <el-col :span="12"><el-form-item label="二维码失效单位" prop="qrUnit" v-if="shouede">
-          <el-select v-model="form.qrUnit" placeholder="请选择二维码失效单位">
+          <el-select style="width: 100%;" v-model="form.qrUnit" placeholder="请选择二维码失效单位">
             <el-option v-for="dict in dict.type.qr_unit" :key="dict.value" :label="dict.label" :value="dict.value">
             </el-option>
           </el-select>
         </el-form-item></el-col>
-         <el-col :span="12"><el-form-item label="二维码失效时间" prop="qrTime" v-if="shouede">
-          <el-input v-model="form.qrTime" placeholder="请输入二维码失效时间" />
-        </el-form-item>
-</el-col>
+
         <el-col :span="12">
           <el-form-item label="是否启用" prop="status">
-            <el-select v-model="form.status" placeholder="请选择是否启用">
+            <el-select style="width: 100%;" v-model="form.status" placeholder="请选择是否启用">
               <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value">
               </el-option>
             </el-select>
@@ -173,11 +177,6 @@
         form: {},
         // 表单校验
         rules: {
-          queryNumber: [{
-            required: true,
-            message: "查询次数不能为空",
-            trigger: "blur"
-          }],
           queryType: [{
             required: true,
             message: "查询主体不能为空",