diff --git a/pages/application/dangerous_options/index.vue b/pages/application/dangerous_options/index.vue
index ef3e0fe..294d16c 100644
--- a/pages/application/dangerous_options/index.vue
+++ b/pages/application/dangerous_options/index.vue
@@ -220,32 +220,43 @@ export default {
});
return;
}
- uni.uploadFile({
- url: basePath+'/app/eightwork/saveFile',
- filePath: this.signImgList[0].filePath,
- name: 'file',
- formData: {
- CORPINFO_ID:loginUser.CORPINFO_ID,
- },
- success: ({data}) => {
- this.signImgList[0].filePath = JSON.parse(data).FILE_PATH;
- this.buttonloading = true;
- setMeasures("")
- uni.$emit('dangerous_options_submit', {
- imgList: this.imgList,
- signImgList: this.signImgList,
- index: this.currentIndex,
- STATUS: this.STATUS
- });
- this.goback()
- },
- fail: (err) => {
- uni.showModal({
- content: "图片上传失败",
- showCancel: false
- });
- }
- })
+
+ if(this.signImgList[0].filePath.indexOf('uploadFiles') > -1){
+ uni.$emit('dangerous_options_submit', {
+ imgList: this.imgList,
+ signImgList: this.signImgList,
+ index: this.currentIndex,
+ STATUS: this.STATUS
+ });
+ this.goback()
+ }else{
+ uni.uploadFile({
+ url: basePath+'/app/eightwork/saveFile',
+ filePath: this.signImgList[0].filePath,
+ name: 'file',
+ formData: {
+ CORPINFO_ID:loginUser.CORPINFO_ID,
+ },
+ success: ({data}) => {
+ this.signImgList[0].filePath = JSON.parse(data).FILE_PATH;
+ this.buttonloading = true;
+ setMeasures("")
+ uni.$emit('dangerous_options_submit', {
+ imgList: this.imgList,
+ signImgList: this.signImgList,
+ index: this.currentIndex,
+ STATUS: this.STATUS
+ });
+ this.goback()
+ },
+ fail: (err) => {
+ uni.showModal({
+ content: "图片上传失败",
+ showCancel: false
+ });
+ }
+ })
+ }
},
goback(){
uni.navigateBack({delta: 1});
diff --git a/pages/application/hotwork/hotwork-detail/index.vue b/pages/application/hotwork/hotwork-detail/index.vue
index ac22c25..83f6a85 100644
--- a/pages/application/hotwork/hotwork-detail/index.vue
+++ b/pages/application/hotwork/hotwork-detail/index.vue
@@ -77,7 +77,7 @@
-
+
安全防护措施
@@ -136,7 +136,7 @@
-
+
其他安全防护措施
@@ -381,6 +381,10 @@ export default {
type: String,
default: ""
},
+ showMeasures: {
+ type: Boolean,
+ default: true
+ },
},
data() {
return {
@@ -466,7 +470,6 @@ export default {
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = this.hotworkId;
this.getData();
-
},
methods: {
//跳转事件
diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue
index 2d2a71e..96409d0 100644
--- a/pages/application/hotwork/hotwork-list/index.vue
+++ b/pages/application/hotwork/hotwork-list/index.vue
@@ -64,13 +64,13 @@
暂存
气体检测打回
{{ item.NEXT_STEP_NAME }}
- {{ item.NEXT_STEP_NAME }}打回
+ {{ item.STEP_NAME }}打回
+ @click="showDrawer('showRight',item.HOTWORK_ID)">查看流程图
@@ -85,6 +85,30 @@
+
+
+
+
+
+ 查看流程图
+
+
+
+
+
+
+
+
+ {{item.STEP_NAME}}
+ {{item.ACT_USER_NAME || item.SIGN_USER}}
+ {{item.ACT_TIME}}
+
+
+
+
+
+
@@ -99,7 +123,7 @@
},
data() {
return {
- flow:"",
+ flow:"",
showRight: false,
dataFlag:'noData',
sTop:0,
@@ -115,6 +139,7 @@
stepList:[],
sindex:-1,
STEP_ID:'',
+ flowList:[],
}
},
onReady() {
@@ -233,11 +258,7 @@
_this.getData();
},
- // 抽屉状态发生变化触发
- change(e, type) {
- console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
- this[type] = e
- },
+
// 滑动到底方法
scrolltolower(){
var _this = this;
@@ -359,6 +380,49 @@
}
})
},
+
+ // 打开窗口
+ showDrawer(e,HOTWORK_ID) {
+ uni.showLoading({
+ title:"加载中..."
+ });//加载中动画
+ uni.request({
+ url: basePath +'/app/hotwork/getFlowList' ,
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type':'application/x-www-form-urlencoded'
+ },
+ data: {
+ HOTWORK_ID
+ },
+ success: (res) => {
+ uni.hideLoading();//结束加载中动画
+ this.flowList = res.data.flowList
+ this.$refs[e].open()
+ }
+ })
+ },
+
+ getShowStatus(work) {
+ if(work.STATUS === 1){
+ return 'success'
+ }else if(work.STATUS < 0){
+ return 'erroractive'
+ }else if(work.CURRENT_STEP){
+ return 'active'
+ }
+ },
+ // 关闭窗口
+ closeDrawer(e) {
+ this.$refs[e].close()
+ },
+
+ // 抽屉状态发生变化触发
+ change(e, type) {
+ console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+ this[type] = e
+ },
}
}
diff --git a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
index 43bf94b..6638726 100644
--- a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
+++ b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
@@ -6,62 +6,7 @@
-
-
- 申请单位：
- {{pd.APPLY_DEPARTMENT_NAME}}
-
-
-
- 申请人：
- {{pd.APPLY_USER_NAME}}
-
-
-
- 编号：
- {{pd.CHECK_NO}}
-
-
-
- 作业内容：
- {{pd.WORK_CONTENT}}
-
-
-
- 动火地点及动火部位：
- {{pd.WORK_PLACE}}
-
-
-
- 动火作业级别：
- {{pd.WORK_LEVEL}}
-
-
-
- 动火方式：
- {{pd.WORK_FUNCTION}}
-
-
- 动火人及证书编号：
- {{pd.WORK_USER}}
-
-
-
- 关联的其他特殊作业及安全作业票编号：
- {{pd.SPECIAL_WORK}}
-
-
-
- 风险辨识结果：
- {{pd.RISK_IDENTIFICATION}}
-
-
-
- 分析人：
- {{pd.ANALYZE_USER_NAME}}
-
-
-
+
@@ -146,9 +91,10 @@
import gcoord from '@/common/gcoord.js'
import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
import { setMeasures } from '@/pages/application/dangerous_options/index.js';
+ import detail from '@/pages/application/hotwork/hotwork-detail/index'
export default {
components: {
- tkiTree,ruiDatePicker,writingBoard
+ tkiTree,ruiDatePicker,writingBoard,detail
},
data() {
return {
diff --git a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
index 954c25f..41ffaf2 100644
--- a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
+++ b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
@@ -6,62 +6,7 @@
-
-
- 申请单位：
- {{pd.APPLY_DEPARTMENT_NAME}}
-
-
-
- 申请人：
- {{pd.APPLY_USER_NAME}}
-
-
-
- 编号：
- {{pd.CHECK_NO}}
-
-
-
- 作业内容：
- {{pd.WORK_CONTENT}}
-
-
-
- 动火地点及动火部位：
- {{pd.WORK_PLACE}}
-
-
-
- 动火作业级别：
- {{pd.WORK_LEVEL}}
-
-
-
- 动火方式：
- {{pd.WORK_FUNCTION}}
-
-
- 动火人及证书编号：
- {{pd.WORK_USER}}
-
-
-
- 关联的其他特殊作业及安全作业票编号：
- {{pd.SPECIAL_WORK}}
-
-
-
- 风险辨识结果：
- {{pd.RISK_IDENTIFICATION}}
-
-
-
- 分析人：
- {{pd.ANALYZE_USER_NAME}}
-
-
-
+
@@ -144,9 +89,10 @@
import writingBoard from "@/components/writing-board/writing-board.vue"
import gcoord from '@/common/gcoord.js'
import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
+ import detail from '@/pages/application/hotwork/hotwork-detail/index'
export default {
components: {
- tkiTree,ruiDatePicker,writingBoard
+ tkiTree,ruiDatePicker,writingBoard,detail
},
data() {
return {