|
@@ -241,7 +241,7 @@
|
|
} else if (this.localStatus == 'editAdd') {
|
|
} else if (this.localStatus == 'editAdd') {
|
|
this.$emit('editSave', mergedArray, 'editAdd');
|
|
this.$emit('editSave', mergedArray, 'editAdd');
|
|
} else {
|
|
} else {
|
|
- this.$emit('editSave', mergedArray, 'edit', this.currentIndex);
|
|
|
|
|
|
+ this.$emit('editSave', mergedArray[0], 'edit', this.currentIndex);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
goBack() {
|
|
goBack() {
|
|
@@ -256,7 +256,10 @@
|
|
if (!data) {
|
|
if (!data) {
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
- this.currentIndex = index
|
|
|
|
|
|
+ console.log('index',index);
|
|
|
|
+ console.log('data',data);
|
|
|
|
+ this.currentIndex = index
|
|
|
|
+ this.zyNameAndLevel =data.zyName+data.zyLevelName
|
|
this.formData.baozhengJigouName = data.jgName;
|
|
this.formData.baozhengJigouName = data.jgName;
|
|
this.formData.baozhengJigouId = data.jgId;
|
|
this.formData.baozhengJigouId = data.jgId;
|
|
this.formData.id = data.id;
|
|
this.formData.id = data.id;
|
|
@@ -266,40 +269,22 @@
|
|
this.formData.zhiyeId = data.zyId;
|
|
this.formData.zhiyeId = data.zyId;
|
|
this.formData.zhiyeLevelName = data.zyLevelName;
|
|
this.formData.zhiyeLevelName = data.zyLevelName;
|
|
this.formData.zhiyeLevelId = data.zyLevel;
|
|
this.formData.zhiyeLevelId = data.zyLevel;
|
|
- if (this.formData.baozhengJigouId) {
|
|
|
|
- this.isJgFlag = false
|
|
|
|
- getJiazhengZhiye({
|
|
|
|
- id: this.formData.baozhengJigouId
|
|
|
|
- }).then(res => {
|
|
|
|
- console.log('res', res);
|
|
|
|
- this.zhiyeNameOpt = res.data
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
- if (this.formData.baozhengJigouId && this.formData.zhiyeId) {
|
|
|
|
- this.isZyFlag = false
|
|
|
|
- let req = {
|
|
|
|
- jgId: this.formData.baozhengJigouId,
|
|
|
|
- zyId: this.formData.zhiyeId,
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- getJiazhengLevel(req).then(res => {
|
|
|
|
- console.log('res', res);
|
|
|
|
- this.zhiyelevelsOpt = res.data
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
this.formData.canxunshijian = data.canxunshijian;
|
|
this.formData.canxunshijian = data.canxunshijian;
|
|
this.formData.zongkeshi = data.zongkeshi;
|
|
this.formData.zongkeshi = data.zongkeshi;
|
|
this.formData.shicaochengji = data.shicaochengji;
|
|
this.formData.shicaochengji = data.shicaochengji;
|
|
this.formData.needKecheng = data.needKecheng ? data.needKecheng.toString() : 'false';
|
|
this.formData.needKecheng = data.needKecheng ? data.needKecheng.toString() : 'false';
|
|
this.formData.needKaoshi = data.needKaoshi ? data.needKaoshi.toString() : 'false';
|
|
this.formData.needKaoshi = data.needKaoshi ? data.needKaoshi.toString() : 'false';
|
|
-
|
|
|
|
if (this.formData.banzhengInfoFlag) {
|
|
if (this.formData.banzhengInfoFlag) {
|
|
this.formData.needFlag = false
|
|
this.formData.needFlag = false
|
|
-
|
|
|
|
} else {
|
|
} else {
|
|
this.formData.needFlag = true
|
|
this.formData.needFlag = true
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
+ this.piliangArray = [{
|
|
|
|
+ id: data.zyId,
|
|
|
|
+ name: data.zyName,
|
|
|
|
+ zyLevel: data.zyLevel,
|
|
|
|
+ zyLevelName: data.zyLevelName
|
|
|
|
+ }]
|
|
})
|
|
})
|
|
},
|
|
},
|
|
getJigou() {
|
|
getJigou() {
|