From cc7fcb20d847bbd9dc451a1a1f38168e7835fbc4 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 12 Nov 2025 09:22:06 +0800
Subject: [PATCH] =?UTF-8?q?1.0.28=20=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/base/materialInfo/types.ts    | 10 +++++++++
 src/api/system/user/types.ts             |  2 ++
 src/components/MaterialSelect/index.vue  |  2 +-
 src/enums/OAEnum.ts                      |  8 ++++++-
 src/views/oa/base/materialInfo/index.vue | 28 +++++++++++++++---------
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/api/oa/base/materialInfo/types.ts b/src/api/oa/base/materialInfo/types.ts
index da2d01f..2d68536 100644
--- a/src/api/oa/base/materialInfo/types.ts
+++ b/src/api/oa/base/materialInfo/types.ts
@@ -176,6 +176,16 @@ export interface MaterialInfoQuery extends PageQuery {
    */
   activeFlag?: string;
 
+  /**
+   * 排序字段
+   */
+  orderByColumn?: string;
+
+  /**
+   * 排序方向
+   */
+  isAsc?: string;
+
   /**
    * 日期范围参数
    */
diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index 8b6924e..9c22283 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -47,6 +47,8 @@ export interface UserVO extends BaseEntity {
   roleIds: any;
   postIds: any;
   roleId: any;
+  chargeId: any;
+  deputyId: any;
   admin: boolean;
 }
 
diff --git a/src/components/MaterialSelect/index.vue b/src/components/MaterialSelect/index.vue
index 560c1f3..9690089 100644
--- a/src/components/MaterialSelect/index.vue
+++ b/src/components/MaterialSelect/index.vue
@@ -50,7 +50,7 @@
               <vxe-column type="checkbox" width="50" align="center" />
 <!--              <vxe-column key="materialId" title="物料ID" align="center" field="materialId" />-->
               <vxe-column key="materialCode" title="SAP物料编码" align="center" field="materialCode" width="120" />
-              <vxe-column key="materialName" title="SAP物料名称" align="center" field="materialName" width="120" />
+              <vxe-column key="materialName" title="SAP物料名称" align="center" field="materialName" width="320" />
               <vxe-column key="materialBrand" title="物料品牌" align="center" field="materialBrand" width="120" />
               <vxe-column key="materialModel" title="物料型号" align="center" field="materialModel" width="120" />
               <vxe-column key="unitName" title="物料单位" align="center" field="unitName" />
diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts
index 94e82c7..409e69f 100644
--- a/src/enums/OAEnum.ts
+++ b/src/enums/OAEnum.ts
@@ -48,10 +48,16 @@ export enum ProjectCategoryEnum {
  * 流程定义编码枚举
  */
 export enum FlowCodeEnum {
+
   /**
-   * 合同编号规则
+   * 合同标识KEY
    */
   CONTRACT_CODE = 'OAC',
 
+  /**
+   * 市场项目标识KEY
+   */
+  PROJECT_KEY = 'xmsq',
+
 
 }
diff --git a/src/views/oa/base/materialInfo/index.vue b/src/views/oa/base/materialInfo/index.vue
index 7105d5c..d7081d2 100644
--- a/src/views/oa/base/materialInfo/index.vue
+++ b/src/views/oa/base/materialInfo/index.vue
@@ -53,11 +53,11 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" border :data="materialInfoList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" border :data="materialInfoList" @selection-change="handleSelectionChange" @sort-change="handleSortChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[0].visible" />
-        <el-table-column label="SAP物料编码" align="center" prop="materialCode" width="120" v-if="columns[2].visible" />
-        <el-table-column label="SAP物料名称" align="center" prop="materialName" width="220" v-if="columns[3].visible" />
+        <el-table-column label="SAP物料编码" align="center" prop="materialCode" width="140" sortable="custom" v-if="columns[2].visible" />
+        <el-table-column label="SAP物料名称" align="center" prop="materialName" width="320" sortable="custom" v-if="columns[3].visible" />
         <el-table-column label="物料品牌" align="center" prop="materialBrand" width="120" v-if="columns[4].visible" />
         <el-table-column label="物料型号" align="center" prop="materialModel" width="120" v-if="columns[5].visible" />
         <el-table-column label="物料单位" align="center" prop="unitName" v-if="columns[6].visible" />
@@ -122,9 +122,9 @@
         <el-form-item label="备货期" prop="stockingPeriod">
           <el-input-number v-model="form.stockingPeriod" placeholder="请输入备货期" style="width: 240px" />
         </el-form-item>
-<!--        <el-form-item label="备注" prop="remark">-->
-<!--          <el-input v-model="form.remark" placeholder="请输入备注" />-->
-<!--        </el-form-item>-->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
 <!--        <el-form-item label="激活标识" prop="activeFlag">-->
 <!--          <el-radio-group v-model="form.activeFlag">-->
 <!--            <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>-->
@@ -186,7 +186,7 @@ const columns = ref<FieldOption[]>([
   { key: 8, label: `采购单价(元)`, visible: true },
   { key: 9, label: `售前对外单价(元)`, visible: true },
   { key: 10, label: `备货期`, visible: true },
-  { key: 11, label: `备注`, visible: false },
+  { key: 11, label: `备注`, visible: true },
   { key: 12, label: `激活标识`, visible: false },
   { key: 13, label: `删除标志`, visible: false },
   { key: 14, label: `创建部门`, visible: false },
@@ -225,12 +225,13 @@ const data = reactive<PageData<MaterialInfoForm, MaterialInfoQuery>>({
     foreignPrice: undefined,
     stockingPeriod: undefined,
     activeFlag: undefined,
+    orderByColumn: undefined,
+    isAsc: undefined,
     params: {}
   },
   rules: {
-    materielCode: [{ required: true, message: 'SAP物料编码不能为空', trigger: 'blur' }],
-    materielName: [{ required: true, message: 'SAP物料名称不能为空', trigger: 'blur' }],
-    unitId: [{ required: true, message: '物料单位不能为空', trigger: 'blur' }]
+    materialCode: [{ required: true, message: 'SAP物料编码不能为空', trigger: 'blur' }],
+    materialName: [{ required: true, message: 'SAP物料名称不能为空', trigger: 'blur' }]
   }
 });
 
@@ -276,6 +277,13 @@ const handleSelectionChange = (selection: MaterialInfoVO[]) => {
   multiple.value = !selection.length;
 };
 
+/** 排序触发事件 */
+const handleSortChange = (column: any) => {
+  queryParams.value.orderByColumn = column.prop;
+  queryParams.value.isAsc = column.order;
+  getList();
+};
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();