diff --git a/pages.json b/pages.json
index 81c51d1..2012cfe 100644
--- a/pages.json
+++ b/pages.json
@@ -534,6 +534,12 @@
"style": {
"navigationBarTitleText": "安全承诺"
}
+ },
+ {
+ "path": "pages/eight_assignments/hot_work/select_position",
+ "style": {
+ "navigationBarTitleText": "定位"
+ }
}
],
"globalStyle": {
diff --git a/pages/eight_assignments/blind_board/apply.vue b/pages/eight_assignments/blind_board/apply.vue
index ba30b93..77d7840 100644
--- a/pages/eight_assignments/blind_board/apply.vue
+++ b/pages/eight_assignments/blind_board/apply.vue
@@ -1,5 +1,5 @@
-
+
@@ -247,6 +247,7 @@ export default {
otherAssignmentsShow: false,
otherIdentificationShow: false,
signVisible: false,
+ taskId: ''
}
},
async onLoad(options) {
@@ -256,6 +257,7 @@ export default {
this.fnAddBoardList()
if (options.taskId) {
this.form = await getData(options.taskId)
+ this.taskId = options.taskId
}
},
methods: {
@@ -352,7 +354,8 @@ export default {
form: this.form,
formItems: this.formItems,
TYPE: this.type,
- CORP_ID: this.form.CORP_ID
+ CORP_ID: this.form.CORP_ID,
+ EW_RU_TASK_ID: this.taskId
})
} catch {
}
diff --git a/pages/eight_assignments/break_ground/apply.vue b/pages/eight_assignments/break_ground/apply.vue
index 4615a3a..1bb5e9c 100644
--- a/pages/eight_assignments/break_ground/apply.vue
+++ b/pages/eight_assignments/break_ground/apply.vue
@@ -114,7 +114,7 @@ export default {
{name: '作业地点', key_name: 'WORK_PLACE', type: 0},
{name: '作业内容', key_name: 'JOB_CONTENT', type: 0},
{name: '作业内容、范围、方式', key_name: 'WORK_CONTENT', type: 0},
- {name: '作业内容、范围、方式简图', key_name: 'CONTENT_IMG_PATH', type: 1},
+ {name: '作业内容、范围、方式简图', key_name: 'CONTENT_IMG_PATH', type: 1, oldUrl: ''},
{name: '关联的其他特殊作业及安全作业票编号', key_name: 'SPECIAL_WORK', type: 0},
{name: '风险辨识结果', key_name: 'RISK_IDENTIFICATION', type: 0},
{name: '申请人签字', key_name: 'SIGN', type: 5},
@@ -184,6 +184,7 @@ export default {
otherAssignmentsShow: false,
otherIdentificationShow: false,
signVisible: false,
+ taskId: ''
}
},
async onLoad(options) {
@@ -192,6 +193,7 @@ export default {
this.type = options.type
if (options.taskId) {
this.form = await getData(options.taskId)
+ this.taskId = options.taskId
}
},
methods: {
@@ -243,7 +245,8 @@ export default {
form: this.form,
formItems: this.formItems,
TYPE: this.type,
- CORP_ID: this.form.CORP_ID
+ CORP_ID: this.form.CORP_ID,
+ EW_RU_TASK_ID: this.taskId
})
} catch {
}
diff --git a/pages/eight_assignments/completed_list.vue b/pages/eight_assignments/completed_list.vue
index bbc141b..78c1f45 100644
--- a/pages/eight_assignments/completed_list.vue
+++ b/pages/eight_assignments/completed_list.vue
@@ -20,11 +20,20 @@
-
+
+
+
+
+
diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue
index e446473..232e272 100644
--- a/pages/eight_assignments/confined_space/apply.vue
+++ b/pages/eight_assignments/confined_space/apply.vue
@@ -171,6 +171,7 @@ export default {
},
otherAssignmentsShow: false,
otherIdentificationShow: false,
+ taskId: ''
}
},
async onLoad(options) {
@@ -179,6 +180,7 @@ export default {
this.type = options.type
if (options.taskId) {
this.form = await getData(options.taskId)
+ this.taskId = options.taskId
}
},
methods: {
@@ -232,7 +234,8 @@ export default {
form: this.form,
formItems: this.formItems,
TYPE: this.type,
- CORP_ID: this.form.CORP_ID
+ CORP_ID: this.form.CORP_ID,
+ EW_RU_TASK_ID: this.taskId
})
} catch {
}
diff --git a/pages/eight_assignments/cut_road/apply.vue b/pages/eight_assignments/cut_road/apply.vue
index 9b0f9f7..dada838 100644
--- a/pages/eight_assignments/cut_road/apply.vue
+++ b/pages/eight_assignments/cut_road/apply.vue
@@ -128,8 +128,8 @@ export default {
CORP_NAME: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
- WORK_LONGITUDE: '1',
- WORK_LATITUDE: '2',
+ WORK_LONGITUDE: '',
+ WORK_LATITUDE: '',
OTHER_DEPT: '',
WORK_REASON: '',
WORK_CONTENT: '',
@@ -184,6 +184,7 @@ export default {
otherAssignmentsShow: false,
otherIdentificationShow: false,
signVisible: false,
+ taskId: ''
}
},
async onLoad(options) {
@@ -192,6 +193,7 @@ export default {
this.type = options.type
if (options.taskId) {
this.form = await getData(options.taskId)
+ this.taskId = options.taskId
}
},
methods: {
@@ -243,7 +245,8 @@ export default {
form: this.form,
formItems: this.formItems,
TYPE: this.type,
- CORP_ID: this.form.CORP_ID
+ CORP_ID: this.form.CORP_ID,
+ EW_RU_TASK_ID: this.taskId
})
} catch {
}
diff --git a/pages/eight_assignments/electricity/apply.vue b/pages/eight_assignments/electricity/apply.vue
index c39fec9..f2b9c24 100644
--- a/pages/eight_assignments/electricity/apply.vue
+++ b/pages/eight_assignments/electricity/apply.vue
@@ -132,8 +132,8 @@ export default {
CORP_NAME: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
- WORK_LONGITUDE: '1',
- WORK_LATITUDE: '2',
+ WORK_LONGITUDE: '',
+ WORK_LATITUDE: '',
WORK_PLACE: '',
WORK_CONTENT: '',
WORK_USER: '',
@@ -208,6 +208,7 @@ export default {
},
otherAssignmentsShow: false,
otherIdentificationShow: false,
+ taskId: ''
}
},
async onLoad(options) {
@@ -216,6 +217,7 @@ export default {
this.type = options.type
if (options.taskId) {
this.form = await getData(options.taskId)
+ this.taskId = options.taskId
}
},
methods: {
@@ -257,7 +259,8 @@ export default {
form: this.form,
formItems: this.formItems,
TYPE: this.type,
- CORP_ID: this.form.CORP_ID
+ CORP_ID: this.form.CORP_ID,
+ EW_RU_TASK_ID: this.taskId
})
} catch {
}
diff --git a/pages/eight_assignments/high_work/apply.vue b/pages/eight_assignments/high_work/apply.vue
index 0d1de51..b063a4f 100644
--- a/pages/eight_assignments/high_work/apply.vue
+++ b/pages/eight_assignments/high_work/apply.vue
@@ -121,8 +121,8 @@ export default {
WORK_CONTENT: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
- WORK_LONGITUDE: '1',
- WORK_LATITUDE: '2',
+ WORK_LONGITUDE: '',
+ WORK_LATITUDE: '',
SPECIAL_WORK: '',
RISK_IDENTIFICATION: '',
},
@@ -168,6 +168,7 @@ export default {
},
otherAssignmentsShow: false,
otherIdentificationShow: false,
+ taskId: ''
}
},
async onLoad(options) {
@@ -176,6 +177,7 @@ export default {
this.type = options.type
if (options.taskId) {
this.form = await getData(options.taskId)
+ this.taskId = options.taskId
}
},
methods: {
@@ -232,7 +234,8 @@ export default {
form: this.form,
formItems: this.formItems,
TYPE: this.type,
- CORP_ID: this.form.CORP_ID
+ CORP_ID: this.form.CORP_ID,
+ EW_RU_TASK_ID: this.taskId
})
} catch {
}
diff --git a/pages/eight_assignments/hoisting/apply.vue b/pages/eight_assignments/hoisting/apply.vue
index 50ba805..19fe2cc 100644
--- a/pages/eight_assignments/hoisting/apply.vue
+++ b/pages/eight_assignments/hoisting/apply.vue
@@ -136,8 +136,8 @@ export default {
WORK_CONTENT: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
- WORK_LONGITUDE: '1',
- WORK_LATITUDE: '2',
+ WORK_LONGITUDE: '',
+ WORK_LATITUDE: '',
SPECIAL_WORK: '',
RISK_IDENTIFICATION: '',
},
@@ -186,6 +186,7 @@ export default {
},
otherAssignmentsShow: false,
otherIdentificationShow: false,
+ taskId: ''
}
},
async onLoad(options) {
@@ -194,6 +195,7 @@ export default {
this.type = options.type
if (options.taskId) {
this.form = await getData(options.taskId)
+ this.taskId = options.taskId
}
},
methods: {
@@ -251,7 +253,8 @@ export default {
form: this.form,
formItems: this.formItems,
TYPE: this.type,
- CORP_ID: this.form.CORP_ID
+ CORP_ID: this.form.CORP_ID,
+ EW_RU_TASK_ID: this.taskId
})
} catch {
}
diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index 61428e9..9d17ffb 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -61,7 +61,7 @@
-
+
@@ -141,6 +141,7 @@ export default {
HOT_WORK_POSITION: '',
// 动火方法
HOT_WORK_METHOD_ID: '',
+ HOT_WORK_METHOD_NAME: '',
// 动火等级
HOT_WORK_LEVEL_ID: '',
HOT_WORK_LEVEL_INDEX: '',
@@ -258,6 +259,7 @@ export default {
*/
async fnSubmit() {
await this.$refs.formRef.validate()
+ this.form.HOT_WORK_METHOD_NAME = this.form.HOT_WORK_METHOD_ID
uni.navigateTo({
url: "/pages/eight_assignments/hot_work/select_operator",
success: ({ eventChannel }) => {
diff --git a/pages/eight_assignments/hot_work/select_operator.vue b/pages/eight_assignments/hot_work/select_operator.vue
index 3580f00..d1f0521 100644
--- a/pages/eight_assignments/hot_work/select_operator.vue
+++ b/pages/eight_assignments/hot_work/select_operator.vue
@@ -94,7 +94,7 @@ export default {
},
fnSelectDepartment(index) {
uni.navigateTo({
- url: "/pages/eight_assignments/select_department",
+ url: `/pages/eight_assignments/select_department?CORP_ID=${this.form.CORP_ID}`,
events: {
confirm: (event) => {
this.hotWorkOperatorList[index].DEPARTMENT_NAME = event.DEPARTMENT_NAME;
@@ -140,6 +140,7 @@ export default {
form: {...this.form, hotWorkOperatorList: this.hotWorkOperatorList},
formItems: this.formItems,
TYPE: "hotWork",
+ CORP_ID: this.form.CORP_ID,
EW_RU_TASK_ID: this.taskId,
});
},
diff --git a/pages/eight_assignments/hot_work/select_position.vue b/pages/eight_assignments/hot_work/select_position.vue
new file mode 100644
index 0000000..5a39e9c
--- /dev/null
+++ b/pages/eight_assignments/hot_work/select_position.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/eight_assignments/select_corp_info.vue b/pages/eight_assignments/select_corp_info.vue
index 7c49f20..f1a1f1b 100644
--- a/pages/eight_assignments/select_corp_info.vue
+++ b/pages/eight_assignments/select_corp_info.vue
@@ -15,7 +15,9 @@
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index 5b512dd..40e095f 100644
--- a/utils/submitHomeworkProcess.js
+++ b/utils/submitHomeworkProcess.js
@@ -6,6 +6,7 @@ import {
setTaskSave
} from "@/api";
import {addFormInfo} from "../api";
+import {filePath} from '@/utils/tools.js'
// 处理表单数据
// TYPE 0 纯文本 1 图片 2 视频 3 divider标签 4 动态添加 5 签字
@@ -27,7 +28,7 @@ const processFormData = async (formData, formItems) => {
const currentItem = uni.$u.deepClone(formData[formItem.key_name])
const codeList = []
for (let j = 0; j < currentItem.length; j++) {
- const {CODE} = await setTaskFile({formData: {type: 0}, name: 'files', filePath: currentItem[j].url})
+ const {CODE} = await setTaskFile({formData: {type: currentItem[j].oldUrl}, name: 'files', filePath: currentItem[j].url})
codeList.push(CODE)
}
obj.ITEM_VALUE = ''
@@ -51,7 +52,7 @@ const processFormData = async (formData, formItems) => {
}
if (formItem.type === 5) {
if (typeof formData[formItem.key_name] === 'string') {
- const {CODE} = await setTaskFile({formData: {type: 0}, name: 'files', filePath: formData[formItem.key_name]})
+ const {CODE} = await setTaskFile({formData: {type: formData[formItem.key_name + 'oldUrl']}, name: 'files', filePath: formData[formItem.key_name]})
obj.ITEM_VALUE = CODE
} else {
throw Error('签字只支持字符串')
@@ -97,7 +98,7 @@ const processSelectedPersonnelData = (formData, list) => {
return form
}
// 提交人员信息
-export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE,vernier}) => {
+export const setPersonnelForm = async ({form, list, taskId, EW_RU_JOB_ID, CORP_ID, TYPE,vernier}) => {
await addFormInfo({
job: processSelectedPersonnelData(form,list),
EW_RU_TASK_ID: taskId,
@@ -109,6 +110,7 @@ export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE,vernie
EW_RU_TASK_ID: taskId,
CORP_ID,
TYPE,
+ EW_RU_JOB_ID,
vernier
})
}
@@ -154,7 +156,7 @@ const endCurrentPersonnelTechnologicalProcess = async ({EW_RU_TASK_ID}) => {
})
}
// 在审批过程中指定下一节点人
-export const addFlowInfo = async ({form,list, taskId,EW_RU_JOB_ID, TYPE,CORP_ID, vernier}) => {
+export const addFlowInfo = async ({form, list, taskId, EW_RU_JOB_ID, TYPE,CORP_ID, vernier}) => {
// 在审批过程中添加节点信息
await addFormInfo({
job: processSelectedPersonnelData(form,list),
@@ -265,7 +267,8 @@ export const getData = async (taskId) => {
}
if (item.TYPE === 1) {
form[item.ITEM_NAME] = item.list.map((item) => ({
- url: this.$filePath + item.ITEM_VALUE,
+ url: filePath + item.ITEM_VALUE,
+ oldUrl: item.ITEM_VALUE
}));
}
if (item.TYPE === 4) {
@@ -279,9 +282,30 @@ export const getData = async (taskId) => {
}
}
if (item.TYPE === 5) {
- form[item.ITEM_NAME] = this.$filePath + item.ITEM_VALUE;
+ form[item.ITEM_NAME] = filePath + item.ITEM_VALUE;
+ form[item.ITEM_NAME + 'oldUrl'] = item.ITEM_VALUE;
}
});
return form;
}
};
+// 针对在某些节点要新增报表信息
+export const addReport = async ({form, formItems, TYPE, CORP_ID, EW_RU_TASK_ID, EW_RU_JOB_ID, vernier}) => {
+ // 在审批过程中添加节点信息
+ await addFormInfo({
+ reports: await processFormData(form,formItems),
+ EW_RU_TASK_ID: EW_RU_TASK_ID,
+ EW_RU_JOB_ID: EW_RU_JOB_ID,
+ TYPE,
+ postMethod: 'application/json'
+ }
+ )
+ // 结束后续流程
+ await resolveNextOperation({
+ EW_RU_TASK_ID: EW_RU_TASK_ID,
+ CORP_ID,
+ TYPE,
+ EW_RU_JOB_ID,
+ vernier
+ })
+}