2 Revīzijas cf34d3c5ad ... 6c40654504

Autors SHA1 Ziņojums Datums
  sunxuewei 6c40654504 Merge branch 'sxw-skeleton' of http://101.36.160.140:21044/emergency-report/report-vue into sxw-skeleton 1 gadu atpakaļ
  sunxuewei 75a0bf4ca7 优化 1 gadu atpakaļ

+ 1 - 1
src/views/admin/dict/index.vue

@@ -102,7 +102,7 @@
102 102
 
103 103
       <el-dialog v-model="dictItemVisible" title="字典项管理" width="70%">
104 104
         <el-row>
105
-          <el-button :icon="Plus" type="primary" @click="openDictItemDialog(false)">添加</el-button>
105
+          <el-button :icon="Plus" type="primary" @click="openDictItemDialog(false)">新增</el-button>
106 106
         </el-row>
107 107
         <el-table v-loading="dialogTableLoading" border :data="dialogTableData" row-key="id">
108 108
           <el-table-column type="index" label="序号" align="center" width="60" />

+ 14 - 9
src/views/admin/user/index.vue

@@ -35,17 +35,19 @@
35 35
             </el-col>
36 36
             <el-col :span="8">
37 37
               <el-form-item label="手机号码">
38
-                <el-input />
38
+                <el-input v-model="searchForm.phone" clearable />
39 39
               </el-form-item>
40 40
             </el-col>
41 41
             <el-col :span="8">
42 42
               <el-form-item label="状态">
43
-                <el-input />
43
+                <el-select v-model="searchForm.delFlag">
44
+                  <el-option v-for="item in del_type" :key="item.value" :label="item.label" :value="item.value" />
45
+                </el-select>
44 46
               </el-form-item>
45 47
             </el-col>
46 48
           </el-row>
47
-          <el-row :gutter="20">
48
-            <el-col :span="12">
49
+          <el-row>
50
+            <!-- <el-col :span="12">
49 51
               <el-form-item label="创建时间">
50 52
                 <el-date-picker
51 53
                   type="daterange"
@@ -54,8 +56,8 @@
54 56
                   end-placeholder="结束时间"
55 57
                 />
56 58
               </el-form-item>
57
-            </el-col>
58
-            <el-col :span="12">
59
+            </el-col> -->
60
+            <el-col :span="24" class="btn_center">
59 61
               <el-button :icon="Search" type="primary" @click="getList">查询</el-button>
60 62
               <el-button :icon="Refresh" @click="clearSearch">清空</el-button>
61 63
               <el-button :icon="Plus" type="primary" @click="addOrUpdateHandle(false)">新增</el-button>
@@ -165,9 +167,8 @@
165 167
         <el-row>
166 168
           <el-col :span="12">
167 169
             <el-form-item label="状态" prop="lockFlag">
168
-              <el-select v-model="dialogForm.lockFlag">
169
-                <el-option label="有效" value="0" />
170
-                <el-option label="无效" value="9" />
170
+              <el-select v-model="dialogForm.lockFlag" clearable>
171
+                <el-option v-for="item in del_type" :key="item.value" :label="item.label" :value="item.value" />
171 172
               </el-select>
172 173
             </el-form-item>
173 174
           </el-col>
@@ -245,6 +246,8 @@ const deptData = ref([]); // 部门数据
245 246
 
246 247
 const searchForm = ref({
247 248
   username: "",
249
+  phone: "",
250
+  delFlag: "",
248 251
   deptId: ""
249 252
 }); // 搜索表格
250 253
 const tableLoading = ref(false); // 表格loading
@@ -328,6 +331,8 @@ getList();
328 331
 const clearSearch = () => {
329 332
   searchForm.value = {
330 333
     username: "",
334
+    phone: "",
335
+    delFlag: "",
331 336
     deptId: ""
332 337
   };
333 338
   dialogForm.value.deptId = "";

+ 1 - 1
src/views/orderType/administration/index.vue

@@ -14,7 +14,7 @@
14 14
       </div>
15 15
       <div class="mti-form">
16 16
         <div class="filter-container">
17
-          <el-button size="mini" :icon="Plus" type="primary" round @click="handlerAdd">添加</el-button>
17
+          <el-button size="mini" :icon="Plus" type="primary" round @click="handlerAdd">新增</el-button>
18 18
           <el-button size="mini" :icon="Edit" round @click="handlerEdit">编辑</el-button>
19 19
           <el-button size="mini" :icon="Delete" round @click="handleDelete">删除</el-button>
20 20
         </div>

+ 1 - 1
src/views/orderType/supply/index.vue

@@ -15,7 +15,7 @@
15 15
       <div class="mti-form">
16 16
         <div class="filter-container">
17 17
           <el-button size="mini" :icon="Plus" type="primary" round @click="handlerAdd">新增</el-button>
18
-          <el-button size="mini" :icon="Edit" type="primary"  round @click="handlerEdit">编辑</el-button>
18
+          <el-button size="mini" :icon="Edit" type="primary" round @click="handlerEdit">编辑</el-button>
19 19
           <el-button size="mini" :icon="Delete" type="danger" round @click="handleDelete">删除</el-button>
20 20
         </div>
21 21
         <div class="box-card">