diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index 93595dd..56f976e 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -51,7 +51,7 @@
-
+
@@ -266,7 +266,7 @@ export default {
eventChannel.emit("data", {
form: this.form,
formItems: this.formItems,
- EW_RU_TASK_ID: this.taskId
+ taskId: this.taskId
});
},
});
diff --git a/pages/eight_assignments/hot_work/select_operator.vue b/pages/eight_assignments/hot_work/select_operator.vue
index 15332ff..c1a8677 100644
--- a/pages/eight_assignments/hot_work/select_operator.vue
+++ b/pages/eight_assignments/hot_work/select_operator.vue
@@ -64,21 +64,20 @@ export default {
mounted() {
const eventChannel = this.getOpenerEventChannel();
eventChannel.on('data', (data) => {
- console.log(data)
this.form = data.form;
this.formItems = data.formItems;
this.taskId = data.taskId;
- this.hotWorkOperatorList = uni.$u.deepClone(data.form.hotWorkOperatorList);
- if (this.hotWorkOperatorList.length === 0) this.fnAddHotWorkOperatorList();
- else {
+ this.hotWorkOperatorList = JSON.parse(JSON.stringify(data.form.hotWorkOperatorList));
+ if (this.hotWorkOperatorList.length === 0) {
+ this.fnAddHotWorkOperatorList();
+ } else {
for (let i = 0; i < this.hotWorkOperatorList.length; i++) {
for (let i = 0; i < this.hotWorkOperatorList.length; i++) {
- fnGetUserList(this.hotWorkOperatorList.value[i], i);
+ this.fnGetUserList(this.hotWorkOperatorList[i], i);
}
}
}
})
-
},
methods: {
fnAddHotWorkOperatorList() {
@@ -161,7 +160,6 @@ export default {
this.picker.show = false;
}
},
-
}
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index ee5d4b6..6481662 100644
--- a/utils/submitHomeworkProcess.js
+++ b/utils/submitHomeworkProcess.js
@@ -277,8 +277,9 @@ export const getData = async (taskId) => {
for (let i = 0; i < item.list.length; i++) {
form[item.ITEM_NAME].push({});
for (let j = 0; j < item.list[i].list.length; j++) {
- form[item.ITEM_NAME][i][item.list[i].list[j].ITEM_NAME] =
- item.list[i].list[j].ITEM_VALUE;
+ form[item.ITEM_NAME][i][item.list[i].list[j].ITEM_NAME] = item.list[i].list[j].ITEM_VALUE;
+ form[item.ITEM_NAME][i][item.list[i].list[j].FK_NAME] = item.list[i].list[j].FK_VALUE;
+ form[item.ITEM_NAME][i]['TYPE'] = item.list[i].list[j].TYPE;
}
}
}