From 0c7b408ead819f4fcc32971dff24514de2ab0e30 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 12 二月 2025 15:38:29 +0800
Subject: [PATCH] 迁移客户管理、整理样式修改
---
src/views/system/config/index.vue | 4
src/views/system/role/index.vue | 122 ++++++------
src/views/monitor/logininfor/index.vue | 4
src/views/monitor/operlog/index.vue | 4
src/views/system/menu/index.vue | 4
src/views/system/role/authUser.vue | 6
src/views/system/dict/data.vue | 6
src/views/system/role/selectUser.vue | 6
src/views/tool/gen/importTable.vue | 4
src/views/monitor/job/log.vue | 4
src/views/system/customer/index.vue | 320 +++++++++++++++++++++++++++++++++++
src/views/monitor/job/index.vue | 4
src/views/system/dept/index.vue | 4
src/views/system/post/index.vue | 4
src/views/business/rawMaterialInspection/index.vue | 2
src/components/RightToolbar/index.vue | 2
src/utils/generator/html.js | 2
src/views/monitor/online/index.vue | 4
src/router/index.js | 7
src/views/business/materialOrder/index.vue | 2
src/views/system/user/index.vue | 4
src/views/tool/gen/index.vue | 4
src/views/system/notice/index.vue | 4
src/views/system/dict/index.vue | 4
src/components/Crontab/index.vue | 2
25 files changed, 430 insertions(+), 103 deletions(-)
diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue
index 3963df2..9c03647 100644
--- a/src/components/Crontab/index.vue
+++ b/src/components/Crontab/index.vue
@@ -105,7 +105,7 @@
<div class="pop_btn">
<el-button size="small" type="primary" @click="submitFill">纭畾</el-button>
- <el-button size="small" type="warning" @click="clearCron">閲嶇疆</el-button>
+ <el-button size="small" type="warning" @click="clearCron">閲� 缃�</el-button>
<el-button size="small" @click="hidePopup">鍙栨秷</el-button>
</div>
</div>
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 67da293..c0a1577 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -90,7 +90,7 @@
}
},
methods: {
- // 鎼滅储
+ // 鏌� 璇�
toggleSearch() {
this.$emit("update:showSearch", !this.showSearch);
},
diff --git a/src/router/index.js b/src/router/index.js
index cc05e07..879e2db 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -160,6 +160,13 @@
// ]
},
{
+ // 鏁版嵁瀛楀吀
+ path: '/customer',
+ component: Layout,
+ hidden: true,
+ permissions: ['customer:edit'],
+ },
+ {
path: '/monitor/job-log',
component: Layout,
hidden: true,
diff --git a/src/utils/generator/html.js b/src/utils/generator/html.js
index 9bcc536..1d3708c 100644
--- a/src/utils/generator/html.js
+++ b/src/utils/generator/html.js
@@ -57,7 +57,7 @@
if (conf.formBtns && type === 'file') {
str = `<el-form-item size="large">
<el-button type="primary" @click="submitForm">鎻愪氦</el-button>
- <el-button @click="resetForm">閲嶇疆</el-button>
+ <el-button @click="resetForm">閲� 缃�</el-button>
</el-form-item>`
if (someSpanIsNot24) {
str = `<el-col :span="24">
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 835a8c9..e5e2306 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -983,7 +983,7 @@
})
}
},
- // 閲嶇疆
+ // 閲� 缃�
refresh() {
this.entity = this.HaveJson(this.entityEmpty)
if (this.tabIndex === 0) {
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 7d35fd0..be961bc 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -623,7 +623,7 @@
this.$refs['ValueTable4'].selectList(e)
}
},
- // 閲嶇疆
+ // 閲� 缃�
refresh() {
this.entity.date = null
this.componentData.entity = this.HaveJson(this.entityCopy)
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 892c727..d13394c 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -30,8 +30,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 60bee1d..8f044b3 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -52,8 +52,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index d6af834..d844d5d 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -47,8 +47,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index ad613c9..8de2963 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -18,8 +18,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 4a1828f..a084d92 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -71,8 +71,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 6bde2ee..e65a06d 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -41,8 +41,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue
new file mode 100644
index 0000000..9bef5d6
--- /dev/null
+++ b/src/views/system/customer/index.vue
@@ -0,0 +1,320 @@
+<template>
+ <div class="app-container">
+ <div class="search">
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鐘舵��" prop="state">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.company"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div>
+ <el-button size="small" type="primary" @click="addDia = true" v-if="addPower" icon="el-icon-plus">鏂板</el-button>
+ </div>
+ </div>
+<!-- <div class="table">-->
+<!-- <ValueTable ref="ValueTable" :url="$api.user.selectCustomPageList" :delUrl="$api.user.delCustomById"-->
+<!-- :componentData="componentData" :key="upIndex" :upUrl="$api.user.upCustom"/>-->
+<!-- </div>-->
+ <el-dialog title="鏂板瀹㈡埛" :visible.sync="addDia" width="450px">
+ <div style="margin-bottom: 15px;">
+ <el-row style="line-height: 50px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>瀹㈡埛鍚嶇О锛�</el-col>
+ <el-col :span="15">
+ <el-input v-model="user.company" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>瀹㈡埛鍗曚綅EN锛�</el-col>
+ <el-col :span="15">
+ <el-input v-model="user.companyEn" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 15px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>鍗曚綅鍦板潃锛�</el-col>
+ <el-col :span="15">
+ <el-input type="textarea" v-model="user.address" size="small" clearable
+ :autosize="{minRows: 2, maxRows: 4}"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 15px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>瀹㈡埛鍦板潃EN锛�</el-col>
+ <el-col :span="15">
+ <el-input type="textarea" v-model="user.addressEn" size="small" clearable
+ :autosize="{minRows: 2, maxRows: 4}"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>鍔犳�ラ搴︼細</el-col>
+ <el-col :span="15">
+ <el-input v-model="user.num" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;">鍗曚綅鐢佃瘽锛�</el-col>
+ <el-col :span="15">
+ <el-input v-model="user.phone" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;">宸ュ巶鍩燂細</el-col>
+ <el-col :span="15">
+ <el-input v-model="user.code" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
+ </span>瀹㈡埛缂栧彿锛�</el-col>
+ <el-col :span="15">
+ <el-input v-model="user.code2" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="addDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="customAdd" :loading="loading">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
+ <div class="search" style="height: 35px; margin-bottom: 9px;">
+ <div class="search_thing">
+ <div class="search_label">鐢ㄦ埛鍚嶏細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
+ </div>
+ </div>
+<!-- <div class="body" style="height: 60vh;" v-if="selectUserDia">-->
+<!-- <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2" />-->
+<!-- </div>-->
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="selectUserDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="selectUser">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import ValueTable from '@/components/Table/value-table.vue'
+export default {
+ components: {
+ ValueTable
+ },
+ data() {
+ return {
+ queryParams: {
+ company: ''
+ },
+ componentData: {
+ entity: {
+ company: null,
+ orderBy: {
+ field: 'id',
+ order: 'asc'
+ }
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [{
+ font: '濮旀墭璁板綍',
+ type: 'text',
+ method: 'entrust'
+ }, {
+ font: '鍗忚璁板綍',
+ type: 'text',
+ method: 'protocol'
+ },{
+ id: 'update',
+ font: '缂栬緫',
+ type: 'text',
+ method: 'doDiy',
+ field:[]
+ },{
+ id: 'delete',
+ font: '鍒犻櫎',
+ type: 'text',
+ method: 'doDiy'
+ }],
+ tagField: {
+ state: {
+ select: [{
+ value: 1,
+ type: 'success',
+ label: '鍚敤'
+ }, {
+ value: 0,
+ type: 'danger',
+ label: '鍋滅敤'
+ }]
+ }
+ },
+ selectField: {
+ state: {
+ select: [{
+ value: 1,
+ type: 'success',
+ label: '鍚敤'
+ }, {
+ value: 0,
+ type: 'danger',
+ label: '鍋滅敤'
+ }]
+ }
+ },
+ requiredAdd: [],
+ requiredUp: ['company','address','code2','companyEn','addressEn','num']
+ },
+ entityCopy: {},
+ upIndex: 0,
+ addDia: false,
+ addPower: true,
+ user: {
+ name: null
+ },
+ selectUserDia: false,
+ loading: false,
+ componentData2: {
+ entity: {
+ isCustom: 0,
+ orderBy: {
+ field: 'id',
+ order: 'asc'
+ }
+ },
+ isIndex: true,
+ showSelect: true,
+ select: false,
+ do: [],
+ tagField: {
+ state: {
+ select: [{
+ value: 1,
+ type: 'success',
+ label: '鍚敤'
+ }, {
+ value: 0,
+ type: 'danger',
+ label: '鍋滅敤'
+ }]
+ }
+ },
+ selectField: {},
+ needSort: ['company'],
+ }
+ }
+ },
+ mounted() {
+ this.entityCopy = this.HaveJson(this.componentData.entity)
+ this.getPower()
+ },
+ methods: {
+ refreshTable() {
+ this.$refs['ValueTable'].selectList()
+ },
+ refresh() {
+ this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.upIndex++
+ },
+ customAdd() {
+ if (this.user.company == '' || this.user.company == null) {
+ this.$message.error('璇峰～鍐欏鎴峰崟浣�')
+ return
+ }
+ if (this.user.address == '' || this.user.address == null) {
+ this.$message.error('璇峰～鍐欏崟浣嶅湴鍧�')
+ return
+ }
+ if (this.user.companyEn == '' || this.user.companyEn == null) {
+ this.$message.error('璇峰～鍐欒嫳鏂囧鎴峰崟浣�')
+ return
+ }
+ if (this.user.addressEn == '' || this.user.addressEn == null) {
+ this.$message.error('璇峰～鍐欒嫳鏂囧崟浣嶅湴鍧�')
+ return
+ }
+ if (this.user.code2 == '' || this.user.code2 == null) {
+ this.$message.error('璇峰～鍐欏鎴风紪鍙�')
+ return
+ }
+ if (this.user.code2 == '' || this.user.code2 == null) {
+ this.$message.error('璇峰～鍐欏姞鎬ラ搴�')
+ return
+ }
+ this.loading = true
+ this.$axios.post(this.$api.user.addCustom, this.user, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) return
+ this.$message.success('娣诲姞鎴愬姛')
+ this.refreshTable()
+ this.loading = false
+ this.addDia = false
+ })
+ },
+ // 鏉冮檺鍒嗛厤
+ getPower() {
+ let power = JSON.parse(sessionStorage.getItem('power'))
+ let up = false
+ let del = false
+ let add = false
+ for (var i = 0; i < power.length; i++) {
+ if (power[i].menuMethod == 'delCustomById') {
+ del = true
+ }
+ if (power[i].menuMethod == 'addCustom') {
+ add = true
+ }
+ if (power[i].menuMethod == 'upCustom') {
+ up = true
+ }
+ }
+ if (!del) {
+ this.componentData.do.splice(3, 1)
+ }
+ if (!up) {
+ this.componentData.do.splice(2, 1)
+ }
+ this.addPower = add
+ },
+ entrust(data) {
+
+ },
+ protocol(data) {
+
+ },
+ selectUser() {
+ let selects = this.$refs.ValueTable2.multipleSelection
+ if (selects.length == 0) {
+ this.$message.error('鏈�夋嫨鏁版嵁')
+ return
+ }
+ delete selects['orderBy']
+ delete selects['updateUser']
+ delete selects['updateTime']
+ this.user = selects
+ this.selectUserDia = false
+ }
+ }
+}
+</script>
+
+<style scoped>
+.search {
+ height: 80px;
+ display: flex;
+ justify-content: space-between;
+}
+</style>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index e502b4e..2483a2b 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -20,8 +20,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 3befe4a..3fef698 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -30,8 +30,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
@@ -399,4 +399,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 75a0081..fbf2712 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -22,8 +22,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c4b5003..5a37d9d 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -20,8 +20,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 7982b54..a3d3569 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -28,8 +28,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 444bf63..42f1a5d 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -28,8 +28,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 147aa33..5e0d18b 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -20,8 +20,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
@@ -196,4 +196,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1395d24..90f67e6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,65 +1,61 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
- <el-input
- v-model="queryParams.roleName"
- placeholder="璇疯緭鍏ヨ鑹插悕绉�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鏉冮檺瀛楃" prop="roleKey">
- <el-input
- v-model="queryParams.roleKey"
- placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select
- v-model="queryParams.status"
- placeholder="瑙掕壊鐘舵��"
- clearable
- style="width: 240px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <div class="addButton mb8">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:role:add']"
- >鏂板</el-button>
+ <div class="search">
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
+ <el-input
+ v-model="queryParams.roleName"
+ placeholder="璇疯緭鍏ヨ鑹插悕绉�"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏉冮檺瀛楃" prop="roleKey">
+ <el-input
+ v-model="queryParams.roleKey"
+ placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select
+ v-model="queryParams.status"
+ placeholder="瑙掕壊鐘舵��"
+ clearable
+ style="width: 200px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 200px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="addButton mb8">
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:role:add']">鏂板</el-button>
+ </div>
</div>
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
@@ -598,7 +594,11 @@
</script>
<style scoped>
+.search {
+ display: flex;
+ justify-content: space-between;
+}
.addButton {
- text-align: right;
+ margin-top: 3px;
}
</style>
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 10a5365..1a51116 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -19,8 +19,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
<el-row>
@@ -129,7 +129,7 @@
this.$modal.msgSuccess(res.msg);
this.visible = false;
this.$emit("ok");
- });
+ });
}
}
};
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2e8dc5f..a999c8f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -28,8 +28,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 3ea9532..6fe2b5a 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -19,8 +19,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
<el-row>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 9237c30..b52fbe9 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -29,8 +29,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-form-item>
</el-form>
--
Gitblit v1.9.3