diff --git a/pages/eight_assignments/hoisting/apply.vue b/pages/eight_assignments/hoisting/apply.vue
index 3ee3a7c..0807898 100644
--- a/pages/eight_assignments/hoisting/apply.vue
+++ b/pages/eight_assignments/hoisting/apply.vue
@@ -3,93 +3,93 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+ @click="fnSingleChoiceClick('WORK_LEVEL_NAME')">
+
-
+
-
+ @click="fnDateTimePickerClick('WORK_START_DATE')">
+
-
+ @click="fnDateTimePickerClick('WORK_END_DATE')">
+
-
+
-
+
-
+
-
+
-
+ :customStyle="{ position: 'absolute', top: '-46upx', right: '20upx', width: '150upx' }"
+ @click="otherAssignmentsShow = true" />
+
+ labelWidth="auto">
-
+ :customStyle="{ position: 'absolute', top: '-46upx', right: '20upx', width: '150upx' }"
+ @click="otherIdentificationShow = true" />
+
-
+
+ :defaultIndex="picker.defaultIndex" @confirm="fnSingleChoiceConfirm" @cancel="fnSingleChoiceCancel" />
-
-
+ :minDate="dateTimePicker.min" :key="dateTimePicker.type" @confirm="fnDateTimePickerConfirm"
+ @cancel="fnDateTimePickerCancel" />
+
+
-
+
diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index 40bcf5e..6bbc9c8 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -57,13 +57,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ :defaultIndex="picker.defaultIndex" @confirm="fnSingleChoiceConfirm" @cancel="fnSingleChoiceCancel" />
@@ -89,7 +101,7 @@ export default {
{ name: '作业编号', key_name: 'JOB_NUMBER', key_id: 'JOB_NUMBER_ID', type: 0 },
{ name: '申请日期', key_name: 'APPLICATION_DATE', type: 0 },
{ name: '作业类型', key_name: 'JOB_TYPE_NAME', key_id: 'JOB_TYPE_ID', type: 0 },
- { name: '动火部位', key_name: 'WORK_PLACE', type: 0 },
+ { name: '动火部位', key_name: 'HOT_WORK_POSITION', type: 0 },
{ name: '动火方法', key_name: 'HOT_WORK_METHOD_ID', type: 0 },
{ name: '动火等级', key_name: 'HOT_WORK_LEVEL_INDEX', key_id: 'HOT_WORK_LEVEL_ID', type: 0 },
{ name: '动火开始时间', key_name: 'HOT_WORK_TIME_START', type: 0 },
@@ -97,6 +109,8 @@ export default {
{ name: '作业内容', key_name: 'JOB_CONTENT', type: 0 },
{ name: '动火操作人', key_name: 'USER_NAME', type: 0 },
{ name: '动火操作人', key_name: 'SUPERVISOR_OF_HOT_WORK_UNIT', type: 0 },
+ { name: '是否安全总监审批', key_name: 'IS_SAFETY_DIRECTOR', type: 0 },
+ { name: '是否需要气体检测', key_name: 'IS_GAS_TESTING', type: 0 },
],
form: {
// 申请单位
@@ -127,26 +141,34 @@ export default {
USER_NAME: '',
/** 动火监火人 */
SUPERVISOR_OF_HOT_WORK_UNIT: '',
+ /** 是否安全总监审批 */
+ IS_SAFETY_DIRECTOR: '',
+ /** 是否需要气体检测 */
+ IS_GAS_TESTING: '',
},
rules: {
APPLY_DEPARTMENT_NAME: [{ type: 'string', required: true, message: '请选择申请单位', trigger: ['blur', 'change'] }],
APPLY_USER_NAME: [{ type: 'string', required: true, message: '请选择申请办理人', trigger: ['blur', 'change'] }],
JOB_NUMBER: [{ type: 'string', required: false, message: '请输入作业编号', trigger: ['blur', 'change'] }],
APPLICATION_DATE: [{ type: 'string', required: true, message: '请选择申请日期', trigger: ['blur', 'change'] }],
- JOB_TYPE_NAME: [{ type: 'string', required: true, message: '请选择动火类型', trigger: ['blur', 'change'] }],
+ JOB_TYPE_NAME: [{ type: 'string', required: true, message: '请选择作业类型', trigger: ['blur', 'change'] }],
HOT_WORK_POSITION: [{ type: 'string', required: true, message: '请输入动火部位', trigger: ['blur', 'change'] }],
HOT_WORK_METHOD_ID: [{ type: 'string', required: false, message: '请选择动火方法', trigger: ['blur', 'change'] }],
+ HOT_WORK_LEVEL_INDEX: [{ type: 'string', required: true, message: '请选择动火等级', trigger: ['blue', 'change'] }],
HOT_WORK_TIME_START: [{ type: 'string', required: true, message: '请选择动火开始时间', trigger: ['blur', 'change'] }],
HOT_WORK_TIME_END: [{ type: 'string', required: true, message: '请选择动火结束时间', trigger: ['blur', 'change'] }],
JOB_CONTENT: [{ type: 'string', required: true, message: '请输入作业内容', trigger: ['blur', 'change'] }],
USER_NAME: [{ type: 'string', required: true, message: '请选择动火操作人', trigger: ['blur', 'change'] }],
SUPERVISOR_OF_HOT_WORK_UNIT: [{ type: 'string', required: true, message: '请输入动火监火人', trigger: ['blur', 'change'] }],
+ IS_SAFETY_DIRECTOR: [{ type: 'string', required: true, message: '请选择是否安全总监审批', trigger: ['blur', 'change'] }],
+ IS_GAS_TESTING: [{ type: 'string', required: true, message: '请选择是否需要气体检测', trigger: ['blur', 'change'] }],
},
picker: {
show: false,
columns: [],
key: 'NAME',
- type: 'picker'
+ type: 'picker',
+ defaultIndex: []
},
dateTimePicker: {
show: false,
@@ -159,6 +181,10 @@ export default {
otherWorkMethodShow: false,
/** 其他动火操作人选择器是否展示 */
otherUserNameSelectShow: false,
+ /** 存储作业类型选中态 */
+ jobTypeNameArr: [],
+ /** 存储动火等级选中态 */
+ hotWorkLevelNameArr: []
}
},
onLoad(options) {
@@ -171,10 +197,19 @@ export default {
},
methods: {
async fnGetData(taskId) {
- let resData = await getTaskInfo({EW_RU_TASK_ID: taskId})
+ let resData = await getTaskInfo({ EW_RU_TASK_ID: taskId })
if (resData.list.form && resData.list.form.length > 0) {
resData.list.form.forEach((sos, index) => {
this.form[sos.ITEM_NAME] = sos.ITEM_VALUE;
+ if (sos.FK_NAME) {
+ this.form[sos.FK_NAME] = sos.FK_VALUE;
+ if (sos.FK_NAME === "JOB_TYPE_ID") {
+ this.jobTypeNameArr = [Number(sos.FK_VALUE)];
+ }
+ if (sos.FK_NAME === "HOT_WORK_LEVEL_ID") {
+ this.hotWorkLevelNameArr = [Number(sos.FK_VALUE)];
+ }
+ }
})
}
},
@@ -185,18 +220,26 @@ export default {
},
fnSingleChoiceClick(event) {
this.picker.type = event;
- if (event === 'JOB_TYPE_NAME') this.picker.columns = [[{ ID: '0', NAME: '内部作业' }, { ID: '1', NAME: '相关方作业' }]];
- if (event === 'HOT_WORK_LEVEL_INDEX') this.picker.columns = [[{ ID: '0', NAME: '特级' }, { ID: '1', NAME: '一级' }, { ID: '2', NAME: '二级' }, { ID: '3', NAME: '三级' }]]
+ if (event === 'JOB_TYPE_NAME') {
+ this.picker.columns = [[{ ID: '0', NAME: '内部作业' }, { ID: '1', NAME: '相关方作业' }]]
+ if (this.jobTypeNameArr.length > 0) this.picker.defaultIndex = this.jobTypeNameArr;
+ };
+ if (event === 'HOT_WORK_LEVEL_INDEX') {
+ this.picker.columns = [[{ ID: '0', NAME: '特级' }, { ID: '1', NAME: '一级' }, { ID: '2', NAME: '二级' }, { ID: '3', NAME: '三级' }]]
+ if (this.hotWorkLevelNameArr.length > 0) this.picker.defaultIndex = this.hotWorkLevelNameArr;
+ }
this.picker.show = true;
},
fnSingleChoiceConfirm(event) {
if (this.picker.type === 'JOB_TYPE_NAME') {
this.form.JOB_TYPE_ID = event.value[0].ID
this.form.JOB_TYPE_NAME = event.value[0].NAME
+ this.picker.defaultIndex = event.indexs
}
if (this.picker.type === 'HOT_WORK_LEVEL_INDEX') {
this.form.HOT_WORK_LEVEL_ID = event.value[0].ID
this.form.HOT_WORK_LEVEL_INDEX = event.value[0].NAME
+ this.picker.defaultIndex = event.indexs
}
this.fnSingleChoiceCancel()
},