yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.59 物料信息添加方式字段

Browse Source
dev
yinq 1 week ago
parent 3ae0922a9f
commit 9dd0195934
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File

15
src/api/oa/base/materialInfo/types.ts
Unescape Escape View File

@ -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;
/**
* 排序字段
*/

41
src/views/oa/base/materialInfo/index.vue
Unescape Escape View File

@ -66,11 +66,29 @@
<el-table-column label="售前对外单价(元)" align="center" prop="foreignPrice" width="130" v-if="columns[9].visible" />
<el-table-column label="备货期" align="center" prop="stockingPeriod" v-if="columns[10].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible" />
<el-table-column label="添加方式" align="center" prop="addMethod" width="120" v-if="columns[19].visible">
<template #default="scope">
<dict-tag :options="add_method" :value="scope.row.addMethod" />
</template>
</el-table-column>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[12].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag" />
</template>
</el-table-column>
<el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[14].visible" />
<el-table-column label="创建人" align="center" prop="createName" v-if="columns[15].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[16].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateName" v-if="columns[17].visible" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[18].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -113,12 +131,12 @@
<el-form-item label="物料参数" prop="materialParameter">
<el-input v-model="form.materialParameter" placeholder="请输入物料参数" />
</el-form-item>
<el-form-item label="采购单价(元)" prop="purchasePrice">
<el-input-number v-model="form.purchasePrice" placeholder="请输入采购单价(元)" style="width: 240px" />
</el-form-item>
<el-form-item label="售前对外单价(元)" prop="foreignPrice">
<el-input-number v-model="form.foreignPrice" placeholder="请输入售前对外单价(元)" style="width: 240px" />
</el-form-item>
<!-- <el-form-item label="采购单价(元)" prop="purchasePrice">-->
<!-- <el-input-number v-model="form.purchasePrice" placeholder="请输入采购单价(元)" style="width: 240px" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="售前对外单价(元)" prop="foreignPrice">-->
<!-- <el-input-number v-model="form.foreignPrice" placeholder="请输入售前对外单价(元)" style="width: 240px" />-->
<!-- </el-form-item>-->
<el-form-item label="备货期" prop="stockingPeriod">
<el-input-number v-model="form.stockingPeriod" placeholder="请输入备货期" style="width: 240px" />
</el-form-item>
@ -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<any>(proxy?.useDict('active_flag'));
const { active_flag, add_method } = toRefs<any>(proxy?.useDict('active_flag', 'add_method'));
const materialInfoList = ref<MaterialInfoVO[]>([]);
const buttonLoading = ref(false);
@ -183,11 +201,12 @@ const columns = ref<FieldOption[]>([
{ 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<PageData<MaterialInfoForm, MaterialInfoQuery>>({
form: { ...initFormData },
@ -225,6 +245,7 @@ const data = reactive<PageData<MaterialInfoForm, MaterialInfoQuery>>({
foreignPrice: undefined,
stockingPeriod: undefined,
activeFlag: undefined,
addMethod: undefined,
orderByColumn: undefined,
isAsc: undefined,
params: {}

Write Preview
Loading…
Cancel
Save