bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

需求变动增加标准使用时间字段

This commit is contained in:
BianLzhaoMin 2025-09-15 14:18:41 +08:00
parent da18804cc2
commit acdb3df462
1 changed files with 67 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/views/user/goodsManagement/index.vue
View File

@ -258,8 +258,7 @@ const deleteRowInfo = async (row: any) => {
getList() getList()
} }
}) })
.catch(() => { .catch(() => {})
})
} }
//获取详情接口 //获取详情接口
const getDetailData = async (row: any) => { const getDetailData = async (row: any) => {
@ -294,6 +293,7 @@ const getDetailData = async (row: any) => {
maintenanceAlarmDay, maintenanceAlarmDay,
isZone, isZone,
zoneId, zoneId,
expirationTime,
} = res } = res
Object.assign(addAndEditForm, { Object.assign(addAndEditForm, {
@ -324,6 +324,7 @@ const getDetailData = async (row: any) => {
maintenanceAlarmDay, maintenanceAlarmDay,
isZone, isZone,
zoneId, zoneId,
expirationTime,
}) })
if (settleinTitle.value == '装备编辑') { if (settleinTitle.value == '装备编辑') {
@ -500,8 +501,7 @@ const handleUpdateUpDown = (row: any, maStatus: any) => {
getList() getList()
} }
}) })
.catch(() => { .catch(() => {})
})
} }
/* /*
@ -688,6 +688,13 @@ const equipRules = ref({
trigger: 'blur', trigger: 'blur',
}, },
], ],
expirationTime: [
{
required: true,
trigger: 'change',
message: '请选择标准使用时间',
},
],
person: [{ required: true, message: '联系人不能为空', trigger: 'blur' }], person: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
checkDate: [{ required: true, message: '校验日期不能为空', trigger: 'blur' }], checkDate: [{ required: true, message: '校验日期不能为空', trigger: 'blur' }],
@ -742,11 +749,15 @@ const submitFun = (type: any) => {
) )
} }
if (type === 2 || type === 4) { if (type === 2 || type === 4) {
equipRules.value.mainFileList = [] // 清空规则，相当于不校验 equipRules.value.mainFileList = [] // 清空规则，相当于不校验
equipRules.value.detailsFileList = [] // 清空规则，相当于不校验 equipRules.value.detailsFileList = [] // 清空规则，相当于不校验
} else { } else {
equipRules.value.mainFileList = [{ required: true, message: '请上传主展示图', trigger: 'change' }] // 清空规则，相当于不校验 equipRules.value.mainFileList = [
equipRules.value.detailsFileList = [{ required: true, message: '请上传详情展示图', trigger: 'change' }] // 清空规则，相当于不校验 { required: true, message: '请上传主展示图', trigger: 'change' },
] // 清空规则，相当于不校验
equipRules.value.detailsFileList = [
{ required: true, message: '请上传详情展示图', trigger: 'change' },
] // 清空规则，相当于不校验
} }
addAndEditFormRef.value.validate(async (valid: any) => { addAndEditFormRef.value.validate(async (valid: any) => {
@ -766,7 +777,7 @@ const submitFun = (type: any) => {
} }
}) })
addAndEditForm.tableList = equipTableList.value addAndEditForm.tableList = equipTableList.value
if (type != 2 && type !=4) { if (type != 2 && type != 4) {
for (let i = 0; i < addAndEditForm.tableList.length; i++) { for (let i = 0; i < addAndEditForm.tableList.length; i++) {
const row = addAndEditForm.tableList[i] const row = addAndEditForm.tableList[i]
for (const key in row) { for (const key in row) {
@ -1093,6 +1104,7 @@ const addAndEditForm = reactive<any>({
tableList: [], tableList: [],
isZone: true, // 是否上架专区 isZone: true, // 是否上架专区
zoneId: '', // 专区id zoneId: '', // 专区id
expirationTime: '',
}) })
// const addAndEditFormTemp = reactive<any>() // const addAndEditFormTemp = reactive<any>()
const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload' const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload'
@ -1555,34 +1567,29 @@ const handleDel = (index: any) => {
<el-col :span="18"> <el-col :span="18">
<el-form-item> <el-form-item>
<el-button class="primary-lease" type="primary" @click="queryTableList" <el-button class="primary-lease" type="primary" @click="queryTableList"
>查询 >查询
</el-button </el-button>
>
<el-button <el-button
class="primary-lease" class="primary-lease"
type="primary" type="primary"
@click="resetTableList(queryFormRef)" @click="resetTableList(queryFormRef)"
>重置 >重置
</el-button </el-button>
>
<el-button class="primary-lease" type="primary" @click="equipmentDeployment" <el-button class="primary-lease" type="primary" @click="equipmentDeployment"
>装备新增 >装备新增
</el-button </el-button>
>
<el-button <el-button
class="primary-lease" class="primary-lease"
type="primary" type="primary"
@click="handleUpdateUpDown(null, 2)" @click="handleUpdateUpDown(null, 2)"
>批量上架 >批量上架
</el-button </el-button>
>
<el-button <el-button
class="primary-lease" class="primary-lease"
type="primary" type="primary"
@click="handleUpdateUpDown(null, 1)" @click="handleUpdateUpDown(null, 1)"
>批量下架 >批量下架
</el-button </el-button>
>
<!-- <el-button class="primary-lease" type="primary" @click="onTempDownLoad()" <!-- <el-button class="primary-lease" type="primary" @click="onTempDownLoad()"
>模板下载</el-button >模板下载</el-button
> --> > -->
@ -1590,9 +1597,8 @@ const handleDel = (index: any) => {
class="primary-lease" class="primary-lease"
type="primary" type="primary"
@click="handleBatchAddVisible" @click="handleBatchAddVisible"
>批量新增 >批量新增
</el-button </el-button>
>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -1627,7 +1633,7 @@ const handleDel = (index: any) => {
<el-table-column align="center" prop="typeName" label="装备类目"> <el-table-column align="center" prop="typeName" label="装备类目">
<template #default="{ row }"> <template #default="{ row }">
<span <span
>{{ row.firstName }} <span v-show="row.firstName">></span> >{{ row.firstName }} <span v-show="row.firstName">></span>
{{ row.secondName }}<span v-show="row.secondName">></span {{ row.secondName }}<span v-show="row.secondName">></span
>{{ row.thirdName }}</span >{{ row.thirdName }}</span
> >
@ -1637,8 +1643,8 @@ const handleDel = (index: any) => {
<el-table-column align="center" prop="nextCheckDate" label="下次检验日期"> <el-table-column align="center" prop="nextCheckDate" label="下次检验日期">
<template #default="{ row }"> <template #default="{ row }">
<span :style="{ backgroundColor: getUpdateTimeBgColor(row) }">{{ <span :style="{ backgroundColor: getUpdateTimeBgColor(row) }">{{
row.nextCheckDate row.nextCheckDate
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="装备状态"> <el-table-column align="center" label="装备状态">
@ -1652,9 +1658,8 @@ const handleDel = (index: any) => {
<el-table-column prop="name" label="操作" min-width="160px" align="center"> <el-table-column prop="name" label="操作" min-width="160px" align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" size="small" @click="previewRowInfo(row)" <el-button type="primary" size="small" @click="previewRowInfo(row)"
>查看 >查看
</el-button </el-button>
>
<el-button <el-button
v-if="row.maStatus == 0 || row.maStatus == 1" v-if="row.maStatus == 0 || row.maStatus == 1"
size="small" size="small"
@ -1878,7 +1883,7 @@ const handleDel = (index: any) => {
maxlength="20" maxlength="20"
:controls="false" :controls="false"
align="left" align="left"
style="width: 100%;" style="width: 100%"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -1895,21 +1900,38 @@ const handleDel = (index: any) => {
<el-col :span="12"> <el-col :span="12">
<el-form-item label="规格型号：" prop="deviceType"> <el-form-item label="规格型号：" prop="deviceType">
<!-- 0 编码 1 数量 --> <!-- 0 编码 1 数量 -->
<el-select <el-select
v-model="addAndEditForm.deviceType" v-model="addAndEditForm.deviceType"
placeholder="请选择管理方式" placeholder="请选择管理方式"
clearable clearable
style="width: 100%;" style="width: 100%"
:disabled="!isAdd" :disabled="!isAdd"
> >
<el-option label="编码" :value="0" /> <el-option label="编码" :value="0" />
<el-option label="数量" :value="1" /> <el-option label="数量" :value="1" />
</el-select> </el-select>
<span style="color: red">说明：编码管理按一台一台管理，一台设备一个唯一编码，数量管理支持同规格型号批量录入，一般小型工器具。</span> <span style="color: red"
>说明：编码管理按一台一台管理，一台设备一个唯一编码，数量管理支持同规格型号批量录入，一般小型工器具。</span
>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 临时录入使用 - end --> <!-- 临时录入使用 - end -->
</el-row> </el-row>
<!-- 9.15新增 -->
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="标准使用时间：" prop="expirationTime">
<el-date-picker
type="date"
style="width: 100%"
value-format="YYYY-MM-DD"
placeholder="请选择标准使用时间"
v-model="addAndEditForm.expirationTime"
/>
</el-form-item>
</el-col>
</el-row>
<!-- 1.13 需求变动要求隐藏 --> <!-- 1.13 需求变动要求隐藏 -->
<!-- <el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -1955,7 +1977,8 @@ const handleDel = (index: any) => {
</el-col> </el-col>
</el-row> --> </el-row> -->
<!-- 临时录入暂时隐藏 - 2025年09月13日 --> <!-- 临时录入暂时隐藏 - 2025年09月13日 -->
<div v-show="false"> <!-- 临时录入又需要隐藏 - 2025年09月15日 -->
<div>
<el-row <el-row
v-for="(item, index) in chunkedItems" v-for="(item, index) in chunkedItems"
:key="index" :key="index"
@ -2153,9 +2176,8 @@ const handleDel = (index: any) => {
style="margin-left: 20px; margin-top: 20px" style="margin-left: 20px; margin-top: 20px"
:disabled="!addAndEditForm.deviceTypeList" :disabled="!addAndEditForm.deviceTypeList"
v-if="settleinTitle == '新增装备'" v-if="settleinTitle == '新增装备'"
>添加 >添加
</el-button </el-button>
>
</div> </div>
<!-- <el-row :gutter="20" v-if="!isEditForm && !isViewForm"> <!-- <el-row :gutter="20" v-if="!isEditForm && !isViewForm">
<el-col :span="24"> <el-col :span="24">
@ -2584,9 +2606,8 @@ const handleDel = (index: any) => {
type="danger" type="danger"
@click="handleDeleteBack($index)" @click="handleDeleteBack($index)"
v-show="$index != 0" v-show="$index != 0"
>删除 >删除
</el-button </el-button>
>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -2615,9 +2636,8 @@ const handleDel = (index: any) => {
<el-col :span="1.5" :offset="0"> <el-col :span="1.5" :offset="0">
<a :href="uploadUrlTemp" download="模板"> <a :href="uploadUrlTemp" download="模板">
<el-button class="primary-lease" type="primary" style="margin-left: 20px" <el-button class="primary-lease" type="primary" style="margin-left: 20px"
>模板下载 >模板下载
</el-button </el-button>
>
</a> </a>
</el-col> </el-col>
<el-col :span="1.5" :offset="0"> <el-col :span="1.5" :offset="0">