feat(订单明细): 添加删除订单明细功能

feat(辅料管理): 新增辅料变动记录功能

feat(仪表拓扑): 在仪表标签中显示上次抄表记录

fix(设备管理): 修复图片预览空值问题

refactor(员工管理): 部门树显示负责人信息

style(备件变动): 优化备件变动页面布局

docs(订单记录): 更新操作类型映射表

test(销售异议): 新增销售异议管理模块

chore: 更新.gitignore文件

klp-ui/src/views/mes/eqp/auxiliary/index.vue

@@ -0,0 +1,404 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="辅料名称" prop="auxiliaryName">
+        <el-input
+          v-model="queryParams.auxiliaryName"
+          placeholder="请输入备件名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="辅料品类" prop="materialCategory">
+        <el-input
+          v-model="queryParams.materialCategory"
+          placeholder="请输入物料品类"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="辅料品牌" prop="auxiliaryModel">
+        <el-input
+          v-model="queryParams.auxiliaryModel"
+          placeholder="请输入辅料品牌"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计量单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入计量单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="关联设备" prop="equipmentId">
+        <el-select v-model="queryParams.equipmentId" placeholder="请选择关联设备" filterable>
+          <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
+        </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-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"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AuxiliaryMaterialList" @row-click="handleRowClick" highlight-current-row @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="辅料名称" align="center" prop="auxiliaryName" />
+      <el-table-column label="辅料品类" align="center" prop="materialCategory" />
+      <el-table-column label="辅料品牌" align="center" prop="auxiliaryModel" />
+      <el-table-column label="计量单位" align="center" prop="unit" />
+      <!-- <el-table-column label="关联设备" align="center" prop="equipmentName" /> -->
+      <el-table-column label="当前库存" align="center" prop="quantity" />
+      <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.native.stop="handleAddChange(scope.row)"
+          >增加</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click.native.stop="handleReduce(scope.row)"
+          >减少</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click.native.stop="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click.native.stop="handleDelete(scope.row)"
+          >删除</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="80px">
+        <el-form-item label="辅料名称" prop="auxiliaryName">
+          <el-input v-model="form.auxiliaryName" placeholder="请输入辅料名称" />
+        </el-form-item>
+        <el-form-item label="辅料品类" prop="materialCategory">
+          <el-input v-model="form.materialCategory" placeholder="请输入辅料品类" />
+        </el-form-item>
+        <el-form-item label="辅料品牌" prop="auxiliaryModel">
+          <el-input v-model="form.auxiliaryModel" placeholder="请输入辅料品牌" />
+        </el-form-item>
+        <el-form-item label="计量单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入计量单位" />
+        </el-form-item>
+        <!-- <el-form-item label="关联设备ID" prop="equipmentId">
+          <el-select v-model="form.equipmentId" placeholder="请选择关联设备ID" filterable>
+            <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="库存变动" :visible.sync="changeOpen" width="500px" append-to-body>
+      <el-form ref="changeForm" :model="changeForm" label-width="80px">
+        <el-form-item label="变动类型">
+          <el-select v-model="changeForm.changeType" placeholder="请选择变动类型">
+            <el-option label="增加" value="增加" />
+            <el-option label="减少" value="减少" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="变动数量">
+          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入变动数量" size="mini"/>
+        </el-form-item>
+        <el-form-item label="变动原因">
+          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入变动原因" size="mini"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="changeSubmitForm">确 定</el-button>
+        <el-button @click="changeCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 辅料变动记录对话框 -->
+    <auxiliaryChange ref="auxiliaryChange" v-if="currentRow.auxiliaryId" :auxiliaryId="currentRow.auxiliaryId" />
+    <el-empty v-else description="请选择辅料查看变动记录" />
+  </div>
+</template>
+
+<script>
+import { listAuxiliaryMaterial, getAuxiliaryMaterial, delAuxiliaryMaterial, addAuxiliaryMaterial, updateAuxiliaryMaterial } from "@/api/mes/eqp/auxiliaryMaterial";
+import { changeStock } from "@/api/mes/eqp/auxiliaryMaterialChange";
+import auxiliaryChange from '../components/pages/auxiliaryChange.vue';
+
+export default {
+  name: "Auxiliary",
+  components: {
+    auxiliaryChange
+  },
+  data() {
+    return {
+      currentRow: {},
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 辅料表格数据
+      AuxiliaryMaterialList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        auxiliaryName: undefined,
+        materialCategory: undefined,
+        auxiliaryModel: undefined,
+        unit: undefined,
+        equipmentId: undefined,
+        quantity: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      equipmentList: [],
+      changeOpen: false,
+      changeTitle: '',
+      changeForm: {},
+    };
+  },
+  created() {
+    this.getList();
+    // this.getEquipmentList();
+  },
+  methods: {
+    /** 查询辅料列表 */
+    // getEquipmentList() {
+    //   listEquipmentManagement({ pageNum: 1, pageSize: 1000 }).then(response => {
+    //     this.equipmentList = response.rows;
+    //   });
+    // },
+    getList() {
+      this.loading = true;
+      listAuxiliaryMaterial(this.queryParams).then(response => {
+        this.AuxiliaryMaterialList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleRowClick(row) {
+      this.currentRow = row;
+    },
+    handleAddChange(row) {
+      this.changeOpen = true;
+      this.changeForm = {
+        changeType: '增加',
+        auxiliaryId: row.auxiliaryId,
+      }
+    },
+    handleReduce(row) {
+      this.changeOpen = true;
+      this.changeForm = {
+        changeType: '减少',
+        auxiliaryId: row.auxiliaryId,
+      }
+    },
+    changeCancel() {
+      this.changeOpen = false;
+    },
+    changeSubmitForm() {
+      this.buttonLoading = true;
+      changeStock(this.changeForm).then(response => {
+        this.buttonLoading = false;
+        this.$modal.msgSuccess("操作成功");
+        this.getList();
+        this.$refs["partChange"].getList();
+      }).finally(() => {
+        this.buttonLoading = false;
+        this.changeCancel();
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        auxiliaryId: undefined,
+        auxiliaryName: undefined,
+        materialCategory: undefined,
+        auxiliaryModel: undefined,
+        unit: undefined,
+        equipmentId: undefined,
+        quantity: 0,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.auxiliaryId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加辅料";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const auxiliaryId = row.auxiliaryId || this.ids
+      getAuxiliaryMaterial(auxiliaryId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改辅料";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.auxiliaryId != null) {
+            updateAuxiliaryMaterial(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addAuxiliaryMaterial(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const auxiliaryIds = row.auxiliaryId || this.ids;
+      this.$modal.confirm('是否确认删除辅料编号为"' + auxiliaryIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delAuxiliaryMaterial(auxiliaryIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('eqp/AuxiliaryMaterial/export', {
+        ...this.queryParams
+      }, `AuxiliaryMaterial_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>