新增品牌及品牌联系人功能

src/api/mes/md/brand.js

 import request from '@/utils/request'
 
-// 查询生产用途列表
+// 查询品牌列表
 export function listBrand(query) {
   return request({
     url: '/mes/md/brand/list',
@@ -9,7 +9,7 @@ export function listBrand(query) {
   })
 }
 
-// 查询所有有效生产用途
+// 查询所有品牌
 export function listAllBrand() {
   return request({
     url: '/mes/md/brand/listAll',
@@ -18,7 +18,7 @@ export function listAllBrand() {
 }
 
 
-// 查询生产用途详细
+// 查询品牌详细
 export function getBrand(brandId) {
   return request({
     url: '/mes/md/brand/' + brandId,
@@ -26,7 +26,7 @@ export function getBrand(brandId) {
   })
 }
 
-// 新增生产用途
+// 新增品牌
 export function addBrand(data) {
   return request({
     url: '/mes/md/brand',
@@ -35,7 +35,7 @@ export function addBrand(data) {
   })
 }
 
-// 修改生产用途
+// 修改品牌
 export function updateBrand(data) {
   return request({
     url: '/mes/md/brand',
@@ -44,7 +44,7 @@ export function updateBrand(data) {
   })
 }
 
-// 删除生产用途
+// 删除品牌
 export function delBrand(brandId) {
   return request({
     url: '/mes/md/brand/' + brandId,

src/api/mes/md/brandcontact.js

+import request from '@/utils/request'
+
+// 查询品牌联系人列表
+export function listContact(query) {
+  return request({
+    url: '/md/contact/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品牌联系人详细
+export function getContact(brandContactId) {
+  return request({
+    url: '/md/contact/' + brandContactId,
+    method: 'get'
+  })
+}
+
+// 新增品牌联系人
+export function addContact(data) {
+  return request({
+    url: '/md/contact',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品牌联系人
+export function updateContact(data) {
+  return request({
+    url: '/md/contact',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌联系人
+export function delContact(brandContactId) {
+  return request({
+    url: '/md/contact/' + brandContactId,
+    method: 'delete'
+  })
+}
+
+// 查询品牌列表（不传参查所有）
+export function listBrand(query) {
+  return request({
+    url: '/md/contact/listBrand',
+    method: 'get',
+    params: query
+  })
+}

src/views/mes/md/brand/index.vue

@@ -24,22 +24,29 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="集团" prop="group">
+      <el-form-item label="集团" prop="groupName">
         <el-input
-          v-model="queryParams.group"
+          v-model="queryParams.groupName"
           placeholder="请输入集团"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="enableFlag">
-        <el-input
-          v-model="queryParams.enableFlag"
-          placeholder="请输入是否启用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+          <el-form-item label="是否启用" prop="enableFlag">
+            <el-select
+              v-model="queryParams.enableFlag"
+              placeholder="是否启用"
+              clearable
+              style="width: 215px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -132,7 +139,7 @@
       <el-table-column
         label="集团"
         align="center"
-        prop="group"
+        prop="groupName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -278,8 +285,8 @@
         </el-row>
         <el-row>
           <el-col :span="7">
-            <el-form-item label="集团" prop="group">
-              <el-input v-model="form.group" placeholder="请输入所属集团名称" />
+            <el-form-item label="集团" prop="groupName">
+              <el-input v-model="form.groupName" placeholder="请输入所属集团名称" />
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -389,11 +396,12 @@ export default {
         pageSize: 10,
         brandCode: null,
         brandName: null,
-        group: null,
+        groupName: null,
         enableFlag: null,
       },
       // 表单参数
       form: {},
+      brandList:[],
       // 表单校验
       rules: {
         brandCode: [
@@ -402,7 +410,7 @@ export default {
         brandName: [
           { required: true, message: "品牌名称不能为空", trigger: "blur" },
         ],
-        group: [
+        groupName: [
           { required: true, message: "集团不能为空", trigger: "blur" },
         ],
         enableFlag: [
@@ -435,7 +443,7 @@ export default {
         brandId: null,
         brandCode: null,
         brandName: null,
-        group: null,
+        groupName: null,
         address: null,
         salesContact: null,
         devContact: null,
@@ -465,7 +473,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.usageId);
+      this.ids = selection.map((item) => item.brandId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -494,7 +502,7 @@ export default {
       getBrand(brandId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改生产用途";
+        this.title = "修改品牌信息";
         this.optType = "edit";
       });
     },
@@ -519,12 +527,14 @@ export default {
       });
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      const usageIds = row.usageId || this.ids;
+    handleDelete() {
+      const brandIds = this.ids.join(',');
+      console.log(brandIds)
+      
       this.$modal
-        .confirm("是否确认删除生产用途？")
+        .confirm("是否确认删除品牌？")
         .then(function () {
-          return delUsage(usageIds);
+          return delBrand(brandIds);
         })
         .then(() => {
           this.getList();