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

Merge remote-tracking branch 'origin/main-20240105' into main-20240105

Browse Source 
# Conflicts:
#	src/views/contract/supplier/index.vue
main-20240105
zfl 8 months ago
parent 457a16d658 0a4373fba9
commit 1bf842201b
10 changed files with 58 additions and 61 deletions
Show Stats Download Patch File Download Diff File

6
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, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.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 && userInfo.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 && userInfo.id ==itemData.creator)) ?'#05A9FF':'#ccc'" :size="25" /> -->
</div>
</div>
</div>

6
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, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.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 && userInfo.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 && userInfo.id ==itemData.creator)) ?'#05A9FF':'#ccc'" :size="25" /> -->
</div>
</div>
</div>

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

@ -36,12 +36,8 @@
</div>
<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)" 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 && userInfo.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,temData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
</div>
</div>
@ -97,7 +93,7 @@ export default {
})
},
handleEdit(obj) {
const { id, status, billType } = obj
const { id, status, billType, creator } = obj
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
return
}

4
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, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.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 && userInfo.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
</div>
</div>
</div>

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

@ -39,12 +39,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, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.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 && userInfo.id ==itemData.creator)) ?'#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, itemData.creator)" v-hasPermi="['procurement:payApply:edit']" :style="`color:${!(!(itemData.status==0 || (itemData.status==3 && userInfo.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 && userInfo.id ==itemData.creator))) ?'#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="handleConfirm(itemData)" v-hasPermi="['bs:payment-apply:paymentAffirm']">付款确认</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>

6
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, itemData.creator)" name="edit" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.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 && userInfo.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 && userInfo.id ==itemData.creator)) ?'#05A9FF':'#ccc'" :size="25" /> -->
</div>
</div>
</div>

10
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 && userInfo.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,temData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.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 && 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 && userInfo.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,temData.creator)" name="delete-o" :color="!(itemData.status==0 || (itemData.status==3 && userInfo.id ==itemData.creator)) ?'#ccc':'#EC3359'" size="25" />
</div>
</div>
@ -94,7 +94,7 @@ export default {
})
},
handleEdit(obj) {
const { id, status, billType } = obj
const { id, status, billType, creator } = obj
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
return
}

7
src/views/contract/payment/index.vue
Unescape Escape View File

@ -39,8 +39,7 @@
import { createVendorPayment, getVendorPayment, updateVendorPayment } from "@/api/bs/vendorPayment";
import VerifyFunc from '@/utils/verify'
import { getDictDatas, DICT_TYPE } from "@/utils/dict";
import { getVendorPage } from "@/api/bs/vendor";
import { getBankAccountInfoPage } from "@/api/bs/bankAccountInfo";
import { vendorBankPage } from "@/api/bs/vendor";
import { listUser } from "@/api/system/user";
export default {
//import引入组件才能使用
@ -216,13 +215,13 @@ export default {
this.$loading(true, 'demo1')
return new Promise((resolve) => {
Promise.all([
getVendorPage({ pageNo: 1, pageSize: 999 }),
vendorBankPage({ pageNo: 1, pageSize: 999 }),
]).then(responses => {
// 处理每个请求的结果
this.allGysList = (responses[0].data.list || []).map(item => {
return {
id: item.id,
title: item.vendorName
title: `${item.vendorName}-付款账户:${item.bankNumber}`
}
});
this.$loading(false, 'demo1')

2
src/views/contract/receipts/index.vue
Unescape Escape View File

@ -197,7 +197,7 @@ export default {
this.allBankList = (responses[1].data.list || []).map(item => {
return {
id: item.id,
title: `${item.bankName}-${item.bankAccount}`
title: `${item.bankName}-收款账户:${item.bankAccount}`
}
});
resolve()

14
src/views/contract/supplier/index.vue
Unescape Escape View File

@ -393,6 +393,10 @@ export default {
}),
// proposerPerson:this.userInfo.id
}
if (!this.oaReimburseFeeitemList.length) {
this.$loading(false, 'form')
return this.$fm('暂无付款计划,无法提交!')
}
this.$loading(true, 'form')
createSupplierContract(newForm).then((res) => {
this.$loading(false, 'form')
@ -405,10 +409,6 @@ export default {
this.$loading(false, 'form')
})
// })
if (!this.oaReimburseFeeitemList.length) {
this.$loading(false, 'form')
return this.$fm('暂无付款计划,无法提交!')
}
}).catch((err) => {
this.$loading(false, 'form')
if (err && err.length > 0 && err[0].name) {
@ -566,8 +566,10 @@ export default {
}).then((res) => {
this.typeList = res.data || []
})
getProjectPage({type:2,pageNo: 1,
pageSize: 500}).then(res=>{
getProjectPage({
type: 2, pageNo: 1,
pageSize: 500
}).then(res => {
this.projectList = res.data.list || []
})
listData({

Write Preview
Loading…
Cancel
Save