From f6405d21714438971fe4ae6630279f4b6d12862f Mon Sep 17 00:00:00 2001
From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com>
Date: Tue, 6 Jan 2026 13:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E8=B4=A7=E6=9D=A1=E6=AC=BE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/baseInformation/srmDeliveryTerm.js    |  16 +
 .../srmBaseInformation/srmDeliveryTerm.vue    | 456 ++++++++++++++++++
 .../srmBaseInformation/srmSupplierGroup.vue   |  14 -
 3 files changed, 472 insertions(+), 14 deletions(-)
 create mode 100644 src/api/baseInformation/srmDeliveryTerm.js
 create mode 100644 src/views/modules/srmBaseInformation/srmDeliveryTerm.vue

diff --git a/src/api/baseInformation/srmDeliveryTerm.js b/src/api/baseInformation/srmDeliveryTerm.js
new file mode 100644
index 0000000..08f4586
--- /dev/null
+++ b/src/api/baseInformation/srmDeliveryTerm.js
@@ -0,0 +1,16 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+// 获取交货条款列表
+export const getDeliveryTermListWithPaging = (params) => createAPI('/srmDeliveryTerm/getDeliveryTermListWithPaging', 'POST', params)
+
+// 新增交货条款
+export const saveDeliveryTerm = (params) => createAPI('/srmDeliveryTerm/saveDeliveryTerm', 'POST', params)
+
+// 更新交货条款
+export const updateDeliveryTerm = (params) => createAPI('/srmDeliveryTerm/updateDeliveryTerm', 'POST', params)
+
+// 删除交货条款
+export const deleteDeliveryTerm = (params) =>  createAPI('/srmDeliveryTerm/deleteDeliveryTerm', 'POST', params)
+
+// 根据ID获取交货条款
+export const getDeliveryTermById = (params) =>  createAPI('/srmDeliveryTerm/getDeliveryTermById', 'POST', params)
diff --git a/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue
new file mode 100644
index 0000000..26dfa21
--- /dev/null
+++ b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue
@@ -0,0 +1,456 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="交货条款代码">
+        <el-input v-model="searchData.deliveryTermId" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="交货条款描述">
+        <el-input v-model="searchData.deliveryTerm" 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
+      v-loading="dataListLoading"
+      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="deleteDeliveryTerm(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;" ref="modalForm">
+        <el-form-item label="交货条款代码" prop="deliveryTermId">
+          <el-input v-model="modalData.deliveryTermId" :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>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;" ref="modalForm">
+        <el-form-item label="交货条款描述" prop="deliveryTerm">
+          <el-input v-model="modalData.deliveryTerm" 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 {
+    getDeliveryTermListWithPaging,
+    saveDeliveryTerm,
+    updateDeliveryTerm,
+    deleteDeliveryTerm,
+    getDeliveryTermById
+  } from "@/api/baseInformation/srmDeliveryTerm.js"
+  import excel from "@/utils/excel-util.js";
+
+  export default {
+    data () {
+      return {
+        columnsProp:['createdBy','updateBy','status'],
+        // 导出
+        exportName: "交货条款" + this.dayjs().format('YYYYMMDDHHmmss'),
+        searchData: {
+          site: '',
+          deliveryTermId: '',
+          deliveryTerm: '',
+          active: '',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 20,
+        totalPage: 0,
+        dataList: [],
+        dataListLoading: false,
+        modalFlag: false,
+        modalDisableFlag: false,
+        modalData: {
+          deliveryTermId: '',
+          deliveryTerm: '',
+          site: '',
+          active: '',
+          createBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name
+        },
+        // 展示列集
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: '9002',
+            serialNumber: '9002TableDeliveryTermId',
+            tableId: '9002Table',
+            tableName: "交货条款表",
+            columnProp: 'deliveryTermId',
+            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: '9002',
+            serialNumber: '9002TableDeliveryTerm',
+            tableId: "9002Table",
+            tableName: "交货条款表",
+            columnProp: 'deliveryTerm',
+            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: '9002',
+            serialNumber: '9002TableActive',
+            tableId: "9002Table",
+            tableName: "交货条款表",
+            columnProp: 'active',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '状态',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          }
+        ],
+        rules: {
+          deliveryTermId: [
+            {
+              required: true,
+              message: '请输入交货条款代码',
+              trigger: 'blur'
+            }
+          ],
+          deliveryTerm: [
+            {
+              required: true,
+              message: '请输入交货条款描述',
+              trigger: 'blur'
+            }
+          ]
+        },
+        authSearch: false,
+        authSave: false,
+        authUpdate: false,
+        authDelete: false,
+        menuId: this.$route.meta.menuId || 'srmDeliveryTerm',
+      }
+    },
+
+    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: "/srmDeliveryTerm/getDeliveryTermListWithPaging",
+          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 () {
+        this.dataListLoading = true;
+        // 准备请求参数
+        const params = {
+          ...this.searchData,
+          page: this.pageIndex,
+          limit: this.pageSize
+        };
+
+        getDeliveryTermListWithPaging(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;
+        })
+      },
+
+      addModal () {
+        this.modalData = {
+          deliveryTermId: '',
+          deliveryTerm: '',
+          site: this.$store.state.user.currentSite || '', // 使用当前用户默认站点
+          active: 'Y',
+          createBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name,
+          flag: '1'
+        }
+        this.modalDisableFlag = false
+        this.modalFlag = true
+        this.$nextTick(() => {
+          // 清除表单验证
+          if (this.$refs.modalForm) {
+            this.$refs.modalForm.clearValidate();
+          }
+        });
+      },
+
+      updateModal (row) {
+        this.modalData = {
+          deliveryTermId: row.deliveryTermId,
+          deliveryTerm: row.deliveryTerm,
+          site: row.site,
+          active: row.active,
+          createBy: row.createBy,
+          updateBy: this.$store.state.user.name,
+          flag: '2'
+        }
+        this.modalDisableFlag = true
+        this.modalFlag = true
+        this.$nextTick(() => {
+          // 清除表单验证
+          if (this.$refs.modalForm) {
+            this.$refs.modalForm.clearValidate();
+          }
+        });
+      },
+
+      // 删除
+      deleteDeliveryTerm (row) {
+        this.$confirm(`确定删除此交货条款吗？条款代码：${row.deliveryTermId}`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const deleteData = {
+            deliveryTermId: row.deliveryTermId,
+            site: row.site
+          };
+
+          deleteDeliveryTerm(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 () {
+        // 手动验证所有字段
+        let valid = true;
+        if (!this.modalData.deliveryTermId || this.modalData.deliveryTermId.trim() === '') {
+          valid = false;
+        }
+        if (!this.modalData.deliveryTerm || this.modalData.deliveryTerm.trim() === '') {
+          valid = false;
+        }
+
+        if (valid) {
+          if (this.modalData.flag === '1') {
+            saveDeliveryTerm(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 {
+            updateDeliveryTerm(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 {
+          // 触发表单验证，显示错误样式
+          this.$refs.modalForm.validate(() => {});
+        }
+      },
+
+      //获取按钮的权限数据
+      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>
\ No newline at end of file
diff --git a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue
index 06a1c49..b06be73 100644
--- a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue
+++ b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue
@@ -242,20 +242,6 @@
               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,