diff --git a/pages.json b/pages.json index f3d858a..d52a304 100644 --- a/pages.json +++ b/pages.json @@ -406,13 +406,13 @@ { "path": "index", "style": { - "navigationBarTitleText": "经营项目预警审批" + "navigationBarTitleText": "分润比例切换" } }, { "path": "detail", "style": { - "navigationBarTitleText": "经营项目预警审批" + "navigationBarTitleText": "分润比例切换" } } ] diff --git a/pages/projectWarning/components/listUnit.vue b/pages/projectWarning/components/listUnit.vue index c3ae9bf..2509efc 100644 --- a/pages/projectWarning/components/listUnit.vue +++ b/pages/projectWarning/components/listUnit.vue @@ -7,7 +7,10 @@

{{item.BUSINESSPROJECT_NAME}}

-

{{item.PROJECTWARNING_STATE===1000?'待切换':item.PROJECTWARNING_STATE===2000?'审核中':item.PROJECTWARNING_STATE===9000?'已切换':item.PROJECTWARNING_STATE===0?'':''}}

+ +

{{item.PROJECTWARNING_STATE===1000?'待切换':item.PROJECTWARNING_STATE===2000?'审核中':item.PROJECTWARNING_STATE===9000?'已切换':item.PROJECTWARNING_STATE===9999?'暂不切换':''}}

+

{{item.PROJECTWARNING_STATE===1000?'待切换':item.PROJECTWARNING_STATE===2000?'审核中':item.PROJECTWARNING_STATE===9000?'已切换':item.PROJECTWARNING_STATE===9999?'暂不切换':''}}

+ {{i+1}} @@ -20,7 +23,11 @@ -

{{item.EXPIREDAYS!==0?`${item.EXPIREDAYS}`:'已到期'}}天

+

+ 预计 + + {{item.EXPIREDAYS!==0?`${item.EXPIREDAYS}`:'完成保底'}}天 +

@@ -97,6 +104,10 @@ padding: 0 10rpx; height: 40rpx; } + .other-coastGray{ + background: transparent; + color: #999999; + } .cellLeftStyle{//标签左侧对齐 line-height: 45rpx; diff --git a/pages/projectWarning/detail.vue b/pages/projectWarning/detail.vue index 1b1c6b5..2ecb0a4 100644 --- a/pages/projectWarning/detail.vue +++ b/pages/projectWarning/detail.vue @@ -36,30 +36,11 @@

是否依合同将分润比例进行切换：驿达{{YDValue}}%，商家{{SJValue}}%？

+

{{dataDetail.PROJECTWARNING_DESC}}

- - - - - - - - - - - - - - - - - - - - - - - + + + @@ -82,6 +63,7 @@ export default { this.handleGetDetail() this.useDate = Store.state.userData console.log('this.useDate',this.useDate) + }, methods:{ // 拿到详细数据 @@ -104,13 +86,14 @@ export default { handleInput(e){ this.inputValue = e.target.value }, + // 暂不切换比例 handleNoChange(){ this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{ BusinessId: this.PROJECTWARNING_ID, // 预警记录内码 StaffId:this.useDate.UserId,// 操作人内码 StaffName:this.useDate.UserName,// 操作人名称 SwitchRate:this.dataDetail.ROYALTY_RATE * 100,// 切换比例 - ApproveState:'0',// 审批状态 + ApproveState:'9999',// 审批状态 }).then(res=>{ console.log('res') uni.showToast({ @@ -129,6 +112,9 @@ export default { SwitchRate:this.dataDetail.ROYALTY_CRATE,// 切换比例 ApproveState:this.dataDetail.PROJECTWARNING_STATE===1000?'2000':'9000',// 审批状态 }).then(res=>{ + if (this.dataDetail.PROJECTWARNING_STATE===1000){ + this.$util.toNextRoute('redirectTo', `/pages/projectWarning/index`) + } console.log('res') uni.showToast({ title: res.Result_Desc, @@ -185,6 +171,10 @@ export default { text-align: left; font-size: 16px; } +.showText{ + font-size: 13px; + text-indent: 2rem; +} .content{ margin-top: 12px; } diff --git a/pages/projectWarning/index.vue b/pages/projectWarning/index.vue index c0b952c..93de978 100644 --- a/pages/projectWarning/index.vue +++ b/pages/projectWarning/index.vue @@ -106,7 +106,6 @@ export default { }), ...mapState({ user: (state) => { - console.log('state.userData',state.userData) return state.userData }, }), @@ -142,8 +141,8 @@ export default { BUSINESSPROJECT_NAME:'',// 经营项目名称 SHOPROYALTY_ID:'',// 门店提成营收内码 SERVERPART_ID:'',// 服务区内码 - // SERVERPART_IDS:this.severpartList[this.pickerIndex].value||'',// 服务区内码(查询条件) - SERVERPART_IDS:'',// 服务区内码(查询条件) + SERVERPART_IDS:this.severpartList[this.pickerIndex].value,// 服务区内码(查询条件) + // SERVERPART_IDS:'',// 服务区内码(查询条件) SERVERPART_NAME:'',// 服务区名称 SERVERPARTSHOP_NAME:'',// 门店名称 BUSINESS_TYPE:'',// 经营模式 @@ -158,7 +157,7 @@ export default { WARNING_DATE_Start:this.searchTime[0],// 提醒日期(查询条件) WARNING_DATE_End:this.searchTime[1],// 提醒日期(查询条件) PROJECTWARNING_STATE:'',// 审批状态 - PROJECTWARNING_STATES:'1000,2000,9000',// 审批状态(查询条件) + PROJECTWARNING_STATES:'',// 审批状态(查询条件) RECORD_DATE:'',// 记录时间 PROJECTWARNING_DESC:'',// 备注说明 REVENUE_AMOUNT:'',// 营收金额 @@ -173,15 +172,13 @@ export default { }, PageIndex: this.pageData.pageIndex,// 查询页码数 PageSize: this.pageData.pageSize,// 页显示数量 - SortStr:'PROJECTWARNING_STATE,EXPIREDAYS,WARNING_DATE desc',// 排序条件 + SortStr:'DealMark,PROJECTWARNING_STATE,EXPIREDAYS,WARNING_DATE desc',// 排序条件 } } }else{ } - console.log('data',data) this.$request.$webPost("EShangApiMain/BusinessProject/GetPROJECTWARNINGList", data.searchModel).then(res=>{ - console.log('res',res) if (!res.Result_Code || res.Result_Code !== 100) { this.pageData.isLoading = false this.pageList = [] @@ -234,6 +231,7 @@ export default { StatisticsType: '1000,2000' }).then(res => { _this.severpartList = res.Result_Data.List + _this.severpartList.unshift({label:'全部服务区',value:''}) this.handleGetList() }) } @@ -241,12 +239,9 @@ export default { }, // 选择开始时间 handlechangeTime(e, index){ - console.log(111) if (index===1){ let startTime = new Date(this.searchTime[0]).getTime() let endTime = new Date(e.detail.value).getTime() - console.log('startTime',startTime) - console.log('endTime',endTime) if (startTime>endTime){ uni.showToast({ title: '结束时间不能小于开始时间', diff --git a/util/api.js b/util/api.js index 6b75943..f479fcc 100644 --- a/util/api.js +++ b/util/api.js @@ -43,16 +43,32 @@ export default { data: data, method: method, } + let ModuleGuid = '' + let obj = Store.state.userData.AuthorityInfo + for (let key in obj){ + // 经管 财务 + if (key==='f0889950-f98a-40de-a369-613efeed2579' || key==='c021bbca-3c0a-478d-81e7-87e81ef80e05' ){ + if (obj[key]===1){ + if (ModuleGuid===''){ + ModuleGuid = key + }else{ + ModuleGuid +=`,${key}` + } + } + } + } if (method == 'POST' && !isWebApi) { requstOptions.header = { 'content-type': 'application/x-www-form-urlencoded;charset=utf-8', 'ServerpartCodes':Store.state.userData.UserCityAuthority, - 'ProvinceCode': Store.state.userData.ProvinceCode + 'ProvinceCode': Store.state.userData.ProvinceCode, + 'ModuleGuid':ModuleGuid } }else{ requstOptions.header = { 'ServerpartCodes':Store.state.userData.UserCityAuthority, - 'ProvinceCode': Store.state.userData.ProvinceCode + 'ProvinceCode': Store.state.userData.ProvinceCode, + 'ModuleGuid':ModuleGuid } } requstOptions.success = (res) => {