dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

功能完善

Browse Source
This commit is contained in:
“hhk” 2024-08-12 11:27:44 +08:00
parent 8a8bb098f0
commit 82bfc26af3
9 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/dict.js
View File

@ -128,6 +128,8 @@ export const DICT_TYPE = {
COMPANY_PROP_STATUS: 'company_prop_status',
//存放类型
COMPANY_DEPOSIT_TYPE: 'company_deposit_type',
COMPANY_COST_TYPE: 'company_cost_type',
}
/**

2
src/views/base/carmain/CarMainForm.vue
View File

@ -96,7 +96,7 @@
<el-row :gutter="2">
<el-col :span="11">
<el-form-item label="最近办理业务" prop="recentlyHandledBusiness">
<el-select v-model="formData.recentlyHandledBusiness" placeholder="请选择业务类别">
<el-select v-model="formData.recentlyHandledBusiness" placeholder="请选择业务类别" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_CUS_BUSI_TYPE)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>

6
src/views/base/carmain/index.vue
View File

@ -107,7 +107,7 @@
</template>
</el-table-column>
<el-table-column label="发动机号码" align="center" prop="engineNumber" width="180" />
<el-table-column label="车架号" align="center" prop="vin" width="150" />
<el-table-column label="车架号" align="center" prop="vin" width="180" />
<el-table-column label="车辆品牌" align="center" prop="brandStr" />
<el-table-column label="车辆型号" align="center" prop="modelStr" />
<!-- <el-table-column label="保养日期" align="center" prop="maintenanceDate" width="180">
@ -147,12 +147,12 @@
<span>{{ parseTime(scope.row.carRegisterDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" width="130">
<el-table-column label="最近办理业务" align="center" prop="recentlyHandledBusiness" width="120">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.recentlyHandledBusiness" />
</template>
</el-table-column>
<el-table-column label="最近办理业务的时间" align="center" prop="recentlyHandleBusinessTime" width="150">
<el-table-column label="最近业务时间" align="center" prop="recentlyHandleBusinessTime" width="120">
<template v-slot="scope">
<span>{{ parseTime(scope.row.recentlyHandleBusinessTime, '{y}-{m}-{d}') }}</span>
</template>

8
src/views/base/property/PropertyForm.vue
View File

@ -82,9 +82,7 @@
<el-input v-model="formData.voucherNo" placeholder="请输入凭证号" />
</el-form-item>
<el-form-item label="维修/保养周期单位" prop="keepCycleType">
<el-select v-model="formData.keepCycleType" placeholder="请选择维修/保养周期单位">
<el-option label="请选择字典生成" value="" />
</el-select>
<el-input v-model="formData.keepCycleType" placeholder="请选择维修/保养周期单位" />
</el-form-item>
<el-form-item label="维修/保养周期" prop="keepCycle">
<el-input v-model="formData.keepCycle" placeholder="请输入维修/保养周期" />
@ -93,10 +91,10 @@
<el-date-picker clearable v-model="formData.lastKeepDate" type="date" value-format="timestamp"
placeholder="选择上次维修/保养日期" />
</el-form-item>
<el-form-item label="下次维修/保养日期" prop="nextKeepDate">
<!-- <el-form-item label="下次维修/保养日期" prop="nextKeepDate">
<el-date-picker clearable v-model="formData.nextKeepDate" type="date" value-format="timestamp"
placeholder="选择下次维修/保养日期" />
</el-form-item>
</el-form-item> -->
<el-form-item label="附件urls">
<FileUpload v-model="formData.fileUrls" />
</el-form-item>

52
src/views/base/property/index.vue
View File

@ -135,21 +135,25 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="企业id" align="center" prop="corpId" />
<el-table-column label="部门id" align="center" prop="deptId" />
<el-table-column label="存放位置" align="center" prop="posId" />
<el-table-column label="使用人id" align="center" prop="userId" />
<el-table-column label="资产编号" align="center" prop="propNo" />
<el-table-column label="资产名称" align="center" prop="propName" />
<el-table-column label="存放位置" align="center" prop="posId" />
<el-table-column label="资产编号" align="center" prop="propNo" />
<el-table-column label="资产分类" align="center" prop="propCatg" />
<el-table-column label="预计使用年限" align="center" prop="useYear" />
<el-table-column label="价值类型" align="center" prop="costType">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.COMPANY_COST_TYPE" :value="scope.row.costType" />
</template>
</el-table-column>
<el-table-column label="资产数量" align="center" prop="propNum" />
<el-table-column label="资产原值（元）" align="center" prop="costTotal" />
<el-table-column label="预计使用年限" align="center" prop="useYear" width="100" />
<el-table-column label="资产数量" align="center" prop="propNum" >
<template v-slot="scope">
{{ scope.row.propNum + " " + scope.row.unit }}
</template>
</el-table-column>
<!-- <el-table-column label="数量计量单位" align="center" prop="unit" /> -->
<!-- <el-table-column label="资产原值（元）" align="center" prop="costTotal" /> -->
<el-table-column label="资产状态" align="center" prop="propStatus">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.COMPANY_PROP_STATUS" :value="scope.row.propStatus" />
@ -157,26 +161,32 @@
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="规格型号" align="center" prop="spec" />
<el-table-column label="生产厂家" align="center" prop="factory" />
<el-table-column label="出场序列号/编号" align="center" prop="serialNo" />
<el-table-column label="数量计量单位" align="center" prop="unit" />
<!-- <el-table-column label="生产厂家" align="center" prop="factory" /> -->
<!-- <el-table-column label="出场序列号/编号" align="center" prop="serialNo" /> -->
<el-table-column label="取得日期" align="center" prop="getDate" />
<el-table-column label="出厂日期" align="center" prop="prodDate" />
<!-- <el-table-column label="出厂日期" align="center" prop="prodDate" /> -->
<el-table-column label="供应商" align="center" prop="supplier" />
<el-table-column label="启用日期" align="center" prop="openDate" />
<el-table-column label="净值（元）" align="center" prop="netValue" />
<el-table-column label="凭证号" align="center" prop="voucherNo" />
<el-table-column label="维修/保养周期单位" align="center" prop="keepCycleType" />
<el-table-column label="维修/保养周期" align="center" prop="keepCycle" />
<el-table-column label="上次维修/保养日期" align="center" prop="lastKeepDate" />
<el-table-column label="下次维修/保养日期" align="center" prop="nextKeepDate" />
<el-table-column label="附件urls" align="center" prop="fileUrls" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="净值（元）" align="center" prop="netValue" width="120" />
<el-table-column label="凭证号" align="center" prop="voucherNo" width="120"/>
<!-- <el-table-column label="维修/保养周期单位" align="center" prop="keepCycleType" /> -->
<el-table-column label="上次维修/保养日期" align="center" prop="lastKeepDate" width="130"/>
<el-table-column label="维修/保养周期" align="center" prop="keepCycle" width="120" >
<template v-slot="scope">
{{ scope.row.keepCycle + " " + scope.row.keepCycleType }}
</template>
</el-table-column>
<el-table-column label="使用人id" align="center" prop="userId" />
<el-table-column label="部门id" align="center" prop="deptId" />
<el-table-column label="企业id" align="center" prop="corpId" />
<!-- <el-table-column label="下次维修/保养日期" align="center" prop="nextKeepDate" /> -->
<!-- <el-table-column label="附件urls" align="center" prop="fileUrls" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="120">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
v-hasPermi="['company:property:update']">修改</el-button>

2
src/views/base/property/position/index.vue
View File

@ -71,7 +71,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
v-hasPermi="['company:property-pos:update']">修改</el-button>

2
src/views/base/property/propertydeal/index.vue
View File

@ -69,7 +69,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
v-hasPermi="['company:property-deal:update']">修改</el-button>

2
src/views/base/property/propertydealitem/index.vue
View File

@ -93,7 +93,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
v-hasPermi="['company:property-deal-item:update']">修改</el-button>

2
src/views/base/property/propertykeep/index.vue
View File

@ -53,7 +53,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
v-hasPermi="['company:property-keep:update']">修改</el-button>