root
/
O1-mobile
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: root:aeeb8ceeaf7d4e1840b9e798e53c21f1bcb59414
Branches Tags
root:haicang
root:dev
root:main
root:main-20240105
..
compare: root:a2824c54a67483063da299311ea64a3d815350ed
Branches Tags
root:haicang
root:dev
root:main
root:main-20240105

No commits in common. 'aeeb8ceeaf7d4e1840b9e798e53c21f1bcb59414' and 'a2824c54a67483063da299311ea64a3d815350ed' have entirely different histories.
aeeb8ceeaf ... a2824c54a6

7 changed files with 49 additions and 49 deletions
Show Stats

14
src/components/CorporatePaymentCard/index.vue
Unescape Escape View File

@ -43,9 +43,9 @@
</div>
<div class="box-rt">
<van-icon class="icon-box" v-hasPermi="['bs:vendor-payment:query']" @click="handleShow(itemData.id)" name="eye-o" color="#05A9FF" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:vendor-payment:update']" @click="handleEdit(itemData.id, itemData.status, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:vendor-payment:delete']" @click="handleDel(itemData.id, itemData.status, itemData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleMerge(itemData.id, itemData.status, itemData.creator)" name="envelop-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#05A9FF':'#ccc'" :size="25" /> -->
<van-icon class="icon-box" v-hasPermi="['bs:vendor-payment:update']" @click="handleEdit(itemData.id, itemData.status)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:vendor-payment:delete']" @click="handleDel(itemData.id, itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleMerge(itemData.id, itemData.status)" name="envelop-o" :color="itemData.status!=0 && itemData.status!=3 ?'#05A9FF':'#ccc'" :size="25" /> -->
</div>
</div>
</div>
@ -92,8 +92,8 @@ export default {
return
}
},
handleEdit(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleEdit(id, status) {
if (status != 0 && status != 3) {
return
}
this.jumoStudentId = id
@ -102,8 +102,8 @@ export default {
query: { id, type: 'edit' }
})
},
handleDel(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleDel(id, status) {
if (status != 0 && status != 3) {
return
}
Dialog.confirm({

14
src/components/CorporateReceiptsCard/index.vue
Unescape Escape View File

@ -43,9 +43,9 @@
</div>
<div class="box-rt">
<van-icon class="icon-box" v-hasPermi="['bs:vendor-receipt:query']" @click="handleShow(itemData.id)" name="eye-o" color="#05A9FF" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:vendor-receipt:update']" @click="handleEdit(itemData.id, itemData.status, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:vendor-receipt:delete']" @click="handleDel(itemData.id, itemData.status, itemData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleMerge(itemData.id, itemData.status, itemData.creator)" name="envelop-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#05A9FF':'#ccc'" :size="25" /> -->
<van-icon class="icon-box" v-hasPermi="['bs:vendor-receipt:update']" @click="handleEdit(itemData.id, itemData.status)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:vendor-receipt:delete']" @click="handleDel(itemData.id, itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleMerge(itemData.id, itemData.status)" name="envelop-o" :color="itemData.status!=0 && itemData.status!=3 ?'#05A9FF':'#ccc'" :size="25" /> -->
</div>
</div>
</div>
@ -92,8 +92,8 @@ export default {
return
}
},
handleEdit(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleEdit(id, status) {
if (status != 0 && status != 3) {
return
}
this.jumoStudentId = id
@ -102,8 +102,8 @@ export default {
query: { id, type: 'edit' }
})
},
handleDel(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleDel(id, status) {
if (status != 0 && status != 3) {
return
}
Dialog.confirm({

14
src/components/MyClaimListCard/index.vue
Unescape Escape View File

@ -37,11 +37,11 @@
<div class="box-rt">
<van-icon class="icon-box" v-hasPermi="[ listType === 'myNewClaim' ? 'bs:expense-claim:myquery' :'bs:expense-claim:query']" @click="handleShow(itemData)" name="eye-o" color="#05A9FF" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:expense-claim:create']" v-if="listType !== 'myNewClaim'" @click="handleEdit(itemData.id,itemData.status)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-claim:delete']" v-if="listType !== 'myNewClaim'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:expense-claim:create']" v-if="listType !== 'myNewClaim'" @click="handleEdit(itemData.id,itemData.status)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-claim:delete']" v-if="listType !== 'myNewClaim'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
-->
<van-icon class="icon-box" v-hasPermi="['bs:expense-claim:create']" v-if="listType == 'myNewClaim'" @click="handleEdit(itemData)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-claim:mydelete']" v-if="listType == 'myNewClaim'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-claim:create']" v-if="listType == 'myNewClaim'" @click="handleEdit(itemData)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-claim:mydelete']" v-if="listType == 'myNewClaim'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
</div>
</div>
@ -98,7 +98,7 @@ export default {
},
handleEdit(obj) {
const { id, status, billType } = obj
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
if (status != 0 && status != 3) {
return
}
this.jumoStudentId = id
@ -107,8 +107,8 @@ export default {
query: { id, type: 'edit', listType: this.listType, billType }
})
},
handleDel(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleDel(id, status) {
if (status != 0 && status != 3) {
return
}
Dialog.confirm({

12
src/components/MyCustomerListCard/index.vue
Unescape Escape View File

@ -33,8 +33,8 @@
</div>
<div class="box-rt">
<van-icon class="icon-box" v-hasPermi="['bs:customer-contract:show']" @click="handleShow(itemData.id)" name="eye-o" color="#05A9FF" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:customer-contract:update']" @click="handleEdit(itemData.id, itemData.status, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:customer-contract:delete']" @click="handleDel(itemData.id, itemData.status, itemData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:customer-contract:update']" @click="handleEdit(itemData.id, itemData.status)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:customer-contract:delete']" @click="handleDel(itemData.id, itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
</div>
</div>
</div>
@ -81,8 +81,8 @@ export default {
return
}
},
handleEdit(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator)) ) {
handleEdit(id, status) {
if (status != 0 && status != 3 ) {
return
}
this.jumoStudentId = id
@ -91,8 +91,8 @@ export default {
query: { id, type: 'edit' }
})
},
handleDel(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator)) ) {
handleDel(id, status) {
if (status != 0 && status != 3 ) {
return
}
Dialog.confirm({

16
src/components/MyPayListCard/index.vue
Unescape Escape View File

@ -36,12 +36,12 @@
</div>
<div class="box-rt">
<!-- <van-icon class="icon-box" v-hasPermi="['procurement:payApply:show']" @click="handleShow(itemData.id)" name="eye-o" color="#05A9FF" size="25" />
<van-icon class="icon-box" v-hasPermi="['procurement:payApply:edit']" @click="handleEdit(itemData.id, itemData.status, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:payment-apply:delete']" @click="handleDel(itemData.id, itemData.status, itemData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" /> -->
<van-icon class="icon-box" v-hasPermi="['procurement:payApply:edit']" @click="handleEdit(itemData.id, itemData.status)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:payment-apply:delete']" @click="handleDel(itemData.id, itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" /> -->
<span class="icon-box" @click="handleShow(itemData.id)" v-hasPermi="['procurement:payApply:show']" :style="`color:#05A9FF;`">查看</span>
<span class="icon-box" @click="handleEdit(itemData.id, itemData.status, itemData.creator)" v-hasPermi="['procurement:payApply:edit']" :style="`color:${!(!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator))) ?'#05A9FF':'#ccc'};`">修改</span>
<span class="icon-box" @click="handleDel(itemData.id, itemData.status, itemData.creator)" v-hasPermi="['bs:payment-apply:delete']" :style="`color:${!(!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator))) ?'#05A9FF':'#ccc'};`">删除</span>
<span class="icon-box" @click="handleEdit(itemData.id, itemData.status)" v-hasPermi="['procurement:payApply:edit']" :style="`color:${!(itemData.status!=0 && itemData.status!=3) ?'#05A9FF':'#ccc'};`">修改</span>
<span class="icon-box" @click="handleDel(itemData.id, itemData.status)" v-hasPermi="['bs:payment-apply:delete']" :style="`color:${!(itemData.status!=0 && itemData.status!=3) ?'#05A9FF':'#ccc'};`">删除</span>
<span class="icon-box" @click="handleConfirm(itemData)" v-hasPermi="['bs:payment-apply:paymentAffirm']" :style="`color:${!(itemData.status !== 2 || (itemData.status == 2 && itemData.payMentStatus == 1) ) ?'#05A9FF':'#ccc'};`">付款确认</span>
<span class="icon-box" @click="handleCancelConfirm(itemData)" v-hasPermi="['bs:payment-apply:paymentCancel']" :style="`color:${!(itemData.status !== 2 || (itemData.status == 2 && itemData.payMentStatus !== 1)) ?'#05A9FF':'#ccc'};`">取消确认</span>
<span class="icon-box" @click="handleUpload(itemData,itemData.payMentStatus == 1 && itemData.status == 2 )" v-hasPermi="['procurement:payApply:upload']" :style="`color:#05A9FF`"> {{ itemData.payMentStatus == 1 && itemData.status == 2 ? '查看凭证' : itemData.files.length ? '修改凭证' : '上传凭证'}}</span>
@ -122,8 +122,8 @@ export default {
return
}
},
handleEdit(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleEdit(id, status) {
if (status != 0 && status != 3) {
return
}
this.jumoStudentId = id
@ -132,8 +132,8 @@ export default {
query: { id, type: 'edit' }
})
},
handleDel(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleDel(id, status) {
if (status != 0 && status != 3) {
return
}
Dialog.confirm({

14
src/components/MySupplierListCard/index.vue
Unescape Escape View File

@ -36,9 +36,9 @@
</div>
<div class="box-rt">
<van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:show']" @click="handleShow(itemData.id)" name="eye-o" color="#05A9FF" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:update']" @click="handleEdit(itemData.id, itemData.status, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleDel(itemData.id, itemData.status, itemData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleMerge(itemData.id, itemData.status, itemData.creator)" name="envelop-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#05A9FF':'#ccc'" :size="25" /> -->
<van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:update']" @click="handleEdit(itemData.id, itemData.status)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleDel(itemData.id, itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:supplier-contract:delete']" @click="handleMerge(itemData.id, itemData.status)" name="envelop-o" :color="itemData.status!=0 && itemData.status!=3 ?'#05A9FF':'#ccc'" :size="25" /> -->
</div>
</div>
</div>
@ -85,8 +85,8 @@ export default {
return
}
},
handleEdit(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator)) ) {
handleEdit(id, status) {
if (status != 0 && status != 3 ) {
return
}
this.jumoStudentId = id
@ -95,8 +95,8 @@ export default {
query: { id, type: 'edit' }
})
},
handleDel(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator)) ) {
handleDel(id, status) {
if (status != 0 && status != 3 ) {
return
}
Dialog.confirm({

14
src/components/MyTripsListCard/index.vue
Unescape Escape View File

@ -38,11 +38,11 @@
<!-- {{listType}} -->
<van-icon class="icon-box" v-hasPermi="[listType === 'myNewTrips' ? 'bs:expense-apply:myquery' : 'bs:expense-apply:query']" @click="handleShow(itemData)" name="eye-o" color="#05A9FF" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:expense-apply:create']" v-if="listType !== 'myNewTrips'" @click="handleEdit(itemData.id,itemData.status)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-apply:delete']" v-if="listType !== 'myNewTrips'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<!-- <van-icon class="icon-box" v-hasPermi="['bs:expense-apply:create']" v-if="listType !== 'myNewTrips'" @click="handleEdit(itemData.id,itemData.status)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-apply:delete']" v-if="listType !== 'myNewTrips'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
-->
<van-icon class="icon-box" v-hasPermi="['bs:expense-apply:create']" v-if="listType == 'myNewTrips'" @click="handleEdit(itemData)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-apply:mydelete']" v-if="listType == 'myNewTrips'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && itemData.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-apply:create']" v-if="listType == 'myNewTrips'" @click="handleEdit(itemData)" name="edit" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':''" size="25" />
<van-icon class="icon-box" v-hasPermi="['bs:expense-apply:mydelete']" v-if="listType == 'myNewTrips'" @click="handleDel(itemData.id,itemData.status)" name="delete-o" :color="itemData.status!=0 && itemData.status!=3 ?'#ccc':'#EC3359'" size="25" />
</div>
</div>
@ -95,7 +95,7 @@ export default {
},
handleEdit(obj) {
const { id, status, billType } = obj
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
if (status != 0 && status != 3) {
return
}
this.jumoStudentId = id
@ -104,8 +104,8 @@ export default {
query: { id, type: 'edit', listType: this.listType, billType }
})
},
handleDel(id, status,creator) {
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
handleDel(id, status) {
if (status != 0 && status != 3) {
return
}
Dialog.confirm({

Write Preview
Loading…
Cancel
Save