Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/md/sizeGroup.js

+import request from '@/utils/request'
+
+// 查询尺码组列表
+export function listGroup(query) {
+  return request({
+    url: '/md/group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询尺码组详细
+export function getGroup(sizeGroupId) {
+  return request({
+    url: '/md/group/' + sizeGroupId,
+    method: 'get'
+  })
+}
+
+// 新增尺码组
+export function addGroup(data) {
+  return request({
+    url: '/md/group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改尺码组
+export function updateGroup(data) {
+  return request({
+    url: '/md/group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除尺码组
+export function delGroup(sizeGroupId) {
+  return request({
+    url: '/md/group/' + sizeGroupId,
+    method: 'delete'
+  })
+}

src/api/mes/md/sizeGroupItem.js

+import request from '@/utils/request'
+
+// 查询尺码组明细列表
+export function listItem(query) {
+  return request({
+    url: '/md/item/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询尺码组明细详细
+export function getItem(sizeGroupItemId) {
+  return request({
+    url: '/md/item/' + sizeGroupItemId,
+    method: 'get'
+  })
+}
+
+// 新增尺码组明细
+export function addItem(data) {
+  return request({
+    url: '/md/item',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改尺码组明细
+export function updateItem(data) {
+  return request({
+    url: '/md/item',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除尺码组明细
+export function delItem(sizeGroupItemId) {
+  return request({
+    url: '/md/item/' + sizeGroupItemId,
+    method: 'delete'
+  })
+}

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

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="尺码组编码" prop="sizeGroupCode">
+        <el-input
+          v-model="queryParams.sizeGroupCode"
+          placeholder="请输入尺码组编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="尺码组名称" prop="sizeGroupName">
+        <el-input
+          v-model="queryParams.sizeGroupName"
+          placeholder="请输入尺码组名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="尺码组类型" prop="sizeType">
+        <el-select v-model="queryParams.sizeType" placeholder="请选择尺码组类型" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </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>
+        <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 :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:group:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:group:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:group:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:group:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="groupList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="尺码组id" align="center" prop="sizeGroupId" />
+      <el-table-column label="尺码组编码" align="center" prop="sizeGroupCode" />
+      <el-table-column label="尺码组名称" align="center" prop="sizeGroupName" />
+      <el-table-column label="尺码组类型" align="center" prop="sizeType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.size_type" :value="scope.row.sizeType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否启用" align="center" prop="enableFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:group:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:group:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改尺码组对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-row>
+            <el-col :span="10">
+              <el-form-item label="尺码组类型" label-width="100px" prop="sizeType">
+                <el-select v-model="form.sizeType" placeholder="请选择尺码组类型">
+                  <el-option
+                    v-for="dict in dict.type.size_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="是否启用" label-width="100px" prop="enableFlag">
+                <el-input v-model="form.enableFlag" placeholder="请输入是否启用" />
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="尺码组编码" label-width="100px" prop="sizeGroupCode">
+              <el-input v-model="form.sizeGroupCode" placeholder="请输入尺码组编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="尺码组名称" label-width="100px" prop="sizeGroupName">
+              <el-input v-model="form.sizeGroupName" placeholder="请输入尺码组名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <SizeGroupItem v-if="form.sizeGroupId" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/mes/md/sizeGroup";
+import SizeGroupItem from './item/index.vue'
+export default {
+  name: "Group",
+  dicts:['size_type'],
+  components: {SizeGroupItem},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 尺码组表格数据
+      groupList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sizeGroupCode: null,
+        sizeGroupName: null,
+        sizeType: null,
+        enableFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询尺码组列表 */
+    getList() {
+      this.loading = true;
+      listGroup(this.queryParams).then(response => {
+        this.groupList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        sizeGroupId: null,        sizeGroupCode: null,        sizeGroupName: null,        sizeType: null,        enableFlag: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.sizeGroupId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加尺码组";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const sizeGroupId = row.sizeGroupId || this.ids
+      getGroup(sizeGroupId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改尺码组";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.sizeGroupId != null) {
+            updateGroup(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGroup(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const sizeGroupIds = row.sizeGroupId || this.ids;
+      this.$modal.confirm('是否确认删除尺码组编号为"' + sizeGroupIds + '"的数据项？').then(function() {
+        return delGroup(sizeGroupIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/group/export', {
+        ...this.queryParams
+      }, `group_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/mes/md/sizegroup/item/index.vue

+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="80px"
+    >
+      <el-form-item label="尺码组ID" prop="sizeGroupId">
+        <el-input
+          v-model="queryParams.sizeGroupId"
+          placeholder="请输入尺码组ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="明细序号" prop="sizeIndex">
+        <el-input
+          v-model="queryParams.sizeIndex"
+          placeholder="请输入尺码组明细序号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="尺码名称" prop="sizeName">
+        <el-input
+          v-model="queryParams.sizeName"
+          placeholder="请输入尺码名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="显示名称" prop="sizeDisplayName">
+        <el-input
+          v-model="queryParams.sizeDisplayName"
+          placeholder="请输入显示名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:item:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:item:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:item:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:item:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="itemList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="尺码组明细ID" align="center" prop="sizeGroupItemId" />
+      <el-table-column label="尺码组ID" align="center" prop="sizeGroupId" /> -->
+      <el-table-column
+        label="序号"
+        align="center"
+        prop="sizeIndex"
+        width="80"
+      />
+      <el-table-column label="尺码名称" align="center" prop="sizeName" />
+      <el-table-column label="显示名称" align="center" prop="sizeDisplayName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        width="120"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:item:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:item:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改尺码组明细对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <!-- <el-form-item label="尺码组ID" prop="sizeGroupId">
+          <el-input v-model="form.sizeGroupId" placeholder="请输入尺码组ID" />
+        </el-form-item> -->
+        <el-form-item label="尺码名称" prop="sizeName">
+          <el-input v-model="form.sizeName" placeholder="请输入尺码名称" />
+        </el-form-item>
+        <el-form-item label="显示名称" prop="sizeDisplayName">
+          <el-input
+            v-model="form.sizeDisplayName"
+            placeholder="请输入显示名称"
+          />
+        </el-form-item>
+        <el-form-item label="明细序号" prop="sizeIndex">
+          <el-input-number
+            v-model="form.sizeIndex"
+            placeholder="请输入尺码组明细序号"
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listItem,
+  getItem,
+  delItem,
+  addItem,
+  updateItem,
+} from "@/api/mes/md/sizeGroupItem";
+
+export default {
+  name: "Item",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 尺码组明细表格数据
+      itemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sizeGroupId: null,
+        sizeIndex: null,
+        sizeName: null,
+        sizeDisplayName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询尺码组明细列表 */
+    getList() {
+      this.loading = true;
+      listItem(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        sizeGroupItemId: null,
+        sizeGroupId: null,
+        sizeIndex: null,
+        sizeName: null,
+        sizeDisplayName: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.sizeGroupItemId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加尺码组明细";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const sizeGroupItemId = row.sizeGroupItemId || this.ids;
+      getItem(sizeGroupItemId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改尺码组明细";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.sizeGroupItemId != null) {
+            updateItem(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addItem(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const sizeGroupItemIds = row.sizeGroupItemId || this.ids;
+      this.$modal
+        .confirm(
+          '是否确认删除尺码组明细编号为"' + sizeGroupItemIds + '"的数据项？'
+        )
+        .then(function () {
+          return delItem(sizeGroupItemIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "md/item/export",
+        {
+          ...this.queryParams,
+        },
+        `item_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>