Commit 90371b10 authored by 邓春圆's avatar 邓春圆

Merge remote-tracking branch 'origin/dev1.6' into dev1.6

parents 26b66e40 598c4c6a
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
{{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i> {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<!-- <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item> --> <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit" v-hasPermi="['shipment:box:sea:edit']">{{$t('编辑')}}</el-dropdown-item>
<el-dropdown-item command="sea" v-hasPermi="['shipment:box:action:sea']">{{$t('操作-海运')}}</el-dropdown-item> <el-dropdown-item command="sea" v-hasPermi="['shipment:box:action:sea']">{{$t('操作-海运')}}</el-dropdown-item>
<el-dropdown-item command="error" v-hasPermi="['shipment:box:action:error']">{{$t('异常登记')}}</el-dropdown-item> <el-dropdown-item command="error" v-hasPermi="['shipment:box:action:error']">{{$t('异常登记')}}</el-dropdown-item>
<el-dropdown-item command="cost" v-hasPermi="['shipment:box:action:cost']">{{$t('费用登记')}}</el-dropdown-item> <el-dropdown-item command="cost" v-hasPermi="['shipment:box:action:cost']">{{$t('费用登记')}}</el-dropdown-item>
......
...@@ -208,9 +208,9 @@ ...@@ -208,9 +208,9 @@
<el-form-item :label="$t('放入箱数')+':'"> <el-form-item :label="$t('放入箱数')+':'">
{{shopForm.putNum||0}} {{shopForm.putNum||0}}
</el-form-item> </el-form-item>
<el-form-item :label="$t('放入数量(个)')+':'" prop="putQuantity" v-show="isQuantity"> <!-- <el-form-item :label="$t('放入数量(个)')+':'" prop="putQuantity" v-show="isQuantity">
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number> <el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
</el-form-item> </el-form-item> -->
<el-form-item :label="$t('备注信息')+':'"> <el-form-item :label="$t('备注信息')+':'">
<el-input v-model="shopForm.remarks"></el-input> <el-input v-model="shopForm.remarks"></el-input>
</el-form-item> </el-form-item>
......
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
this.$set(this.subMaterialObj,'notifyingName',response.data.externalBackVO?.notifyCompanyName||'/') this.$set(this.subMaterialObj,'notifyingName',response.data.externalBackVO?.notifyCompanyName||'/')
this.$set(this.subMaterialObj,'packageNum',response.data.externalBackVO?.packNum) this.$set(this.subMaterialObj,'packageNum',response.data.externalBackVO?.packNum)
this.$set(this.subMaterialObj,'packageUnit',response.data.externalBackVO?.packUnit) this.$set(this.subMaterialObj,'packageUnit',response.data.externalBackVO?.packUnit)
this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName+response.data.externalBackVO?.fromNo+response.data.externalBackVO?.baNo) this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||'')
if(this.subMaterialObj.goodsDesc == null){ if(this.subMaterialObj.goodsDesc == null){
this.$set(this.subMaterialObj,'goodsDesc','/') this.$set(this.subMaterialObj,'goodsDesc','/')
} }
......
...@@ -312,8 +312,8 @@ ...@@ -312,8 +312,8 @@
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<div slot="footer" style="margin: 20px 0"> <div slot="footer" style="margin: 20px 0">
<el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11" type="primary" @click="toEdit" v-hasPermi="['ecw:payment:detail:edit']">{{ $t('编辑') }}</el-button> <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="toEdit" v-hasPermi="['ecw:payment:detail:edit']">{{ $t('编辑') }}</el-button>
<el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11" type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button> <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button>
<el-button <el-button
type="primary" type="primary"
v-if="form.state == 11" v-if="form.state == 11"
...@@ -342,6 +342,13 @@ ...@@ -342,6 +342,13 @@
@click="detailClickCancel(2)" @click="detailClickCancel(2)"
>{{ $t('取消全部核销审核') }}</el-button >{{ $t('取消全部核销审核') }}</el-button
> >
<el-button
v-if="form.state == 4 || form.state == 5 || form.state == 6"
type="primary"
v-hasPermi="['ecw:voucher:cancelWriteOff']"
@click="writeOffShow()"
>{{ $t('提交收款单反核销') }}</el-button
>
<el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button> <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div> </div>
...@@ -358,6 +365,19 @@ ...@@ -358,6 +365,19 @@
<el-button @click="detailShow = false">{{$t('取消')}}</el-button> <el-button @click="detailShow = false">{{$t('取消')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog
:title="$t('收款单反核销')"
:visible.sync="wiffShow"
width="30%">
<div class="cancel_content">
<span>{{$t('申请理由')}}</span>
<el-input type="textarea" :rows ="6" v-model="wiffRemark" :placeholder="$t('请输入理由')"></el-input>
</div>
<span slot="footer" class="dialog-footers">
<el-button type="primary" @click="writeOffClick()">{{$t('提交反核销')}}</el-button>
<el-button @click="wiffShow = false">{{$t('取消')}}</el-button>
</span>
</el-dialog>
<el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="50%" append-to-body> <el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="50%" append-to-body>
<div style="padding: 0 24px"> <div style="padding: 0 24px">
<el-form ref="addForm" :model="addForm" label-width="250px"> <el-form ref="addForm" :model="addForm" label-width="250px">
...@@ -539,7 +559,8 @@ import { ...@@ -539,7 +559,8 @@ import {
cancelFinanceReceiptItemWriteOff, cancelFinanceReceiptItemWriteOff,
cancelFinanceReceiptItemWriteOffNo, cancelFinanceReceiptItemWriteOffNo,
cancelFinanceReceiptWriteOffNo, cancelFinanceReceiptWriteOffNo,
cancelFinanceReceiptWriteOff cancelFinanceReceiptWriteOff,
financeReceiptWriteOffNo
} from "@/api/ecw/financial"; } from "@/api/ecw/financial";
import { getCurrencyPage } from "@/api/ecw/currency"; import { getCurrencyPage } from "@/api/ecw/currency";
import NP from 'number-precision' import NP from 'number-precision'
...@@ -594,7 +615,9 @@ export default { ...@@ -594,7 +615,9 @@ export default {
detailReason:'', detailReason:'',
detailTitle:'', detailTitle:'',
detailShow:false, detailShow:false,
detailIndex:1 detailIndex:1,
wiffShow:false,
wiffRemark:''
} }
}, },
computed: { computed: {
...@@ -640,6 +663,29 @@ export default { ...@@ -640,6 +663,29 @@ export default {
}) })
return total.toFixed(2) return total.toFixed(2)
}, },
//显示反审核反核销弹窗
writeOffShow(){
this.wiffRemark = ''
this.wiffShow = true
},
writeOffClick(){
if(!this.wiffRemark){
this.$modal.msgError(this.$t('请输入申请理由'));
return
}
this.$modal
.confirm(this.$t('您确认要反核销吗')+'?')
.then(()=>{
financeReceiptWriteOffNo({receiptId:this.id,receiptNo:this.form.receiptNo,remark:this.wiffRemark}).then(res=>{
this.getList();
this.$message.success(this.$t("提交成功"));
this.wiffShow = false
// this.$store.dispatch('tagsView/delCurrentView')
});
})
.catch(() => {this.wiffShow = false});
},
WriteOffProportion(){ WriteOffProportion(){
let total = 0 let total = 0
if(!this.form.receiptAccountList) return 0 if(!this.form.receiptAccountList) return 0
...@@ -916,20 +962,33 @@ export default { ...@@ -916,20 +962,33 @@ export default {
if(this.detailIndex ==1){ if(this.detailIndex ==1){
cancelFinanceReceiptWriteOffNo({receiptId:this.id,remark:this.detailReason}).then(res=>{ cancelFinanceReceiptWriteOffNo({receiptId:this.id,remark:this.detailReason}).then(res=>{
this.detailShow = false this.detailShow = false
this.getList(); this.getReceiptInfoData();
this.$message.success(this.$t("提交成功")); this.$message.success(this.$t("提交成功"));
}); });
}else{ }else{
cancelFinanceReceiptWriteOff({receiptId:this.id,remark:this.detailReason}).then(res=>{ cancelFinanceReceiptWriteOff({receiptId:this.id,remark:this.detailReason}).then(res=>{
this.detailShow = false this.detailShow = false
this.getList(); this.getReceiptInfoData();
this.$message.success(this.$t("提交成功")); this.$message.success(this.$t("提交成功"));
}); });
} }
}, },
getReceiptInfoData(){
getReceiptInfoByIds({ id: this.id }).then(res => {
this.form = res.data
getCustomer(this.form.customerId).then(res => {
this.form.customerName = res?.data?.name
})
var dept = this.deptData.filter((itt) => itt.id == res.data.departmentId);
// console.log(dept)
if(dept.length>0){
this.form.departmentName = dept[0].name
}
})
},
//取消审核 //取消审核
cancelWriteOffClick(){ cancelWriteOffClick(){
if(!this.cancelReason){ if(!this.cancelReason){
......
...@@ -53,7 +53,11 @@ ...@@ -53,7 +53,11 @@
<template slot-scope="{row}">{{row.weight}}kg</template> <template slot-scope="{row}">{{row.weight}}kg</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')"> <el-table-column :label="$t('箱数')">
<template slot-scope="{row}">{{row.num}}</template></el-table-column> <template slot-scope="{row}">{{row.num}}</template>
</el-table-column>
<el-table-column :label="$t('数量')">
<template slot-scope="{row}">{{row.quantity}}</template>
</el-table-column>
</el-table> </el-table>
</template> </template>
</div> </div>
......
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
<el-table-column :label="$t('箱数')"> <el-table-column :label="$t('箱数')">
<template slot-scope="{row}">{{row.num}}</template> <template slot-scope="{row}">{{row.num}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('数量')">
<template slot-scope="{row}">{{row.quantity}}</template>
</el-table-column>
<el-table-column :label="$t('备注')"> <el-table-column :label="$t('备注')">
<template slot-scope="{row}">{{row.remark}}</template> <template slot-scope="{row}">{{row.remark}}</template>
</el-table-column> </el-table-column>
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<el-table-column :label="$t('序号')" width="80px"> <el-table-column :label="$t('序号')" width="80px">
<template slot-scope="scope">{{scope.$index + 1}}</template> <template slot-scope="scope">{{scope.$index + 1}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('部门')" prop="priceAdvantage"> <el-table-column :label="$t('部门')" prop="department">
</el-table-column> </el-table-column>
<el-table-column :label="$t('职位')" prop="position"> <el-table-column :label="$t('职位')" prop="position">
</el-table-column> </el-table-column>
...@@ -470,6 +470,7 @@ export default { ...@@ -470,6 +470,7 @@ export default {
this.formData = response.data this.formData = response.data
this.$set(this.formData, 'companyTypeArr', this.strToArray(response.data.companyType)) this.$set(this.formData, 'companyTypeArr', this.strToArray(response.data.companyType))
this.$set(this.formData, 'priceAdvantage', response.data.priceAdvantage==0?'':response.data.priceAdvantage)
this.$set(this.formData, 'settlementPeriod', response.data.settlementPeriod==0?null:response.data.settlementPeriod) this.$set(this.formData, 'settlementPeriod', response.data.settlementPeriod==0?null:response.data.settlementPeriod)
this.formData.bankList.forEach(item => { this.formData.bankList.forEach(item => {
item.currency = +item.currency item.currency = +item.currency
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-input v-model="queryParams.keyword" :placeholder="$t('名称/代码')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.keyword" :placeholder="$t('名称/代码')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('供应商区域')" prop="areaType"> <el-form-item :label="$t('境内外')" prop="areaType">
<el-select v-model="queryParams.areaType" placeholder="请选择" clearable="true"> <el-select v-model="queryParams.areaType" placeholder="请选择" clearable="true">
<el-option <el-option
v-for="item in areaTypes" v-for="item in areaTypes"
...@@ -64,6 +64,11 @@ ...@@ -64,6 +64,11 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('境内外')" align="center" prop="areaType">
<template slot-scope="scope">
<span>{{ areaData[scope.row.areaType] }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('合作类型')" align="center" prop="cooperationType"> <el-table-column :label="$t('合作类型')" align="center" prop="cooperationType">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag type="cooperation_type" :value="row.cooperationType" /> <dict-tag type="cooperation_type" :value="row.cooperationType" />
...@@ -120,9 +125,10 @@ export default { ...@@ -120,9 +125,10 @@ export default {
dateRangeCreateTime: [], dateRangeCreateTime: [],
areaTypes:[ areaTypes:[
{value:0, label:"国内供应商"}, {value:0, label:"境内"},
{value:1, label:"国外供应商"} {value:1, label:"境外"}
], ],
areaData: ["境内", "境外"],
// 查询参数 // 查询参数
queryParams: { queryParams: {
......
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