Skip to content

J
jiedao-app-operator-master
Commit 5b36caa5 authored by zs嵩's avatar zs嵩
Browse files
Options

批量加价 批量费用申请

parent 17870ae2
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 435 deletions
src/components/DictSelector/index.vue
View file @ 5b36caa5
......@@ -2,6 +2,7 @@
<div class="dict-selector">
<el-select v-if="formType == 'select'" v-model="valueSync" filterable :placeholder="placeholder || $t('请选择')" :clearable="clearable" :multiple="multiple" :disabled="disabled" @change="(val) => $emit('change', val)">
<el-option v-for="dict in formattedList" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
<slot></slot>
</el-select>
<el-radio-group v-if="formType == 'radio'" v-model="valueSync" :disabled="disabled">
<el-radio v-for="dict in formattedList" :label="dict.value" :checked="valueSync === dict.value" :key="dict.value">{{ $l(dict, "label") }}</el-radio>
......
src/views/ecw/box/batchMarkup.vue
View file @ 5b36caa5
......@@ -205,7 +205,7 @@
<el-button type="default" @click="listOpen" v-else>{{ $t("收起明细") }}</el-button>
</div>
</div>
<el-table v-loading="loading" ref="orderTable" border :data="list || []" @selection-change="handleSelectionChange" :row-style="rowStyle" class="mt-10">
<el-table v-loading="loading" ref="orderTable" border :data="list || []" @selection-change="handleSelectionChange" :row-style="rowStyle" class="mt-10 table2">
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column :label="$t('序号')" width="50" type="index" align="center" />
<el-table-column prop="orderNo" :label="$t('订单号')" align="center" width="150">
......@@ -717,3 +717,11 @@ export default {
content: "，";
}
</style>
<style lang="scss" scoped>
::v-deep.table2 {
.el-table__expanded-cell {
padding-top: 0;
padding-bottom: 0;
}
}
</style>
src/views/ecw/box/batchMarkupComList.vue
View file @ 5b36caa5
<template>
<div style="padding: 20px; background: #f4f4f4; margin: 0 20px 0 100px; border: 1px solid #e4e4e4">
<el-table :data="list" border style="width: 100%" size="mini">
<div style="margin: 0 20px 0 100px; padding: 10px 0">
<el-table class="table3" :data="list" border style="width: 100%" size="mini">
<el-table-column :label="$t('序号')" width="90px" type="index" align="center"></el-table-column>
<el-table-column prop="prodTitleZh" :label="$t('品名')" width="220px">
<template slot-scope="{ row }">
......@@ -346,3 +346,17 @@ export default {
}
}
</script>
<style lang="scss" scoped>
::v-deep.table3 {
.el-table__cell {
padding-top: 3px;
padding-bottom: 3px;
}
.el-table__header-wrapper th {
height: 30px;
font-weight: normal;
color: #ccc;
}
}
</style>
src/views/ecw/order/feeApplicationBatch/batchMarkupComList.vue deleted 100644 → 0
View file @ 17870ae2
<template>
<div style="padding: 20px; background: #f4f4f4; margin: 0 20px 0 100px; border: 1px solid #e4e4e4">
<el-table :data="list" border style="width: 100%" size="mini">
<el-table-column :label="$t('序号')" width="90px" type="index" align="center"></el-table-column>
<el-table-column prop="prodTitleZh" :label="$t('品名')" width="220px">
<template slot-scope="{ row }">
<div>{{ getProdTypeName(row.prodType) }}</div>
<div>{{ row.prodTitleZh }}/{{ row.prodTitleEn }}</div>
</template>
</el-table-column>
<!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
<el-table-column prop="brand" :label="$t('品牌')" width="90px">
<template slot-scope="{ row }">
<template v-if="row.brandName">{{ row.brandName }}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
</template>
</el-table-column>
<el-table-column prop="brand" :label="$t('特性')" width="90px">
<template slot-scope="{ row }">
{{ showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds) }}
</template>
</el-table-column>
<el-table-column prop="sumNum" :label="$t('入仓信息')" width="220px">
<template slot-scope="{ row }">
<!--<el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
<div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>-->
<el-link type="primary" @click.native="$emit('showWarehouseLogs', row, 1)" v-if="row.warehouseInInfoVO"> {{ row.warehouseInInfoVO.cartonsNum }}{{ $t("箱") }} {{ row.warehouseInInfoVO.weight }}Kg {{ row.warehouseInInfoVO.volume }}m³ {{ row.warehouseInInfoVO.quantityAll }}{{ $t("个") }} </el-link>
<div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{ $t("多规格") }})</div>
</template>
</el-table-column>
<el-table-column prop="warehouseType" :label="$t('类型')" width="120px" />
<el-table-column prop="specificationType" :label="$t('包装')" width="120px" />
<el-table-column prop="sumNum" :label="$t('收费数据')" width="220px">
<template slot-scope="{ row }">
<div v-if="row.warehouseInInfoVO">{{ row.chargeWeight }}Kg {{ row.chargeVolume }}m³</div>
</template>
</el-table-column>
<el-table-column prop="" :label="`${$t('费用类型')}/${$t('模式')}`" width="200px">
<template slot-scope="{ row }">
<dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance" />
<div v-if="row.charging == 0">{{ $t("运费/清关费") }}</div>
<div v-if="row.charging == 1">{{ $t("全包价") }}</div>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('成交单价')" width="220px">
<template slot-scope="{ row }">
<template v-if="row.charging == 1">
<template v-if="!row.originalSeaFreight">{{ $t("未报价") }}</template>
<el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{ $t("全包价") }} {{ row.oneSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}</el-link>
</template>
<template v-else-if="!row.originalSeaFreight && !row.originalClearanceFreight">{{ $t("未报价") }}</template>
<template v-else>
<el-link type="primary" @click="showFeeDetail(row, 'freight')"> {{ $t("运费") }}：{{ row.oneSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }} </el-link>
<el-link type="primary" @click="showFeeDetail(row, 'clearance')"> {{ $t("清关费") }}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }} </el-link>
</template>
</template>
</el-table-column>
<el-table-column :label="$t('特价')" align="center">
<template v-slot="scope">{{ scope.row.specialPriceType ? "是" : "否" }}</template>
</el-table-column>
<el-table-column prop="firstInTime" :label="$t('首次入仓时间')" align="center" width="150"></el-table-column>
<el-table-column prop="lastInTime" :label="$t('最后入仓时间')" align="center" width="150"></el-table-column>
<el-table-column prop="" :label="$t('材质')">
<template slot-scope="{ row }">
<dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="row.material" />
</template>
</el-table-column>
<el-table-column prop="" :label="$t('用途')">
<template slot-scope="{ row }">
<div v-if="row.usageIds">
<div v-for="(item, index) in row.usageIds.split(',')">
<dict-tag :type="DICT_TYPE.OREER_ITEM_USAGE" :value="item" />
<span v-if="index + 1 != row.usageIds.split(',').length">,</span>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('原价')" width="180px">
<template slot-scope="{ row }">
<template v-if="row.charging == 1">
<template v-if="!row.oneSeaFreight">{{ $t("未报价") }}</template>
<template>{{ $t("全包价") }} {{ row.oneSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}</template>
</template>
<template v-else-if="!row.oneSeaFreight && !row.oneClearanceFreight">{{ $t("未报价") }}</template>
<template v-else-if="row.specialPriceType">
<div style="color: red; font-weight: 700">
{{ $t("原价") }}
</div>
<div>{{ $t("运费") }}：{{ row.originalSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}</div>
<div>{{ $t("清关费") }}：{{ row.originalClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}</div>
<div style="color: red; font-weight: 700">
{{ $t("特价") }}
</div>
<div>{{ $t("运费") }}：{{ row.oneSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}</div>
<div>{{ $t("清关费") }}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}</div>
</template>
<template v-else>
<div>{{ $t("运费") }}：{{ row.oneSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}</div>
<div v-if="row.oneClearanceFreight">{{ $t("清关费") }}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}</div>
<div v-else>{{ $t("清关费未报价") }}</div>
</template>
</template>
</el-table-column>
</el-table>
<el-dialog :title="$t('费用详情')" :visible="!!showFeeDetailDialog" :before-close="closeFeeDetail">
<el-row v-if="feeDetail">
<el-col :span="12">
<div>{{ feeDetail.charging ? $t("全包价") : $t("运费") }}</div>
<div v-for="item in feeDetail.freight">
{{ item.label }}: {{ item.value }}
<template v-if="item.currency">
{{ currencyMap[item.currency] }} / {{ unitMap[item.volume] }} <span v-if="item.remark">【{{ item.remark }}】</span>
</template>
</div>
</el-col>
<el-col :span="12" v-if="feeDetail.charging != 1">
<div>
{{ $t("清关费") }}
<template v-if="transportId == 3 || transportId == 4">
{{ $t("来自{source}", { source: feeDetail.airClearanceSource + feeDetail.sourceName }) }}
</template>
</div>
<div v-for="item in feeDetail.clearance">
{{ item.label }}: {{ item.value }}
<template v-if="item.currency">
{{ currencyMap[item.currency] }} / {{ unitMap[item.volume] }} <span v-if="item.remark">【{{ item.remark }}】</span>
</template>
</div>
</el-col>
</el-row>
<div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">{{ $t("优惠详情") }}</div>
<el-table v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" :data="feeDetail.coupons">
<el-table-column label="优惠ID" prop="couponId"></el-table-column>
<el-table-column label="优惠名称">
<template slot-scope="{ row }">
{{ $l(row, "title") }}
</template>
</el-table-column>
<el-table-column label="类型">
<template slot-scope="{ row }">
<dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type"></dict-tag>
</template>
</el-table-column>
<el-table-column label="运费优惠">
<template slot-scope="{ row }">
{{ row.freightReduceAmount }}
{{ currencyMap[row.freightReduceCurrencyId] }}
</template>
</el-table-column>
<el-table-column label="清关费优惠">
<template slot-scope="{ row }">
{{ row.clearanceReduceAmount }}
{{ currencyMap[row.clearanceReduceCurrencyId] }}
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
import Decimal from "decimal.js"
import { parseTime } from "@/utils/ruoyi"
export default {
props: {
list: {
type: Array,
required: true
},
attrList: {
type: Array,
required: true
},
prodTypeList: {
type: Array,
required: true
},
currencyMap: {
type: Object,
required: true
},
unitMap: {
type: Object,
required: true
},
transportId: {
type: Number,
required: false
}
},
data() {
return {
feeDetail: null,
showFeeDetailDialog: false
}
},
computed: {
getProdTypeName() {
return (prodType) => {
for (let index in this.prodTypeList) {
let prodTypeItem = this.prodTypeList[index]
if (prodTypeItem.id == prodType) {
return this.$l(prodTypeItem, "title")
}
}
}
},
// 显示特性
showAttrText() {
return (ids) => {
if (!ids) return ""
ids = !Array.isArray(ids) ? ids.split(",") : ids
const attrMap = {}
this.attrList.forEach((item) => {
attrMap[item.id] = this.$l(item, "attrName")
})
return ids.map((id) => attrMap[id]).join(",")
}
}
},
created() {},
methods: {
closeFeeDetail() {
this.showFeeDetailDialog = null
},
showFeeDetail(row, type) {
console.log("showFeeDetail", row, type)
this.showFeeDetailDialog = true
const freight = [],
clearance = []
let freightFields = []
let clearanceFields = []
const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
// 不是特价则显示其他字段
freightFields = [
// {field: 'oneSeaFreight', label: this.$t('成交单价')},
{ field: "originalSeaFreight", label: this.$t("默认单价（无牌无液无电）") },
// {field: 'brandFreightPrice', label: this.$t('品牌加价')},
{ field: "liquidFreightPrice", label: this.$t("液体加价") },
{ field: "electrifiedFreightPrice", label: this.$t("带电加价") },
{ field: "discountFreightPrice", label: this.$t("优惠活动减免") },
{ field: "plainCommission", label: this.$t("明佣") },
{ field: "hiddenCommission", label: this.$t("暗佣") }
]
// 批量加价
if (row.markupSeaFreight) {
freightFields.push({ field: "markupSeaFreight", label: this.$t("批量加价") })
}
// 品牌加价
if (row["brandFreightPrice"] && row["brandFreightPrice"] > 0) {
freightFields.push({ field: "brandFreightPrice", label: brandType == 1 ? this.$t("有品牌加价") : this.$t("中性品牌加价") })
}
// 有减免金额才显示优惠后单价
if (row["discountFreightPrice"] && row["discountFreightPrice"] > 0) {
freightFields.push({ field: "afterDiscountSeaFreight", label: this.$t("优惠后单价") })
}
// 包装加价
if (row["packagingFreightPrice"] && row["packagingFreightPrice"] > 0) {
freightFields.push({ field: "packagingFreightPrice", label: this.$t("包装加价") })
}
freightFields.push({ field: "oneSeaFreight", label: this.$t("成交单价") })
console.log({ freightFields })
freightFields.forEach((item) => {
if (row[item.field]) {
freight.push({
label: item.label,
value: row[item.field],
currency: row.seaFreightCurrency,
volume: row.seaFreightVolume,
// 特价通过四个字段标识，任一为true则为特价
remark: item.field == "oneSeaFreight" && (row.specialPriceType || row.splitCustomPriceType || row.channelManualPricing) ? this.$t("特价") : null
})
}
})
clearanceFields = [
{ field: "originalClearanceFreight", label: this.$t("默认单价（无牌无液无电）") },
// {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
{ field: "liquidClearanceFeePrice", label: this.$t("液体加价") },
{ field: "electrifiedClearanceFeePrice", label: this.$t("带电加价") },
{ field: "discountClearanceFeePrice", label: this.$t("优惠活动减免") }
]
// 批量加价
if (row.markupClearanceFreight) {
clearanceFields.push({ field: "markupClearanceFreight", label: this.$t("批量加价") })
}
// 品牌加价
if (row["brandClearanceFeePrice"] && row["brandClearanceFeePrice"] > 0) {
clearanceFields.push({ field: "brandClearanceFeePrice", label: brandType == 1 ? this.$t("有品牌加价") : this.$t("中性品牌加价") })
}
if (row["discountClearanceFeePrice"] && row["discountClearanceFeePrice"] > 0) {
clearanceFields.push({ field: "afterDiscountClearanceFreight", label: this.$t("优惠后单价") })
}
// 包装加价
if (row["packagingClearanceFeePrice"] && row["packagingClearanceFeePrice"] > 0) {
clearanceFields.push({ field: "packagingClearanceFeePrice", label: this.$t("包装加价") })
}
clearanceFields.push({ field: "oneClearanceFreight", label: this.$t("成交单价") })
clearanceFields.forEach((item) => {
if (row[item.field]) {
clearance.push({
label: item.label,
value: row[item.field],
currency: row.clearanceFreightCurrency,
volume: row.clearanceFreightVolume,
remark: (row.specialPriceType || row.splitCustomPriceType || row.channelManualPricing) && item.field == "oneClearanceFreight" ? this.$t("特价") : null
})
}
})
freight.push({
label: this.$t("价格更新时间"),
value: parseTime(row.lastFreightChargePriceTime)
})
clearance.push({
label: this.$t("价格更新时间"),
value: parseTime(row.lastClearanceChargePriceTime)
})
this.feeDetail = {
freight,
clearance,
charging: row.charging,
coupons: row.couponInfoVOList,
airClearanceSource: [, this.$t("商品"), this.$t("渠道"), this.$t("商品线路价格"), this.$t("线路渠道")][row.airClearanceSource], // 1 商品 2 渠道 3 商品线路价格 4 线路渠道
airClearanceInfo: JSON.parse(row.airClearanceInfo), //空运清关费来源数据详情,
sourceName: row.airClearanceSource == 1 ? this.$l(row, "prodTitle") : this.order?.channelName
}
},
// 获取储位名称
getLocationName(locationArr) {
if (!locationArr || !locationArr.length) return ""
let arr = []
locationArr.forEach((item) => {
arr.push(`${item.areaName}${item.locationName || ""}`)
})
return Array.from(new Set(arr)).join(",")
}
}
}
</script>
src/views/ecw/order/feeApplicationBatch/index.vue
View file @ 5b36caa5
......@@ -4,13 +4,14 @@
<el-divider></el-divider>
<div class="flex-c-c">
<div class="fills">费用申请</div>
<el-button type="primary" :disabled="!!processInstanceId" @click="addCost">{{ $t("添加申请") }} </el-button>
<el-button type="primary" @click="addCost">{{ $t("添加申请") }} </el-button>
</div>
<el-table border :data="batchApplyDetailsInfoVO.feeDetailsVOList" class="mt-10">
<el-table-column :label="$t('序号')" type="index"></el-table-column>
<el-table-column :label="$t('序号')" type="index" align="center"></el-table-column>
<el-table-column :label="$t('费用类型')">
<template slot-scope="{ row, $index }">
<dict-selector :type="DICT_TYPE.FEE_TYPE" v-model="row.feeType" @change="updatePayer($index)" />
<dict-selector :type="DICT_TYPE.FEE_TYPE" v-model="row.feeType" @change="batchUpdateField($index, 'feeType')" />
</template>
</el-table-column>
<el-table-column :label="$t('金额')">
......@@ -32,7 +33,9 @@
</el-table-column>
<el-table-column :label="$t('付款人')">
<template slot-scope="{ row, $index }">
<dict-selector :type="DICT_TYPE.DRAWEE" :filter="payerDictFilter" v-model="row.payer" @change="batchUpdateField($index, 'payer')" />
<dict-selector :type="DICT_TYPE.DRAWEE" :filter="payerDictFilter" v-model="row.payer" @change="batchUpdateField($index, 'payer')">
<el-option :label="$t('按订单')" value="" />
</dict-selector>
</template>
</el-table-column>
<el-table-column :label="$t('备注')">
......@@ -46,9 +49,7 @@
</template>
</el-table-column>
<el-table-column :label="$t('申请人')">
<template slot-scope="{ row, $index }">
{{ row.status === 0 ? $t("未提交") : row.applicationAuthor }}
</template>
<template slot-scope="{ row, $index }">未提交</template>
</el-table-column>
<el-table-column :label="$t('操作')" width="100">
<template slot-scope="{ index }">
......@@ -65,7 +66,7 @@
<div class="flex-c-c mt20">
<div class="fills">订单列表</div>
</div>
<el-table class="mt10" ref="orderTable" border default-expand-all :data="batchApplyDetailsInfoVO.orderFeeDetailsVOList" @selection-change="handleSelectionChange">
<el-table class="mt10 table2" ref="orderTable" border default-expand-all :data="batchApplyDetailsInfoVO.orderFeeDetailsVOList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column :label="$t('序号')" width="50" type="index" align="center" />
<el-table-column prop="orderNo" :label="$t('订单号')" align="center" width="150">
......@@ -122,9 +123,9 @@
<el-table-column type="expand" :label="$t('更多')">
<template slot-scope="{ row, $index: INDEX }">
<div style="margin: 0 20px 0 100px">
<el-table :data="row.orderFeeApplicationBaseVOList" border size="mini" :row-class-name="rowClassname">
<el-table-column :label="$t('序号')" type="index"></el-table-column>
<div style="margin: 0 20px 0 100px; padding: 10px 0" v-if="row.orderFeeApplicationBaseVOList.length">
<el-table class="table3" :data="row.orderFeeApplicationBaseVOList" border size="mini" :row-class-name="rowClassname">
<el-table-column :label="$t('序号')" type="index" align="center"></el-table-column>
<el-table-column :label="$t('费用类型')">
<template slot-scope="{ row }">
<dict-selector :type="DICT_TYPE.FEE_TYPE" v-model="row.feeType" />
......@@ -132,7 +133,7 @@
</el-table-column>
<el-table-column :label="$t('金额')">
<template slot-scope="{ row }">
<el-input v-model="row.applicationFee" type="number" @input="formatAmount(row)"></el-input>
<el-input v-model="row.applicationFee" type="number" @input="formatAmount2(row)"></el-input>
</template>
</el-table-column>
<el-table-column :label="$t('货币类型')">
......@@ -163,9 +164,7 @@
</template>
</el-table-column>
<el-table-column :label="$t('申请人')">
<template slot-scope="{ row }">
{{ row.status === 0 ? $t("未提交") : row.applicationAuthor }}
</template>
<template slot-scope="{ row }"> 未提交 </template>
</el-table-column>
<el-table-column :label="$t('操作')" width="100">
<template slot-scope="{ row, $index }">
......@@ -182,10 +181,7 @@
<work-flow xmlkey="batch_order_free_apply" v-model="selectedUsers" />
</div>
<div style="text-align: center; margin-top: 20px">
<el-button type="primary" v-if="!processInstanceId" style="margin-right: 30px" @click="submit">{{ $t("提交") }} </el-button>
<el-button type="primary" v-if="processInstanceId" style="margin-right: 30px" @click="goProcessDetail">{{ $t("审核中") }} </el-button>
<el-button type="primary" v-if="processInstanceId" style="margin-right: 30px" @click="cancel">{{ $t("取消审核") }} </el-button>
<el-button @click="$emit('update:dialogVisible', false)">{{ $t("返回") }} </el-button>
<el-button type="primary" @click="submit">{{ $t("提交") }} </el-button>
</div>
</div>
</template>
......@@ -198,11 +194,9 @@ import { getProductTypeList } from "@/api/ecw/productType"
import { getOrder, feeApplicationBatch, feeApplicationBatchGetOrderListByIds, applicationUpdate, feeApplicationCancel, getFeeApplicationApproveByOrderId, getBatchFeeByProcessId, qetBatchFeeByBusinessId, getBatchFeeByBusinessId, feeApplicationDelete, getFeeDraweeByFeeType } from "@/api/ecw/order"
import { getDictDatas, DICT_TYPE } from "@/utils/dict"
import workFlow from "@/components/WorkFlow"
import batchMarkupComList from "./batchMarkupComList"
export default {
name: "feeApplicationBatch",
components: { workFlow, batchMarkupComList },
components: { workFlow },
props: {
orderList: [Array],
dialogVisible: {
......@@ -217,8 +211,6 @@ export default {
attrList: [],
unitList: [],
currencyList: [],
// 审核ID，没有则表示不在审核中
processInstanceId: null,
DICT_TYPE,
getDictDatas,
STATUS: {},
......@@ -277,25 +269,6 @@ export default {
this.getDictDatas(this.DICT_TYPE.AUDIT_STATUS).forEach((e) => {
this.STATUS[e.value] = e.label
})
feeApplicationBatchGetOrderListByIds({ orderIds: this.orderIds }).then((res) => {
this.batchApplyDetailsInfoVO.orderFeeDetailsVOList = res.data.map((item) => {
return {
...item,
orderFeeApplicationBaseVOList: []
}
})
})
// 查询是否有审核中的费用申请
// getFeeApplicationApproveByOrderId(this.orderId).then((res) => {
// if (res.data) {
// this.processInstanceId = res.data.formId
// /*getBatchFeeByBusinessId(res.data.orderApprovalId).then(res => {
// this.list = res.data
// })*/
// }
// })
getUnitList().then((res) => (this.unitList = res.data))
getCurrencyList().then((res) => (this.currencyList = res.data))
getProductAttrList().then((response) => {
......@@ -304,6 +277,8 @@ export default {
getProductTypeList().then((response) => {
this.prodTypeList = response.data
})
this.getData()
},
methods: {
// 表格多选
......@@ -322,6 +297,16 @@ export default {
}
this.batchUpdateField(index, "applicationFee")
},
formatAmount2(row) {
// 使用正则表达式限制输入为数字和小数点，并限制小数点后最多两位数字
// row.applicationFee = row.applicationFee.replace(/[^\d.]/g, '').replace(/(\..*)\./g, '$1');
if (row.applicationFee.indexOf(".") > -1) {
const decimalPart = row.applicationFee.split(".")[1]
if (decimalPart.length > 2) {
row.applicationFee = row.applicationFee.substring(0, row.applicationFee.length - (decimalPart.length - 2))
}
}
},
del(index) {
this.$confirm(this.$t("确定要删除此条费用申请么？")).then(() => {
......@@ -346,11 +331,19 @@ export default {
}
return true
},
updatePayer(index) {
this.batchUpdateField(index, "feeType")
updatePayer2(item) {
console.log("变动的费用记录:", item)
this.$nextTick(() => {
// 根据新费用类型和索引更新payer付款人信息
this.orderDetails.drawee ? (this.orderDetails.drawee != 3 ? this.$set(item, "payer", this.orderDetails.drawee) : this.getDraweePayer(item)) : undefined // 费用申请付款人
console.log("变动的费用记录:", item)
})
},
batchUpdateField(index, field) {
this.$nextTick(() => {
if (field === "payer" && this.batchApplyDetailsInfoVO.feeDetailsVOList[index][field] === "") {
return
}
this.batchApplyDetailsInfoVO.orderFeeDetailsVOList.forEach((item, i) => {
item.orderFeeApplicationBaseVOList[index][field] = this.batchApplyDetailsInfoVO.feeDetailsVOList[index][field]
})
......@@ -393,14 +386,13 @@ export default {
item.orderFeeApplicationBaseVOList.push({ ...obj, isDel: false })
})
},
deleteByFeeIsZero(id) {
this.$confirm(this.$t("确定要删除此条费用申请么？")).then(() => {
feeApplicationDelete(id).then((r) => {
this.$message({
type: "success",
message: this.$t("删除成功")
})
this.$emit("update:dialogVisible", false)
getData() {
feeApplicationBatchGetOrderListByIds({ orderIds: this.orderIds }).then((res) => {
this.batchApplyDetailsInfoVO.orderFeeDetailsVOList = res.data.map((item) => {
return {
...item,
orderFeeApplicationBaseVOList: []
}
})
})
},
......@@ -445,41 +437,12 @@ export default {
this.selectedUsers = []
}
})
},
goProcessDetail() {
this.$emit("update:dialogVisible", false)
this.$router.push("/bpm/process-instance/detail?id=" + this.processInstanceId)
},
cancel() {
this.$prompt(this.$t("请输入取消原因"), this.$t("提示"), {
confirmButtonText: this.$t("确定"),
cancelButtonText: this.$t("取消")
})
.then(({ value }) => {
let item = this.list.find((e) => e.status === 1)
feeApplicationCancel({
huifu: value,
bpmProcessId: this.processInstanceId
}).then((r) => {
this.$message({
type: "success",
message: this.$t("取消成功")
})
this.$emit("update:dialogVisible", false)
})
})
.catch(() => {})
}
},
watch: {
dialogVisible(val) {
orderIds() {
if (val) {
this.getOrderList()
getOrder(this.orderId).then((r) => {
if (r.code === 0) {
this.orderDetails = r.data
}
})
this.getData()
}
}
}
......@@ -498,6 +461,23 @@ export default {
.content {
width: 200px;
}
::v-deep.table2 {
.el-table__expanded-cell {
padding-top: 0;
padding-bottom: 0;
}
}
::v-deep.table3 {
.el-table__cell {
padding-top: 3px;
padding-bottom: 3px;
}
.el-table__header-wrapper th {
height: 30px;
font-weight: normal;
color: #ccc;
}
}
}
.my-process-designer {
......
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