角色管理

src/api/system/basicdata/manufacturer.js

+import request from '@/utils/request'
+
+// 查询制造商管理列表
+export function listManufacturer(query) {
+  return request({
+    url: '/control/manufacturer/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询制造商管理详细
+export function getManufacturer(id) {
+  return request({
+    url: '/control/manufacturer/' + id,
+    method: 'get'
+  })
+}
+
+// 新增制造商管理
+export function addManufacturer(data) {
+  return request({
+    url: '/control/manufacturer',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改制造商管理
+export function updateManufacturer(data) {
+  return request({
+    url: '/control/manufacturer',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除制造商管理
+export function delManufacturer(id) {
+  return request({
+    url: '/control/manufacturer/' + id,
+    method: 'delete'
+  })
+}
+export function getfactory(){
+  return request({
+    url: '/control/manufacturer/factory',
+    method: 'get'
+  })
+}

src/layout/components/Navbar.vue

@@ -238,7 +238,6 @@ function toggleTheme() {
           font-size: 12px;
         }
       }
-      avatar-wrapper-name
     }
   }
 }

src/views/system/basicdata/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="工厂编号" prop="factoryCode">
+        <el-input
+          v-model="queryParams.factoryCode"
+          placeholder="请输入工厂编号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="制造商" prop="manufacturer">
+        <el-input
+          v-model="queryParams.manufacturer"
+          placeholder="请输入制造商"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生产厂" prop="productionFactory">
+        <el-input
+          v-model="queryParams.productionFactory"
+          placeholder="请输入生产厂"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生产地址" prop="productionAddress">
+        <el-input
+          v-model="queryParams.productionAddress"
+          placeholder="请输入生产地址"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['control:manufacturer:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="manufacturerList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="工厂编号" align="center" prop="factoryCode" />
+      <el-table-column label="制造商" align="center" prop="manufacturer" />
+      <el-table-column label="生产厂" align="center" prop="productionFactory" />
+      <el-table-column label="生产地址" align="center" prop="productionAddress" />
+      <el-table-column label="制造工厂" align="center" prop="manufacturingFactory" />
+      <el-table-column label="制造商名称（英文）" align="center" prop="manufacturerEn" />
+      <el-table-column label="生产厂名称（英文）" align="center" prop="productionFactoryEn" />
+      <el-table-column label="生产地址（英文）" align="center" prop="productionAddressEn" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['control:manufacturer:edit']">编辑</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['control:manufacturer:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改制造商管理对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="manufacturerRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="工厂编号" prop="factoryCode">
+          <el-input v-model="form.factoryCode" placeholder="请输入工厂编号" />
+        </el-form-item>
+        <el-form-item label="制造商" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入制造商" />
+        </el-form-item>
+        <el-form-item label="生产厂" prop="productionFactory">
+          <el-input v-model="form.productionFactory" placeholder="请输入生产厂" />
+        </el-form-item>
+        <el-form-item label="生产地址" prop="productionAddress">
+          <el-input v-model="form.productionAddress" placeholder="请输入生产地址" />
+        </el-form-item>
+        <el-form-item label="制造商（英文）" prop="manufacturerEn">
+          <el-input v-model="form.manufacturerEn" placeholder="请输入制造商英文" />
+        </el-form-item>
+        <el-form-item label="生产厂（英文）" prop="productionFactoryEn">
+          <el-input v-model="form.productionFactoryEn" placeholder="请输入生产厂英文" />
+        </el-form-item>
+        <el-form-item label="生产地址（英文）" prop="productionAddressEn">
+          <el-input v-model="form.productionAddressEn" placeholder="请输入生产地址英文" />
+        </el-form-item>
+        <div>
+          <FactorySelector
+            :initialData="initialFactoryData"
+            @update-success="handleUpdateSuccess"
+            @cancel="handleCancel"
+          />
+        </div>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Manufacturer">
+import { ref } from 'vue'
+import { listManufacturer, getManufacturer, delManufacturer, addManufacturer, updateManufacturer,getfactory } from "@/api/system/basicdata/manufacturer";
+
+const { proxy } = getCurrentInstance();
+
+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 initialFactoryData = ref({}) // 从API获取的初始数据
+
+
+const loadInitialData=function getFactoryList() {
+  getfactory().then(response => {
+    initialFactoryData.value = response.rows;
+  });
+}
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    factoryCode: null,
+    manufacturer: null,
+    productionFactory: null,
+    productionAddress: null,
+    manufacturerEn: null,
+    productionFactoryEn: null,
+    productionAddressEn: null,
+    manufacturingFactory: null,
+  },
+  rules: {
+    factoryCode: [
+      { required: true, message: "工厂编号不能为空", trigger: "blur" }
+    ],
+    manufacturer: [
+      { required: true, message: "制造商不能为空", trigger: "blur" }
+    ],
+    productionFactory: [
+      { required: true, message: "生产厂不能为空", trigger: "blur" }
+    ],
+    productionAddress: [
+      { required: true, message: "生产地址不能为空", trigger: "blur" }
+    ],
+    manufacturerEn: [
+      { required: true, message: "制造商英文不能为空", trigger: "blur" }
+    ],
+    productionFactoryEn: [
+      { required: true, message: "生产厂英文不能为空", trigger: "blur" }
+    ],
+    productionAddressEn: [
+      { required: true, message: "生产地址英文不能为空", trigger: "blur" }
+    ],
+    manufacturingFactory: [
+      { required: true, message: "制造工厂不能为空", trigger: "blur" }
+    ],
+    createBy: [
+      { required: true, message: "创建人不能为空", trigger: "blur" }
+    ],
+    createTime: [
+      { required: true, message: "创建时间不能为空", trigger: "blur" }
+    ],
+    updateBy: [
+      { required: true, message: "更新人不能为空", trigger: "blur" }
+    ],
+    updateTime: [
+      { required: true, message: "更新时间不能为空", trigger: "blur" }
+    ],
+    delFlag: [
+      { required: true, message: "删除状态不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询制造商管理列表 */
+function getList() {
+  loading.value = true;
+  listManufacturer(queryParams.value).then(response => {
+    manufacturerList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    factoryCode: null,
+    manufacturer: null,
+    productionFactory: null,
+    productionAddress: null,
+    manufacturerEn: null,
+    productionFactoryEn: null,
+    productionAddressEn: null,
+    manufacturingFactory: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    remark: null,
+    delFlag: null
+  };
+  proxy.resetForm("manufacturerRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+  loadInitialData();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加制造商管理";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _id = row.id || ids.value
+  getManufacturer(_id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "编辑";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["manufacturerRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateManufacturer(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+          loadInitialData();
+        });
+      } else {
+        addManufacturer(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+          loadInitialData();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除制造商管理编号为"' + _ids + '"的数据项？').then(function() {
+    return delManufacturer(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('control/manufacturer/export', {
+    ...queryParams.value
+  }, `manufacturer_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>

src/views/system/role/index.vue

@@ -16,15 +16,6 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入权限字符"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -40,70 +31,22 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker
-          v-model="dateRange"
-          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="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <el-form-item class="addRoleBtn">
         <el-button
           v-hasPermi="['system:role:add']"
           type="primary"
-          plain
           icon="Plus"
           @click="handleAdd"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:role:edit']"
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:role:remove']"
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:role:export']"
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          >导出</el-button
-        >
-      </el-col>
-      <right-toolbar
-        v-model:show-search="showSearch"
-        @query-table="getList"
-      ></right-toolbar>
+        >新建角色</el-button>
+      </el-form-item>
+
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+
     </el-row>
 
     <!-- 表格数据 -->
@@ -113,7 +56,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="序号" prop="roleId" width="120" />
       <el-table-column
         label="角色名称"
         prop="roleName"
@@ -127,7 +70,7 @@
         width="150"
       />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
+      <el-table-column label="角色状态" align="center" width="100">
         <template #default="scope">
           <el-switch
             v-model="scope.row.status"
@@ -142,6 +85,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="updateTime">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -726,3 +674,9 @@ function cancelDataScope() {
 
 getList()
 </script>
+<style scoped>
+.addRoleBtn{
+  margin-left: 420px;
+  margin-right: 0px;
+}
+</style>