|
@@ -6,7 +6,7 @@
|
|
|
<h4 :id="titleId">阶段设置</h4>
|
|
|
<div>
|
|
|
<el-button type="primary" @click="addStage(false)">新增</el-button>
|
|
|
- <el-button type="primary" @click="saveState()" v-loading="allLoading.saveLoading">保存</el-button>
|
|
|
+ <el-button type="primary" @click="saveState()" :loading="allLoading.saveLoading">保存</el-button>
|
|
|
<el-button @click="cancel()">取消</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -139,7 +139,7 @@ function editState(flag: boolean) {
|
|
|
globalPopup?.showWarning('请输入阶段名称')
|
|
|
return
|
|
|
}
|
|
|
- const listIndex = stageTableList.value.findIndex((item: stageFormType) => item.name == stageForm.name)
|
|
|
+ const listIndex = stageTableList.value.findIndex((item: stageFormType) => item.seq == stageForm.seq)
|
|
|
const newStage = {
|
|
|
...stageForm,
|
|
|
plan: stageForm.plan,
|
|
@@ -158,14 +158,19 @@ function editState(flag: boolean) {
|
|
|
|
|
|
function addStage(item: any) {
|
|
|
const row = JSON.parse(JSON.stringify(item))
|
|
|
+ console.log(item)
|
|
|
if (!item) {
|
|
|
resetStage()
|
|
|
} else {
|
|
|
- Object.assign(stageForm, {
|
|
|
+ let newData: any = {
|
|
|
name: row.name,
|
|
|
plan: row.plan,
|
|
|
- seq: row.seq
|
|
|
- })
|
|
|
+ seq: row.seq,
|
|
|
+ ...(row.id && { id: row.id }),
|
|
|
+ ...(row.companyId && { companyId: row.companyId }),
|
|
|
+ ...(row.isFinish && { isFinish: row.isFinish })
|
|
|
+ }
|
|
|
+ Object.assign(stageForm, newData)
|
|
|
}
|
|
|
allVisible.editVisible = true
|
|
|
}
|
|
@@ -173,11 +178,16 @@ function addStage(item: any) {
|
|
|
function resetStage() {
|
|
|
let newData = JSON.parse(JSON.stringify(stageTableList.value))
|
|
|
let maxnum = newData.sort((a: any, b: any) => { return b.seq - a.seq; })[0];
|
|
|
- Object.assign(stageForm, {
|
|
|
+ console.log(maxnum)
|
|
|
+ let formVal = {
|
|
|
name: '',
|
|
|
plan: 0,
|
|
|
- seq: +maxnum + 1
|
|
|
- })
|
|
|
+ seq: +maxnum.seq + 1
|
|
|
+ }
|
|
|
+ delete stageForm.id
|
|
|
+ delete stageForm.isFinish
|
|
|
+ Object.assign(stageForm, formVal);
|
|
|
+ console.log(stageForm, '<=== 新增的数据', formVal)
|
|
|
}
|
|
|
|
|
|
function moveStage(index: number, stageType: moveStageType) {
|