diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 40e5e805..1e1eb6a2 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -19,7 +19,7 @@ "type" : "uniCloud" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/components/dateTimePicker/index.vue b/components/dateTimePicker/index.vue index 7683edce..1f1dc087 100644 --- a/components/dateTimePicker/index.vue +++ b/components/dateTimePicker/index.vue @@ -378,7 +378,7 @@ export default { * @param {Number} hour 时 * @param {Number} minute 分 */ - setSecondData(year, month, day, hour) { + setSecondData(year, month, day, hour, minute) { // 有效日期 let yearStart = this.dtStart.getFullYear(); let monthStart = this.dtStart.getMonth() + 1; diff --git a/main.js b/main.js index 1c4a3178..b9b85946 100644 --- a/main.js +++ b/main.js @@ -37,7 +37,7 @@ if (process.env.NODE_ENV === 'development') { console.log('开发环境') // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用） // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 - // Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址 + // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 @@ -45,8 +45,10 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 + // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 - // Vue.prototype.url_config = 'http://139.9.66.234:8/' + // Vue.prototype.url_config = 'http://139.9.66.234:5173/' // Vue.prototype.url_config = 'http://192.168.34.125:6023/' // Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通 // Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局 @@ -83,13 +85,13 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址 // Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址 // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用） - // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 - Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 + Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 + // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段 // Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） - // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 + // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 // Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址 // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 diff --git a/manifest.json b/manifest.json index 1393203e..a461d31a 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "智慧安全", //中建四局 "appid" : "__UNI__4AA4101", "description" : "", - "versionName" : "1.4.4", - "versionCode" : 144, + "versionName" : "1.5.0", + "versionCode" : 150, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index ed340b57..8d6f950e 100644 --- a/pages.json +++ b/pages.json @@ -539,6 +539,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/projectEnd/qualityManage/editIssue", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, { "path": "pages/projectEnd/safeSame/addIssue", "style": { @@ -546,6 +553,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/projectEnd/safeSame/editIssue", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, { "path": "pages/projectEnd/carWashManage/index", "style": { diff --git a/pages/messageCenter/messageCenter.vue b/pages/messageCenter/messageCenter.vue index bedece2e..0e46163c 100644 --- a/pages/messageCenter/messageCenter.vue +++ b/pages/messageCenter/messageCenter.vue @@ -79,9 +79,9 @@ }, method: "POST", success(res) { - if (res.result.status == 6) { + if (!res.result || res.result.status == 6) { uni.showToast({ - title: '通知消息已撤回', + title: '检查单已撤回', icon: "none" }) return; @@ -101,9 +101,9 @@ method: "POST", success(res) { console.log(res) - if (res.result.status == 6) { + if (!res.result || res.result.status == 6) { uni.showToast({ - title: '通知消息已撤回', + title: '检查单已撤回', icon: "none" }) return; diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue index 7764ac53..8005fada 100644 --- a/pages/projectEnd/qualityManage/addIssue.vue +++ b/pages/projectEnd/qualityManage/addIssue.vue @@ -991,7 +991,7 @@ this.$nextTick(() => { this.isShowPicker = true; }); - this.getPersonUpdateList(); + // this.getPersonUpdateList(); // } else { // this.form.enterpriseSn = val.enterpriseSn; // this.form.enterpriseName = val.enterpriseName; diff --git a/pages/projectEnd/qualityManage/details.vue b/pages/projectEnd/qualityManage/details.vue index 1785e18b..87b5c9d5 100644 --- a/pages/projectEnd/qualityManage/details.vue +++ b/pages/projectEnd/qualityManage/details.vue @@ -9,7 +9,7 @@ 检查详细 审批流程 - + 检查部位 {{basicInfo.regionName}} @@ -108,7 +108,7 @@ 现场整改 - {{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4?'未完成':basicInfo.status==5?'已完成':''}} + {{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4||basicInfo.status==6?'未完成':basicInfo.status==5?'已完成':''}} @@ -127,6 +127,15 @@ {{item.split('*')[0]}} + + 撤回 + + + 删除检查 + 重新提交 + @@ -224,6 +233,70 @@ this.getIssueInfo(); }, methods: { + // 重新提交 + resubmitCheckRecord(){ + uni.navigateTo({ + url: '/pages/projectEnd/qualityManage/editIssue?id=' + this.id + }) + }, + // 删除检查单 + deleteCheckRecord() { + let that = this; + uni.showModal({ + title: '提示', + content: '您确定要删除吗？', + success: async (res) => { + if (res.confirm) { + this.sendRequest({ + url: 'xmgl/qualityInspectionRecord/delete', + method: 'post', + data: { + id: that.id + }, + success: res => { + uni.showToast({ + title: res.message + }) + setTimeout(function() { + uni.redirectTo({ + url: '/pages/projectEnd/qualityManage/list?type=1' + }) + }, 500) + } + }) + } + } + }); + }, + // 撤回检查单 + backCheckRecord() { + let that = this; + uni.showModal({ + title: '提示', + content: '您确定要撤回吗？', + success: async (res) => { + if (res.confirm) { + this.sendRequest({ + url: 'xmgl/qualityInspectionRecord/revocation', + method: 'post', + data: { + id: that.id + }, + success: res => { + uni.showToast({ + title: res.message + }) + setTimeout(function() { + uni.redirectTo({ + url: '/pages/projectEnd/qualityManage/list?type=1' + }) + }, 500) + } + }) + } + } + }); + }, handleShowItem(index) { this.issueInfoList[index].isShow = !this.issueInfoList[index].isShow console.log(this.issueInfoList) @@ -529,6 +602,51 @@ background-color: rgba(65, 129, 254, 0.8); } + .backBtn { + position: fixed; + bottom: 0px; + left: 0px; + width: 100%; + box-sizing: border-box; + z-index: 99; + } + + .backBtn .btn-option { + width: 100%; + line-height: 40px; + background-color: #4181FE; + color: #fff; + text-align: center; + } + + .backBtn .btn-option:active { + background-color: rgba(65, 129, 254, 0.8); + } + + .editBtn { + position: fixed; + bottom: 0px; + left: 0px; + width: 100%; + display: flex; + align-items: center; + box-sizing: border-box; + z-index: 99; + } + .editBtn .btn-delete { + width: 50%; + line-height: 40px; + background-color: #D51C1C; + color: #fff; + text-align: center; + } + .editBtn .btn-resubmit{ + width: 50%; + line-height: 40px; + background-color: #5382F6; + color: #fff; + text-align: center; + } .pass_wrap { position: absolute; top: 100px; diff --git a/pages/projectEnd/qualityManage/editIssue.vue b/pages/projectEnd/qualityManage/editIssue.vue new file mode 100644 index 00000000..21c63dc8 --- /dev/null +++ b/pages/projectEnd/qualityManage/editIssue.vue @@ -0,0 +1,1904 @@ + + + + + \ No newline at end of file diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue index 38eaf7bd..7a9fe2c2 100644 --- a/pages/projectEnd/safeSame/addIssue.vue +++ b/pages/projectEnd/safeSame/addIssue.vue @@ -991,7 +991,7 @@ this.$nextTick(() => { this.isShowPicker = true; }); - this.getPersonUpdateList(); + // this.getPersonUpdateList(); // } else { // this.form.enterpriseSn = val.enterpriseSn; // this.form.enterpriseName = val.enterpriseName; diff --git a/pages/projectEnd/safeSame/details.vue b/pages/projectEnd/safeSame/details.vue index 393a2e69..1b06d7c2 100644 --- a/pages/projectEnd/safeSame/details.vue +++ b/pages/projectEnd/safeSame/details.vue @@ -9,7 +9,7 @@ 检查详细 审批流程 - + 检查部位 {{basicInfo.regionName}} @@ -108,7 +108,7 @@ 现场整改 - {{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4?'未完成':basicInfo.status==5?'已完成':''}} + {{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4||basicInfo.status==6?'未完成':basicInfo.status==5?'已完成':''}} @@ -127,6 +127,15 @@ {{item.split('*')[0]}} + + 撤回 + + + 删除检查 + 重新提交 + @@ -224,6 +233,70 @@ this.getIssueInfo(); }, methods: { + // 重新提交 + resubmitCheckRecord(){ + uni.navigateTo({ + url: '/pages/projectEnd/safeSame/editIssue?id=' + this.id + }) + }, + // 删除检查单 + deleteCheckRecord() { + let that = this; + uni.showModal({ + title: '提示', + content: '您确定要删除吗？', + success: async (res) => { + if (res.confirm) { + this.sendRequest({ + url: 'xmgl/xzSecurityQualityInspectionRecord/delete', + method: 'post', + data: { + id: that.id + }, + success: res => { + uni.showToast({ + title: res.message + }) + setTimeout(function() { + uni.redirectTo({ + url: '/pages/projectEnd/safeSame/list?type=1' + }) + }, 500) + } + }) + } + } + }); + }, + // 撤回检查单 + backCheckRecord() { + let that = this; + uni.showModal({ + title: '提示', + content: '您确定要撤回吗？', + success: async (res) => { + if (res.confirm) { + this.sendRequest({ + url: 'xmgl/xzSecurityQualityInspectionRecord/revocation', + method: 'post', + data: { + id: that.id + }, + success: res => { + uni.showToast({ + title: res.message + }) + setTimeout(function() { + uni.redirectTo({ + url: '/pages/projectEnd/safeSame/list?type=1' + }) + }, 500) + } + }) + } + } + }); + }, handleShowItem(index) { this.issueInfoList[index].isShow = !this.issueInfoList[index].isShow let newObj = this.issueInfoList[index] @@ -526,7 +599,52 @@ .approveBtn .btn:active { background-color: rgba(65, 129, 254, 0.8); } - + + .backBtn { + position: fixed; + bottom: 0px; + left: 0px; + width: 100%; + box-sizing: border-box; + z-index: 99; + } + + .backBtn .btn-option { + width: 100%; + line-height: 40px; + background-color: #4181FE; + color: #fff; + text-align: center; + } + + .backBtn .btn-option:active { + background-color: rgba(65, 129, 254, 0.8); + } + + .editBtn { + position: fixed; + bottom: 0px; + left: 0px; + width: 100%; + display: flex; + align-items: center; + box-sizing: border-box; + z-index: 99; + } + .editBtn .btn-delete { + width: 50%; + line-height: 40px; + background-color: #D51C1C; + color: #fff; + text-align: center; + } + .editBtn .btn-resubmit{ + width: 50%; + line-height: 40px; + background-color: #5382F6; + color: #fff; + text-align: center; + } .pass_wrap { position: absolute; top: 100px; diff --git a/pages/projectEnd/safeSame/editIssue.vue b/pages/projectEnd/safeSame/editIssue.vue new file mode 100644 index 00000000..bdeeec1d --- /dev/null +++ b/pages/projectEnd/safeSame/editIssue.vue @@ -0,0 +1,1902 @@ + + + + + \ No newline at end of file