From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Thu, 13 Oct 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/foundationSet/material/index.vue | 62 +++++++++++++-----------------
1 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/src/views/specialWorkSystem/foundationSet/material/index.vue b/src/views/specialWorkSystem/foundationSet/material/index.vue
index 209fa2e..116b215 100644
--- a/src/views/specialWorkSystem/foundationSet/material/index.vue
+++ b/src/views/specialWorkSystem/foundationSet/material/index.vue
@@ -173,7 +173,7 @@
</el-form-item>
</el-form>
</el-dialog>
- <el-dialog v-model="dialogAddRecord" title="作业物资标准编辑" @close="closeAdd" @open="openAdd">
+ <el-dialog v-model="dialogAddRecord" title="作业物资标准编辑" @close="closeAdd" @open="openAdd" center>
<el-form :model="addRecord" label-width="150px" ref="addRef" :rules="addRules">
<el-form-item label="作业物资标准名称" prop="name">
<el-input v-model="addRecord.name"> </el-input>
@@ -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,40 +237,29 @@
<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>
<el-radio :label=false>否</el-radio>
</el-radio-group>
</el-form-item>
- <!-- <div>-->
- <!-- <span>配置级别:</span>-->
- <!-- <el-select size="small" v-model="checkData[index].list[x].configurationLevel">-->
- <!-- <el-option key="0" label="必选" value="0"/>-->
- <!-- <el-option key="1" label="可选" value="1"/>-->
- <!-- <el-option key="2" label="高配" value="2"/>-->
- <!-- </el-select>-->
- <!-- </div>-->
- <!-- <div>-->
- <!-- <span>是否耗材:</span>-->
- <!-- <el-radio-group v-model="checkData[index].list[x].consumables">-->
- <!-- <el-radio label="1">是</el-radio>-->
- <!-- <el-radio label="2">否</el-radio>-->
- <!-- </el-radio-group>-->
- <!-- </div>-->
</el-form>
</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"/>
</el-form-item>
- <el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
<el-button type="warning" @click="dialogAddRecord = false" size="default" plain>取消</el-button>
<el-button type="primary" @click="confirmAddRecord(addRef)" size="default">确认</el-button>
- </el-form-item>
- </el-form>
+ </span>
+ </template>
</el-dialog>
<el-dialog v-model="deleteDialog" title="提示" width="30%" center @close="indexClear">
<span>您确定要删除该条记录吗？</span>
@@ -552,7 +540,6 @@
configurationLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
consumables: [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
- const addNoRules = reactive<FormRules>({});
// 页面载入时执行方法
onMounted(() => {
@@ -564,14 +551,18 @@
};
const toLevel = (row, column, cellValue, index) => {
- if(row.workLevel <= 3){
- return state.fireLevel.find((item) => item.value === row.workLevel)?.label;
- }else if(row.workLevel>3 && row.workLevel<=7){
- return state.heightLevel.find((item) => item.value === row.workLevel)?.label;
- }else if(row.workLevel>8 && row.workLevel<=10){
- return state.hoistLevel.find((item) => item.value === row.workLevel)?.label;
+ if(row.workLevel == null){
+ return '无'
}else{
- return state.plateLevel.find((item) => item.value === row.workLevel)?.label;
+ if(row.workLevel <= 3){
+ return state.fireLevel.find((item) => item.value === row.workLevel)?.label;
+ }else if(row.workLevel>3 && row.workLevel<=7){
+ return state.heightLevel.find((item) => item.value === row.workLevel)?.label;
+ }else if(row.workLevel>8 && row.workLevel<=10){
+ return state.hoistLevel.find((item) => item.value === row.workLevel)?.label;
+ }else{
+ return state.plateLevel.find((item) => item.value === row.workLevel)?.label;
+ }
}
};
@@ -585,7 +576,7 @@
checked: false,
materialName: item.name,
consumables: null,
- defaultVal: null,
+ defaultVal: 0,
configurationLevel: null,
materialType: item.materialType,
materialTypeName: item.materialTypeName,
@@ -715,9 +706,10 @@
if(state.checkData[i].list && state.checkData[i].list.length>0){
for(let j=0;j<state.checkData[i].list.length;j++){
if(state.checkData[i].list[j].checked){
- delete state.checkData[i].list[j].checked
- state.checkData[i].list[j].checked
- state.addRecord.materialDetailList.push(state.checkData[i].list[j])
+ // delete state.checkData[i].list[j].checked
+ // state.checkData[i].list[j].checked
+ let { checked,...checkObj } = state.checkData[i].list[j]
+ state.addRecord.materialDetailList.push(checkObj)
}
}
}
@@ -729,10 +721,11 @@
info: state.addRecord.info,
materialDetailList: state.addRecord.materialDetailList
};
- if(data.materialDetailList.length==0){
+ console.log(data.materialDetailList,'data.materialDetailList')
+ if(data.materialDetailList.length==0 || data.materialDetailList.some((e) => e.configurationLevel == null) || data.materialDetailList.some((e) => e.consumables == null)){
ElMessage({
type: 'warning',
- message: '物资配置数据为空'
+ message: '请选择物资配置并完善必填数据'
});
return
}
@@ -882,7 +875,6 @@
addListRef,
addRules,
addListRules,
- addNoRules,
View,
Edit,
Delete,
--
Gitblit v1.9.2