ylj/wechat_yxcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2023-05-19 19:45:23 +08:00
parent e7025feed3
commit dbf6325353
5 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages.json
View File

@ -406,13 +406,13 @@
{ {
"path": "index", "path": "index",
"style": { "style": {
"navigationBarTitleText": "经营项目预警审批" "navigationBarTitleText": "分润比例切换"
} }
}, },
{ {
"path": "detail", "path": "detail",
"style": { "style": {
"navigationBarTitleText": "经营项目预警审批" "navigationBarTitleText": "分润比例切换"
} }
} }
] ]

15
pages/projectWarning/components/listUnit.vue
View File

@ -7,7 +7,10 @@
<p class="contentName">{{item.BUSINESSPROJECT_NAME}}</p> <p class="contentName">{{item.BUSINESSPROJECT_NAME}}</p>
<!-- 右侧 --> <!-- 右侧 -->
<!-- 有效状态 --> <!-- 有效状态 -->
<p class="other-coast">{{item.PROJECTWARNING_STATE===1000?'待切换':item.PROJECTWARNING_STATE===2000?'审核中':item.PROJECTWARNING_STATE===9000?'已切换':item.PROJECTWARNING_STATE===0?'':''}}</p>
<p v-if="item.DealMark===0" class="other-coast">{{item.PROJECTWARNING_STATE===1000?'待切换':item.PROJECTWARNING_STATE===2000?'审核中':item.PROJECTWARNING_STATE===9000?'已切换':item.PROJECTWARNING_STATE===9999?'暂不切换':''}}</p>
<p v-else class="other-coastGray">{{item.PROJECTWARNING_STATE===1000?'待切换':item.PROJECTWARNING_STATE===2000?'审核中':item.PROJECTWARNING_STATE===9000?'已切换':item.PROJECTWARNING_STATE===9999?'暂不切换':''}}</p>
<!-- <p v-else :class="item.PROJECTWARNING_STATE===9999 || item.PROJECTWARNING_STATE===9000?'other-coast other-coastGray':'other-coast'">{{item.PROJECTWARNING_STATE===1000?'待切换':item.PROJECTWARNING_STATE===2000?'审核中':item.PROJECTWARNING_STATE===9000?'已切换':item.PROJECTWARNING_STATE===9999?'暂不切换':''}}</p>-->
</view> </view>
<!-- 卡片第一行角标 --> <!-- 卡片第一行角标 -->
<view class="content-index" style="background-color:#FB8B56">{{i+1}}</view> <view class="content-index" style="background-color:#FB8B56">{{i+1}}</view>
@ -20,7 +23,11 @@
<view class="uni-flex content-box-cashpay"> <view class="uni-flex content-box-cashpay">
<!-- 中间 --> <!-- 中间 -->
<!-- 资质到期时间 --> <!-- 资质到期时间 -->
<p class="titleStyle" ><text :style="{fontSize:item.EXPIREDAYS!==0?'28px':'18px',lineHeight:'50px'}">{{item.EXPIREDAYS!==0?`${item.EXPIREDAYS}`:'已到期'}}</text><text style="font-size: 12px" v-if="item.EXPIREDAYS!==0">天</text></p> <p class="titleStyle" >
<text style="font-size: 12px;color: orangered" v-if="item.EXPIREDAYS!==0">预计</text>
<text :style="{fontSize:item.EXPIREDAYS!==0?'28px':'18px',lineHeight:'50px',margin:'0 4px'}">
{{item.EXPIREDAYS!==0?`${item.EXPIREDAYS}`:'完成保底'}}</text><text style="font-size: 12px" v-if="item.EXPIREDAYS!==0">天</text>
</p>
</view> </view>
<!-- 分割线 --> <!-- 分割线 -->
<view class="bb1"></view> <view class="bb1"></view>
@ -97,6 +104,10 @@
padding: 0 10rpx; padding: 0 10rpx;
height: 40rpx; height: 40rpx;
} }
.other-coastGray{
background: transparent;
color: #999999;
}
.cellLeftStyle{//标签左侧对齐 .cellLeftStyle{//标签左侧对齐
line-height: 45rpx; line-height: 45rpx;

38
pages/projectWarning/detail.vue
View File

@ -36,30 +36,11 @@
<p class="text">是否依合同将分润比例进行切换：驿达<span style="font-size: 18px;color: orangered">{{YDValue}}%</span>，商家<span style="font-size: 18px;color: orangered">{{SJValue}}%</span>？</p> <p class="text">是否依合同将分润比例进行切换：驿达<span style="font-size: 18px;color: orangered">{{YDValue}}%</span>，商家<span style="font-size: 18px;color: orangered">{{SJValue}}%</span>？</p>
</view> </view>
<p class="showText" v-if="dataDetail.PROJECTWARNING_STATE===2000">{{dataDetail.PROJECTWARNING_DESC}}</p>
<!-- <view v-if="dataDetail.PROJECTWARNING_STATE===1000" style="display: flex;align-items: center;justify-content:flex-start;margin:10px 0">--> <view class="position" v-if="dataDetail.DealMark===0" >
<!-- <span class="fourth-name">分润比例：</span>--> <button class="change" type="primary" @click="handleChange">切换比例</button>
<!-- <input type="number" style="flex: 1" placeholder="请输入分润比例" :value="inputValue" @input="handleInput"/>--> <button class="noChange" type="primary" @click="handleNoChange">暂不切换</button>
<!-- <span>(500-9500)</span>-->
<!-- </view>-->
<!-- <view v-if="dataDetail.PROJECTWARNING_STATE>1000">-->
<!-- <view class="modle-title">-->
<!-- <h4>切换信息</h4>-->
<!-- </view>-->
<!-- <view class="content-detail-box main-card ino-flex ai-center uni-column">-->
<!-- <view class="cellTopStyle" style="margin-right: 6%">-->
<!-- <view class="item">-->
<!-- <span class="fourth-name">分润比例：</span>-->
<!-- <span class="fourth-value">{{dataDetail.ROYALTY_CRATE / 100}}%</span>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view class="position">
<button class="change" v-if="dataDetail.PROJECTWARNING_STATE===1000" type="primary" @click="handleChange">切换比例</button>
<button class="noChange" v-if="dataDetail.PROJECTWARNING_STATE===1000" type="primary" @click="handleNoChange">暂不切换</button>
</view> </view>
</view> </view>
</template> </template>
@ -82,6 +63,7 @@ export default {
this.handleGetDetail() this.handleGetDetail()
this.useDate = Store.state.userData this.useDate = Store.state.userData
console.log('this.useDate',this.useDate) console.log('this.useDate',this.useDate)
}, },
methods:{ methods:{
// 拿到详细数据 // 拿到详细数据
@ -104,13 +86,14 @@ export default {
handleInput(e){ handleInput(e){
this.inputValue = e.target.value this.inputValue = e.target.value
}, },
// 暂不切换比例
handleNoChange(){ handleNoChange(){
this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{ this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{
BusinessId: this.PROJECTWARNING_ID, // 预警记录内码 BusinessId: this.PROJECTWARNING_ID, // 预警记录内码
StaffId:this.useDate.UserId,// 操作人内码 StaffId:this.useDate.UserId,// 操作人内码
StaffName:this.useDate.UserName,// 操作人名称 StaffName:this.useDate.UserName,// 操作人名称
SwitchRate:this.dataDetail.ROYALTY_RATE * 100,// 切换比例 SwitchRate:this.dataDetail.ROYALTY_RATE * 100,// 切换比例
ApproveState:'0',// 审批状态 ApproveState:'9999',// 审批状态
}).then(res=>{ }).then(res=>{
console.log('res') console.log('res')
uni.showToast({ uni.showToast({
@ -129,6 +112,9 @@ export default {
SwitchRate:this.dataDetail.ROYALTY_CRATE,// 切换比例 SwitchRate:this.dataDetail.ROYALTY_CRATE,// 切换比例
ApproveState:this.dataDetail.PROJECTWARNING_STATE===1000?'2000':'9000',// 审批状态 ApproveState:this.dataDetail.PROJECTWARNING_STATE===1000?'2000':'9000',// 审批状态
}).then(res=>{ }).then(res=>{
if (this.dataDetail.PROJECTWARNING_STATE===1000){
this.$util.toNextRoute('redirectTo', `/pages/projectWarning/index`)
}
console.log('res') console.log('res')
uni.showToast({ uni.showToast({
title: res.Result_Desc, title: res.Result_Desc,
@ -185,6 +171,10 @@ export default {
text-align: left; text-align: left;
font-size: 16px; font-size: 16px;
} }
.showText{
font-size: 13px;
text-indent: 2rem;
}
.content{ .content{
margin-top: 12px; margin-top: 12px;
} }

15
pages/projectWarning/index.vue
View File

@ -106,7 +106,6 @@ export default {
}), }),
...mapState({ ...mapState({
user: (state) => { user: (state) => {
console.log('state.userData',state.userData)
return state.userData return state.userData
}, },
}), }),
@ -142,8 +141,8 @@ export default {
BUSINESSPROJECT_NAME:'',// 经营项目名称 BUSINESSPROJECT_NAME:'',// 经营项目名称
SHOPROYALTY_ID:'',// 门店提成营收内码 SHOPROYALTY_ID:'',// 门店提成营收内码
SERVERPART_ID:'',// 服务区内码 SERVERPART_ID:'',// 服务区内码
// SERVERPART_IDS:this.severpartList[this.pickerIndex].value||'',// 服务区内码(查询条件) SERVERPART_IDS:this.severpartList[this.pickerIndex].value,// 服务区内码(查询条件)
SERVERPART_IDS:'',// 服务区内码(查询条件) // SERVERPART_IDS:'',// 服务区内码(查询条件)
SERVERPART_NAME:'',// 服务区名称 SERVERPART_NAME:'',// 服务区名称
SERVERPARTSHOP_NAME:'',// 门店名称 SERVERPARTSHOP_NAME:'',// 门店名称
BUSINESS_TYPE:'',// 经营模式 BUSINESS_TYPE:'',// 经营模式
@ -158,7 +157,7 @@ export default {
WARNING_DATE_Start:this.searchTime[0],// 提醒日期(查询条件) WARNING_DATE_Start:this.searchTime[0],// 提醒日期(查询条件)
WARNING_DATE_End:this.searchTime[1],// 提醒日期(查询条件) WARNING_DATE_End:this.searchTime[1],// 提醒日期(查询条件)
PROJECTWARNING_STATE:'',// 审批状态 PROJECTWARNING_STATE:'',// 审批状态
PROJECTWARNING_STATES:'1000,2000,9000',// 审批状态(查询条件) PROJECTWARNING_STATES:'',// 审批状态(查询条件)
RECORD_DATE:'',// 记录时间 RECORD_DATE:'',// 记录时间
PROJECTWARNING_DESC:'',// 备注说明 PROJECTWARNING_DESC:'',// 备注说明
REVENUE_AMOUNT:'',// 营收金额 REVENUE_AMOUNT:'',// 营收金额
@ -173,15 +172,13 @@ export default {
}, },
PageIndex: this.pageData.pageIndex,// 查询页码数 PageIndex: this.pageData.pageIndex,// 查询页码数
PageSize: this.pageData.pageSize,// 页显示数量 PageSize: this.pageData.pageSize,// 页显示数量
SortStr:'PROJECTWARNING_STATE,EXPIREDAYS,WARNING_DATE desc',// 排序条件 SortStr:'DealMark,PROJECTWARNING_STATE,EXPIREDAYS,WARNING_DATE desc',// 排序条件
} }
} }
}else{ }else{
} }
console.log('data',data)
this.$request.$webPost("EShangApiMain/BusinessProject/GetPROJECTWARNINGList", data.searchModel).then(res=>{ this.$request.$webPost("EShangApiMain/BusinessProject/GetPROJECTWARNINGList", data.searchModel).then(res=>{
console.log('res',res)
if (!res.Result_Code || res.Result_Code !== 100) { if (!res.Result_Code || res.Result_Code !== 100) {
this.pageData.isLoading = false this.pageData.isLoading = false
this.pageList = [] this.pageList = []
@ -234,6 +231,7 @@ export default {
StatisticsType: '1000,2000' StatisticsType: '1000,2000'
}).then(res => { }).then(res => {
_this.severpartList = res.Result_Data.List _this.severpartList = res.Result_Data.List
_this.severpartList.unshift({label:'全部服务区',value:''})
this.handleGetList() this.handleGetList()
}) })
} }
@ -241,12 +239,9 @@ export default {
}, },
// 选择开始时间 // 选择开始时间
handlechangeTime(e, index){ handlechangeTime(e, index){
console.log(111)
if (index===1){ if (index===1){
let startTime = new Date(this.searchTime[0]).getTime() let startTime = new Date(this.searchTime[0]).getTime()
let endTime = new Date(e.detail.value).getTime() let endTime = new Date(e.detail.value).getTime()
console.log('startTime',startTime)
console.log('endTime',endTime)
if (startTime>endTime){ if (startTime>endTime){
uni.showToast({ uni.showToast({
title: '结束时间不能小于开始时间', title: '结束时间不能小于开始时间',

20
util/api.js
View File

@ -43,16 +43,32 @@ export default {
data: data, data: data,
method: method, 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) { if (method == 'POST' && !isWebApi) {
requstOptions.header = { requstOptions.header = {
'content-type': 'application/x-www-form-urlencoded;charset=utf-8', 'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
'ServerpartCodes':Store.state.userData.UserCityAuthority, 'ServerpartCodes':Store.state.userData.UserCityAuthority,
'ProvinceCode': Store.state.userData.ProvinceCode 'ProvinceCode': Store.state.userData.ProvinceCode,
'ModuleGuid':ModuleGuid
} }
}else{ }else{
requstOptions.header = { requstOptions.header = {
'ServerpartCodes':Store.state.userData.UserCityAuthority, 'ServerpartCodes':Store.state.userData.UserCityAuthority,
'ProvinceCode': Store.state.userData.ProvinceCode 'ProvinceCode': Store.state.userData.ProvinceCode,
'ModuleGuid':ModuleGuid
} }
} }
requstOptions.success = (res) => { requstOptions.success = (res) => {