Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/modules/srmSupplier/supplierList.vue

src/views/modules/srmBaseInformation/srmSupplierAddress.vue

@@ -0,0 +1,94 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -10px;">
+      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 33px">{{buttons.search}}</el-button>
+    </el-form>
+
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</a>
+          <a type="text" size="small" @click="deleteHandle(scope.row.id)">删除</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        min-width="20%"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </div>
+</template>
+
+<script>
+
+  import {} from "@/api/sysLanguage.js"
+
+  export default {
+    name: "null",
+    data() {
+      return {
+        height: 200,
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 9002,
+            serialNumber: '9002tBlbasedataId',
+            tableId: "9002Blbasedata",
+            tableName: "工厂信息表",
+            columnProp: "id",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工厂id",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 50
+          },
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 240;
+      })
+    },
+    methods: {},
+    created() {
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/srmBaseInformation/srmSupplierCurrency.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="mod-config">
+    <!-- 查询条件 -->
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="货币代码">
+        <el-input v-model="searchData.currency" clearable style="width: 120px" placeholder="货币代码"></el-input>
+      </el-form-item>
+      <el-form-item label="货币描述">
+        <el-input v-model="searchData.currencyDesc" clearable style="width: 160px" placeholder="货币描述"></el-input>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select v-model="searchData.active" clearable placeholder="状态" style="width: 120px">
+          <el-option label="启用" value="Y"></el-option>
+          <el-option label="禁用" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-button type="primary" @click="getDataList()">查询</el-button>
+        <el-button type="primary" @click="addModal()">新增</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 主表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        prop="currency"
+        header-align="center"
+        align="left"
+        width="120"
+        label="货币代码">
+      </el-table-column>
+      <el-table-column
+        prop="currencyDesc"
+        header-align="center"
+        align="left"
+        min-width="150"
+        label="货币描述"
+        show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="center"
+        width="120"
+        label="站点">
+      </el-table-column>
+      <el-table-column
+        prop="active"
+        header-align="center"
+        align="center"
+        width="100"
+        label="状态">
+        <template slot-scope="scope">
+          <span>{{ scope.row.active === 'Y' ? '启用' : '禁用' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="baseCurrency"
+        header-align="center"
+        align="center"
+        width="120"
+        label="基础货币">
+        <template slot-scope="scope">
+          <span>{{ scope.row.baseCurrency === 'Y' ? '是' : '否' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="120"
+        label="操作">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" @click="updateModal(scope.row)">编辑 |</el-link>
+          <el-link style="cursor: pointer" @click="deleteHandle(scope.row)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 新增/修改对话框 -->
+    <el-dialog :title="modalTitle" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="415px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" ref="modalForm" style="margin-left: 7px;">
+        <el-form-item label="货币代码" prop="currency" :rules="rules.currency">
+          <el-input v-model="modalData.currency" :disabled="modalDisableFlag" style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="active">
+          <el-select v-model="modalData.active" style="width: 100px">
+            <el-option label="启用" value="Y"></el-option>
+            <el-option label="禁用" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="基础货币" prop="baseCurrency">
+          <el-select v-model="modalData.baseCurrency" style="width: 100px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;">
+        <el-form-item label="货币描述" prop="currencyDesc" :rules="rules.currencyDesc">
+          <el-input v-model="modalData.currencyDesc" style="width: 325px"></el-input>
+        </el-form-item>
+        <el-form-item label="站点" prop="site" :rules="rules.site" v-if="modalData.flag === '2'">
+          <el-input v-model="modalData.site" disabled style="width: 325px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { srmCurrencyApi } from '@/api/srm/srmCurrency.js'
+
+export default {
+  name: "srmSupplierCurrency",
+  data() {
+    return {
+      height: 300,
+      dataList:[],
+      dataListLoading: false,
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      searchData: {
+        currency: '',
+        currencyDesc: '',
+        active: '',
+        baseCurrency: '',
+        site: this.$store.state.user.site
+      },
+      modalFlag: false,
+      modalTitle: '',
+      modalDisableFlag: false,
+      isEdit: false,
+      modalData: {
+        currency: '',
+        currencyDesc: '',
+        site: this.$store.state.user.site,
+        active: 'Y',
+        baseCurrency: 'N'
+      },
+      rules: {
+        currency: [
+          { required: true, message: '请输入货币代码', trigger: 'blur' }
+        ],
+        currencyDesc: [
+          { required: true, message: '请输入货币描述', trigger: 'blur' }
+        ],
+        site: [
+          { required: true, message: '请输入站点', trigger: 'blur' }
+        ],
+        active: [
+          { required: true, message: '请选择状态', trigger: 'change' }
+        ],
+        baseCurrency: [
+          { required: true, message: '请选择是否基础货币', trigger: 'change' }
+        ]
+      },
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 240;
+    })
+    // 初始化数据
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true
+      const params = {
+        ...this.searchData,
+        page: this.pageIndex,
+        limit: this.pageSize
+      }
+
+      srmCurrencyApi.getCurrencyListWithPaging(params).then(({data}) => {
+        if (data && data.code === 0) {
+          const pageData = data.data || data.page
+          this.dataList = pageData && pageData.list ? pageData.list : pageData
+          if(pageData && pageData.currPage) {
+            this.pageIndex = pageData.currPage
+            this.pageSize = pageData.pageSize
+            this.totalPage = pageData.totalCount
+          } else {
+            this.totalPage = this.dataList ? this.dataList.length : 0
+          }
+        } else {
+          this.$message.error(data.msg || '获取数据失败')
+        }
+      }).catch(error => {
+        console.error('获取货币列表失败:', error)
+        this.$message.error('获取数据失败: ' + (error.message || '网络错误'))
+      }).finally(() => {
+        this.dataListLoading = false
+      })
+    },
+
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // 新增
+    addModal() {
+      this.modalTitle = '新增货币'
+      this.isEdit = false
+      this.modalDisableFlag = false
+      this.modalData = {
+        currency: '',
+        currencyDesc: '',
+        site: this.$store.state.user.site || this.$store.state.user.currentSite || '',  // 设置默认值但不显示在界面上
+        active: 'Y',
+        baseCurrency: 'N',
+        flag: '1'
+      }
+      this.$nextTick(() => {
+        if (this.$refs.modalForm) {
+          this.$refs.modalForm.clearValidate()
+        }
+      })
+      this.modalFlag = true
+    },
+
+    // 修改
+    updateModal(row) {
+      this.modalTitle = '修改货币'
+      this.isEdit = true
+      this.modalDisableFlag = true
+      this.modalData = {
+        currency: row.currency,
+        currencyDesc: row.currencyDesc,
+        site: row.site,
+        active: row.active,
+        baseCurrency: row.baseCurrency
+      }
+      this.$nextTick(() => {
+        if (this.$refs.modalForm) {
+          this.$refs.modalForm.clearValidate()
+        }
+      })
+      this.modalFlag = true
+    },
+
+    // 保存数据
+    saveData() {
+      this.$refs.modalForm.validate((valid) => {
+        if (valid) {
+          const saveData = { ...this.modalData }
+          let apiCall
+          
+          if (this.modalData.flag === '1') {
+            apiCall = srmCurrencyApi.addCurrency(saveData)
+          } else {
+            apiCall = srmCurrencyApi.updateCurrency(saveData)
+          }
+          
+          apiCall.then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500
+              })
+              // 立即关闭弹窗并刷新数据，不依赖 onclose 回调
+              this.modalFlag = false
+              this.getDataList()
+            } else {
+              this.$message.error(data.msg || '操作失败')
+            }
+          }).catch(error => {
+            console.error('保存货币失败:', error)
+            this.$message.error('保存失败: ' + (error.message || '网络错误'))
+          })
+        } else {
+          return false
+        }
+      })
+    },
+
+    // 删除
+    deleteHandle(row) {
+      this.$confirm(`确定删除此货币吗？货币代码：${row.currency}`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          currency: row.currency,
+          site: row.site
+        }
+
+        srmCurrencyApi.deleteCurrency(params).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '删除成功',
+              type: 'success',
+              duration: 1500
+            })
+            // 立即刷新数据，不依赖 onclose 回调
+            this.getDataList()
+          } else {
+            this.$message.error(data.msg || '删除失败')
+          }
+        }).catch(error => {
+          console.error('删除货币失败:', error)
+          this.$message.error('删除失败: ' + (error.message || '网络错误'))
+        })
+      }).catch(() => {
+        this.$message.info('已取消删除')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.mod-config {
+  padding: 20px;
+}
+</style>

src/views/modules/srmBaseInformation/srmSupplierGroup.vue

@@ -0,0 +1,489 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="供应商分组代码">
+        <el-input v-model="searchData.supplierGroup" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="供应商分组描述">
+        <el-input v-model="searchData.groupDesc" clearable style="width: 200px"></el-input>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select v-model="searchData.active" clearable style="width: 120px">
+          <el-option label="启用" value="Y"></el-option>
+          <el-option label="禁用" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-button v-if="authSearch" type="primary" @click="getDataList()">查询</el-button>
+        <el-button v-if="authSave" type="primary" @click="addModal()">新增</el-button>
+        <el-button @click="exportExcel()" type="primary" style="margin-left: 2px">导出</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">
+            <span v-if="columnsProp.includes(item.columnProp)">{{ scope.row[`${item.columnProp}Desc`] }}</span>
+            <span v-else>
+              {{ scope.row[item.columnProp] }}
+            </span>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="120"
+        label="操作">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" v-if="authUpdate" @click="updateModal(scope.row)">编辑 |</el-link>
+          <el-link style="cursor: pointer" v-if="authDelete" @click="deleteSupplierGroup(scope.row)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页栏 -->
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <el-dialog title="供应商分组" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="415px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;">
+        <el-form-item label="供应商分组代码" prop="supplierGroup" :rules="rules.supplierGroup">
+          <el-input v-model="modalData.supplierGroup" :disabled="modalDisableFlag" style="width: 100px"></el-input>
+        </el-form-item>
+        <el-form-item label="分组类型" prop="groupType">
+          <el-select v-model="modalData.groupType" style="width: 100px">
+            <el-option label="Group1" value="Y"></el-option>
+            <el-option label="Group2" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="active">
+          <el-select v-model="modalData.active" style="width: 100px">
+            <el-option label="启用" value="Y"></el-option>
+            <el-option label="禁用" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;">
+        <el-form-item label="供应商分组描述" prop="groupDesc" :rules="rules.groupDesc">
+          <el-input v-model="modalData.groupDesc" style="width: 325px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    getSupplierGroupList,
+    addSupplierGroup,
+    updateSupplierGroup,
+    deleteSupplierGroup
+  } from "@/api/srm/srmGroup.js"
+  import excel from "@/utils/excel-util.js";
+
+  export default {
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.supplierGroup = this.searchData.supplierGroup.toUpperCase()
+        }
+      },
+      modalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modalData.supplierGroup = this.modalData.supplierGroup.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+        columnsProp:['createdBy','updateBy','status'],
+        // 导出
+        exportName: "供应商分组" + this.dayjs().format('YYYYMMDDHHmmss'),
+        searchData: {
+          site: '',
+          supplierGroup: '',
+          groupDesc: '',
+          active: '',
+          groupType: '',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 20,
+        totalPage: 0,
+        dataList: [],
+        modalFlag: false,
+        modalDisableFlag: false,
+        modalData: {
+          supplierGroup: '',
+          groupDesc: '',
+          site: '',
+          active: '',
+          groupType: '',
+          createBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name
+        },
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: '812001',
+            serialNumber: '812001TableSupplierGroup',
+            tableId: '812001Table',
+            tableName: "供应商分组表",
+            columnProp: 'supplierGroup',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '供应商分组代码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: '812001',
+            serialNumber: '812001TableGroupDesc',
+            tableId: "812001Table",
+            tableName: "供应商分组表",
+            columnProp: 'groupDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '供应商分组描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: '812001',
+            serialNumber: '812001TableGroupType',
+            tableId: "812001Table",
+            tableName: "供应商分组表",
+            columnProp: 'groupType',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '分组类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: '812001',
+            serialNumber: '812001TableActive',
+            tableId: "812001Table",
+            tableName: "供应商分组表",
+            columnProp: 'active',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '状态',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          }
+        ],
+        rules: {
+          supplierGroup: [
+            {
+              required: true,
+              message: '请输入供应商分组代码',
+              trigger: ['blur','change']
+            }
+          ],
+          groupDesc: [
+            {
+              required: true,
+              message: '请输入供应商分组描述',
+              trigger: ['blur','change']
+            }
+          ],
+          site: [
+            {
+              required: false,
+              message: '请输入Site',
+              trigger: ['blur','change'],
+              validator: (rule, value, callback) => {
+                if (this.modalData.flag === '2' && (!value || value === '')) {
+                  callback(new Error('编辑时请输入Site'))
+                } else {
+                  callback()
+                }
+              }
+            }
+          ]
+        },
+        authSearch: false,
+        authSave: false,
+        authUpdate: false,
+        authDelete: false,
+        menuId: this.$route.meta.menuId || 'srmGroup',
+      }
+    },
+
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 180
+      })
+    },
+
+    created () {
+      // 按钮控制
+      this.getButtonAuthData()
+      // 无论是否有查询权限，都获取数据列表
+      this.getDataList()
+    },
+
+    methods: {
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+      async exportExcel() {
+        const params = {
+          ...this.searchData,
+          limit: -1,
+          page: 1
+        };
+
+        excel.exportTable({
+          url: "/srmGroup/getSupplierGroupList",
+          columnMapping: this.columnList,
+          mergeSetting: [],
+          params: params,
+          fileName: this.exportName + ".xlsx",
+          // 返回包含rows字段的对象，让excel工具能够正确提取数据
+          rowFetcher: res => {
+            if (res && res.data && res.data.code === 0) {
+              return { rows: res.data.data || [] };
+            }
+            return { rows: [] };
+          },
+          columnFormatter: [],
+          dropColumns: [],
+        });
+      },
+
+      // 获取数据列表
+      getDataList () {
+        // 准备请求参数
+        const params = {
+          ...this.searchData,
+          page: this.pageIndex,
+          limit: this.pageSize
+        };
+
+        getSupplierGroupList(params).then(({data}) => {
+          if (data && data.code === 0) {
+            const pageData = data.data || data.page;
+            this.dataList = pageData && pageData.list ? pageData.list : pageData;
+            if(pageData && pageData.currPage) {
+              this.pageIndex = pageData.currPage;
+              this.pageSize = pageData.pageSize;
+              this.totalPage = pageData.totalCount;
+            } else {
+              // 如果返回的数据格式不包含分页信息，根据实际返回数据处理
+              this.totalPage = this.dataList ? this.dataList.length : 0;
+            }
+          } else {
+            this.$message.error(data.msg || '获取数据失败')
+          }
+         }).catch(error => {
+          console.error('获取供应商分组列表失败:', error)
+          this.$message.error('获取数据失败: ' + (error.message || '网络错误'))
+        })
+      },
+
+      addModal () {
+        this.modalData = {
+          supplierGroup: '',
+          groupDesc: '',
+          site: this.$store.state.user.currentSite || '', // 使用当前用户默认站点
+          active: 'Y',
+          groupType: 'Group1',
+          createBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name,
+          flag: '1'
+        }
+        this.modalDisableFlag = false
+        this.modalFlag = true
+      },
+
+      updateModal (row) {
+        this.modalData = {
+          supplierGroup: row.supplierGroup,
+          groupDesc: row.groupDesc,
+          site: row.site,
+          active: row.active,
+          groupType: row.groupType,
+          createBy: row.createBy,
+          updateBy: this.$store.state.user.name,
+          flag: '2'
+        }
+        this.modalDisableFlag = true
+        this.modalFlag = true
+      },
+
+      // 删除
+      deleteSupplierGroup (row) {
+        this.$confirm(`确定删除此供应商分组吗？分组代码：${row.supplierGroup}`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const deleteData = {
+            supplierGroup: row.supplierGroup,
+            site: row.site
+          };
+
+          deleteSupplierGroup(deleteData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          }).catch(error => {
+            console.error('删除供应商分组失败:', error)
+            this.$message.error('删除失败: ' + (error.message || '网络错误'))
+          })
+        }).catch(() => {
+          this.$message.info('已取消删除')
+        })
+      },
+
+      saveData () {
+        if (this.modalData.supplierGroup === '' || this.modalData.supplierGroup == null) {
+          this.$message.warning('请输入供应商分组代码！')
+          return
+        }
+        if (this.modalData.groupDesc === '' || this.modalData.groupDesc == null) {
+          this.$message.warning('请输入供应商分组描述！')
+          return
+        }
+
+        if (this.modalData.flag === '1') {
+          addSupplierGroup(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          }).catch(error => {
+            console.error('保存供应商分组失败:', error)
+            this.$message.error('保存失败: ' + (error.message || '网络错误'))
+          })
+        } else {
+          updateSupplierGroup(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          }).catch(error => {
+            console.error('更新供应商分组失败:', error)
+            this.$message.error('更新失败: ' + (error.message || '网络错误'))
+          })
+        }
+      },
+
+      //获取按钮的权限数据
+      getButtonAuthData () {
+        let searchFlag = this.isAuth(this.menuId+":search")
+        let saveFlag = this.isAuth(this.menuId+":save")
+        let updateFlag = this.isAuth(this.menuId+":update")
+        let deleteFlag = this.isAuth(this.menuId+":delete")
+        //处理页面的权限数据
+        this.authSearch = !searchFlag
+        this.authSave = !saveFlag
+        this.authUpdate = !updateFlag
+        this.authDelete = !deleteFlag
+      },
+    }
+  }
+</script>
+<style scoped lang="scss">
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>

src/views/modules/srmSupplier/supplierList.vue

@@ -402,7 +402,11 @@
 /* 组件 */
 
 import {
-  searchSupplierGroupRequestList, searchSrmSupplierList, createSrmSupplier, updateSrmSupplier, deleteSrmSupplier
+  searchSupplierGroupRequestList,
+  searchSrmSupplierList,
+  createSrmSupplier,
+  updateSrmSupplier,
+  deleteSrmSupplier
 } from '@/api/srm/srmSupplier.js'
 import excel from '@/utils/excel-util.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'