Skip to content

J
jiedao-app-operator-master
Commit 7a9d6dbc authored by 我在何方's avatar 我在何方
Browse files
Options

Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6

parents 85c46a69 52ad7eba
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 45 deletions
src/views/ecw/financial/commission-requestFunds.vue
View file @ 7a9d6dbc
...@@ -98,11 +98,12 @@ ...@@ -98,11 +98,12 @@
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('客户的账户名称')" > <el-descriptions-item :label="$t('客户的账户名称')" >
<el-form-item label-width="0" prop="customerBankAccountName"> <el-form-item v-if="(form.customerId && bankAccountList.length) || !form.customerId" label-width="0" prop="customerBankAccountName">
<el-select v-model="form.customerBankAccount" > <el-select v-model="form.customerBankAccount" >
<el-option @click.native="getBankInfo(item)" v-for="(item) in bankAccountList" :value="item.bankAccount" :label="item.bankAccount + (item.bankName)" ></el-option> <el-option @click.native="getBankInfo(item)" v-for="(item) in bankAccountList" :value="item.bankAccount" :label="item.bankAccount + (item.bankName)" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<span v-else >{{$t('客户档案没有银行账户。')}}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('账户名称')" > <el-descriptions-item :label="$t('账户名称')" >
<el-form-item label-width="0" :rules="{message:$t('账户名称不能为空'),required:true,}" prop="customerBankAccountName"> <el-form-item label-width="0" :rules="{message:$t('账户名称不能为空'),required:true,}" prop="customerBankAccountName">
...@@ -403,8 +404,12 @@ ...@@ -403,8 +404,12 @@
> >
<el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column> <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
<el-table-column :label="$t('订单编号')" prop="orderNo"></el-table-column> <el-table-column :label="$t('订单编号')" prop="orderNo"></el-table-column>
<el-table-column align="center" :label="$t('品名')">
<template v-slot="{row}">
{{row.titleZh}}/{{row.titleEn}}
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" prop="customerName"></el-table-column> <el-table-column :label="$t('客户名称')" prop="customerName"></el-table-column>
<el-table-column :label="$t('订单编号')" prop="payableNo"></el-table-column>
<el-table-column :label="$t('佣金类型')"> <el-table-column :label="$t('佣金类型')">
<template v-slot="{row}"> <template v-slot="{row}">
<dict-tag <dict-tag
...@@ -466,10 +471,12 @@ import NP from 'number-precision' ...@@ -466,10 +471,12 @@ import NP from 'number-precision'
import {getWarehouseList} from '@/api/ecw/warehouse' import {getWarehouseList} from '@/api/ecw/warehouse'
import WorkFlow from '@/components/WorkFlow/' import WorkFlow from '@/components/WorkFlow/'
import {getCustomer, getCustomerPage} from "@/api/ecw/customer"; import {getCustomer, getCustomerPage} from "@/api/ecw/customer";
import Template from "@/views/cms/template/index.vue";
export default { export default {
name: "commission-requestFunds", name: "commission-requestFunds",
components: { components: {
Template,
CustomerSelector, WorkFlow CustomerSelector, WorkFlow
}, },
data() { data() {
...@@ -865,6 +872,15 @@ export default { ...@@ -865,6 +872,15 @@ export default {
watch:{ watch:{
'form.customerId'(val){ 'form.customerId'(val){
this.selectChange(val) this.selectChange(val)
if(!val){
// 清空银行卡信息
this.form.customerAccountType = ''; //账户类型
this.form.customerBank = ''; //客户银行
this.form.customerBankAccount = ''; // 客户银行账号
this.form.customerBankAccountName = ''; //客户银行账户名
this.form.customerBankAddress = ''; // 银行地址
this.form.customerBankAddress = ''; // 银行代码
}
} }
} }
...@@ -872,6 +888,9 @@ export default { ...@@ -872,6 +888,9 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-form-item{
margin-bottom: 0;
}
.card { .card {
margin-top: 20px; margin-top: 20px;
} }
......
src/views/ecw/financial/paymentVoucher.vue
View file @ 7a9d6dbc
...@@ -7,40 +7,23 @@ ...@@ -7,40 +7,23 @@
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="small"
:inline="true"
label-width="100px" label-width="100px"
class="card" class="card"
> >
<el-row :span="24"> <el-row :gutter="10">
<el-form-item :label="$t('柜号')"> <el-col :span="4"> <el-form-item :label="$t('付款单号')">
<el-input <el-input
style="max-width: 188px"
v-model="queryParams.receiptNo"
:placeholder="$t('请输入收款单号')"
clearable clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('自编号')">
<el-input
style="max-width: 188px" style="max-width: 188px"
v-model="queryParams.receiptNo" v-model="queryParams.paymentNo"
:placeholder="$t('请输入收款单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('付款单号')">
<el-input
style="max-width: 188px"
v-model="queryParams.receiptNo"
:placeholder="$t('请输入付款单号')" :placeholder="$t('请输入付款单号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item></el-col>
<el-form-item :label="$t('供应商')"> <el-col :span="4"><el-form-item :label="$t('供应商')">
<el-select <el-select
clearable
v-model="queryParams.supplierId" v-model="queryParams.supplierId"
:placeholder="$t('请选择供应商')" :placeholder="$t('请选择供应商')"
> >
...@@ -51,13 +34,8 @@ ...@@ -51,13 +34,8 @@
:value="supplier.id" :value="supplier.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item></el-col>
<el-form-item :label="$t('状态')"> <el-col :span="4"><el-form-item :label="$t('业务员')">
<dict-selector :type="DICT_TYPE.PAYMENT_STATE" v-model="queryParams.state"/>
</el-form-item>
</el-row>
<el-row :span="24">
<el-form-item :label="$t('业务员')">
<!-- <el-select v-model="form.salesmanId" :placeholder="$t('请选择业务员')"> <!-- <el-select v-model="form.salesmanId" :placeholder="$t('请选择业务员')">
<el-option <el-option
v-for="item in creatorData" v-for="item in creatorData"
...@@ -66,7 +44,8 @@ ...@@ -66,7 +44,8 @@
:value="item.id" :value="item.id"
/> />
</el-select> --> </el-select> -->
<el-select v-model="form.salesmanId" filterable :placeholder="$t('请选择业务员')" <el-select v-model="queryParams.salesmanId" filterable :placeholder="$t('请选择业务员')"
clearable
@change="v => form.salesmanName = creatorData.find(t => t.id === v).nickname"> @change="v => form.salesmanName = creatorData.find(t => t.id === v).nickname">
<el-option <el-option
v-for="item in creatorData" v-for="item in creatorData"
...@@ -75,8 +54,8 @@ ...@@ -75,8 +54,8 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> </el-col>
<el-form-item :label="$t('创建时间')"> <el-col :span="6"><el-form-item :label="$t('创建时间')">
<el-date-picker <el-date-picker
v-model="queryParams.beginCreateTime" v-model="queryParams.beginCreateTime"
type="datetimerange" type="datetimerange"
...@@ -85,17 +64,25 @@ ...@@ -85,17 +64,25 @@
:start-placeholder="$t('请选择日期')" :start-placeholder="$t('请选择日期')"
:end-placeholder="$t('请选择日期')"> :end-placeholder="$t('请选择日期')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item></el-col>
<el-form-item :label="$t('发票状态')"> </el-row>
<el-row :gutter="10">
<el-col :span="4">
<el-form-item :label="$t('状态')">
<dict-selector clearable :type="DICT_TYPE.ECW_PAYMENT_STATE" v-model="queryParams.state"/>
</el-form-item>
</el-col>
<el-col :span="4"><el-form-item :label="$t('发票状态')">
<el-select <el-select
clearable
v-model="queryParams.invoiceStatus" v-model="queryParams.invoiceStatus"
:placeholder="$t('请选择是否开票')" :placeholder="$t('请选择是否开票')"
> >
<el-option :label="$t('未开票')" value="0"/> <el-option :label="$t('未开票')" value="0"/>
<el-option :label="$t('已开票')" value="1"/> <el-option :label="$t('已开票')" value="1"/>
</el-select> </el-select>
</el-form-item> </el-form-item></el-col>
<el-form-item> <el-col :span="6"><el-form-item>
<el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button> <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
<el-button <el-button
style="margin-left: 10px" style="margin-left: 10px"
...@@ -104,7 +91,7 @@ ...@@ -104,7 +91,7 @@
@click="handleAdd(0)" @click="handleAdd(0)"
>{{ $t('新增请款单') }}</el-button >{{ $t('新增请款单') }}</el-button
> >
</el-form-item> </el-form-item></el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-card> </el-card>
...@@ -154,12 +141,12 @@ ...@@ -154,12 +141,12 @@
v-hasPermi="['ecw:paymentVoucher:edit']" type="text">{{ $t('编辑') }} v-hasPermi="['ecw:paymentVoucher:edit']" type="text">{{ $t('编辑') }}
</el-button> </el-button>
<!-- <el-button v-if="[1,3].includes(row.state)" size="mini" v-hasPermi="['ecw:paymentVoucher:process']" type="text" @click="examineClick(scope.row.id)">{{ $t('审核') }}</el-button>--> <!-- <el-button v-if="[1,3].includes(row.state)" size="mini" v-hasPermi="['ecw:paymentVoucher:process']" type="text" @click="examineClick(scope.row.id)">{{ $t('审核') }}</el-button>-->
<el-button size="mini" v-has-permi="['ecw:paymentVoucher:Unapprove']" type="text" v-if="[1].includes(row.state)" @click="bridgeFn(1, '取消审核',row)"> <el-button size="mini" type="text" v-show="[1].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Unapprove']" @click="bridgeFn(1, '取消审核',row)">
{{ $t('取消审核') }} {{ $t('取消审核') }}
</el-button> </el-button>
<el-button size="mini" type="text" v-has-permi="['ecw:paymentVoucher:details']" v-if="[7,3,1,5].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button> <el-button size="mini" type="text" v-show="[7,3,1,5].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:details']" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button>
<el-button size="mini" type="text" v-has-permi="['ecw:paymentVoucher:Cancel-De-approval']" v-if="[3].includes(row.state)" @click="bridgeFn(2, '取消付款单反审核',row)" >{{ $t('取消反审核') }}</el-button> <el-button size="mini" type="text" v-if="[3].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-De-approval']" @click="bridgeFn(2, '取消付款单反审核',row)" >{{ $t('取消反审核') }}</el-button>
<el-button size="mini" v-has-permi="['ecw:paymentVoucher:Cancel-Write-off']" type="text" v-if="[5].includes(row.state)" @click="bridgeFn(3, '取消付款单核销',row)" >{{ $t('取消核销') }}</el-button> <el-button size="mini" type="text" v-if="[5].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Write-off']" @click="bridgeFn(3, '取消付款单核销',row)" >{{ $t('取消核销') }}</el-button>
<el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:De-approval']" <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:De-approval']"
@click="bridgeFn(4, '反审核',row)">{{ $t('反审核') }} @click="bridgeFn(4, '反审核',row)">{{ $t('反审核') }}
...@@ -172,7 +159,7 @@ ...@@ -172,7 +159,7 @@
v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, '反核销',row)"> v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, '反核销',row)">
{{ $t('反核销') }} {{ $t('反核销') }}
</el-button> </el-button>
<el-button v-hasPermi="['ecw:paymentVoucher:Cancel-Cancelling-Write-off']" v-if="[7].includes(row.state)" size="mini" type="text" @click="bridgeFn(7, '取消付款单反核销',row)" > {{ $t('取消反核销') }}</el-button> <el-button v-if="[7].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Cancelling-Write-off']" size="mini" type="text" @click="bridgeFn(7, '取消付款单反核销',row)" > {{ $t('取消反核销') }}</el-button>
<!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">{{ $t('开票') }}</el-button> --> <!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">{{ $t('开票') }}</el-button> -->
<el-button v-if="[6,4].includes(row.state)" size="mini" type="text" @click="toprint(row.id)" <el-button v-if="[6,4].includes(row.state)" size="mini" type="text" @click="toprint(row.id)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment