Browse Source

上传

master
前端-胡立永 5 months ago
parent
commit
f595d6a355
6 changed files with 79 additions and 4 deletions
  1. +48
    -0
      components/work/WorkOrderitem.vue
  2. +2
    -0
      pages/index/index.vue
  3. +2
    -0
      pages_order/order/WorkOrderList.vue
  4. +24
    -3
      pages_order/order/WorkOrders.vue
  5. +2
    -1
      pages_order/order/memberList.vue
  6. +1
    -0
      store/store.js

+ 48
- 0
components/work/WorkOrderitem.vue View File

@ -46,6 +46,20 @@
{{ obj.statusId_dictText }} {{ obj.statusId_dictText }}
</view> </view>
</view> </view>
<view class="Work-List"
v-if="isShowCollect">
<view class="modi"
v-if="obj.collectonFlag"
@click.stop="addCollection">
收藏
</view>
<view class="modi a"
v-else
@click.stop="addCollection">
取消收藏
</view>
</view>
</view> </view>
</template> </template>
@ -57,11 +71,31 @@
margin : { margin : {
default : '30rpx 0' default : '30rpx 0'
}, },
isShowCollect : {
default : false,
}
}, },
data() { data() {
return { return {
}; };
},
methods : {
//-
addCollection(){
this.$api('addCollection', {
templateId : this.obj.id
}, res => {
this.$emit('getData')
if(res.code == 200){
uni.showToast({
title: this.obj.collectonFlag ? '收藏成功' : '取消成功',
icon: 'none'
})
this.obj.collectonFlag = !this.obj.collectonFlag
}
})
},
} }
} }
</script> </script>
@ -80,6 +114,20 @@
width: 150rpx; width: 150rpx;
flex-shrink: 0; flex-shrink: 0;
} }
.modi{
padding: 15rpx 30rpx;
border-radius: 15rpx;
background-color: $uni-color;
color: #fff;
font-size: 22rpx;
margin-left: auto;
}
.a{
background-color: #fff;
border: 1rpx solid $uni-color;
color: $uni-color;
}
} }
} }
</style> </style>

+ 2
- 0
pages/index/index.vue View File

@ -54,6 +54,8 @@
<WorkOrderitem <WorkOrderitem
v-for="(item,index) in list" v-for="(item,index) in list"
:obj="item" :obj="item"
isShowCollect
@getData="getData"
:key="index" :key="index"
@click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)" @click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)"
/> />


+ 2
- 0
pages_order/order/WorkOrderList.vue View File

@ -21,6 +21,8 @@
<view class="Urgent-Work-Order"> <view class="Urgent-Work-Order">
<WorkOrderitem <WorkOrderitem
:key="index" :key="index"
isShowCollect
@getData="getData"
v-for="(item,index) in list" :obj="item" v-for="(item,index) in list" :obj="item"
@click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)"/> @click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)"/>
</view> </view>


+ 24
- 3
pages_order/order/WorkOrders.vue View File

@ -5,10 +5,23 @@
<navbar <navbar
title="详情" title="详情"
leftClick leftClick
@leftClick="$utils.navigateBack" @leftClick="$utils.navigateBack"
/> />
<view class="collect"
@click="addCollection">
<uv-icon
size="60rpx"
v-if="collectonFlag"
color="rgb(83, 125, 180)"
name="star-fill"></uv-icon>
<uv-icon
size="60rpx"
v-else
name="star"></uv-icon>
</view>
<view class="Box"> <view class="Box">
<view class="work-box"> <view class="work-box">
<view class="works"> <view class="works">
@ -83,10 +96,11 @@
</view> </view>
<view class="modify"> <view class="modify">
<view class="modi" <view class="modi"
v-if="isPermission('修改')"
@click="$utils.navigateTo('/pages_order/order/ModifyWorkOrder?id=' + id)"> @click="$utils.navigateTo('/pages_order/order/ModifyWorkOrder?id=' + id)">
修改 修改
</view> </view>
<view class="modi"
<!-- <view class="modi"
v-if="TemplateById.collectonFlag" v-if="TemplateById.collectonFlag"
@click="addCollection"> @click="addCollection">
收藏 收藏
@ -95,7 +109,7 @@
v-else v-else
@click="addCollection"> @click="addCollection">
取消收藏 取消收藏
</view>
</view> -->
</view> </view>
</view> </view>
</template> </template>
@ -169,6 +183,13 @@
background-color: #fff; background-color: #fff;
height: 100vh; height: 100vh;
font-size: 28rpx; font-size: 28rpx;
width: 100%;
position: relative;
.collect{
position: absolute;
right: 20rpx;
margin-top: 20rpx;
}
.Box{ .Box{
margin-top: 40rpx; margin-top: 40rpx;
.work-box { .work-box {


+ 2
- 1
pages_order/order/memberList.vue View File

@ -18,10 +18,11 @@
v-for="(item, index) in list" v-for="(item, index) in list"
:key="index"> :key="index">
<view class="Top"> <view class="Top">
<view class="userName" >
<view class="userName">
{{item.name}} {{item.name}}
</view> </view>
<view class="modify" <view class="modify"
v-if="isPermission('修改')"
@click="$utils.navigateTo('/pages_order/order/ModifyMembers?id=' + item.id)"> @click="$utils.navigateTo('/pages_order/order/ModifyMembers?id=' + item.id)">
修改 修改
</view> </view>


+ 1
- 0
store/store.js View File

@ -67,6 +67,7 @@ const store = new Vuex.Store({
}, res => { }, res => {
if(res.code == 200){ if(res.code == 200){
state.userInfo = res.result state.userInfo = res.result
state.permissions = res.result.permissionRoleList.map(n => n.permissionName)
} }
}) })
}, },


Loading…
Cancel
Save