diff --git a/main.js b/main.js index cbab794d..98c61f80 100644 --- a/main.js +++ b/main.js @@ -37,16 +37,16 @@ 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://42.180.188.17: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:28888/' //郭圣雄本地 - Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // 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://192.168.34.138:5173' // 工作流地址 + Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // 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/' // 湖里 diff --git a/pages/standardScheduleNews/addFrom.vue b/pages/standardScheduleNews/addFrom.vue index 0f35de01..b6db89d4 100644 --- a/pages/standardScheduleNews/addFrom.vue +++ b/pages/standardScheduleNews/addFrom.vue @@ -94,7 +94,7 @@ uploadDate: '', progressRatio: 0, feedbackContent: '', - hasDelayEvent: 0, + hasDelayEvent: '0', delayEventReason: '', delayEventType: [] }, @@ -243,6 +243,7 @@ }, //新增保存 addSaveBtn() { + console.log(this.form,111222); if (this.form.uploadDate == "") { uni.showToast({ title: "请选择上报时间", @@ -250,19 +251,21 @@ }) return } - if(!this.form.delayEventReason){ - uni.showToast({ - title: "请输入延期误工原因", - icon: 'error' - }) - return - } - if(this.form.delayEventType.length == 0){ - uni.showToast({ - title: "请选择延期原因类型", - icon: 'error' - }) - return + if(this.form.hasDelayEvent !== '0'){ + if(!this.form.delayEventReason){ + uni.showToast({ + title: "请输入延期误工原因", + icon: 'error' + }) + return + } + if(this.form.delayEventType.length == 0){ + uni.showToast({ + title: "请选择延期原因类型", + icon: 'error' + }) + return + } } let data = JSON.parse(JSON.stringify(this.form)); data.projectSn = this.projectSn;