diff --git a/pages.json b/pages.json
index 7afc491..caced64 100644
--- a/pages.json
+++ b/pages.json
@@ -273,6 +273,13 @@
"navigationBarTitleText": "班组安全活动",
"onReachBottomDistance": 100
}
+ },
+ {
+ "path": "FO041Edit",
+ "style": {
+ "navigationBarTitleText": "领导带班下井",
+ "onReachBottomDistance": 100
+ }
}
]
},
diff --git a/pages/apply/subPages/FO/FO041Edit.vue b/pages/apply/subPages/FO/FO041Edit.vue
new file mode 100644
index 0000000..e054eed
--- /dev/null
+++ b/pages/apply/subPages/FO/FO041Edit.vue
@@ -0,0 +1,776 @@
+
+
+
+
+
+
+
+ *
+
+
+ 基本信息填写
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
+ *
+
+
+ 检查内容
+
+
+
+
+
+
+ {{index+1+'.'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+ 上一步
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/apply/subPages/SK/riskVerifyShow.vue b/pages/apply/subPages/SK/riskVerifyShow.vue
index 39a8a9f..f2be509 100644
--- a/pages/apply/subPages/SK/riskVerifyShow.vue
+++ b/pages/apply/subPages/SK/riskVerifyShow.vue
@@ -100,7 +100,10 @@
-
+
+
+ 确认
+
@@ -123,6 +126,7 @@
} from '../../../../utils/enums.js'
import {
GetVerifyRiskReportRecord,
+ SKHiddenDangerIdentityUpdate
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
@@ -282,6 +286,17 @@
this.isLoadOK = true
},
+ submit() {
+ let json = {};
+ json.ID = this.model.ID;
+ json.TaskID = this.TaskID;
+ SKHiddenDangerIdentityUpdate(json).then(res => {
+ uni.$showMsgFunc('操作成功!', () => {
+ uni.navigateBack()
+ },
+ 'success', 1000)
+ })
+ }
}
diff --git a/pages/apply/subPages/SK/safeCheckEditNew.vue b/pages/apply/subPages/SK/safeCheckEditNew.vue
index be093ea..e2a2ec6 100644
--- a/pages/apply/subPages/SK/safeCheckEditNew.vue
+++ b/pages/apply/subPages/SK/safeCheckEditNew.vue
@@ -283,7 +283,7 @@
this.model.Nav_Details = []
if (this.ID == undefined || this.ID == '')
this.ID = guid()
- this.model.ID = guid()
+ this.model.ID = this.ID
} else {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "")
diff --git a/services/apply/FOServices/FOServices.js b/services/apply/FOServices/FOServices.js
index c48631e..0de5738 100644
--- a/services/apply/FOServices/FOServices.js
+++ b/services/apply/FOServices/FOServices.js
@@ -344,4 +344,48 @@ export function getJobActivityRecordReject(params) {
reject(error);
})
})
+}
+export function getUser(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FM/User/Get", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result.Data);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+export function getLeaderWellRecord(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FO/LeaderWellRecord/Get", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+export function fullFOLeaderWellRecord(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FO/FOLeaderWellRecord/FullUpdate", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error)=>{
+ reject(error);
+ })
+ })
+}
+export function getClassLists(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FM/Class/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error) => {
+ reject(error);
+ })
+ })
}
\ No newline at end of file
diff --git a/services/apply/subPages/SK/SKServices.js b/services/apply/subPages/SK/SKServices.js
index 93d7c5e..606f691 100644
--- a/services/apply/subPages/SK/SKServices.js
+++ b/services/apply/subPages/SK/SKServices.js
@@ -408,6 +408,17 @@ export function IdentityUpdate(params) {
})
})
}
+export function SKHiddenDangerIdentityUpdate(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/SK/SKHiddenDangerConfirm/IdentityUpdate", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result.Data);
+ }
+ }).catch((error) => {
+ reject(error)
+ })
+ })
+}
export function HiddenDangerReportUpdate(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKHiddenDangerReport/IdentityUpdate", params).then((result) => {
diff --git a/services/safe.js b/services/safe.js
index c5890e6..499ccf1 100644
--- a/services/safe.js
+++ b/services/safe.js
@@ -149,6 +149,17 @@ export function getDepartmentLists(params) {
})
})
}
+export function getProductionUnitLists(params) {
+ return new Promise((resolve, reject) => {
+ request.post("/FM/UserProductionUnitSet/OrderPaged", params).then((result) => {
+ if (result.IsSuccessful) {
+ resolve(result);
+ }
+ }).catch((error) => {
+ reject(error);
+ })
+ })
+}
export function saveUser(params) {
return new Promise((resolve, reject) => {
request.post("/FM/User/Update", params).then((result) => {
diff --git a/style/css/newTemplate.css b/style/css/newTemplate.css
index 328bfaf..7b31bb5 100644
--- a/style/css/newTemplate.css
+++ b/style/css/newTemplate.css
@@ -149,4 +149,26 @@
flex-wrap: wrap;
justify-content: end;
flex: 1;
+}
+.tag-view {
+ position: relative;
+ padding-bottom: 4px;
+ flex-wrap: wrap;
+ display: flex;
+}
+
+.tag-view:after {
+ content: '';
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ -webkit-transform: scaleY(0.5);
+ left: 0;
+ transform: scaleY(0.5);
+ border-bottom: 1px solid rgb(214, 215, 217);
+}
+
+.tag-view .tag {
+ margin-right: 12px;
+ margin-bottom: 10px;
}
\ No newline at end of file