diff --git a/src/api/oa/base/materialInfo/types.ts b/src/api/oa/base/materialInfo/types.ts
index 2d68536..3ec5c8d 100644
--- a/src/api/oa/base/materialInfo/types.ts
+++ b/src/api/oa/base/materialInfo/types.ts
@@ -59,6 +59,11 @@ export interface MaterialInfoVO {
*/
activeFlag: string;
+ /**
+ * 添加方式(1物料页面 2合同页面 3导入)
+ */
+ addMethod?: string;
+
}
export interface MaterialInfoForm extends BaseEntity {
@@ -122,6 +127,11 @@ export interface MaterialInfoForm extends BaseEntity {
*/
activeFlag?: string;
+ /**
+ * 添加方式(1物料页面 2合同页面 3导入)
+ */
+ addMethod?: string;
+
}
export interface MaterialInfoQuery extends PageQuery {
@@ -176,6 +186,11 @@ export interface MaterialInfoQuery extends PageQuery {
*/
activeFlag?: string;
+ /**
+ * 添加方式(1物料页面 2合同页面 3导入)
+ */
+ addMethod?: string;
+
/**
* 排序字段
*/
diff --git a/src/views/oa/base/materialInfo/index.vue b/src/views/oa/base/materialInfo/index.vue
index d7081d2..8d627d2 100644
--- a/src/views/oa/base/materialInfo/index.vue
+++ b/src/views/oa/base/materialInfo/index.vue
@@ -66,11 +66,29 @@
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
@@ -113,12 +131,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -147,7 +165,7 @@ import { MaterialInfoVO, MaterialInfoQuery, MaterialInfoForm } from '@/api/oa/ba
import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { active_flag } = toRefs(proxy?.useDict('active_flag'));
+const { active_flag, add_method } = toRefs(proxy?.useDict('active_flag', 'add_method'));
const materialInfoList = ref([]);
const buttonLoading = ref(false);
@@ -183,11 +201,12 @@ const columns = ref([
{ key: 5, label: `物料型号`, visible: true },
{ key: 6, label: `物料单位`, visible: true },
{ key: 7, label: `物料参数`, visible: true },
- { key: 8, label: `采购单价(元)`, visible: true },
- { key: 9, label: `售前对外单价(元)`, visible: true },
+ { key: 8, label: `采购单价(元)`, visible: false },
+ { key: 9, label: `售前对外单价(元)`, visible: false },
{ key: 10, label: `备货期`, visible: true },
{ key: 11, label: `备注`, visible: true },
{ key: 12, label: `激活标识`, visible: false },
+ { key: 19, label: `添加方式`, visible: false },
{ key: 13, label: `删除标志`, visible: false },
{ key: 14, label: `创建部门`, visible: false },
{ key: 15, label: `创建人`, visible: false },
@@ -208,7 +227,8 @@ const initFormData: MaterialInfoForm = {
foreignPrice: undefined,
stockingPeriod: undefined,
remark: undefined,
- activeFlag: undefined
+ activeFlag: undefined,
+ addMethod: undefined
};
const data = reactive>({
form: { ...initFormData },
@@ -225,6 +245,7 @@ const data = reactive>({
foreignPrice: undefined,
stockingPeriod: undefined,
activeFlag: undefined,
+ addMethod: undefined,
orderByColumn: undefined,
isAsc: undefined,
params: {}