Преглед изворни кода

feat: 供应商管理界面查询条件优化

Administrator пре 6 дана
родитељ
комит
ec8a576d28

+ 1 - 1
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/WxMiniController.java

@@ -104,7 +104,7 @@ public class WxMiniController {
     @GetMapping("/getContact")
     public AjaxResult getContact() {
         //通过系统参数rj.customer.service,获取客服电话
-        return AjaxResult.success(configService.selectConfigByKey("rj.customer.service"));
+        return AjaxResult.success().put("contact", configService.selectConfigByKey("rj.customer.service"));
     }
 
 }

+ 9 - 8
jd-logistics-ui-v3/src/views/system/dept/index.vue

@@ -1,17 +1,17 @@
 <template>
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="部门名称" prop="deptName">
+         <el-form-item label="供应商名称" prop="deptName">
             <el-input
                v-model="queryParams.deptName"
-               placeholder="请输入部门名称"
+               placeholder="请输入供应商名称"
                clearable
                style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
+            <el-select v-model="queryParams.status" placeholder="供应商状态" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -123,6 +123,11 @@
                      <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
                   </el-form-item>
                </el-col>
+              <el-col :span="12">
+                <el-form-item label="费率" prop="rateValue">
+                  <el-input-number v-model="form.rateValue" controls-position="right" :min="0" :max="100" :precision="2" placeholder="请输入费率(%)" />
+                </el-form-item>
+              </el-col>
                <el-col :span="12">
                   <el-form-item label="供应商状态">
                      <el-radio-group v-model="form.status">
@@ -144,11 +149,7 @@
                      <el-input v-model="form.invoiceNum" placeholder="请输入税号" />
                   </el-form-item>
                </el-col>
-               <el-col :span="12">
-                  <el-form-item label="费率" prop="rateValue">
-                     <el-input-number v-model="form.rateValue" controls-position="right" :min="0" :max="100" :precision="2" placeholder="请输入费率(%)" />
-                  </el-form-item>
-               </el-col>
+
                <el-col :span="24">
                   <el-form-item label="开户银行" prop="openBank">
                      <el-input v-model="form.openBank" placeholder="请输入开户银行" />