From 4b65c83845208972c85ede0ea1a632fc8e2fc41c Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期三, 28 九月 2022 17:53:30 +0800 Subject: [PATCH] Default Changelist --- src/views/specialWorkSystem/foundationSet/material/index.vue | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/specialWorkSystem/foundationSet/material/index.vue b/src/views/specialWorkSystem/foundationSet/material/index.vue index 93ea978..116b215 100644 --- a/src/views/specialWorkSystem/foundationSet/material/index.vue +++ b/src/views/specialWorkSystem/foundationSet/material/index.vue @@ -230,7 +230,6 @@ <el-checkbox :label="i.materialName" v-model="checkData[index].list[x].checked"> </el-checkbox> <el-form v-if="checkData[index].list[x].checked" :model="checkData[index].list[x]" label-width="100px" ref="addListRef" :rules="addListRules"> - <el-form-item label="默认值" prop="defaultVal"><el-input v-model="checkData[index].list[x].defaultVal"/></el-form-item> <el-form-item label="配置级别" prop="configurationLevel"> <el-select v-model="checkData[index].list[x].configurationLevel"> <el-option key="0" label="必选" value="0"/> @@ -238,6 +237,7 @@ <el-option key="2" label="高配" value="2"/> </el-select> </el-form-item> + <el-form-item v-if="checkData[index].list[x].configurationLevel==0" label="默认值" prop="defaultVal"><el-input v-model="checkData[index].list[x].defaultVal"/></el-form-item> <el-form-item label="是否耗材" prop="consumables"> <el-radio-group v-model="checkData[index].list[x].consumables"> <el-radio :label=true>是</el-radio> @@ -248,6 +248,7 @@ </div> </el-tab-pane> </el-tabs> + <div v-if="chosenIndex != null" style="color: #79bbff">注:修改配置数据须重新填写配置</div> </el-form-item> <el-form-item label="描述" prop="info"> <el-input v-model="addRecord.info" type="textarea" autosize :rows="2"/> @@ -292,7 +293,6 @@ import type { FormInstance, FormRules } from 'element-plus' import { teamManageApi } from '/@/api/systemManage/basicDateManage/personShiftManage/teamManage'; import { materialApi } from '/@/api/specialWorkSystem/material'; -import {a} from "pinia-plugin-persistedstate/dist/types-374a3a36"; // 定义接口来定义对象的类型 interface stateType { @@ -576,7 +576,7 @@ checked: false, materialName: item.name, consumables: null, - defaultVal: null, + defaultVal: 0, configurationLevel: null, materialType: item.materialType, materialTypeName: item.materialTypeName, @@ -722,20 +722,20 @@ materialDetailList: state.addRecord.materialDetailList }; console.log(data.materialDetailList,'data.materialDetailList') - if(data.materialDetailList.length==0 || data.materialDetailList.some((e) => e.defaultVal == null) || data.materialDetailList.some((e) => e.configurationLevel == null) || data.materialDetailList.some((e) => e.consumables == null)){ + if(data.materialDetailList.length==0 || data.materialDetailList.some((e) => e.configurationLevel == null) || data.materialDetailList.some((e) => e.consumables == null)){ ElMessage({ type: 'warning', - message: '请完善物资配置必填数据' + message: '请选择物资配置并完善必填数据' }); - }else{ - if (state.chosenIndex == null) { - await addRecord(data); - } else { - data.id = state.addRecord.id; - await editRecord(data); - } - state.dialogAddRecord = false; + return } + if (state.chosenIndex == null) { + await addRecord(data); + } else { + data.id = state.addRecord.id; + await editRecord(data); + } + state.dialogAddRecord = false; } else { console.log('error submit!', fields); } -- Gitblit v1.9.2