From a2f671f1259aa5be99281cb2bcd231d2697cd52f Mon Sep 17 00:00:00 2001 From: wangpeng Date: Mon, 1 Apr 2024 09:26:01 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/home.vue | 4 ++-- pages/my/home.vue | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pages/login/home.vue b/pages/login/home.vue index 5944912..59cdc47 100644 --- a/pages/login/home.vue +++ b/pages/login/home.vue @@ -87,8 +87,8 @@ data() { return { noClick: true, - userName: '130324198402060201', - userPwd: 'Aa@123456', + userName: '', + userPwd: '', radio: '' } }, diff --git a/pages/my/home.vue b/pages/my/home.vue index 2fc4692..882c3f8 100644 --- a/pages/my/home.vue +++ b/pages/my/home.vue @@ -78,7 +78,6 @@ mounted() { this.loginUser = loginUser; this.loginCorpId = loginUser.CORPINFO_ID - console.log('loginCorpId =>' + this.loginCorpId) this.isRest = isRest; if(this.loginCorpId && this.loginUser.USERNAME){ this.getData(); From d8b2081e399cccc08d316fdd64a1e0b8e62aee82 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 1 Apr 2024 18:56:06 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 4 + pages/my/news/home.vue | 73 +++++++++++++++- pages/news/home.vue | 133 +++++++++++++++++++++++++++++- pages/news/notice-list-detail.vue | 133 ++++++++++++++++++++++++++++++ 4 files changed, 339 insertions(+), 4 deletions(-) create mode 100644 pages/news/notice-list-detail.vue diff --git a/pages.json b/pages.json index e901b8a..bea55c6 100644 --- a/pages.json +++ b/pages.json @@ -316,6 +316,10 @@ "path": "pages/news/news-list-detail", "style": {} }, + { + "path": "pages/news/notice-list-detail", + "style": {} + }, { "path": "pages/application/other-apps/videos/videos", "style": {} diff --git a/pages/my/news/home.vue b/pages/my/news/home.vue index e176ad2..a56e82a 100644 --- a/pages/my/news/home.vue +++ b/pages/my/news/home.vue @@ -73,6 +73,35 @@ + + + + + + + + + {{item.SYNOPSIS}} + + + {{item.CREATTIME}} + + + + + + + + + + + + 暂无数据 + + + + + @@ -89,10 +118,11 @@ totalHeight:0, TabCur: 0, scrollLeft: 0, - tabNav: ['平台公告', '企业公告'], + tabNav: ['平台公告', '企业公告', '业务提醒'], noClick:true, list: [], pclist: [], + txlist: [], page:1,//分页参数--页数 rows:10,//分页参数--每页数据条数 totalCount:0,//分页参数--初始化页数 @@ -134,6 +164,11 @@ _this.getPcData();//开始分页查询 } } + if ("2"==_this.TabCur){ + if(_this.totalPage >= _this.currentPage){ + _this.getTxData();//开始分页查询 + } + } }, onReady() { @@ -143,6 +178,9 @@ tabSelect(e) { this.TabCur = e.currentTarget.dataset.id; this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60; + if("2" ==this.TabCur){ + this.getTxData(); + } if("1" ==this.TabCur){ this.getPcData(); } @@ -215,6 +253,39 @@ } }); }, + + getTxData() { + var _this = this; + uni.showLoading({ + title: '请稍候' + }) + uni.request({ + url: basePath + '/app/notice/listForCp', + method: 'POST', + dataType: 'json', + header: { + 'Content-type':'application/x-www-form-urlencoded' + }, + data: { + showCount : _this.showCount, + currentPage : _this.currentPage, + loginUserId :loginUserId, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, + }, + success: (res) => { + if("success" == res.data.result){ + uni.hideLoading(); + _this.pclist = res.data.varList; + } else { + uni.showToast({ + title: res.data.message, + duration: 2000 + }); + } + } + }); + }, //跳转事件 goToDetail(e) { uni.navigateTo({ diff --git a/pages/news/home.vue b/pages/news/home.vue index 1d0e526..287afb5 100644 --- a/pages/news/home.vue +++ b/pages/news/home.vue @@ -41,7 +41,7 @@ - + @@ -109,6 +109,42 @@ + + + + + + + + + {{item.SYNOPSIS}} + + + + + + + {{item.CREATTIME}} + + + + + + + + + + + + + + + 暂无数据 + + + + + @@ -125,11 +161,12 @@ totalHeight:0, TabCur: 0, scrollLeft: 0, - tabNav: ['平台公告', '企业公告'], + tabNav: ['平台公告', '企业公告', '业务提醒'], noClick:true, KEYWORDS:'', list: [], pclist: [], + txlist: [], page:1,//分页参数--页数 rows:10,//分页参数--每页数据条数 totalCount:0,//分页参数--初始化页数 @@ -171,6 +208,11 @@ _this.getPcData();//开始分页查询 } } + if ("2"==_this.TabCur){ + if(_this.totalPage >= _this.currentPage){ + _this.getTxData();//开始分页查询 + } + } }, onReady() { }, @@ -178,6 +220,9 @@ tabSelect(e) { this.TabCur = e.currentTarget.dataset.id; this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60; + if("2" ==this.TabCur){ + this.getTxData(); + } if("1" ==this.TabCur){ this.getPcData(); } @@ -262,17 +307,99 @@ } }); }, + + getTxData() { + var _this = this; + uni.showLoading({ + title: '请稍候' + }) + uni.request({ + url: basePath + '/app/notice/listForCp', + method: 'POST', + dataType: 'json', + header: { + 'Content-type':'application/x-www-form-urlencoded' + }, + data: { + showCount : _this.showCount, + currentPage : _this.currentPage, + loginUserId :loginUserId, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, + }, + success: (res) => { + if("success" == res.data.result){ + uni.hideLoading(); + _this.txlist = res.data.varList; + } else { + uni.showToast({ + title: res.data.message, + duration: 2000 + }); + } + } + }); + }, //跳转事件 goToDetail(e) { uni.navigateTo({ - url: '/pages/news/news-list-detail?id='+e+'&type=0', + url: '/pages/news/notice-list-detail?id='+e+'&type=0', }); }, + goToTxDetail(e){ + uni.navigateTo({ + url: '/pages/news/notice-list-detail?id='+e+'&type=1', + }); + }, goToPcDetail(e){ uni.navigateTo({ url: '/pages/news/news-list-detail?id='+e+'&type=1', }); }, + deleteNoticeTx(ID){ + var _this = this; + uni.showModal({ + title: '', + content: '确定要删除这条记录？', + cancelColor:"#000000", + cancelText: '取消', + confirmText: '确定', + success: res => { + if (res.confirm) { + uni.showLoading({ + title: '处理中' + }) + uni.request({ + url: basePath+'/app/notice/delete', + method: 'POST', + dataType: 'json', + header: { + 'Content-type':'application/x-www-form-urlencoded' + }, + data: { + NOTICECORPUSERID_ID: ID + }, + success: (res) => { + uni.hideLoading(); + uni.showToast({ + icon: 'none', + title: '删除成功', + duration: 1500 + }); + _this.getQuery() + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + } + } + }) + }, deleteNotice(ID){ var _this = this; uni.showModal({ diff --git a/pages/news/notice-list-detail.vue b/pages/news/notice-list-detail.vue new file mode 100644 index 0000000..1e8246f --- /dev/null +++ b/pages/news/notice-list-detail.vue @@ -0,0 +1,133 @@ + + + + + From 0923bb456dcf87b659b949d9455482086ec22962 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Wed, 17 Apr 2024 00:29:20 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/tool.js | 7 +- manifest.json | 66 +++++++++++++++---- .../driving-item-check-list.vue | 11 +++- pages/login/home.vue | 8 +-- 4 files changed, 71 insertions(+), 21 deletions(-) diff --git a/common/tool.js b/common/tool.js index 3a6f338..bed8457 100644 --- a/common/tool.js +++ b/common/tool.js @@ -1,6 +1,7 @@ -// export var basePath = "http://192.168.0.42:8099/"; -export var basePath = "http://192.168.0.69:7072/"; -// export var basePath = "https://gateway.qhdsafety.com/"; + +// export var basePath = "http://192.168.0.69:7082/"; +// export var basePath = "http://192.168.0.31:7082/integrated_traffic/"; +export var basePath = "http://39.101.166.211:8073/integrated_traffic/"; export const baseImgPath = "https://file.zcloudchina.com/YTHFile"; export const adminPath = "http://192.168.0.18:8085"; export const projectManagerUrl = 'https://pm.qhdsafety.com/zy-projectManage/'; diff --git a/manifest.json b/manifest.json index 06db41b..290366b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,15 +1,20 @@ { - "name" : "秦安双控", - "appid" : "__UNI__F48179F", - "description" : "秦安双控", - "versionName" : "3.0.0", - "versionCode" : 3, + "name" : "交运安全", + "appid" : "__UNI__CEE68CC", + "description" : "交运安全", + "versionName" : "1.0.0", + "versionCode" : 1, "transformPx" : false, "app-plus" : { /* 5+App特有相关 */ "modules" : { "Geolocation" : {}, - "LivePusher" : {} + "LivePusher" : {}, + "Camera" : {}, + "Maps" : {}, + "VideoPlayer" : {}, + "Barcode" : {}, + "Contacts" : {} }, "compatible" : { "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 @@ -40,15 +45,19 @@ "", "", "", + "", "", "", + "", "", "", "", "", "", + "", "" - ] + ], + "abiFilters" : [ "armeabi-v7a" ] }, "ios" : { "privacyDescription" : { @@ -58,7 +67,8 @@ "NSMicrophoneUsageDescription" : "调取手机麦克风用于用户快捷输入", "NSLocationAlwaysAndWhenInUseUsageDescription" : "使用用户地理位置用于提供客户的位置信息", "NSLocationWhenInUseUsageDescription" : "使用用户地理位置用于提供客户的位置信息" - } + }, + "dSYMs" : false }, /* ios打包配置 */ "sdkConfigs" : { @@ -69,17 +79,47 @@ "appkey_android" : "43G1sKuHV6oRTrdR9VTIGPF9soej7V5a" } }, - "ad" : {} + "ad" : {}, + "maps" : { + "baidu" : { + "appkey_ios" : "g3lZyqt0KkFnZGUsjIVO7U6lTCfpjSCt", + "appkey_android" : "43G1sKuHV6oRTrdR9VTIGPF9soej7V5a" + } + } }, "splashscreen" : { "androidStyle" : "common" }, "icons" : { "android" : { - "hdpi" : "C:/Users/Administrator/Desktop/icons/72x72.png", - "xhdpi" : "C:/Users/Administrator/Desktop/icons/96x96.png", - "xxhdpi" : "C:/Users/Administrator/Desktop/icons/144x144.png", - "xxxhdpi" : "C:/Users/Administrator/Desktop/icons/192x192.png" + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } } } } diff --git a/pages/application/driving-inspections/driving-item-check-list.vue b/pages/application/driving-inspections/driving-item-check-list.vue index d08a078..26056d1 100644 --- a/pages/application/driving-inspections/driving-item-check-list.vue +++ b/pages/application/driving-inspections/driving-item-check-list.vue @@ -55,8 +55,9 @@ - + 实时照片 + *照片说明：车辆正前方、左右两侧45°角及车尾部拍照 @@ -516,6 +517,14 @@ }); return; } + if (_this.liveImgs.length < 4) { + uni.showToast({ + icon: 'none', + title: '车辆检查需要4张照片', + duration: 1500 + }); + return; + } if (_this.imgList.length <= 0) { uni.showToast({ icon: 'none', diff --git a/pages/login/home.vue b/pages/login/home.vue index 59cdc47..b6ac662 100644 --- a/pages/login/home.vue +++ b/pages/login/home.vue @@ -46,7 +46,7 @@ - @@ -61,7 +61,7 @@ 《隐私政策》 - + --> @@ -199,13 +199,13 @@ this.userPwd = e.detail.value }, login() { - if (this.radio !== '1') { + /*if (this.radio !== '1') { uni.showToast({ title: '请先阅读并同意《服务协议》和《隐私政策》', icon: 'none' }) return; - } + }*/ var _this = this; var userName = _this.userName; var userPwd = _this.userPwd; From 57324bccddc1f8fc6e503489d5b82b1e44bee9a3 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 30 Apr 2024 17:55:25 +0800 Subject: [PATCH 04/10] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driving-item-check-list.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pages/application/driving-inspections/driving-item-check-list.vue b/pages/application/driving-inspections/driving-item-check-list.vue index 26056d1..41589ea 100644 --- a/pages/application/driving-inspections/driving-item-check-list.vue +++ b/pages/application/driving-inspections/driving-item-check-list.vue @@ -62,7 +62,12 @@ - + + @@ -207,7 +212,15 @@ } }); }, - + clickImg(url) { + uni.previewImage({ + urls: [url], + current: '', + success: function(res) {}, + fail: function(res) {}, + complete: function(res) {}, + }) + }, DelImg(index) { var _this = this; uni.showModal({ From d795ca102c2043708472dbc53df742942f00aa44 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 6 May 2024 17:39:59 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BB=8E=E4=B8=9A?= =?UTF-8?q?=E4=BA=BA=E5=91=98=20=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A4=9A=E9=80=89=20=20=E6=9C=89=E9=A9=BE=E9=A9=B6=E5=91=98?= =?UTF-8?q?=E7=9A=84=E9=A9=BE=E9=A9=B6=E4=BF=A1=E6=81=AF=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=20=20=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/register/apply.vue | 2 +- pages/login/register/baseInfo.vue | 24 ++++++- pages/login/register/certificate.vue | 101 ++++++++++++++------------- pages/login/register/index.vue | 2 +- 4 files changed, 75 insertions(+), 54 deletions(-) diff --git a/pages/login/register/apply.vue b/pages/login/register/apply.vue index 1366031..7a9db8f 100644 --- a/pages/login/register/apply.vue +++ b/pages/login/register/apply.vue @@ -22,7 +22,7 @@ 人员类型 - {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}} + {{formData.PERSONNEL_TYPE.join()}} diff --git a/pages/login/register/baseInfo.vue b/pages/login/register/baseInfo.vue index 67d7936..fb4e3fa 100644 --- a/pages/login/register/baseInfo.vue +++ b/pages/login/register/baseInfo.vue @@ -19,13 +19,28 @@ + 人员类型 + + + 文化程度 @@ -80,8 +95,10 @@ import { formatDate,validateIdCard,validateMobile,getLevel } from '../../../common/tool.js'; +import ZqsSelect from "../../../components/zqs-select/zqs-select.vue"; export default { name: "register_baseInfo", + components: {ZqsSelect}, props: { formData: { type: Object, @@ -142,6 +159,9 @@ import { this.formData[name] = e.detail.value this.$forceUpdate();//强制刷新 }, + changeSelect(e, name) { + this.$forceUpdate();//强制刷新 + }, pickerChangeData(e,name) { // 人员类型 if (name === 'PERSONNEL_TYPE') { @@ -172,7 +192,7 @@ import { }, validateData() { // 人员类型 - if (!this.formData.PERSONNEL_TYPE) { + if (this.formData.PERSONNEL_TYPE.length < 1) { uni.showToast({ icon: 'none', title: '请选择人员类型', diff --git a/pages/login/register/certificate.vue b/pages/login/register/certificate.vue index 5d9cf79..056a727 100644 --- a/pages/login/register/certificate.vue +++ b/pages/login/register/certificate.vue @@ -22,7 +22,7 @@ 人员类型 - {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}} + {{formData.PERSONNEL_TYPE.join()}} @@ -635,57 +635,58 @@ export default { }); return false; } + if (this.formData.PERSONNEL_TYPE.find((item) => item === '驾驶员')) { + // 驾驶证 + if (this.fileData.driverLicense.length < 1) { + uni.showToast({ + icon: 'none', + title: '请上传驾驶证照片', + duration: 2000 + }); + return false; + } - // 驾驶证 - if (this.fileData.driverLicense.length < 1) { - uni.showToast({ - icon: 'none', - title: '请上传驾驶证照片', - duration: 2000 - }); - return false; + if (!this.formData.DRIVER_LICENSE_NO) { + uni.showToast({ + icon: 'none', + title: '请输入驾驶证号', + duration: 2000 + }); + return false; + } + if (this.formData.DRIVING_MODEL.length < 1) { + uni.showToast({ + icon: 'none', + title: '请选择准驾车型', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) { + uni.showToast({ + icon: 'none', + title: '请选择初次领证日期', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) { + uni.showToast({ + icon: 'none', + title: '请选择驾驶证有效期时间', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_ORGAN) { + uni.showToast({ + icon: 'none', + title: '请输入驾驶证的签发机关', + duration: 2000 + }); + return false; + } } - if (!this.formData.DRIVER_LICENSE_NO) { - uni.showToast({ - icon: 'none', - title: '请输入驾驶证号', - duration: 2000 - }); - return false; - } - if (this.formData.DRIVING_MODEL.length < 1) { - uni.showToast({ - icon: 'none', - title: '请选择准驾车型', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) { - uni.showToast({ - icon: 'none', - title: '请选择初次领证日期', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) { - uni.showToast({ - icon: 'none', - title: '请选择驾驶证有效期时间', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_ORGAN) { - uni.showToast({ - icon: 'none', - title: '请输入驾驶证的签发机关', - duration: 2000 - }); - return false; - } - // 从业资格证证 if (this.fileData.qualificationCertificate.length < 1) { uni.showToast({ diff --git a/pages/login/register/index.vue b/pages/login/register/index.vue index 766f3d5..cc9c666 100644 --- a/pages/login/register/index.vue +++ b/pages/login/register/index.vue @@ -89,7 +89,7 @@ SEXNAME: '', //人员类型 - PERSONNEL_TYPE: '', + PERSONNEL_TYPE: [], PERSONNEL_TYPENAME: '', // 政治面貌 POLITICAL_OUTLOOK: '', From 7157c910cf5d6d3694948b2617de5c6a02b2491a Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 7 May 2024 11:25:40 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/application/home.vue | 2 +- pages/basics/home.vue | 2 +- pages/my/home.vue | 4 ++-- static/apps-banner.png | Bin 230918 -> 206330 bytes static/banner.jpg | Bin 112509 -> 0 bytes static/banner.png | Bin 77027 -> 301859 bytes 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 static/banner.jpg diff --git a/pages/application/home.vue b/pages/application/home.vue index dbe814b..24a87b3 100644 --- a/pages/application/home.vue +++ b/pages/application/home.vue @@ -1,7 +1,7 @@ @@ -187,6 +226,7 @@ hs: [], files: [], list:[], + list2:[], commitmentList:[], videoList: [], checkList: [], @@ -238,7 +278,8 @@ _this.pd = res.data.pd; //参数map _this.commitmentList = res.data.commitmentList; //参数map _this.list = res.data.pd.varList - + _this.list2 = res.data.pd.varList2 + console.log(_this.list2) } else if ("exception" == data.result) { uni.showToast({ title: '错误', diff --git a/pages/application/driving-inspections/driving-item-list.vue b/pages/application/driving-inspections/driving-item-list.vue index e1cf023..0c9319c 100644 --- a/pages/application/driving-inspections/driving-item-list.vue +++ b/pages/application/driving-inspections/driving-item-list.vue @@ -13,7 +13,7 @@ 'CHECKTYPE_NAME':item.CHECKTYPE_NAME, 'WAYBILLREGISTRATION_ID':WAYBILLREGISTRATION_ID,index})"> - + @@ -104,35 +104,93 @@ }, //跳转事件 goToList(e) { - const index = e.index - const WAYBILLSTATUS = this.pd.WAYBILLSTATUS - if((this.pd.WAYBILLSTATUS === '1' || this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist != '0') && index === 1){ - uni.showModal({ - title: '提示', - cancelText: '确认', - confirmText: '取消', - content:'您已经完成出车前检查，无需再次检查', - }); - return; - }else if((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '1' || this.pd.IsExist == '0') && index === 2){ - if(this.pd.WAYBILLSTATUS === '0') { + const index = e.index + console.log(this.pd) + if ((this.pd.WAYBILLSTATUS === '3' || this.pd.IsExist == '0') && index === 1) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '未进行出车前安全承诺，无法进行此操作', + }); + return; + }else if ((this.pd.WAYBILLSTATUS === '0' || this.pd.IsExist == '0') && index === 2) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '未进行出车前检查，无法进行此操作', + }); + return; + }else if ((this.pd.WAYBILLSTATUS === '0' || this.pd.WAYBILLSTATUS === '1' || this.pd.WAYBILLSTATUS === '2') && index === 0) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '您已经完成出车前安全承诺，无需再次承诺', + }); + return; + }else if ((this.pd.WAYBILLSTATUS === '1' || this.pd.WAYBILLSTATUS === '2' || this.pd.WAYBILLSTATUS === '2') && index === 1) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '您已经完成出车前检查，无需再次检查', + }); + return; + }else if ((this.pd.WAYBILLSTATUS === '2') && index === 2) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '您已经完成行车中检查，无需再次检查', + }); + return; + }else if ((this.pd.WAYBILLSTATUS === '0') && index === 3) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '您未进行行车中检查，请按顺序检查', + }); + return; + }else if ((this.pd.WAYBILLSTATUS === '3') && index === 3) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '您未进行行车中检查，请按顺序检查', + }); + return; + } + + /* if ((this.pd.WAYBILLSTATUS === '2' || this.pd.WAYBILLSTATUS === '3' || this.pd.IsExist != '0') && index === 1) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '您已经完成出车前检查，无需再次检查', + }); + return; + } else if ((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '1' || this.pd.IsExist == '0') && index === 2) { + if (this.pd.WAYBILLSTATUS === '0') { uni.showModal({ title: '提示', - content:'未进行出车前检查，无法进行此操作', + content: '未进行出车前检查，无法进行此操作', showCancel: false, confirmText: '确认' }); } - return - }else if((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '2' || this.pd.IsExist == '0') && index === 3){ - uni.showModal({ - title: '提示', - cancelText: '确认', - confirmText: '取消', - content:'您未进行行车中检查，请按顺序检查', - }); - return; - } + return + } else if ((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '2' || this.pd.IsExist == '0') && index === 3) { + uni.showModal({ + title: '提示', + cancelText: '确认', + confirmText: '取消', + content: '您未进行行车中检查，请按顺序检查', + }); + return; + }*/ uni.navigateTo({ url: '/pages/application/driving-inspections/driving-item-check-list?CHECKTYPE_ID=' + e.CHECKTYPE_ID + '&CHECKTYPE_NAME=' + e.CHECKTYPE_NAME + '&WAYBILLREGISTRATION_ID=' + e.WAYBILLREGISTRATION_ID From 84faaaca3d1bf650ce0a9bc691042b23b8456595 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Sat, 11 May 2024 18:01:06 +0800 Subject: [PATCH 10/10] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/driving-inspections/driving-item-detail.vue | 4 ---- pages/news/home.vue | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pages/application/driving-inspections/driving-item-detail.vue b/pages/application/driving-inspections/driving-item-detail.vue index 99970f7..0ab8bd5 100644 --- a/pages/application/driving-inspections/driving-item-detail.vue +++ b/pages/application/driving-inspections/driving-item-detail.vue @@ -279,7 +279,6 @@ _this.commitmentList = res.data.commitmentList; //参数map _this.list = res.data.pd.varList _this.list2 = res.data.pd.varList2 - console.log(_this.list2) } else if ("exception" == data.result) { uni.showToast({ title: '错误', @@ -346,8 +345,6 @@ }); return; } - - var i = 0; _this.uploadImg(_this.imgList, i); }, @@ -378,7 +375,6 @@ }, fail: (err) => { uni.hideLoading(); - console.log('uploadImage fail', err); uni.showModal({ content: err.errMsg, showCancel: false diff --git a/pages/news/home.vue b/pages/news/home.vue index 287afb5..0430798 100644 --- a/pages/news/home.vue +++ b/pages/news/home.vue @@ -262,7 +262,6 @@ if("success" == res.data.result){ uni.hideLoading(); _this.list = res.data.varList; - console.log(res.data.varList) } else { uni.showToast({ title: res.data.message, @@ -297,7 +296,6 @@ if("success" == res.data.result){ uni.hideLoading(); _this.pclist = res.data.varList; - console.log(res.data.varList) } else { uni.showToast({ title: res.data.message, @@ -421,7 +419,9 @@ 'Content-type':'application/x-www-form-urlencoded' }, data: { - NOTIFICATION_ID: ID + NOTIFICATION_ID: ID, + USER_ID: loginUser.USER_ID, + USERNAME: loginUser.NAME }, success: (res) => { uni.hideLoading();