From bb96cb2954f750436335cf7772c14cbb529ac4dd Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 31 Aug 2024 09:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=A8=A1=E5=9D=97=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                               |  1 +
 components/other-select/index.vue          |  4 ++--
 pages/eight_assignments/hot_work/apply.vue | 15 +++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/api/index.js b/api/index.js
index f10dc0d..e00125b 100644
--- a/api/index.js
+++ b/api/index.js
@@ -48,6 +48,7 @@ export const getHotWorkGasDelete = (params) => post("/app/elSpe/delete", params)
 export const getOtherAssignmentsSelectList = (params) => post("/app/Task/getAllUnEndList", params) //关联的其他特殊作业及安全作业票编号选择列表
 export const getRiskIdentificationResultsSelectList = (params) => post("/app/eightWork/getInfo", params) //风险辨识结果选择列表
 export const getHotWorkMethodSelectList = (params) => post("/app/util/getDicList", params) // 动火方法选择列表
+export const getQyDicList = (params) => post("/app/util/otherSysDic", params) // 动火方法选择列表
 export const setTaskSave = (params) => post("/app/Task/init", params) //八项作业、隐患整改、安全环保检查任务保存更新接口
 export const getCurrentNextOperation = (params) => post("/app/Task/getSupplementInfo", params) //获取当前任务的下一步操作
 export const getDepartmentTree = (params) => post("/app/util/getDepartmentTree", params) //获取部门树
diff --git a/components/other-select/index.vue b/components/other-select/index.vue
index 333c7db..c71159f 100644
--- a/components/other-select/index.vue
+++ b/components/other-select/index.vue
@@ -22,7 +22,7 @@
 	import {
 		getOtherAssignmentsSelectList,
 		getRiskIdentificationResultsSelectList,
-		getHotWorkMethodSelectList,
+    getQyDicList,
 		getUserList
 	} from '@/api'
 
@@ -69,7 +69,7 @@
 					})
 					this.list = resData.accidentType
 				} else if (this.type === 'hotWorkMethod') {
-					const resData = await getHotWorkMethodSelectList({
+					const resData = await getQyDicList({
 						DICTIONARIES_ID: "63cf39931a89467594efc441bf67f6dd",
 					});
 					this.list = resData.list
diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index 6bbc9c8..703aea9 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -8,7 +8,7 @@
         <u-form-item label="申请办理人" prop="APPLY_USER_NAME" borderBottom required>
           <u-input v-model="form.APPLY_USER_NAME" border="none" readonly />
         </u-form-item>
-        <u-form-item label="作业编号" prop="JOB_NUMBER" borderBottom>
+        <u-form-item v-if="false" label="作业编号" prop="JOB_NUMBER" borderBottom>
           <u-input v-model="form.JOB_NUMBER" border="none" placeholder="请输入作业编号" />
         </u-form-item>
         <u-form-item label="申请日期" prop="APPLICATION_DATE" borderBottom required
@@ -24,7 +24,7 @@
         <u-form-item label="动火部位" prop="HOT_WORK_POSITION" borderBottom required>
           <u-input v-model="form.HOT_WORK_POSITION" border="none" placeholder="请输入动火部位" />
         </u-form-item>
-        <u-form-item label="动火方法" prop="HOT_WORK_METHOD_ID" borderBottom labelPosition="top" labelWidth="auto">
+        <u-form-item label="动火方法" prop="HOT_WORK_METHOD_ID" borderBottom labelPosition="top" labelWidth="auto" required>
           <u-button type="primary" size="mini" text="选择其它动火方法"
             :customStyle="{ position: 'absolute', top: '-46upx', right: '20upx', width: '180upx' }"
             @click="otherWorkMethodShow = true" />
@@ -153,7 +153,7 @@ export default {
         APPLICATION_DATE: [{ 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_METHOD_ID: [{ type: 'string', required: true, 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'] }],
@@ -253,12 +253,7 @@ export default {
     fnDateTimePickerCancel() {
       this.dateTimePicker.show = false
     },
-    fnDateTimePickerClick(event) {
-      this.dateTimePicker.type = event
-      this.dateTimePicker.value = Number(new Date(this.form[event])) || Number(new Date())
-      this.dateTimePicker.show = true
-    },
-    /** 
+    /**
      * 下一步所触发的按钮事件
     */
     async fnSubmit() {
@@ -280,4 +275,4 @@ export default {
 }
 </script>
 
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss"></style>