diff --git a/pages.json b/pages.json index aeb9e60..b97f07a 100644 --- a/pages.json +++ b/pages.json @@ -627,6 +627,10 @@ "path": "pages/application/blindboard/blindboard-apply/blindboard-apply-detail", "style": {} }, + { + "path": "pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail", + "style": {} + }, { "path": "pages/application/blindboard/blindboard-measures/blindboard-measures-detail", "style": {} diff --git a/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue b/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue index e6340a5..19e6829 100644 --- a/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue +++ b/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue @@ -198,7 +198,28 @@ - + + + 车间人员单位 + + {{pd.WORKSHOP_DEPARTMENT_NAME?pd.WORKSHOP_DEPARTMENT_NAME:'请选择'}} + + + + + 车间人员 + + + {{pd.WORKSHOP_USER_NAME?pd.WORKSHOP_USER_NAME:'请选择'}} + + + + 监护人单位 @@ -602,6 +623,8 @@ confirmindex:-1, guardianUserList:[], guardianindex:-1, + workshopUserList:[], + workshopindex: -1, leaderUserList:[], workUsersList:[], workusersindex:-1, @@ -837,7 +860,7 @@ formData.OPERATOR=loginUser.USER_ID formData.ACTION_USER=loginUser.NAME formData.APPLY_STATUS=STATUS - formData.boardList = JSON.stringify(this.boardList) + formData.boardList = JSON.stringify(this.boardList) formData.TASK_ID=13 this.buttonloading = true uni.request({ @@ -1009,6 +1032,15 @@ }) } break + case 'workshop': + if(this.workshopUserList.length == 0) { + uni.showToast({ + icon: 'none', + title: '请先选择车间人员单位', + duration: 1500 + }) + } + break case 'confess': if(this.confessUserList.length == 0) { uni.showToast({ @@ -1111,6 +1143,9 @@ guardiantreeCancel(e) { this.isUps=false; }, + workshoptreeCancel(e) { + this.isUps=false; + }, // 取消回调事件 confesstreeCancel(e) { this.isUps=false; @@ -1128,6 +1163,11 @@ this.isUps=true this.$refs.tkiTree_guardian._show(); }, + + showWorkshopTree() { + this.isUps=true + this.$refs.tkiTree_workshop._show(); + }, // 显示树形选择器 showConfessTree() { this.isUps=true @@ -1142,7 +1182,12 @@ this.isUps=true this.$refs.tkiTree_workstart._show(); }, - + PickerWorkshop(e) { + this.workshopindex = e.detail.value; + this.pd.WORKSHOP_USER_ID=this.workshopUserList[this.workshopindex].USER_ID; + this.pd.WORKSHOP_USER_NAME=this.workshopUserList[this.workshopindex].NAME; + this.$forceUpdate();//强制刷新 + }, PickerGuardian(e) { this.guardianindex = e.detail.value; this.pd.GUARDIAN_USER_ID=this.guardianUserList[this.guardianindex].USER_ID; @@ -1218,6 +1263,15 @@ this.$forceUpdate();//强制刷新 this.getUserList(e[0].id,'guardianUserList'); }, + workshoptreeConfirm(e) { + this.isUps=false; + this.pd.WORKSHOP_DEPARTMENT_ID=e[0].id; + this.pd.WORKSHOP_DEPARTMENT_NAME=e[0].name; + this.pd.WORKSHOP_USER_ID = '' + this.pd.WORKSHOP_USER_NAME = '' + this.$forceUpdate();//强制刷新 + this.getUserList(e[0].id,'workshopUserList'); + }, // // 取消回调事件 // guardiantreeCancel(e) { // this.isUps=false; diff --git a/pages/application/blindboard/blindboard-detail/index.vue b/pages/application/blindboard/blindboard-detail/index.vue index 72a510d..5eafe46 100644 --- a/pages/application/blindboard/blindboard-detail/index.vue +++ b/pages/application/blindboard/blindboard-detail/index.vue @@ -66,10 +66,10 @@ {{boardList[index].BOARD_NO}} - - - 盲板抽堵位置及安全措施： - + + + 盲板抽堵位置及安全措施： + @@ -86,6 +86,8 @@ + + 实际作业开始时间： diff --git a/pages/application/blindboard/blindboard-list/index.vue b/pages/application/blindboard/blindboard-list/index.vue index b48ba9d..d34d4d6 100644 --- a/pages/application/blindboard/blindboard-list/index.vue +++ b/pages/application/blindboard/blindboard-list/index.vue @@ -177,6 +177,10 @@ uni.navigateTo({ url: '/pages/application/blindboard/blindboard-apply/blindboard-apply-detail?BLINDBOARD_ID='+e }); + }else if(this.flow === '车间人员签字'){ + uni.navigateTo({ + url: '/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail?BLINDBOARD_ID='+e + }); }else if(this.flow === '设置安全措施确认人'){ uni.navigateTo({ url: '/pages/application/blindboard/blindboard-measures/blindboard-measures-detail?BLINDBOARD_ID='+e diff --git a/pages/application/blindboard/blindboard-measures/blindboard-measures-detail.vue b/pages/application/blindboard/blindboard-measures/blindboard-measures-detail.vue index e4882ed..8ff4eba 100644 --- a/pages/application/blindboard/blindboard-measures/blindboard-measures-detail.vue +++ b/pages/application/blindboard/blindboard-measures/blindboard-measures-detail.vue @@ -7,31 +7,7 @@ - - - 盲板抽堵位置及安全措施： - - - - 盲板抽堵位置图： - - - - - - - - - - - - - - - - - 安全防护措施 @@ -128,7 +104,6 @@ measuresList:[], modalName:null, imgList:[], - conimgList: [], } }, onLoad(event){ @@ -140,74 +115,7 @@ loginSession(); }, methods: { - delImgs(e) { - var _this = this; - uni.showModal({ - title: '秦安双控', - content: '确定要删除这张图片吗？', - cancelColor: "#000000", - cancelText: '取消', - confirmText: '确定', - success: res => { - if (res.confirm) { - uni.request({ - url: basePath+'/app/eightwork/deleteFile', - method: 'POST', - dataType: 'json', - header: { - 'Content-type':'application/x-www-form-urlencoded' - }, - data: { - FILE_PATH:_this.conimgList[e.currentTarget.dataset.index].filePath - }, - success: (res) => { - uni.showToast({ - icon: 'none', - title: '删除成功', - duration: 1500 - }); - this.conimgList.splice(e.currentTarget.dataset.index, 1) - }, - fail: (err) => { - uni.showModal({ - content: "删除失败", - showCancel: false - }); - } - }) - } - } - }) - }, - chooseImages() { - uni.chooseImage({ - count: 1, //默认9 - sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 - sourceType: ['camera', 'album'], //从相册选择 - success: (res) => { - uni.uploadFile({ - url: basePath+'/app/eightwork/saveFile', - filePath: res.tempFilePaths[0], - name: 'file', - formData: { - CORPINFO_ID:loginUser.CORPINFO_ID, - }, - success: ({data}) => { - let img = {}; - img.filePath = JSON.parse(data).FILE_PATH; - this.conimgList.push(img) - console.log(this.conimgList) - }, - fail: (err) => { - uni.showModal({ - content: "图片上传失败", - showCancel: false - }); - } - }) - } - }); - }, + getData() { var _this = this; uni.showLoading({ @@ -263,14 +171,7 @@ return; } } - if(_this.conimgList.length <= 0){ - uni.showToast({ - icon: 'none', - title: '请上传盲板抽堵位置图', - duration: 1500 - }); - return; - } + } const formData={} var files = []; @@ -287,9 +188,7 @@ formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS formData.PREPARERS = JSON.stringify(signers) - formData.CONIMG_PATH = this.conimgList.map(item => { - return item.filePath - }).join(",") + uni.uploadFile({ url: basePath+'app/blindboard/nextStep', files: files, diff --git a/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail.vue b/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail.vue new file mode 100644 index 0000000..14dd437 --- /dev/null +++ b/pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail.vue @@ -0,0 +1,483 @@ + + + + + diff --git a/pages/application/blindboard/home.vue b/pages/application/blindboard/home.vue index 7675af6..d3df323 100644 --- a/pages/application/blindboard/home.vue +++ b/pages/application/blindboard/home.vue @@ -22,7 +22,16 @@ 申请 - + + + + {{count.WORKSHOP}} + + + 车间人员 + 签字 + + diff --git a/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue index 4d2008a..2c027c6 100644 --- a/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue +++ b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue @@ -322,7 +322,7 @@ formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS - formData.WORK_CONTENT = _this.pd.WORK_CONTENT + formData.WORK_CONTENT = _this.pd.WORK_CONTENT?_this.pd.WORK_CONTENT:"" formData.CONIMG_PATH = this.conimgList.map(item => { return item.filePath }).join(",") diff --git a/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue b/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue index 04d98f1..580e750 100644 --- a/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue +++ b/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue @@ -705,6 +705,10 @@ name: 'RISK_IDENTIFICATION', message: '请输入风险辨识结果' }, + { + name: 'SPECIAL_WORK', + message: '请输入关联的其他特殊作业及安全作业票编号' + }, { name: 'CONFIRM_USER_ID',