Skip to content

J
jiedao-app-operator-master
Commit 20fd044a authored by zhoutong's avatar zhoutong
Browse files
Options

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

parents b4a5f54d d9f53673
Show whitespace changes
Inline Side-by-side
Showing with 3855 additions and 3821 deletions
src/i18n/languages/en_US.json
View file @ 20fd044a
...@@ -3790,5 +3790,38 @@ ...@@ -3790,5 +3790,38 @@
"版本号不能为空": "Version number cannot be empty", "版本号不能为空": "Version number cannot be empty",
"内部号不能为空": "Internal number cannot be empty", "内部号不能为空": "Internal number cannot be empty",
"版本链接不能为空": "Version link cannot be empty", "版本链接不能为空": "Version link cannot be empty",
"强制更新不能为空": "Forced update cannot be empty" "强制更新不能为空": "Forced update cannot be empty",
"货物毛重(KGS)": "Gross weight of goods (KGS)",
"请输入货物毛重": "Please enter the gross weight of the goods",
"提单确认件.xlsx": "Bill of Lading Confirmation.xlsx",
"提交佣金付款单反核销申请成功，请耐心等待审核结果": "Successfully submitted the commission payment form cancellation application. Please be patient and wait for the review result",
"客户档案未设置银行账户。": "The customer profile does not have a bank account set up.",
"反核销审核详情": "Details of anti verification approval",
"全部核销审核详情": "Full verification and review details",
"取消全部核销审核": "Cancel All Write-off Review",
"提交收款单反核销": "Submit payment receipt for reverse verification",
"输入金额不对": "Incorrect input amount",
"标签超过1000需要耐心等候标签生成，请稍候": "Tags exceeding 1000 require patience to wait for tag generation, please wait",
"首次入仓时间": "First entry time",
"订单{no}的放货箱数不能大于可放货箱数": "The number of delivery boxes for order {no} cannot be greater than the number of available delivery boxes",
"请填写合作开始时间": "Please fill in the start time of cooperation",
"请填写合作结束时间": "Please fill in the cooperation end time",
"境内外": "domestic and foreign",
"佣金付款单反审核": "De-approval of commission payment documents",
"佣金付款单核销申请": "Commission Payment Document Verification Application",
"佣金付款单反核销申请": "Commission Payment Document Reverse Write-off Application",
"取消佣金付款单反审核": "Cancel the approval of commission payment documents",
"提交取消反审核": "Submit Cancel De-approval",
"取消佣金付款单核销": "Cancel commission payment document verification",
"取消付款单核销": "Cancel Payment Order Write-off",
"取消佣金付款单反核销": "Cancel Commission Payment Document Cancellation",
"取消付款单反核销": "Cancel Payment Document Cancellation Write-off",
"零": "zero",
"玖": "nine",
"仟": "Thousand",
"兆": "Megabyte",
"角": "horn",
"厘": "Centimeters",
"取消付款单反审核": "Cancel Payment Order De-approval",
"提交核销": "Submit for verification"
} }
src/views/ecw/financial/commission-Payment.vue
View file @ 20fd044a
...@@ -108,14 +108,14 @@ ...@@ -108,14 +108,14 @@
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:edit']" v-if="[0,2].includes(row.state)" @click="$router.push({path:'/financial/commission-requestFunds',query:{id:row.id}})" >{{$t('编辑')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:edit']" v-if="[0,2].includes(row.state)" @click="$router.push({path:'/financial/commission-requestFunds',query:{id:row.id}})" >{{$t('编辑')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:delete']" @click="deleteFn(row)" v-if="[0,2].includes(row.state)" > {{$t('删除')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:delete']" @click="deleteFn(row)" v-if="[0,2].includes(row.state)" > {{$t('删除')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment: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 type="text" size="mini" v-has-permi="['ecw:commission-Payment: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 type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn('取消审核',7, row, '取消审核' )" >{{$t('取消审核')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn($t('取消审核'),7, row, $t('取消审核') )" >{{$t('取消审核')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单反审核', 1, row, '提交反审核',)" >{{$t('反审核')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn($t('佣金付款单反审核'), 1, row, $t('提交反审核'),)" >{{$t('反审核')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单核销申请', 2, row, '提交核销')" >{{$t('核销')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn($t('佣金付款单核销申请'), 2, row, $t('提交核销'))" >{{$t('核销')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:print']" v-if="[4,6].includes(row.state)" @click="$router.push({path:'/financial/printPaymentVoucherCommission',query:{id:row.id}})" >{{$t('打印')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:print']" v-if="[4,6].includes(row.state)" @click="$router.push({path:'/financial/printPaymentVoucherCommission',query:{id:row.id}})" >{{$t('打印')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn('佣金付款单反核销申请', 3, row, '提交反核销')" >{{$t('反核销')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn($t('佣金付款单反核销申请'), 3, row, $t('提交反核销'))" >{{$t('反核销')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn('取消佣金付款单反审核',4, row, '提交取消反审核' )" >{{$t('取消反审核')}}</el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn($t('取消佣金付款单反审核'),4, row, $t('提交取消反审核') )" >{{$t('取消反审核')}}</el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)" @click="bridgeFn('取消佣金付款单核销',5, row, '取消付款单核销' )" > {{$t('取消核销')}} </el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)" @click="bridgeFn($t('取消佣金付款单核销'),5, row, $t('取消付款单核销') )" > {{$t('取消核销')}} </el-button>
<el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']" v-if="[7].includes(row.state)" @click="bridgeFn('取消佣金付款单反核销',6, row, '取消付款单反核销' )" > {{$t('取消反核销')}} </el-button> <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']" v-if="[7].includes(row.state)" @click="bridgeFn($t('取消佣金付款单反核销'),6, row, $t('取消付款单反核销') )" > {{$t('取消反核销')}} </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/ecw/financial/commission-requestFunds.vue
View file @ 20fd044a
...@@ -751,13 +751,13 @@ export default { ...@@ -751,13 +751,13 @@ export default {
}, },
convertCurrency(money) { convertCurrency(money) {
//汉字的数字 //汉字的数字
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖'); var cnNums = new Array(this.$t('零'), this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), this.$t('玖'));
//基本单位 //基本单位
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟'); var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), this.$t('仟'));
//对应整数部分扩展单位 //对应整数部分扩展单位
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆'); var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), this.$t('兆'));
//对应小数部分单位 //对应小数部分单位
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘'); var cnDecUnits = new Array(this.$t('角'), this.$t('分'), this.$t('毫'), this.$t('厘'));
//整数金额时后面跟的字符 //整数金额时后面跟的字符
var cnInteger = this.$t('整'); var cnInteger = this.$t('整');
//整型完以后的单位 //整型完以后的单位
......
src/views/ecw/financial/components/commissionPaymentDetails.vue
View file @ 20fd044a
<template> <template>
<div> <div>
<el-descriptions :column="5" size="mini"> <el-descriptions :column="5" size="mini">
<el-descriptions-item label="付款单">{{record.paymentNo}}</el-descriptions-item> <el-descriptions-item :label="$t('付款单')">{{record.paymentNo}}</el-descriptions-item>
<el-descriptions-item label="客户名称">{{record.customerName}}</el-descriptions-item> <el-descriptions-item :label="$t('客户名称')">{{record.customerName}}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{parseTime(record.createTime)}}</el-descriptions-item> <el-descriptions-item :label="$t('创建时间')">{{parseTime(record.createTime)}}</el-descriptions-item>
<el-descriptions-item label="业务员">{{record.salesmanName}}</el-descriptions-item> <el-descriptions-item :label="$t('业务员')">{{record.salesmanName}}</el-descriptions-item>
<el-descriptions-item label="付款金额">{{record.totalAmount}}rmb</el-descriptions-item> <el-descriptions-item :label="$t('付款金额')">{{record.totalAmount}}rmb</el-descriptions-item>
<el-descriptions-item v-if="record.reason" label="申请理由">{{record.reason}}</el-descriptions-item> <el-descriptions-item v-if="record.reason" :label="$t('申请理由')">{{record.reason}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<router-link :to="{path:'/financial/commission-requestFunds',query:{lookId: this.record.id}}"> <router-link :to="{path:'/financial/commission-requestFunds',query:{lookId: this.record.id}}">
<el-button type="primary">查看详情</el-button> <el-button type="primary">{{$t('查看详情')}}</el-button>
</router-link> </router-link>
</div> </div>
</template> </template>
...@@ -37,6 +37,7 @@ export default { ...@@ -37,6 +37,7 @@ export default {
id:{ id:{
handler:function (newVal){ handler:function (newVal){
commissionPaymentGetPaymentApprove({id:newVal}).then(r => { commissionPaymentGetPaymentApprove({id:newVal}).then(r => {
console.log(r,'rrr');
getCommissionPayment({id:r.data.paymentId}).then(res => { getCommissionPayment({id:r.data.paymentId}).then(res => {
this.record = res.data; this.record = res.data;
this.record.reason = r.data.reason //申请理由 this.record.reason = r.data.reason //申请理由
......
src/views/ecw/financial/paymentVoucher.vue
View file @ 20fd044a
...@@ -141,25 +141,25 @@ ...@@ -141,25 +141,25 @@
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" type="text" v-show="[1].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Unapprove']" @click="bridgeFn(1, '取消审核',row)"> <el-button size="mini" type="text" v-show="[1].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Unapprove']" @click="bridgeFn(1, $t('取消审核'),row)">
{{ $t('取消审核') }} {{ $t('取消审核') }}
</el-button> </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-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-if="[3].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-De-approval']" @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, $t('取消付款单反审核'),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 size="mini" type="text" v-if="[5].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Write-off']" @click="bridgeFn(3, $t('取消付款单核销'),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, $t('反审核'),row)">{{ $t('反审核') }}
</el-button> </el-button>
<el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:writeOff']" <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:writeOff']"
@click="bridgeFn(5, '核销',row)">{{ $t('核销') }} @click="bridgeFn(5, $t('核销'),row)">{{ $t('核销') }}
</el-button> </el-button>
<el-button v-if="[6].includes(row.state)" size="mini" type="text" <el-button v-if="[6].includes(row.state)" size="mini" type="text"
v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, '反核销',row)"> v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, $t('反核销'),row)">
{{ $t('反核销') }} {{ $t('反核销') }}
</el-button> </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="[7].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Cancelling-Write-off']" size="mini" type="text" @click="bridgeFn(7, $t('取消付款单反核销'),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)"
......
src/views/ecw/financial/printPaymentVoucher.vue
View file @ 20fd044a
...@@ -198,13 +198,13 @@ ...@@ -198,13 +198,13 @@
}, },
convertCurrency(money) { convertCurrency(money) {
//汉字的数字 //汉字的数字
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖'); var cnNums = new Array(this.$t('零'), this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), this.$t('玖'));
//基本单位 //基本单位
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟'); var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), this.$t('仟'));
//对应整数部分扩展单位 //对应整数部分扩展单位
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆'); var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), this.$t('兆'));
//对应小数部分单位 //对应小数部分单位
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘'); var cnDecUnits = new Array(this.$t('角'), this.$t('分'), this.$t('毫'), this.$t('厘'));
//整数金额时后面跟的字符 //整数金额时后面跟的字符
var cnInteger = this.$t('整'); var cnInteger = this.$t('整');
//整型完以后的单位 //整型完以后的单位
......
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