diff --git a/pages.json b/pages.json
index 6775057..6ea8876 100644
--- a/pages.json
+++ b/pages.json
@@ -336,6 +336,48 @@
"navigationBarTitleText": "安全交底表",
"onReachBottomDistance": 100
}
+ },
+ {
+ "path": "jobFireEdit",
+ "style": {
+ "navigationBarTitleText": "动火作业工作票",
+ "onReachBottomDistance": 100
+ }
+ },{
+ "path": "jobFireTenEdit",
+ "style": {
+ "navigationBarTitleText": "动火作业工作票",
+ "onReachBottomDistance": 100
+ }
+ },{
+ "path": "jobFireTwoEdit",
+ "style": {
+ "navigationBarTitleText": "动火作业工作票",
+ "onReachBottomDistance": 100
+ }
+ },
+ {
+ "path": "jobFireShow",
+ "style": {
+ "navigationBarTitleText": "动火作业工作票",
+ "onReachBottomDistance": 100,
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "fontSize": "14px",
+ "text": "审批详情",
+ "width": "auto"
+ }]
+ }
+ }
+ }
+ },
+ {
+ "path": "jobFireList",
+ "style": {
+ "navigationBarTitleText": "动火作业工作票",
+ "onReachBottomDistance": 100
+ }
}
]
},
diff --git a/pages/apply/subPages/FO/FO035Show.vue b/pages/apply/subPages/FO/FO035Show.vue
index ea6078a..bda7e75 100644
--- a/pages/apply/subPages/FO/FO035Show.vue
+++ b/pages/apply/subPages/FO/FO035Show.vue
@@ -45,7 +45,7 @@
- 签到
+ 确认
diff --git a/pages/apply/subPages/FO/FO037Show.vue b/pages/apply/subPages/FO/FO037Show.vue
index ee1726c..0ee684f 100644
--- a/pages/apply/subPages/FO/FO037Show.vue
+++ b/pages/apply/subPages/FO/FO037Show.vue
@@ -45,7 +45,7 @@
- 签到
+ 确认
diff --git a/pages/apply/subPages/FO/jobFireEdit.vue b/pages/apply/subPages/FO/jobFireEdit.vue
new file mode 100644
index 0000000..4cf4f40
--- /dev/null
+++ b/pages/apply/subPages/FO/jobFireEdit.vue
@@ -0,0 +1,1009 @@
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息填写
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
+ *
+
+
+ 作业人员信息
+
+
+
+
+
+
+ {{item.Nav_User?index+1+'.'+item.Nav_User.NAME:index+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+ 上一步
+ 下一步
+
+
+
+
+
+
+
+ *
+
+
+ 作业流程及安全措施
+
+
+
+
+
+
+ {{item.CONTENT?index+1+'.'+item.JOB_STEPName+'--'+item.CONTENT:index+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ 上一步
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/apply/subPages/FO/jobFireList.vue b/pages/apply/subPages/FO/jobFireList.vue
new file mode 100644
index 0000000..80c7186
--- /dev/null
+++ b/pages/apply/subPages/FO/jobFireList.vue
@@ -0,0 +1,351 @@
+
+
+
+
+
+ {{dateFilterTxt}}
+
+
+
+
+ {{statusFilterTxt}}
+
+
+
+
+
+
+
+
+
+
+
+ 作业申请人：
+ {{item.Nav_ApplyUser ? item.Nav_ApplyUser.NAME : ''}}
+
+
+ 创建时间：
+ {{$u.timeFormat(item.CREATE_TIME,'yyyy-mm-dd')}}
+
+
+ 状态：
+ {{item.IS_PUBLISH}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/apply/subPages/FO/jobFireShow.vue b/pages/apply/subPages/FO/jobFireShow.vue
new file mode 100644
index 0000000..17f62d9
--- /dev/null
+++ b/pages/apply/subPages/FO/jobFireShow.vue
@@ -0,0 +1,482 @@
+
+
+
+
+
+
+ *
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+ *
+
+
+ 作业人员信息
+
+
+
+
+
+
+ {{item.Nav_User?index+1+'.'+item.Nav_User.NAME:index+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+
+
+
+
+ *
+
+
+ 作业流程及安全措施
+
+
+
+
+
+
+ {{item.CONTENT?index+1+'.'+item.JOB_STEPName+'--'+item.CONTENT:index+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 现场条件验收附件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完工验收附件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审阅
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/apply/subPages/FO/jobFireTenEdit.vue b/pages/apply/subPages/FO/jobFireTenEdit.vue
new file mode 100644
index 0000000..54b5192
--- /dev/null
+++ b/pages/apply/subPages/FO/jobFireTenEdit.vue
@@ -0,0 +1,856 @@
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息填写
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 现场条件验收附件：
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
+ *
+
+
+ 作业流程及安全措施
+
+
+
+
+
+
+ {{item.CONTENT?index+1+'.'+item.JOB_STEPName+'--'+item.CONTENT:index+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ 上一步
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/apply/subPages/FO/jobFireTwoEdit.vue b/pages/apply/subPages/FO/jobFireTwoEdit.vue
new file mode 100644
index 0000000..05a29e5
--- /dev/null
+++ b/pages/apply/subPages/FO/jobFireTwoEdit.vue
@@ -0,0 +1,910 @@
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息填写
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 完工验收附件：
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/my/subPages/userInfo1.vue b/pages/my/subPages/userInfo1.vue
index 09006ce..d972f97 100644
--- a/pages/my/subPages/userInfo1.vue
+++ b/pages/my/subPages/userInfo1.vue
@@ -1,7 +1,7 @@
-
+
{{userInfo.UserName}}
@@ -21,7 +21,7 @@
-->
-
@@ -39,6 +39,10 @@
+
+
+
+
@@ -190,6 +194,9 @@
})
},
methods: {
+ changeSwitch(e){
+ this.userInfo.ISGETMSG = e
+ },
formSubmit() {
saveUser(this.userInfo).then(res => {
uni.$showMsgFunc('操作成功!', () => {
diff --git a/services/apply/FOServices/FOServices.js b/services/apply/FOServices/FOServices.js
index 0930d69..8151fa8 100644
--- a/services/apply/FOServices/FOServices.js
+++ b/services/apply/FOServices/FOServices.js
@@ -63,6 +63,62 @@ export function getUserLists(params) {
})
})
}
+export function getRenewalTrain(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/SE/RenewalTrain/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+export function getAnalyzeDetail(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FO/FOFireJob/GetAnalyzeDetail", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result.Data);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+
+export function getWorkLists(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/HM/OperationLink/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+export function getFireType(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FO/FireType/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+export function getSafeUser(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FO/FOFireJob/GetSafeUser", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result.Data);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
//人员列表
export function getPersonLists(params) {
return new Promise((resolve, reject) => {
@@ -110,6 +166,28 @@ export function getRiskArea(params) {
})
})
}
+export function getSKEnterpriseLibrary(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/SK/SKEnterpriseLibrary/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+export function getRelatedUserType(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/OG/RelatedUserType/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
//工作票选人不分页
export function getAllLists(params) {
return new Promise((resolve, reject) => {
@@ -367,6 +445,17 @@ export function getLeaderWellRecord(params) {
})
})
}
+export function getFOFireJob(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FO/FOFireJob/GetEdit", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result.Data);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
export function getTechDisclosure(params) {
return new Promise((resolve, reject) => {
request.post("/FO/TechDisclosureFromTech/Get", params).then((result) => {
@@ -400,6 +489,17 @@ export function fullFOLeaderWellRecord(params) {
})
})
}
+export function fullFOFireJob(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FO/FOFireJob/FullUpdate", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
export function fullFOTechDisclosure(params) {
return new Promise((resolve, reject) => {
request.post("/FO/FOTechDisclosureFromTech/FullUpdate", params).then((result) => {
diff --git a/utils/common.js b/utils/common.js
index d33a9d8..ebf3a03 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1431,6 +1431,9 @@ export function ApproveCode(json) {
case 'FO025_SHOWPRINT': //工作票审批外包
linkToUrl = '/pages/apply/subPages/FO2/jobOutsourceShow'
break;
+ case 'FO043_SHOWPRINT': //工作票审批外包
+ linkToUrl = '/pages/apply/subPages/FO/jobFireShow'
+ break;
case 'HM104_SHOWPRINT': //作业任务识别审批
linkToUrl = '../apply/subPages/HM2/jobTaskIdentityShow'
break;
@@ -1693,6 +1696,18 @@ export function SourceFormcode(json) {
case 'FO041_SHOWPRINT': //班组安全活动编辑
linkToUrl = '../apply/subPages/FO/FO041Show'
break;
+ case 'FO043': //班组安全活动编辑
+ linkToUrl = '../apply/subPages/FO/jobFireEdit'
+ break;
+ case 'FO043_1': //班组安全活动编辑
+ linkToUrl = '../apply/subPages/FO/jobFireTenEdit'
+ break;
+ case 'FO043_2': //班组安全活动编辑
+ linkToUrl = '../apply/subPages/FO/jobFireTwoEdit'
+ break;
+ case 'FO043_SHOWPRINT': //班组安全活动编辑
+ linkToUrl = '../apply/subPages/FO/jobFireShow'
+ break;
case 'FO035': //班组安全活动编辑
linkToUrl = '../apply/subPages/FO/FO035Edit'
break;