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 @@
-
+
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 @@
-
+
-
-
+
+
@@ -122,9 +122,9 @@
-
-
-
+
+
+
@@ -186,7 +186,7 @@ const columns = ref([
{ 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>({
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();