diff --git a/common/tool.js b/common/tool.js index 8279cce..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.55:8093/"; -// 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/components/yk-authpup/yk-authpup.vue b/components/yk-authpup/yk-authpup.vue index 7c8d0dc..c4efd82 100644 --- a/components/yk-authpup/yk-authpup.vue +++ b/components/yk-authpup/yk-authpup.vue @@ -44,15 +44,15 @@ refuseNum:'',//拒绝次数， authList: { 'CAMERA': { - title: "秦安安全对相机/照片权限申请说明", + title: "交运安全对相机/照片权限申请说明", content: "便于您使用该功能上传您的照片/图片/视频,用于上传隐患、人脸识别与扫描二维码等场景中读取和写入相册和文件内容。" }, 'ACCESS_FINE_LOCATION': { - title: "秦安安全对地理位置权限申请说明", - content: "秦安安全应用程序可以提供基于位置的服务、定位等功能。", + title: "交运安全对地理位置权限申请说明", + content: "交运安全应用程序可以提供基于位置的服务、定位等功能。", }, 'RECORD_AUDIO': { - title: "秦安安全对麦克风权限申请说明", + title: "交运安全对麦克风权限申请说明", content: "便于您使用该功能进行人脸识别。", }, } 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.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/application/driving-inspections/dirving-inspections-list.vue b/pages/application/driving-inspections/dirving-inspections-list.vue index eea9496..3447ce9 100644 --- a/pages/application/driving-inspections/dirving-inspections-list.vue +++ b/pages/application/driving-inspections/dirving-inspections-list.vue @@ -44,7 +44,8 @@ 运单状态:
出车前
行车中
-
收车后
+
收车后
+
待承诺
 diff --git a/pages/application/driving-inspections/driving-item-check-list.vue b/pages/application/driving-inspections/driving-item-check-list.vue index d08a078..90e5de4 100644 --- a/pages/application/driving-inspections/driving-item-check-list.vue +++ b/pages/application/driving-inspections/driving-item-check-list.vue @@ -5,7 +5,7 @@ {{CHECKTYPE_NAME}}排查项 - + 检查项名称:{{item.CHECKITEMNAME}} 检查项说明:{{item.REMARKS}} @@ -29,10 +29,39 @@ - - + + 承诺项:{{item.INQUIRYCONTENT}} + + + + + + + 是 + + + + + + 不是 + + + + + + 不涉及 + + + + + + + + + + @@ -55,13 +84,19 @@ - + 实时照片 + *照片说明：车辆正前方、左右两侧45°角及车尾部拍照 - + + @@ -75,6 +110,7 @@ + @@ -127,7 +163,8 @@ modalName:null, imgList:[], liveImgs: [], - } + promiseList: [], + } }, onLoad(e){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); @@ -136,6 +173,7 @@ this.WAYBILLREGISTRATION_ID = e.WAYBILLREGISTRATION_ID; console.log(this.WAYBILLREGISTRATION_ID) this.getData(); + this.getData2(); loginSession(); }, onShow() { @@ -206,7 +244,15 @@ } }); }, - + clickImg(url) { + uni.previewImage({ + urls: [url], + current: '', + success: function(res) {}, + fail: function(res) {}, + complete: function(res) {}, + }) + }, DelImg(index) { var _this = this; uni.showModal({ @@ -382,6 +428,40 @@ }); }, + getData2() { + var _this = this; + console.log(_this) + uni.showLoading({ + title: '请稍候' + }) + uni.request({ + url: basePath + '/app/drivingtype/safetycommitment', + method: 'POST', + dataType: 'json', + header: { + 'Content-type':'application/x-www-form-urlencoded' + }, + data: { + CHECKTYPE_ID: _this.CHECKTYPE_ID, + USER_NAME : loginUser.NAME, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, + }, + success: (res) => { + if("success" == res.data.result){ + uni.hideLoading(); + _this.pd=res.data.pd; + _this.promiseList = res.data.varList; + } else { + uni.showToast({ + title: res.data.message, + duration: 2000 + }); + } + } + }); + }, + openAuth(permissionID){ this.permissionID = permissionID; setTimeout(()=>{ @@ -501,71 +581,131 @@ }); }, - goSubmit(){ - var _this = this; - let required = true - uni.showLoading({ - title: '请稍候' - }) - - if (_this.liveImgs.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请上传车辆检查照片', - duration: 1500 - }); - return; - } - if (_this.imgList.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请签字', - duration: 1500 - }); - return; - } - - var files = []; - var signtime = []; - const formData={} - this.uploadImgFaults(files,signtime) - formData.SIGNTIME = signtime - formData.CORPINFO_ID = loginUser.CORPINFO_ID - formData.USER_ID = loginUser.USER_ID - formData.USER_NAME = loginUser.USERNAME - formData.CHECKTYPE_ID = this.CHECKTYPE_ID - formData.IMG_PATH = this.liveImgs.map(item => { - return item.filePath - }).join(",") - formData.checklist = JSON.stringify(this.list) - if(this.CHECKTYPE_NAME == "出车前" || this.CHECKTYPE_NAME == "行车中"){ - formData.WAYBILLSTATUS = 1 - }else if (this.CHECKTYPE_NAME == "收车后"){ - formData.WAYBILLSTATUS = 2 - } - formData.WAYBILLREGISTRATION_ID = this.WAYBILLREGISTRATION_ID - console.log(JSON.stringify(this.list)) - uni.uploadFile({ - url: basePath+'app/drivingitem/add', - files: files, - formData:formData, - success: (res) => { - uni.showToast({ - icon:'none', - title: '保存成功', - duration: 2000 - }); - _this.goback() - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false - }); - } - }) - }, + goSubmit() { + if(this.CHECKTYPE_NAME !== "待承诺") { + var _this = this; + let required = true + uni.showLoading({ + title: '请稍候' + }) + if (_this.liveImgs.length <= 0) { + uni.showToast({ + icon: 'none', + title: '请上传车辆检查照片', + duration: 1500 + }); + return; + } + if (_this.liveImgs.length < 4) { + uni.showToast({ + icon: 'none', + title: '车辆检查需要4张照片', + duration: 1500 + }); + return; + } + if (_this.imgList.length <= 0) { + uni.showToast({ + icon: 'none', + title: '请签字', + duration: 1500 + }); + return; + } + var files = []; + var signtime = []; + const formData = {} + this.uploadImgFaults(files, signtime) + formData.SIGNTIME = signtime + formData.CORPINFO_ID = loginUser.CORPINFO_ID + formData.USER_ID = loginUser.USER_ID + formData.USER_NAME = loginUser.USERNAME + formData.CHECKTYPE_ID = this.CHECKTYPE_ID + formData.IMG_PATH = this.liveImgs.map(item => { + return item.filePath + }).join(",") + formData.checklist = JSON.stringify(this.list) + if (this.CHECKTYPE_NAME == "出车前" || this.CHECKTYPE_NAME == "行车中") { + formData.WAYBILLSTATUS = 1 + } else if (this.CHECKTYPE_NAME == "收车后") { + formData.WAYBILLSTATUS = 2 + } + formData.WAYBILLREGISTRATION_ID = this.WAYBILLREGISTRATION_ID + console.log(JSON.stringify(this.list)) + uni.uploadFile({ + url: basePath + 'app/drivingitem/add', + files: files, + formData: formData, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.goback() + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + }else{ + var _this = this; + let required = true + uni.showLoading({ + title: '请稍候' + }) + if (_this.imgList.length <= 0) { + uni.showToast({ + icon: 'none', + title: '请签字', + duration: 1500 + }); + return; + } + var files = []; + var signtime = []; + const formData = {} + this.uploadImgFaults(files, signtime) + formData.SIGNTIME = signtime + formData.CORPINFO_ID = loginUser.CORPINFO_ID + formData.USER_ID = loginUser.USER_ID + formData.USER_NAME = loginUser.USERNAME + formData.CHECKTYPE_ID = this.CHECKTYPE_ID + formData.IMG_PATH = this.liveImgs.map(item => { + return item.filePath + }).join(",") + formData.checklist = JSON.stringify(this.promiseList) + if (this.CHECKTYPE_NAME == "待承诺"){ + formData.WAYBILLSTATUS = 0 + } + formData.WAYBILLREGISTRATION_ID = this.WAYBILLREGISTRATION_ID + console.log(JSON.stringify(this.list)) + uni.uploadFile({ + url: basePath + 'app/commitentitem/add', + files: files, + formData: formData, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.goback() + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + } + }, goback(){ var pages = getCurrentPages(); // 获取当前页面栈 var prePage = pages[pages.length - 2]; // 上二级页面 @@ -575,7 +715,6 @@ }, //点击合格 checkTrue(e,STATUS) { - let _this=this; _this.list[e.index].ISNORMAL=STATUS; console.log(_this.list[e.index].ISNORMAL) @@ -583,6 +722,14 @@ _this.$set(_this.list[e.index], 'REMARK', _this.list[e.index].REMARK) }, + //点击合格 + checkTrue1(e,STATUS) { + let _this=this; + _this.promiseList[e.index].ISNORMAL=STATUS; + console.log(_this.promiseList[e.index].ISNORMAL) + _this.$forceUpdate();//强制刷新 + _this.$set(_this.promiseList[e.index], 'REMARK', _this.promiseList[e.index].REMARK) + }, } } diff --git a/pages/application/driving-inspections/driving-item-detail.vue b/pages/application/driving-inspections/driving-item-detail.vue index 2dd311b..0ab8bd5 100644 --- a/pages/application/driving-inspections/driving-item-detail.vue +++ b/pages/application/driving-inspections/driving-item-detail.vue @@ -97,7 +97,7 @@ - + 排查项 - + + + 行车安全问询: + + + + 承诺项: + + + {{ item2.INQUIRYCONTENT }} + + + 承诺说明: + + + {{ item2.REMARK?item2.REMARK:'无' }} + + + 是否合格: + + {{item2.STATUS === '0'? "合格":item2.STATUS === '1'?"不合格": "不涉及"}} + + + + + 检查人签字 + + + + + {{item1.SIGN_TIME}} + + + + + + + {{item.CHECKTYPE_NAME}}检查： @@ -129,11 +167,15 @@ 出车说明: {{item2.REMARK?item2.REMARK:'无'}} - + + 是否合格: + + {{item2.STATUS === '0'? "合格":"不合格"}} + - - + + 检查图片 @@ -160,11 +202,8 @@ - - - @@ -187,6 +226,7 @@ hs: [], files: [], list:[], + list2:[], commitmentList:[], videoList: [], checkList: [], @@ -238,7 +278,7 @@ _this.pd = res.data.pd; //参数map _this.commitmentList = res.data.commitmentList; //参数map _this.list = res.data.pd.varList - + _this.list2 = res.data.pd.varList2 } else if ("exception" == data.result) { uni.showToast({ title: '错误', @@ -305,8 +345,6 @@ }); return; } - - var i = 0; _this.uploadImg(_this.imgList, i); }, @@ -337,7 +375,6 @@ }, fail: (err) => { uni.hideLoading(); - console.log('uploadImage fail', err); uni.showModal({ content: err.errMsg, showCancel: false diff --git a/pages/application/driving-inspections/driving-item-list.vue b/pages/application/driving-inspections/driving-item-list.vue index 929a7c6..0c9319c 100644 --- a/pages/application/driving-inspections/driving-item-list.vue +++ b/pages/application/driving-inspections/driving-item-list.vue @@ -7,12 +7,13 @@ + @@ -103,43 +104,100 @@ }, //跳转事件 goToList(e) { - const index = e.index - if((this.pd.WAYBILLSTATUS === '1' || this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist != '0') && index === 0){ - uni.showModal({ - title: '提示', - cancelText: '确认', - confirmText: '取消', - content:'您已经完成出车前检查，无需再次检查', - }); - return; - }else if((this.pd.WAYBILLSTATUS === '2' || this.pd.IsExist == '1' || this.pd.IsExist == '0') && index === 1){ - 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 === 2){ - 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 - }); - }, - - - } - } + 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 + }); + } + } + } 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 @@ @@ -87,8 +87,8 @@ data() { return { noClick: true, - userName: '130324198402060201', - userPwd: 'Aa@123456', + userName: '', + userPwd: '', radio: '' } }, @@ -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; diff --git a/pages/login/register/apply.vue b/pages/login/register/apply.vue index 118eea1..5c26120 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 6d5d6d4..fb4e3fa 100644 --- a/pages/login/register/baseInfo.vue +++ b/pages/login/register/baseInfo.vue @@ -7,27 +7,42 @@ - 姓名 + 姓名 - 身份证号 + 身份证号 - 手机 - + 手机 + - 人员类型 + 人员类型 + + + - 文化程度 + 文化程度 {{formData.DEGREE_OF_EDUCATIONNAME?formData.DEGREE_OF_EDUCATIONNAME:'请选择'}} @@ -35,7 +50,7 @@ - 政治面貌 + 政治面貌 {{formData.POLITICAL_OUTLOOKNAME?formData.POLITICAL_OUTLOOKNAME:'请选择'}} @@ -43,7 +58,7 @@ - 参加工作日期 + 参加工作日期 {{formData.WORKING_DATE?formData.WORKING_DATE:'请选择'}} @@ -51,35 +66,19 @@ - 健康状况 + 健康状况 - - 毕业院校及专业 - - - - 户籍所在地 - - - - 之前从事本岗位时间 - - - {{formData.PREVIOUS_POST_DATE?formData.PREVIOUS_POST_DATE:'请选择'}} - - - - 主要工作经历 + 主要工作经历 - 入职前接受安全培训和考核以及取得安全培训有关的岗位证书等情况 + 入职前接受安全培训和考核以及取得安全培训有关的岗位证书等情况 - 入职前受过何种有关安全生产的处罚以及是否受到刑事处罚 + 入职前受过何种有关安全生产的处罚以及是否受到刑事处罚 @@ -96,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, @@ -115,11 +116,6 @@ import { // 参加工作日期 WORKING_DATE:{ start: '', end: '' }, }, - // 范围限制 - limitData2: { - // 参加工作日期 - PREVIOUS_POST_DATE:{ start: '', end: '' }, - }, dictData:{ // 人员类型 PERSONNEL_TYPE:{ @@ -142,7 +138,6 @@ import { mounted() { this.getDictList() this.limitData.WORKING_DATE.end = formatDate(new Date(), 'yyyy-MM-dd'); // 参加工作日期截止时间 - this.limitData2.PREVIOUS_POST_DATE.end = formatDate(new Date(), 'yyyy-MM-dd'); // 参加工作日期截止时间 }, methods: { async getDictList(){ @@ -164,6 +159,9 @@ import { this.formData[name] = e.detail.value this.$forceUpdate();//强制刷新 }, + changeSelect(e, name) { + this.$forceUpdate();//强制刷新 + }, pickerChangeData(e,name) { // 人员类型 if (name === 'PERSONNEL_TYPE') { @@ -194,7 +192,7 @@ import { }, validateData() { // 人员类型 - if (!this.formData.PERSONNEL_TYPE) { + if (this.formData.PERSONNEL_TYPE.length < 1) { uni.showToast({ icon: 'none', title: '请选择人员类型', @@ -202,86 +200,6 @@ import { }); return false; } - if (!this.formData.DEGREE_OF_EDUCATIONNAME) { - uni.showToast({ - icon: 'none', - title: '请选择文化程度', - duration: 2000 - }); - return false; - } - if (!this.formData.POLITICAL_OUTLOOKNAME) { - uni.showToast({ - icon: 'none', - title: '请选择政治面貌', - duration: 2000 - }); - return false; - } - if (!this.formData.WORKING_DATE) { - uni.showToast({ - icon: 'none', - title: '请选择参加工作日期', - duration: 2000 - }); - return false; - } - if (!this.formData.HEALTH) { - uni.showToast({ - icon: 'none', - title: '健康状况不能为空', - duration: 2000 - }); - return false; - } - if (!this.formData.UNIVERSITY) { - uni.showToast({ - icon: 'none', - title: '毕业院校及专业不能为空', - duration: 2000 - }); - return false; - } - if (!this.formData.RESIDENCE) { - uni.showToast({ - icon: 'none', - title: '户籍所在地不能为空', - duration: 2000 - }); - return false; - } - if (!this.formData.PREVIOUS_POST_DATE) { - uni.showToast({ - icon: 'none', - title: '请选择之前从事本岗位时间', - duration: 2000 - }); - return false; - } - if (!this.formData.WORK_EXPERIENCE) { - uni.showToast({ - icon: 'none', - title: '主要工作经历不能为空', - duration: 2000 - }); - return false; - } - if (!this.formData.CERTIFICATES) { - uni.showToast({ - icon: 'none', - title: '入职前接受安全培训和考核以及取得安全培训有关的岗位证书等情况不能为空', - duration: 2000 - }); - return false; - } - if (!this.formData.PUNISH) { - uni.showToast({ - icon: 'none', - title: '入职前受过何种有关安全生产的处罚以及是否受到刑事处罚不能为空', - duration: 2000 - }); - return false; - } return true; }, diff --git a/pages/login/register/certificate.vue b/pages/login/register/certificate.vue index a377940..056a727 100644 --- a/pages/login/register/certificate.vue +++ b/pages/login/register/certificate.vue @@ -7,22 +7,22 @@ - 姓名 + 姓名 - 身份证号 + 身份证号 - 手机 - + 手机 + - 人员类型 + 人员类型 - {{formData.PERSONNEL_TYPENAME?formData.PERSONNEL_TYPENAME:'请选择'}} + {{formData.PERSONNEL_TYPE.join()}} @@ -30,7 +30,7 @@ - + 身份证（正面） @@ -51,7 +51,7 @@ - + 身份证（背面） @@ -72,7 +72,7 @@ - 生日 + 生日 {{formData.DATE_OF_BIRTH?formData.DATE_OF_BIRTH:'请选择'}} @@ -80,7 +80,7 @@ - 民族 + 民族 {{formData.NATIONNAME?formData.NATIONNAME:'请选择'}} @@ -88,7 +88,7 @@ - 性别 + 性别 {{formData.SEXNAME?formData.SEXNAME:'请选择'}} @@ -96,7 +96,7 @@ - 有效期（起始） + 有效期（起始） {{formData.ID_CARD_VALIDITY_START?formData.ID_CARD_VALIDITY_START:'请选择'}} @@ -104,7 +104,7 @@ - 有效期（截止） + 有效期（截止） {{formData.ID_CARD_VALIDITY_END?formData.ID_CARD_VALIDITY_END:'请选择'}} @@ -112,11 +112,11 @@ - 住址 + 住址 - 签发机关 + 签发机关 @@ -124,7 +124,7 @@ - + 驾驶证 @@ -145,11 +145,11 @@ - 驾驶证号 + 驾驶证号 - 准驾车型 + 准驾车型 - 国籍 + 国籍 - 初次领证日期 + 初次领证日期 {{formData.DRIVER_LICENSE_ISSUE_DATE?formData.DRIVER_LICENSE_ISSUE_DATE:'请选择'}} @@ -187,7 +186,7 @@ - 有效期（起始） + 有效期（起始） {{formData.DRIVER_LICENSE_VALIDITY_START?formData.DRIVER_LICENSE_VALIDITY_START:'请选择'}} @@ -195,7 +194,7 @@ - 有效期（截止） + 有效期（截止） {{formData.DRIVER_LICENSE_VALIDITY_END?formData.DRIVER_LICENSE_VALIDITY_END:'请选择'}} @@ -203,7 +202,7 @@ - 签发机关 + 签发机关 @@ -211,7 +210,7 @@ - + 从业资格证 @@ -232,11 +231,11 @@ - 从业资格证号 + 从业资格证号 - 从业资格类别 + 从业资格类别 - 国籍 + 国籍 - 初次领证日期 + 初次领证日期 {{formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE?formData.QUALIFICATION_CERTIFICATE_ISSUE_DATE:'请选择'}} @@ -274,7 +272,7 @@ - 有效期（起始） + 有效期（起始） {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_START?formData.QUALIFICATION_CERTIFICATE_VALIDITY_START:'请选择'}} @@ -282,7 +280,7 @@ - 有效期（截止） + 有效期（截止） {{formData.QUALIFICATION_CERTIFICATE_VALIDITY_END?formData.QUALIFICATION_CERTIFICATE_VALIDITY_END:'请选择'}} @@ -290,7 +288,7 @@ - 签发机关 + 签发机关 @@ -385,7 +383,6 @@ export default { NATIONALITY: { index: -1, list:[], - tempList: [], }, // 从业资格类别 QUALIFICATION_CERTIFICATE_CATEGORY: { @@ -396,15 +393,12 @@ export default { QUALIFICATION_CERTIFICATE_NATIONALITY: { index: -1, list:[], - tempList: [], }, } } }, mounted() { this.getDictList() - this.getNationality() - this.getQualificationCertificateNationality() var _this = this let now = new Date(); var birthEnd=now.setFullYear(now.getFullYear()-17); @@ -426,32 +420,14 @@ export default { this.dictData.NATION.list = await getLevel({DICTIONARIES_ID: '0a0e406f27f74ee698fe9979d25f62dd'}); // 准驾车型 this.dictData.DRIVING_MODEL.list = await getLevel({DICTIONARIES_ID: 'b41e247057334789b60bdf3fe6d8d6ba'}); + // 国籍 + this.dictData.NATIONALITY.list = await getLevel({DICTIONARIES_ID: '3b614b43e8814f51a3492f2fdbc9a415'}); // 从业资格类别 this.dictData.QUALIFICATION_CERTIFICATE_CATEGORY.list = await getLevelCustom({DICTIONARIES_ID: 'ed38fa5f78c64e6d906d2bad0d72bd63', LEVEL: 3}); this.dictData.QUALIFICATION_CERTIFICATE_CATEGORY.list.forEach((item) => { item.NAME = '（'+ item.BIANMA + '） ' + item.NAME }) - }, - async getNationality(){ - // 国籍 - this.dictData.NATIONALITY.list = await getLevel({DICTIONARIES_ID: '3b614b43e8814f51a3492f2fdbc9a415'}); - this.dictData.NATIONALITY.tempList = JSON.parse(JSON.stringify(this.dictData.NATIONALITY.list)); - }, - async getQualificationCertificateNationality(){ - this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list = await getLevel({DICTIONARIES_ID: '3b614b43e8814f51a3492f2fdbc9a415'}); - this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.tempList = JSON.parse(JSON.stringify(this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list)); - }, - searchSelectNationality(e, name) { - this.dictData.NATIONALITY.list = JSON.parse(JSON.stringify(this.dictData.NATIONALITY.tempList)); - if (e) { - this.dictData.NATIONALITY.list = this.dictData[name].list.filter(item => item.NAME.indexOf(e) > -1); - } - }, - searchSelectQualificationCertificateNationality(e, name) { - this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list = JSON.parse(JSON.stringify(this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.tempList)); - if (e) { - this.dictData.QUALIFICATION_CERTIFICATE_NATIONALITY.list = this.dictData[name].list.filter(item => item.NAME.indexOf(e) > -1); - } + }, //跳转事件 confirmCertificate() { @@ -594,18 +570,19 @@ export default { uni.hideLoading(); }, validateData() { - if (!this.formData.ID_CARD_FRONT) { + // 身份证 + if (this.fileData.idCardFront.length < 1) { uni.showToast({ icon: 'none', - title: '请上传身份证（正面）', + title: '请上传身份证照片（正面）', duration: 2000 }); return false; } - if (!this.formData.ID_CARD_BACK) { + if (this.fileData.idCardBack.length < 1) { uni.showToast({ icon: 'none', - title: '请上传身份证（反面）', + title: '请上传身份证照片（背面）', duration: 2000 }); return false; @@ -642,14 +619,6 @@ export default { }); return false; } - if (new Date(this.formData.ID_CARD_VALIDITY_START).getTime() > new Date(this.formData.ID_CARD_VALIDITY_END).getTime()) { - uni.showToast({ - icon: 'none', - title: '身份证有效起始时间不能超过截止时间', - duration: 2000 - }); - return false; - } if (!this.formData.ID_CARD_ADDRESS) { uni.showToast({ icon: 'none', @@ -666,73 +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.DRIVING_NATIONALITY) { - 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 (new Date(this.formData.DRIVER_LICENSE_VALIDITY_START).getTime() > new Date(this.formData.DRIVER_LICENSE_VALIDITY_END).getTime()) { - 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({ @@ -766,14 +720,6 @@ export default { }); return false; } - if (!this.formData.QUALIFICATION_CERTIFICATE_NATIONALITY) { - uni.showToast({ - icon: 'none', - title: '请选择国籍', - duration: 2000 - }); - return false; - } if (!this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_START || !this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_END) { uni.showToast({ icon: 'none', @@ -782,14 +728,6 @@ export default { }); return false; } - if (new Date(this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_START).getTime() > new Date(this.formData.QUALIFICATION_CERTIFICATE_VALIDITY_END).getTime()) { - uni.showToast({ - icon: 'none', - title: '从业资格证有效起始时间不能超过结束时间', - duration: 2000 - }); - return false; - } if (!this.formData.QUALIFICATION_CERTIFICATE_ORGAN) { uni.showToast({ icon: 'none', 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: '', diff --git a/pages/my/home.vue b/pages/my/home.vue index 2fc4692..613cf8c 100644 --- a/pages/my/home.vue +++ b/pages/my/home.vue @@ -37,7 +37,7 @@ - + 关于 @@ -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(); 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..0430798 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(); } @@ -217,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, @@ -252,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, @@ -262,17 +305,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({ @@ -294,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(); 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 @@ + + + + + diff --git a/static/apps-banner.png b/static/apps-banner.png index 0093235..75dbc2f 100644 Binary files a/static/apps-banner.png and b/static/apps-banner.png differ diff --git a/static/banner.jpg b/static/banner.jpg deleted file mode 100644 index 48bff15..0000000 Binary files a/static/banner.jpg and /dev/null differ diff --git a/static/banner.png b/static/banner.png index f6d6ade..528f00f 100644 Binary files a/static/banner.png and b/static/banner.png differ