From 1f492f9b1acb55577f59ad911339ad174d693558 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 21 Oct 2021 13:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/setting.js                  |  4 ++--
 src/views/course/Curriculum.vue | 10 +++++-----
 src/views/customer/customer.vue |  6 +++---
 src/views/order/Order.vue       | 10 +++++-----
 src/views/serve/Configure.vue   |  6 +++---
 src/views/user/User.vue         | 34 +++++++++++++++++++++------------
 6 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/setting.js b/src/setting.js
index 280e21b..c2daea4 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -12,8 +12,8 @@ if (isDev) {
     // jumpPath = "http://39.108.250.202/judgmentPoint/";
     jumpPath = "http://192.168.31.154:8087/"; // 本地调试-需要启动本地判分点系统
 
-    // host = "http://39.108.250.202:9000";
-    host = 'http://192.168.31.151:9000'// 榕
+    host = "http://39.108.250.202:9000";
+    // host = 'http://192.168.31.151:9000'// 榕
     // host = 'http://192.168.31.125:9000'// 坤
     // host = 'http://192.168.31.137:9000'// 赓
 } else if (isTest) {
diff --git a/src/views/course/Curriculum.vue b/src/views/course/Curriculum.vue
index 53c56d1..93af661 100644
--- a/src/views/course/Curriculum.vue
+++ b/src/views/course/Curriculum.vue
@@ -10,7 +10,7 @@
                         </div>
                         <div>
                             <el-form label-width="80px">
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="学科类别">
                                         <el-select v-model="form.categoryId" clearable
                                                    @change="getProfessionalClass()" @clear="clearClass()">
@@ -20,7 +20,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="专业类">
                                         <el-select v-model="form.professionalCategoryId" clearable
                                                    :disabled="form.categoryId ? false : true"
@@ -31,7 +31,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="专业">
                                         <el-select v-model="form.professionalId" clearable
                                                    :disabled="form.professionalCategoryId ? false : true"
@@ -42,7 +42,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="课程类别">
                                         <el-select v-model="form.curriculumType" clearable
                                                    @change="getData()">
@@ -51,7 +51,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="4">
+                                <el-col :span="6">
                                     <el-form-item>
                                         <el-input placeholder="请输入课程名称" prefix-icon="el-icon-search"
                                                   v-model="form.curriculumName" clearable
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index 1dcb4e8..ccba207 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -10,21 +10,21 @@
                         </div>
                         <div>
                             <el-form label-width="80px">
-                                <el-col :span="6">
+                                <el-col :span="4">
                                     <el-form-item label="国家">
                                         <el-select v-model="form.countries" placeholder="请选择国家">
                                             <el-option v-for="(item,index) in countryList" :key="index" :label="item.name" :value="item.name"></el-option>
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="4">
                                     <el-form-item label="省份">
                                         <el-select v-model="form.provinces" clearable placeholder="请选择省份" @change="getCity" @clear="clearprovince">
                                             <el-option v-for="(item,index) in provinceList" :key="index" :label="item.provinceName" :value="item.provinceId"></el-option>
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :span="4">
                                     <el-form-item label="城市">
                                         <el-select v-model="form.city" clearable placeholder="请选择城市" :disabled="form.provinces ? false : true" @change="initData">
                                             <el-option v-for="(item,index) in cityList" :key="index" :label="item.cityName" :value="item.cityId"></el-option>
diff --git a/src/views/order/Order.vue b/src/views/order/Order.vue
index 2b4f7cb..13fcb26 100644
--- a/src/views/order/Order.vue
+++ b/src/views/order/Order.vue
@@ -10,7 +10,7 @@
                         </div>
                         <div>
                             <el-form label-width="80px">
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="省份">
                                         <el-select v-model="form.provinces" clearable placeholder="请选择省份"
                                                    @change="getCity()" @clear="clearprovince()">
@@ -19,7 +19,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="城市">
                                         <el-select v-model="form.city" clearable placeholder="请选择城市"
                                                    :disabled="form.provinces ? false : true" @change="getData()">
@@ -28,7 +28,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="订单类型">
                                         <el-select v-model="form.orderType" clearable placeholder="请选择订单类型"
                                                    @change="getData()">
@@ -37,7 +37,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="5">
+                                <el-col :span="4">
                                     <el-form-item label="订单状态">
                                         <el-select v-model="form.orderStatus" clearable placeholder="请选择订单状态"
                                                    @change="getData()">
@@ -46,7 +46,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="4">
+                                <el-col :span="6">
                                     <el-form-item>
                                         <el-input placeholder="请输入订单号/客户名称/订单名称" prefix-icon="el-icon-search"
                                                   v-model="keyword" @keyup.enter.native="onSearch" clearable></el-input>
diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue
index c2462b6..976ea90 100644
--- a/src/views/serve/Configure.vue
+++ b/src/views/serve/Configure.vue
@@ -9,9 +9,9 @@
                             <span>筛选</span>
                         </div>
                         <div>
-                            <el-form label-width="80px" class="flex-between">
+                            <el-form label-width="80px">
                                 <div>
-                                    <el-col :span="10">
+                                    <el-col :span="4">
                                         <el-form-item label="系统归属">
                                             <el-select v-model="systemAttribution" clearable placeholder="请选择系统归属"
                                                        @change="initData">
@@ -20,7 +20,7 @@
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="10">
+                                    <el-col :span="4">
                                         <el-form-item label="系统类型">
                                             <el-select v-model="systemType" clearable placeholder="请选择系统类型"
                                                        @change="initData">
diff --git a/src/views/user/User.vue b/src/views/user/User.vue
index ff6ecc1..4f7e760 100644
--- a/src/views/user/User.vue
+++ b/src/views/user/User.vue
@@ -11,21 +11,21 @@
                         <div>
                             <el-form label-width="80px">
                                 <el-row>
-                                    <el-col :span="6">
+                                    <el-col :span="4">
                                         <el-form-item label="国家">
                                             <el-select v-model="form.countries" clearable placeholder="请选择国家">
                                                 <el-option v-for="(item,index) in countryList" :key="index" :label="item.name" :value="item.value"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6">
+                                    <el-col :span="4">
                                         <el-form-item label="省份">
                                             <el-select v-model="form.provinces" clearable placeholder="请选择省份" @change="getCity" @clear="clearprovince()">
                                                 <el-option v-for="(item,index) in provinceList" :key="index" :label="item.provinceName" :value="item.provinceId"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6">
+                                    <el-col :span="4">
                                         <el-form-item label="城市">
                                             <el-select v-model="form.city" clearable placeholder="请选择城市"
                                              :disabled="form.provinces ? false : true" @clear="clearcity()" @change="getSchool">
@@ -33,13 +33,18 @@
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6">
+                                    <el-col :span="4">
                                         <el-form-item label="学校">
                                             <el-select v-model="form.schoolId" clearable placeholder="请选择学校" :disabled="form.city ? false : true" @change="getData()">
                                                 <el-option v-for="(item,index) in schoolList" :key="index" :label="item.schoolName" :value="item.schoolId"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item>
+                                            <el-input placeholder="支持账号,手机号,姓名,学校查询" prefix-icon="el-icon-search" v-model="form.keyword" clearable></el-input>
+                                        </el-form-item>
+                                    </el-col>
                                     <!-- <el-col :span="5">
                                         <el-form-item label="角色">
                                             <el-select v-model="form.accountRole" clearable placeholder="请选择角色" @change="getData()">
@@ -50,7 +55,7 @@
                                 </el-row>
 
                                 <el-row>
-                                    <el-col :span="10">
+                                    <el-col :span="8">
                                         <el-form-item label="创建时间" class="userRadio">
                                             <el-radio-group v-model="form.month">
                                                 <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{item.name}}</el-radio>
@@ -59,13 +64,18 @@
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="自定义">
-                                            <el-date-picker v-model="form.date" align="right" unlink-panels type="daterange"
-                                             start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item>
-                                            <el-input placeholder="支持账号,手机号,姓名,学校查询" prefix-icon="el-icon-search" v-model="form.keyword" clearable></el-input>
+                                            <el-date-picker
+                                                v-model="form.date"
+                                                align="right"
+                                                unlink-panels
+                                                type="daterange"
+                                                start-placeholder="开始日期"
+                                                end-placeholder="结束日期"
+                                                format="yyyy-MM-dd"
+                                                value-format="yyyy-MM-dd"
+                                                clearable
+                                                style="width: 100%"
+                                            ></el-date-picker>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>