Skip to content

Q
qr-consistency-vue3
Commit afb00fa5 authored by Mr.Tang's avatar Mr.Tang
Browse files
Options

按钮使用通用样式

parent 0e9ce6ee
Hide whitespace changes
Inline Side-by-side
Showing with 586 additions and 310 deletions
src/api/system/basicdata/businessunit.js
View file @ afb00fa5
...@@ -5,7 +5,7 @@ export function listUnit(query) { ...@@ -5,7 +5,7 @@ export function listUnit(query) {
return request({ return request({
url: '/control/unit/list', url: '/control/unit/list',
method: 'get', method: 'get',
params: query params: query,
}) })
} }
...@@ -13,7 +13,7 @@ export function listUnit(query) { ...@@ -13,7 +13,7 @@ export function listUnit(query) {
export function getUnit(id) { export function getUnit(id) {
return request({ return request({
url: '/control/unit/' + id, url: '/control/unit/' + id,
method: 'get' method: 'get',
}) })
} }
...@@ -22,7 +22,7 @@ export function addUnit(data) { ...@@ -22,7 +22,7 @@ export function addUnit(data) {
return request({ return request({
url: '/control/unit', url: '/control/unit',
method: 'post', method: 'post',
data: data data: data,
}) })
} }
...@@ -31,7 +31,7 @@ export function updateUnit(data) { ...@@ -31,7 +31,7 @@ export function updateUnit(data) {
return request({ return request({
url: '/control/unit', url: '/control/unit',
method: 'put', method: 'put',
data: data data: data,
}) })
} }
...@@ -39,6 +39,14 @@ export function updateUnit(data) { ...@@ -39,6 +39,14 @@ export function updateUnit(data) {
export function delUnit(id) { export function delUnit(id) {
return request({ return request({
url: '/control/unit/' + id, url: '/control/unit/' + id,
method: 'delete' method: 'delete',
})
}
// 查询所有事业部名称
export function getAllBusinessUnitName(query) {
return request({
url: '/control/unit/getAllBusinessUnitName',
method: 'get',
data: query,
}) })
} }
src/views/baseData/vehicleModelData/domestic/index.vue
View file @ afb00fa5
...@@ -5,31 +5,40 @@ ...@@ -5,31 +5,40 @@
ref="queryRef" ref="queryRef"
:model="queryParams" :model="queryParams"
:inline="true" :inline="true"
label-width="68px" label-width="90px"
> >
<el-form-item label="车型代码" prop="modelCode"> <el-form-item label="车型代码" prop="modelCode">
<el-input <el-input
v-model="queryParams.modelCode" v-model="queryParams.modelCode"
placeholder="请输入车型代码" placeholder="请输入"
clearable clearable
style="width: 120px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="车型公告号" prop="modelAnnouncementNumber"> <el-form-item label="车型公告号" prop="modelAnnouncementNumber">
<el-input <el-input
v-model="queryParams.modelAnnouncementNumber" v-model="queryParams.modelAnnouncementNumber"
placeholder="请输入车型公告号" placeholder="请输入"
clearable clearable
style="width: 120px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="车型系列" prop="modelSeries"> <el-form-item label="车型系列" prop="modelSeries">
<el-input <el-select
v-model="queryParams.modelSeries" v-model="queryParams.modelSeries"
placeholder="请输入车型系列" placeholder="请选择"
clearable clearable
@keyup.enter="handleQuery" style="width: 120px"
/> >
<el-option
v-for="dict in sys_manufacture"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否维护" prop="isMaintained"> <el-form-item label="是否维护" prop="isMaintained">
<el-select <el-select
...@@ -46,13 +55,20 @@ ...@@ -46,13 +55,20 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="事业部" prop="brand"> <el-form-item label="事业部" prop="businessUnitName">
<el-input <el-select
v-model="queryParams.brand" v-model="queryParams.businessUnitName"
placeholder="请输入品牌" placeholder="请选择"
clearable clearable
@keyup.enter="handleQuery" style="width: 100px"
/> >
<el-option
v-for="item in allBusinessUnit"
:key="item.id"
:label="item.businessUnitName"
:value="item.businessUnitName || ''"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="发动机型号" prop="engineModel"> <el-form-item label="发动机型号" prop="engineModel">
...@@ -60,13 +76,14 @@ ...@@ -60,13 +76,14 @@
v-model="queryParams.engineModel" v-model="queryParams.engineModel"
placeholder="请输入发动机型号" placeholder="请输入发动机型号"
clearable clearable
style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="认证申报生产地址" prop="productionAddress"> <el-form-item label="认证申报生产地址" prop="productionAddress">
<el-input <el-input
v-model="queryParams.productionAddress" v-model="queryParams.productionAddress"
placeholder="请输入生产地址" placeholder="请输入"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
...@@ -74,33 +91,50 @@ ...@@ -74,33 +91,50 @@
<el-form-item label="制造工厂" prop="manufacturingPlant"> <el-form-item label="制造工厂" prop="manufacturingPlant">
<el-input <el-input
v-model="queryParams.manufacturingPlant" v-model="queryParams.manufacturingPlant"
placeholder="请输入制造工厂" placeholder="请选择"
clearable clearable
style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="CVN" prop="cvn"> <el-form-item label="CVN" prop="cvn">
<el-input <el-input
v-model="queryParams.cvn" v-model="queryParams.cvn"
placeholder="请输入CVN" placeholder="请输入"
clearable clearable
style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="CALID" prop="calid"> <el-form-item label="CALID" prop="calid">
<el-input <el-input
v-model="queryParams.calid" v-model="queryParams.calid"
placeholder="请输入CALID" placeholder="请输入"
clearable clearable
style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery" <el-button class="btn-A" icon="Search" @click="handleQuery"
>搜索</el-button >搜索</el-button
> >
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button class="btn-B" icon="Refresh" @click="resetQuery"
>重置</el-button
>
<div>
<el-button
style="
float: left;
margin: 0px 100px;
border: 1px solid #0154fb;
color: #0154fb;
"
@click="handleExport"
>导出</el-button
>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -125,10 +159,6 @@ ...@@ -125,10 +159,6 @@
>导出</el-button >导出</el-button
> >
</el-col> </el-col>
<right-toolbar
v-model:show-search="showSearch"
@query-table="getList"
></right-toolbar>
</el-row> </el-row>
<el-table <el-table
...@@ -138,8 +168,12 @@ ...@@ -138,8 +168,12 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="id" /> <el-table-column label="序号" align="center" width="80">
<el-table-column label="事业部" align="center" prop="brand" /> <template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column label="事业部" align="center" prop="businessUnitName" />
<el-table-column label="车型代码" align="center" prop="modelCode" /> <el-table-column label="车型代码" align="center" prop="modelCode" />
<el-table-column label="车型系列" align="center" prop="modelSeries" /> <el-table-column label="车型系列" align="center" prop="modelSeries" />
<el-table-column <el-table-column
...@@ -148,7 +182,14 @@ ...@@ -148,7 +182,14 @@
prop="modelAnnouncementNumber" prop="modelAnnouncementNumber"
/> />
<el-table-column label="品牌" align="center" prop="brand" /> <el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="是否维护" align="center" prop="isMaintained" /> <el-table-column label="是否维护" align="center" prop="isMaintained">
<template #default="scope">
<dict-tag
:options="vehicle_model_maintenance"
:value="scope.row.isMaintained"
/>
</template>
</el-table-column>
<el-table-column label="发动机型号" align="center" prop="engineModel" /> <el-table-column label="发动机型号" align="center" prop="engineModel" />
<el-table-column <el-table-column
label="车型代码今年累计产量" label="车型代码今年累计产量"
...@@ -185,15 +226,7 @@ ...@@ -185,15 +226,7 @@
type="primary" type="primary"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button >补充信息</el-button
>
<el-button
v-hasPermi="['control:model:remove']"
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
>删除</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
...@@ -223,7 +256,15 @@ ...@@ -223,7 +256,15 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否维护" prop="isMaintained"> <el-form-item label="是否维护" prop="isMaintained">
<el-input v-model="form.isMaintained" placeholder="请输入是否维护" /> <el-radio-group v-model="form.isMaintained">
<el-radio
v-for="(item, index) in vehicle_model_maintenance"
:key="index"
:label="parseInt(item.value)"
:disabled="item.disabled"
>{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="生产地址" prop="productionAddress"> <el-form-item label="生产地址" prop="productionAddress">
<el-input <el-input
...@@ -247,8 +288,8 @@ ...@@ -247,8 +288,8 @@
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button class="btn-B" @click="cancel">取 消</el-button>
<el-button @click="cancel">取 消</el-button> <el-button class="btn-A" @click="submitForm">保 存</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
...@@ -264,6 +305,7 @@ import { ...@@ -264,6 +305,7 @@ import {
updateModel, updateModel,
} from '@/api/vehicleModelData/domestic' } from '@/api/vehicleModelData/domestic'
import { getAllFactoryName } from '@/api/system/factory' import { getAllFactoryName } from '@/api/system/factory'
import { getAllBusinessUnitName } from '@/api/system/basicdata/businessunit'
import { ref, toRefs, watch } from 'vue' import { ref, toRefs, watch } from 'vue'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
...@@ -282,10 +324,13 @@ const title = ref('') ...@@ -282,10 +324,13 @@ const title = ref('')
const data = reactive({ const data = reactive({
form: { form: {
manufacturingPlant: '', // 字符串类型，存储选中的工厂 manufacturingPlant: '', // 字符串类型，存储选中的工厂
businessUnitName: '',
isMaintained: '',
}, },
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
businessUnitName: null,
brand: null, brand: null,
modelCode: null, modelCode: null,
modelSeries: null, modelSeries: null,
...@@ -301,10 +346,12 @@ const data = reactive({ ...@@ -301,10 +346,12 @@ const data = reactive({
}, },
rules: {}, rules: {},
}) })
// Vue 中的 v-model 绑定默认是字符串类型。
const allFactories = ref([]) // 所有工厂列表 const allFactories = ref([]) // 所有工厂列表
const selectedFactories = ref([]) // 当前选中的工厂数组 const selectedFactories = ref([]) // 当前选中的工厂数组
// 监听表单数据变化，初始化选中的工厂 // 监听表单数据变化，初始化选中的工厂
const { queryParams, form, rules } = toRefs(data) const { queryParams, form, rules } = toRefs(data)
const allBusinessUnit = ref([]) // 获取所有事业部列表
// 获取工厂数据的方法 // 获取工厂数据的方法
const fetchFactories = async () => { const fetchFactories = async () => {
...@@ -316,6 +363,15 @@ const fetchFactories = async () => { ...@@ -316,6 +363,15 @@ const fetchFactories = async () => {
console.error('获取工厂列表失败:', error) console.error('获取工厂列表失败:', error)
} }
} }
const fetchBusinessUnit = async () => {
try {
const response = await getAllBusinessUnitName()
// 提取factoryName字段
allBusinessUnit.value = response.data.map((item) => item.businessUnitName)
} catch (error) {
console.error('获取工厂列表失败:', error)
}
}
// 监听选中的工厂变化，更新表单字符串数据（使用顿号分隔） // 监听选中的工厂变化，更新表单字符串数据（使用顿号分隔）
watch( watch(
selectedFactories, selectedFactories,
...@@ -462,6 +518,7 @@ function handleExport() { ...@@ -462,6 +518,7 @@ function handleExport() {
} }
onMounted(() => { onMounted(() => {
fetchFactories() fetchFactories()
fetchBusinessUnit()
}) })
getList() getList()
</script> </script>
src/views/system/basicdata/businessunit/index.vue
View file @ afb00fa5
<template> <template>
<div class="app-container"> <div class="app-container">
<div> <div>
<el-button style="float: right;margin: 12px 0;border: 1px solid #0154fb;color: #0154fb;" @click="handleAdd">新建</el-button> <el-button
style="
float: right;
margin: 12px 0;
border: 1px solid #0154fb;
color: #0154fb;
"
@click="handleAdd"
>新建</el-button
>
</div> </div>
<el-table v-loading="loading" :data="unitList" @selection-change="handleSelectionChange" border> <el-table
<el-table-column label="序号" align="center" width="80"> v-loading="loading"
:data="unitList"
border
@selection-change="handleSelectionChange"
>
<el-table-column label="序号" align="center" width="80">
<template #default="scope"> <template #default="scope">
{{scope.$index + 1}} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="事业部" align="center" prop="businessUnitName" width="100"/> <el-table-column
label="事业部"
align="center"
prop="businessUnitName"
width="100"
/>
<el-table-column prop="manufacturingFactory" label="制造工厂" width="800"> <el-table-column prop="manufacturingFactory" label="制造工厂" width="800">
<template #default="{ row }"> <template #default="{ row }">
{{ formatFactoryDisplay(row.manufacturingFactory) }} {{ formatFactoryDisplay(row.manufacturingFactory) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="200"/> <el-table-column label="备注" align="center" prop="remark" width="200" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="200"/> <el-table-column
<el-table-column label="更新人" align="center" prop="updateName" width="150"/> label="更新时间"
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> align="center"
prop="updateTime"
width="200"
/>
<el-table-column
label="更新人"
align="center"
prop="updateName"
width="150"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['control:unit:edit']" style='color: #0154FB'>编辑</el-button> <el-button
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['control:unit:remove']">删除</el-button>--> v-hasPermi="['control:unit:edit']"
link
type="primary"
style="color: #0154fb"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['control:unit:remove']">删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改事业部对话框 --> <!-- 添加或修改事业部对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog v-model="open" :title="title" width="500px" append-to-body>
<el-form ref="unitRef" :model="form" :rules="rules" label-width="130px"> <el-form ref="unitRef" :model="form" :rules="rules" label-width="130px">
<el-form-item label="事业部名称" prop="businessUnitName"> <el-form-item label="事业部名称" prop="businessUnitName">
<el-input v-model="form.businessUnitName" placeholder="请输入事业部名称" /> <el-input
v-model="form.businessUnitName"
placeholder="请输入事业部名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="制造工厂" prop="manufacturingFactory"> <el-form-item label="制造工厂" prop="manufacturingFactory">
<el-checkbox-group v-model="selectedFactories"> <el-checkbox-group v-model="selectedFactories">
<div style="display: flex; flex-wrap: wrap;"> <div style="display: flex; flex-wrap: wrap">
<div v-for="(factory, index) in allFactories" :key="index" style="width: 33%; margin-bottom: 10px;"> <div
v-for="(factory, index) in allFactories"
:key="index"
style="width: 33%; margin-bottom: 10px"
>
<el-checkbox :label="factory">{{ factory }}</el-checkbox> <el-checkbox :label="factory">{{ factory }}</el-checkbox>
</div> </div>
</div> </div>
...@@ -56,8 +103,8 @@ ...@@ -56,8 +103,8 @@
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button class="btn-B" @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button> <el-button class="btn-A" @click="submitForm">保 存</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
...@@ -65,67 +112,81 @@ ...@@ -65,67 +112,81 @@
</template> </template>
<script setup name="Unit"> <script setup name="Unit">
import { listUnit, getUnit, delUnit, addUnit, updateUnit } from "@/api/system/basicdata/businessunit"; import {
import { getAllFactoryName } from "@/api/system/factory"; listUnit,
import { formatFactories } from '@/utils/factoryFormatter'; getUnit,
delUnit,
addUnit,
updateUnit,
} from '@/api/system/basicdata/businessunit'
import { getAllFactoryName } from '@/api/system/factory'
import { formatFactories } from '@/utils/factoryFormatter'
import { ref, toRefs, watch } from 'vue' import { ref, toRefs, watch } from 'vue'
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance()
const unitList = ref([]); const unitList = ref([])
const open = ref(false); const open = ref(false)
const loading = ref(true); const loading = ref(true)
const showSearch = ref(true); const showSearch = ref(true)
const ids = ref([]); const ids = ref([])
const single = ref(true); const single = ref(true)
const multiple = ref(true); const multiple = ref(true)
const total = ref(0); const total = ref(0)
const title = ref(""); const title = ref('')
const formatFactoryDisplay = (factoryJson) => { const formatFactoryDisplay = (factoryJson) => {
return formatFactories(factoryJson); return formatFactories(factoryJson)
}; }
// 选中的工厂列表 // 选中的工厂列表
const selectedFactories = ref([]); const selectedFactories = ref([])
// 监听表单数据变化，初始化选中的工厂 // 监听表单数据变化，初始化选中的工厂
const data = reactive({ const data = reactive({
form: { form: {
businessUnitName: "", businessUnitName: '',
manufacturingFactory: {}, // 或 '{}'（根据后端需求） manufacturingFactory: {}, // 或 '{}'（根据后端需求）
remark: "", remark: '',
}, },
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
businessUnitName: null, businessUnitName: null,
manufacturingFactory: null manufacturingFactory: null,
}, },
rules: { rules: {
createBy: [ createBy: [
{ required: true, message: "创建人ID不能为空", trigger: "blur" } { required: true, message: '创建人ID不能为空', trigger: 'blur' },
], ],
createTime: [ createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" } { required: true, message: '创建时间不能为空', trigger: 'blur' },
], ],
updateBy: [ updateBy: [
{ required: true, message: "更新人ID不能为空", trigger: "blur" } { required: true, message: '更新人ID不能为空', trigger: 'blur' },
], ],
updateTime: [ updateTime: [
{ required: true, message: "更新时间不能为空", trigger: "blur" } { required: true, message: '更新时间不能为空', trigger: 'blur' },
], ],
delFlag: [ delFlag: [
{ required: true, message: "删除状态，0表示未删除，1表示已删除不能为空", trigger: "blur" } {
required: true,
message: '删除状态，0表示未删除，1表示已删除不能为空',
trigger: 'blur',
},
], ],
businessUnitName: [ businessUnitName: [
{ required: true, message: "事业部名称不能为空", trigger: "blur" } { required: true, message: '事业部名称不能为空', trigger: 'blur' },
], ],
manufacturingFactory: [ manufacturingFactory: [
{ required: true, message: "所属制造工厂，以JSON数组形式存储不能为空", trigger: "blur" } {
] required: true,
} message: '所属制造工厂，以JSON数组形式存储不能为空',
}); trigger: 'blur',
},
],
},
})
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data)
// 所有可选的工厂列表 // 所有可选的工厂列表
const allFactories = ref([]) const allFactories = ref([])
...@@ -134,43 +195,51 @@ const fetchFactories = async () => { ...@@ -134,43 +195,51 @@ const fetchFactories = async () => {
try { try {
const response = await getAllFactoryName() const response = await getAllFactoryName()
// 提取factoryName字段 // 提取factoryName字段
allFactories.value = response.data.map(item => item.factoryName) allFactories.value = response.data.map((item) => item.factoryName)
} catch (error) { } catch (error) {
console.error('获取工厂列表失败:', error) console.error('获取工厂列表失败:', error)
} }
} }
watch(() => form.value.manufacturingFactory, (newVal) => { watch(
try { () => form.value.manufacturingFactory,
const factoryObj = JSON.parse(newVal || '{}'); (newVal) => {
selectedFactories.value = Object.values(factoryObj); try {
} catch (e) { const factoryObj = JSON.parse(newVal || '{}')
selectedFactories.value = []; selectedFactories.value = Object.values(factoryObj)
} } catch (e) {
}, { immediate: true }); selectedFactories.value = []
}
},
{ immediate: true },
)
// 监听选中的工厂变化，更新表单数据 // 监听选中的工厂变化，更新表单数据
watch(selectedFactories, (newVal) => { watch(
const factoryObj = {}; selectedFactories,
newVal.forEach((item, index) => { (newVal) => {
factoryObj[index] = item; const factoryObj = {}
}); newVal.forEach((item, index) => {
form.value.manufacturingFactory = JSON.stringify(factoryObj); factoryObj[index] = item
}, { deep: true }); })
form.value.manufacturingFactory = JSON.stringify(factoryObj)
},
{ deep: true },
)
/** 查询事业部列表 */ /** 查询事业部列表 */
function getList() { function getList() {
loading.value = true; loading.value = true
listUnit(queryParams.value).then(response => { listUnit(queryParams.value).then((response) => {
unitList.value = response.rows; unitList.value = response.rows
total.value = response.total; total.value = response.total
loading.value = false; loading.value = false
}); })
} }
// 取消按钮 // 取消按钮
function cancel() { function cancel() {
open.value = false; open.value = false
reset(); reset()
} }
// 表单重置 // 表单重置
...@@ -184,88 +253,96 @@ function reset() { ...@@ -184,88 +253,96 @@ function reset() {
remark: null, remark: null,
delFlag: null, delFlag: null,
businessUnitName: null, businessUnitName: null,
manufacturingFactory: null manufacturingFactory: null,
}; }
proxy.resetForm("unitRef"); proxy.resetForm('unitRef')
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1
getList(); getList()
} }
/** 重置按钮操作 */ /** 重置按钮操作 */
function resetQuery() { function resetQuery() {
proxy.resetForm("queryRef"); proxy.resetForm('queryRef')
handleQuery(); handleQuery()
} }
// 多选框选中数据 // 多选框选中数据
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id); ids.value = selection.map((item) => item.id)
single.value = selection.length != 1; single.value = selection.length != 1
multiple.value = !selection.length; multiple.value = !selection.length
} }
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
reset(); reset()
open.value = true; open.value = true
title.value = "新增"; title.value = '新增'
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset()
const _id = row.id || ids.value const _id = row.id || ids.value
getUnit(_id).then(response => { getUnit(_id).then((response) => {
form.value = response.data; form.value = response.data
open.value = true; open.value = true
title.value = "修改事业部"; title.value = '修改事业部'
}); })
} }
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["unitRef"].validate(valid => { proxy.$refs['unitRef'].validate((valid) => {
if (valid) { if (valid) {
if (form.value.id != null) { if (form.value.id != null) {
updateUnit(form.value).then(response => { updateUnit(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess('修改成功')
open.value = false; open.value = false
getList(); getList()
}); })
} else { } else {
addUnit(form.value).then(response => { addUnit(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess('新增成功')
open.value = false; open.value = false
getList(); getList()
}); })
} }
} }
}); })
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _ids = row.id || ids.value; const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除事业部编号为"' + _ids + '"的数据项？').then(function() { proxy.$modal
return delUnit(_ids); .confirm('是否确认删除事业部编号为"' + _ids + '"的数据项？')
}).then(() => { .then(function () {
getList(); return delUnit(_ids)
proxy.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
getList()
proxy.$modal.msgSuccess('删除成功')
})
.catch(() => {})
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('control/unit/export', { proxy.download(
...queryParams.value 'control/unit/export',
}, `unit_${new Date().getTime()}.xlsx`) {
...queryParams.value,
},
`unit_${new Date().getTime()}.xlsx`,
)
} }
onMounted(() => { onMounted(() => {
fetchFactories(); fetchFactories()
}); })
getList(); getList()
</script> </script>
src/views/system/basicdata/manufacturer/index.vue
View file @ afb00fa5
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form
v-show="showSearch"
ref="queryRef"
:model="queryParams"
:inline="true"
label-width="68px"
>
<el-form-item label="工厂编号" prop="factoryCode"> <el-form-item label="工厂编号" prop="factoryCode">
<el-input <el-input
v-model="queryParams.factoryCode" v-model="queryParams.factoryCode"
placeholder="请输入" placeholder="请输入"
clearable clearable
@keyup.enter="handleQuery"
style="width: 120px" style="width: 120px"
@keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="制造商" prop="manufacturer"> <el-form-item label="制造商" prop="manufacturer">
...@@ -45,8 +51,8 @@ ...@@ -45,8 +51,8 @@
v-model="queryParams.productionAddress" v-model="queryParams.productionAddress"
placeholder="请输入" placeholder="请输入"
clearable clearable
@keyup.enter="handleQuery"
style="width: 120px" style="width: 120px"
@keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="制造工厂" prop="manufacturingFactory"> <el-form-item label="制造工厂" prop="manufacturingFactory">
...@@ -54,16 +60,20 @@ ...@@ -54,16 +60,20 @@
v-model="queryParams.manufacturingFactory" v-model="queryParams.manufacturingFactory"
placeholder="请输入" placeholder="请输入"
clearable clearable
@keyup.enter="handleQuery"
style="width: 120px" style="width: 120px"
@keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button style='background: #0154fb;color: white' @click="handleQuery">查询</el-button> <el-button class="btn-A" icon="Search" @click="handleQuery"
<el-button style="border: 1px solid #0154fb;color: #0154fb;" @click="resetQuery">重置</el-button> >查询</el-button
>
<el-button class="btn-B" icon="Refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <el-form-item> <!-- <el-form-item>
<el-button <el-button
type="primary" type="primary"
plain plain
...@@ -75,19 +85,44 @@ ...@@ -75,19 +85,44 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="manufacturerList" :data="manufacturerList"
@selection-change="handleSelectionChange"
style="width: 100%" style="width: 100%"
border> border
@selection-change="handleSelectionChange"
>
<!-- 固定左侧列 --> <!-- 固定左侧列 -->
<el-table-column label="序号" align="center" width="80" fixed="left" > <el-table-column label="序号" align="center" width="80" fixed="left">
<template #default="scope"> <template #default="scope">
{{scope.$index + 1}} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工厂编号" align="center" prop="factoryCode" width="180" fixed="left" /> <el-table-column
<el-table-column label="制造商" align="center" prop="manufacturer" width="210" fixed="left" /> label="工厂编号"
<el-table-column label="生产厂" align="center" prop="productionFactory" width="300" fixed="left" /> align="center"
<el-table-column label="生产地址" align="center" prop="productionAddress" width="300" fixed="left" /> prop="factoryCode"
width="180"
fixed="left"
/>
<el-table-column
label="制造商"
align="center"
prop="manufacturer"
width="210"
fixed="left"
/>
<el-table-column
label="生产厂"
align="center"
prop="productionFactory"
width="300"
fixed="left"
/>
<el-table-column
label="生产地址"
align="center"
prop="productionAddress"
width="300"
fixed="left"
/>
<!-- 可滚动部分 --> <!-- 可滚动部分 -->
<el-table-column prop="manufacturingFactory" label="制造工厂" width="150"> <el-table-column prop="manufacturingFactory" label="制造工厂" width="150">
...@@ -95,57 +130,136 @@ ...@@ -95,57 +130,136 @@
{{ formatFactoryDisplay(row.manufacturingFactory) }} {{ formatFactoryDisplay(row.manufacturingFactory) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="制造商名称（英文）" align="center" prop="manufacturerEn" width="250" /> <el-table-column
<el-table-column label="生产厂名称（英文）" align="center" prop="productionFactoryEn" width="200" /> label="制造商名称（英文）"
<el-table-column label="生产地址（英文）" align="center" prop="productionAddressEn" width="250" /> align="center"
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" /> prop="manufacturerEn"
<el-table-column label="更新人" align="center" prop="updateName" width="120" /> width="250"
/>
<el-table-column
label="生产厂名称（英文）"
align="center"
prop="productionFactoryEn"
width="200"
/>
<el-table-column
label="生产地址（英文）"
align="center"
prop="productionAddressEn"
width="250"
/>
<el-table-column
label="更新时间"
align="center"
prop="updateTime"
width="180"
/>
<el-table-column
label="更新人"
align="center"
prop="updateName"
width="120"
/>
<!-- 固定右侧操作列 --> <!-- 固定右侧操作列 -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="150"
fixed="right"
>
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['control:manufacturer:edit']" style='color: #0154FB'>编辑</el-button> <el-button
<el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['control:manufacturer:remove']" style='color: #DF5454'>删除</el-button> v-hasPermi="['control:manufacturer:edit']"
link
type="primary"
style="color: #0154fb"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button
v-hasPermi="['control:manufacturer:remove']"
link
type="primary"
style="color: #df5454"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改制造商管理对话框 --> <!-- 添加或修改制造商管理对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog v-model="open" :title="title" width="500px" append-to-body>
<el-form ref="manufacturerRef" :model="form" :rules="rules" label-width="130px"> <el-form
ref="manufacturerRef"
:model="form"
:rules="rules"
label-width="130px"
>
<el-form-item label="工厂编号" prop="factoryCode"> <el-form-item label="工厂编号" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编号" :disabled="isEditMode"/> <el-input
v-model="form.factoryCode"
placeholder="请输入工厂编号"
:disabled="isEditMode"
/>
</el-form-item> </el-form-item>
<el-form-item label="制造商" prop="manufacturer"> <el-form-item label="制造商" prop="manufacturer">
<el-input v-model="form.manufacturer" placeholder="请输入制造商" :disabled="isEditMode"/> <el-input
v-model="form.manufacturer"
placeholder="请输入制造商"
:disabled="isEditMode"
/>
</el-form-item> </el-form-item>
<el-form-item label="生产厂" prop="productionFactory"> <el-form-item label="生产厂" prop="productionFactory">
<el-input v-model="form.productionFactory" placeholder="请输入生产厂" :disabled="isEditMode"/> <el-input
v-model="form.productionFactory"
placeholder="请输入生产厂"
:disabled="isEditMode"
/>
</el-form-item> </el-form-item>
<el-form-item label="生产地址" prop="productionAddress"> <el-form-item label="生产地址" prop="productionAddress">
<el-input v-model="form.productionAddress" placeholder="请输入生产地址" :disabled="isEditMode"/> <el-input
v-model="form.productionAddress"
placeholder="请输入生产地址"
:disabled="isEditMode"
/>
</el-form-item> </el-form-item>
<el-form-item label="制造商（英文）" prop="manufacturerEn"> <el-form-item label="制造商（英文）" prop="manufacturerEn">
<el-input v-model="form.manufacturerEn" placeholder="请输入制造商英文" /> <el-input
v-model="form.manufacturerEn"
placeholder="请输入制造商英文"
/>
</el-form-item> </el-form-item>
<el-form-item label="生产厂（英文）" prop="productionFactoryEn"> <el-form-item label="生产厂（英文）" prop="productionFactoryEn">
<el-input v-model="form.productionFactoryEn" placeholder="请输入生产厂英文" /> <el-input
v-model="form.productionFactoryEn"
placeholder="请输入生产厂英文"
/>
</el-form-item> </el-form-item>
<el-form-item label="生产地址（英文）" prop="productionAddressEn"> <el-form-item label="生产地址（英文）" prop="productionAddressEn">
<el-input v-model="form.productionAddressEn" placeholder="请输入生产地址英文" /> <el-input
v-model="form.productionAddressEn"
placeholder="请输入生产地址英文"
/>
</el-form-item> </el-form-item>
<el-form-item label="制造工厂" prop="manufacturingFactory"> <el-form-item label="制造工厂" prop="manufacturingFactory">
<el-checkbox-group v-model="selectedFactories"> <el-checkbox-group v-model="selectedFactories">
<div style="display: flex; flex-wrap: wrap;"> <div style="display: flex; flex-wrap: wrap">
<div v-for="(factory, index) in allFactories" :key="index" style="width: 33%; margin-bottom: 10px;"> <div
v-for="(factory, index) in allFactories"
:key="index"
style="width: 33%; margin-bottom: 10px"
>
<el-checkbox :label="factory">{{ factory }}</el-checkbox> <el-checkbox :label="factory">{{ factory }}</el-checkbox>
</div> </div>
</div> </div>
...@@ -154,8 +268,8 @@ ...@@ -154,8 +268,8 @@
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button class="btn-B" @click="cancel">取 消</el-button>
<el-button @click="cancel">取 消</el-button> <el-button class="btn-A" @click="submitForm">保 存</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
...@@ -163,34 +277,40 @@ ...@@ -163,34 +277,40 @@
</template> </template>
<script setup name="Manufacturer"> <script setup name="Manufacturer">
import { reactive,ref,computed, watch,toRefs} from 'vue' import { reactive, ref, computed, watch, toRefs } from 'vue'
import { listManufacturer, getManufacturer, delManufacturer, addManufacturer, updateManufacturer} from "@/api/system/basicdata/manufacturer"; import {
import { getAllFactoryName } from "@/api/system/factory"; listManufacturer,
import { formatFactories } from '@/utils/factoryFormatter'; getManufacturer,
const { proxy } = getCurrentInstance(); delManufacturer,
const { sys_manufacture,production_factory } = proxy.useDict('sys_manufacture','production_factory') addManufacturer,
updateManufacturer,
const manufacturerList = ref([]); } from '@/api/system/basicdata/manufacturer'
const open = ref(false); import { getAllFactoryName } from '@/api/system/factory'
const loading = ref(true); import { formatFactories } from '@/utils/factoryFormatter'
const showSearch = ref(true); const { proxy } = getCurrentInstance()
const ids = ref([]); const { sys_manufacture, production_factory } = proxy.useDict(
const single = ref(true); 'sys_manufacture',
const multiple = ref(true); 'production_factory',
const total = ref(0); )
const title = ref("");
const manufacturerList = ref([])
const open = ref(false)
const loading = ref(true)
const showSearch = ref(true)
const ids = ref([])
const single = ref(true)
const multiple = ref(true)
const total = ref(0)
const title = ref('')
const formatFactoryDisplay = (factoryJson) => { const formatFactoryDisplay = (factoryJson) => {
return formatFactories(factoryJson); return formatFactories(factoryJson)
}; }
// 选中的工厂列表 // 选中的工厂列表
const selectedFactories = ref([]); const selectedFactories = ref([])
// 监听表单数据变化，初始化选中的工厂 // 监听表单数据变化，初始化选中的工厂
const data = reactive({ const data = reactive({
// 表单数据 // 表单数据
form: { form: {
...@@ -221,25 +341,25 @@ const data = reactive({ ...@@ -221,25 +341,25 @@ const data = reactive({
// 验证规则（仅保留用户需输入的字段） // 验证规则（仅保留用户需输入的字段）
rules: { rules: {
factoryCode: [ factoryCode: [
{ required: true, message: "工厂编号不能为空", trigger: "blur" } { required: true, message: '工厂编号不能为空', trigger: 'blur' },
], ],
manufacturer: [ manufacturer: [
{ required: true, message: "制造商不能为空", trigger: "blur" } { required: true, message: '制造商不能为空', trigger: 'blur' },
], ],
productionFactory: [ productionFactory: [
{ required: true, message: "生产厂不能为空", trigger: "blur" } { required: true, message: '生产厂不能为空', trigger: 'blur' },
], ],
productionAddress: [ productionAddress: [
{ required: true, message: "生产地址不能为空", trigger: "blur" } { required: true, message: '生产地址不能为空', trigger: 'blur' },
], ],
// 英文字段可选是否必填 // 英文字段可选是否必填
manufacturingFactory: [ manufacturingFactory: [
{ required: true, message: "请至少选择一个制造工厂", trigger: "change" } { required: true, message: '请至少选择一个制造工厂', trigger: 'change' },
] ],
} },
}); })
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data)
// 所有可选的工厂列表 // 所有可选的工厂列表
const allFactories = ref([]) const allFactories = ref([])
...@@ -248,42 +368,50 @@ const fetchFactories = async () => { ...@@ -248,42 +368,50 @@ const fetchFactories = async () => {
try { try {
const response = await getAllFactoryName() const response = await getAllFactoryName()
// 提取factoryName字段 // 提取factoryName字段
allFactories.value = response.data.map(item => item.factoryName) allFactories.value = response.data.map((item) => item.factoryName)
} catch (error) { } catch (error) {
console.error('获取工厂列表失败:', error) console.error('获取工厂列表失败:', error)
} }
} }
watch(() => form.value.manufacturingFactory, (newVal) => { watch(
try { () => form.value.manufacturingFactory,
const factoryObj = JSON.parse(newVal || '{}'); (newVal) => {
selectedFactories.value = Object.values(factoryObj); try {
} catch (e) { const factoryObj = JSON.parse(newVal || '{}')
selectedFactories.value = []; selectedFactories.value = Object.values(factoryObj)
} } catch (e) {
}, { immediate: true }); selectedFactories.value = []
}
},
{ immediate: true },
)
// 监听选中的工厂变化，更新表单数据 // 监听选中的工厂变化，更新表单数据
watch(selectedFactories, (newVal) => { watch(
const factoryObj = {}; selectedFactories,
newVal.forEach((item, index) => { (newVal) => {
factoryObj[index] = item; const factoryObj = {}
}); newVal.forEach((item, index) => {
form.value.manufacturingFactory = JSON.stringify(factoryObj); factoryObj[index] = item
}, { deep: true }); })
form.value.manufacturingFactory = JSON.stringify(factoryObj)
},
{ deep: true },
)
/** 查询制造商管理列表 */ /** 查询制造商管理列表 */
function getList() { function getList() {
loading.value = true; loading.value = true
listManufacturer(queryParams.value).then(response => { listManufacturer(queryParams.value).then((response) => {
manufacturerList.value = response.rows; manufacturerList.value = response.rows
total.value = response.total; total.value = response.total
loading.value = false; loading.value = false
}); })
} }
// 取消按钮 // 取消按钮
function cancel() { function cancel() {
open.value = false; open.value = false
reset(); reset()
} }
// 表单重置 // 表单重置
...@@ -303,90 +431,98 @@ function reset() { ...@@ -303,90 +431,98 @@ function reset() {
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
remark: null, remark: null,
delFlag: null delFlag: null,
}; }
proxy.resetForm("manufacturerRef"); proxy.resetForm('manufacturerRef')
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1
getList(); getList()
} }
/** 重置按钮操作 */ /** 重置按钮操作 */
function resetQuery() { function resetQuery() {
proxy.resetForm("queryRef"); proxy.resetForm('queryRef')
handleQuery(); handleQuery()
} }
// 多选框选中数据 // 多选框选中数据
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id); ids.value = selection.map((item) => item.id)
single.value = selection.length != 1; single.value = selection.length != 1
multiple.value = !selection.length; multiple.value = !selection.length
} }
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
reset(); reset()
open.value = true; open.value = true
title.value = "添加制造商管理"; title.value = '添加制造商管理'
} }
const isEditMode = computed(() => { const isEditMode = computed(() => {
return title.value === "编辑"; return title.value === '编辑'
}); })
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset()
const _id = row.id || ids.value const _id = row.id || ids.value
getManufacturer(_id).then(response => { getManufacturer(_id).then((response) => {
form.value = response.data; form.value = response.data
open.value = true; open.value = true
title.value = "编辑"; title.value = '编辑'
}); })
} }
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["manufacturerRef"].validate(valid => { proxy.$refs['manufacturerRef'].validate((valid) => {
if (valid) { if (valid) {
if (form.value.id != null) { if (form.value.id != null) {
updateManufacturer(form.value).then(response => { updateManufacturer(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess('修改成功')
open.value = false; open.value = false
getList(); getList()
}); })
} else { } else {
addManufacturer(form.value).then(response => { addManufacturer(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功"); proxy.$modal.msgSuccess('新增成功')
open.value = false; open.value = false
getList(); getList()
}); })
} }
} }
}); })
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _ids = row.id || ids.value; const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除制造商管理编号为"' + _ids + '"的数据项？').then(function() { proxy.$modal
return delManufacturer(_ids); .confirm('是否确认删除制造商管理编号为"' + _ids + '"的数据项？')
}).then(() => { .then(function () {
getList(); return delManufacturer(_ids)
proxy.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
getList()
proxy.$modal.msgSuccess('删除成功')
})
.catch(() => {})
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('control/manufacturer/export', { proxy.download(
...queryParams.value 'control/manufacturer/export',
}, `manufacturer_${new Date().getTime()}.xlsx`) {
...queryParams.value,
},
`manufacturer_${new Date().getTime()}.xlsx`,
)
} }
onMounted(() => { onMounted(() => {
fetchFactories(); fetchFactories()
}); })
getList(); getList()
</script> </script>
src/views/system/role/index.vue
View file @ afb00fa5
...@@ -32,14 +32,12 @@ ...@@ -32,14 +32,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button class="btn-A" icon="Search" @click="handleQuery"
type="primary"
icon="Search"
style="background: #0154fb"
@click="handleQuery"
>查询</el-button >查询</el-button
> >
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button class="btn-B" icon="Refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
<el-button <el-button
v-hasPermi="['system:role:add']" v-hasPermi="['system:role:add']"
...@@ -260,8 +258,8 @@ ...@@ -260,8 +258,8 @@
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button class="btn-A" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button class="btn-B" @click="cancel">取 消</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
...@@ -321,8 +319,8 @@ ...@@ -321,8 +319,8 @@
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitDataScope">确 定</el-button> <el-button class="btn-A" @click="submitDataScope">确 定</el-button>
<el-button @click="cancelDataScope">取 消</el-button> <el-button class="btn-B" @click="cancelDataScope">取 消</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
......
src/views/system/role/selectUser.vue
View file @ afb00fa5
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
</el-row> </el-row>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="handleSelectUser">确 定</el-button> <el-button class="btn-A" @click="handleSelectUser">确 定</el-button>
<el-button @click="visible = false">取 消</el-button> <el-button class="btn-B" @click="visible = false">取 消</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment