This commit is contained in:
linfso 2024-10-12 15:46:19 +08:00
parent 8650d6159a
commit 2acf644884
2 changed files with 28 additions and 75 deletions

View File

@ -100,50 +100,22 @@
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('成本序号')" align="center" prop="costNo" min-width="100" />
<el-table-column :label="$t('成本名称')" align="center" prop="costName" min-width="100" />
<el-table-column :label="$t('成本类型')" align="center" prop="feeType" min-width="100" />
<el-table-column :label="$t('分摊类型')" align="center" prop="splitType" min-width="100" />
<!-- <el-table-column :label="$t('成本名称')" align="center" prop="costName" min-width="100" /> -->
<el-table-column :label="$t('成本类型')" align="center" prop="feeType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_cost_fee_type" :value="scope.row.feeType"/>
</template>
</el-table-column>
<el-table-column :label="$t('分摊类型')" align="center" prop="splitType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_cost_split_type" :value="scope.row.splitType"/>
</template>
</el-table-column>
<el-table-column :label="$t('总费用')" align="center" prop="costFee" min-width="100" />
<el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" min-width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" />
<!-- <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" /> -->
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<!-- <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="100" />

View File

@ -2,7 +2,7 @@
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-col :span="12">
<el-form-item label="费用类型" prop="feeType">
<el-select clearable v-model="form.feeType" placeholder="请选择" style="width:100%">
<el-option
@ -19,9 +19,9 @@
<el-input v-model="form.costName" placeholder="请输入成本名称" />
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="成本费" prop="costFee">
<el-input v-model="form.costFee" placeholder="请输入成本费" />
<el-col :span="12">
<el-form-item label="总费用" prop="costFee">
<el-input-number v-model="form.costFee" size="mini" placeholder="总费用" :min="1" :controls="false" :precision="2"></el-input-number>
</el-form-item>
</el-col>
@ -58,7 +58,7 @@
</el-col> -->
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input v-model="form.remark" rows="3" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
@ -94,11 +94,14 @@ export default {
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
feeType: [
{ required: true, message: "成本类型不能为空", trigger: ["blur","change"] }
],
delFlag: [
{ required: true, message: "删除标志(0代表存在不能为空", trigger: "blur" }
splitType: [
{ required: true, message: "分摊类型不能为空", trigger: ["blur","change"] }
],
costFee: [
{ required: true, message: "成本费不能为空", trigger: ["blur","change"] }
],
}
};
@ -127,6 +130,7 @@ export default {
});
}else{
this.reset();
this.form.splitType='1';
}
// this.getTreeselect();
},
@ -165,7 +169,9 @@ export default {
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
updateSite: null,
billRelList:null
};
this.resetForm("form");
},
@ -187,32 +193,7 @@ export default {
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisTmsCostFee(queryParams).then(response => {
// this.emisTmsCostFeeOptions = [];
// const rootItem = { idId: 0, emisTmsCostFeeName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisTmsCostFeeOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>