|
|
@@ -7,7 +7,7 @@
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
<span>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="90px">
|
|
|
+ <el-form ref="form" :model="form" label-width="90px">
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="客户名称" prop="fCorpId">
|
|
|
@@ -517,7 +517,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-row v-if="form.billType == 1">
|
|
|
+ <el-row v-if="form.billType == 1">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="修洗费" prop="costomAmt03">
|
|
|
<el-input
|
|
|
@@ -631,12 +631,12 @@
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<el-collapse v-model="collapses">
|
|
|
- <!-- <el-collapse-item v-if="userType == '00'">
|
|
|
+ <el-collapse-item>
|
|
|
<template slot="title">
|
|
|
<i class="header-icon el-icon-circle-plus" style="font-size: 16px"
|
|
|
><span
|
|
|
style="font-size: 16px; font-weight: bolder; margin-left: 5px"
|
|
|
- >收款信息</span
|
|
|
+ >确认费用</span
|
|
|
>
|
|
|
</i>
|
|
|
</template>
|
|
|
@@ -653,340 +653,215 @@
|
|
|
type="primary"
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
- @click="addDListRow(DList)"
|
|
|
- :disabled="disabled"
|
|
|
- >添加</el-button
|
|
|
+ @click="addRelevt"
|
|
|
+ >添加费用</el-button
|
|
|
>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <el-table :data="DList">
|
|
|
- <el-table-column label="结算单位" align="center" prop="fCorpid">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
- placeholder="结算单位"
|
|
|
- :clearable="true"
|
|
|
- filterable
|
|
|
- :disabled="disabled"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column label="费用名称" align="center" prop="fFeeid">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeid"
|
|
|
- placeholder="费用名称"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- :disabled="disabled"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fWbuOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="计费单位"
|
|
|
- align="center"
|
|
|
- prop="fFeeunitid"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeunitid"
|
|
|
- placeholder="计费单位"
|
|
|
- :disabled="disabled"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in ffeeunitidList"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="计费数量" align="center" prop="fQty">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fQty"
|
|
|
- placeholder="计费数量"
|
|
|
- v-input-limit="0"
|
|
|
- :disabled="disabled"
|
|
|
- @input="total(scope.row)"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="单价" align="center" prop="fUnitprice">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fUnitprice"
|
|
|
- placeholder="单价"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="disabled"
|
|
|
- @input="total(scope.row)"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="币种" align="center" prop="fCurrency">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fCurrency"
|
|
|
- placeholder="RMB"
|
|
|
- :disabled="true"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="汇率" align="center" prop="fExrate">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fExrate"
|
|
|
- placeholder="汇率"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="金额" align="center" prop="fAmount">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fAmount"
|
|
|
- placeholder="金额"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="true"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="税率" align="center" prop="fTaxrate">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fTaxrate"
|
|
|
- placeholder="税率"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column label="备注" align="center" prop="remarks">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.remarks"
|
|
|
- placeholder="备注"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- width="100"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- @click.native.prevent="deleteRow(scope.$index, DList)"
|
|
|
- :disabled="disabled"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- </el-collapse-item>
|
|
|
- <el-collapse-item v-if="userType == '00'">
|
|
|
- <template slot="title">
|
|
|
- <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
|
|
|
- ><span
|
|
|
- style="font-size: 16px; font-weight: bolder; margin-left: 5px"
|
|
|
- >付款信息</span
|
|
|
- >
|
|
|
- </i>
|
|
|
- </template>
|
|
|
- <div>
|
|
|
- <div
|
|
|
- style="
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- margin: 10px 0;
|
|
|
- "
|
|
|
- >
|
|
|
- <div>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
- @click="addDListRow(CList)"
|
|
|
- :disabled="disabled"
|
|
|
- >添加</el-button
|
|
|
+ @click="addRelevt2"
|
|
|
+ >导入费用</el-button
|
|
|
>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-table :data="CList">
|
|
|
- <el-table-column label="结算单位" align="center" prop="fCorpid">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
- placeholder="结算单位"
|
|
|
- :clearable="true"
|
|
|
- filterable
|
|
|
- :disabled="disabled"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column label="费用名称" align="center" prop="fFeeid">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeid"
|
|
|
- placeholder="费用名称"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- :disabled="disabled"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in fWbuOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="计费单位"
|
|
|
- align="center"
|
|
|
- prop="fFeeunitid"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeunitid"
|
|
|
- placeholder="计费单位"
|
|
|
- :disabled="disabled"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in ffeeunitidList"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="计费数量" align="center" prop="fQty">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fQty"
|
|
|
- placeholder="计费数量"
|
|
|
- v-input-limit="0"
|
|
|
- :disabled="disabled"
|
|
|
- @input="total(scope.row)"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="单价" align="center" prop="fUnitprice">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fUnitprice"
|
|
|
- placeholder="单价"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="disabled"
|
|
|
- @input="total(scope.row)"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="币种" align="center" prop="fCurrency">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fCurrency"
|
|
|
- placeholder="RMB"
|
|
|
- :disabled="true"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="汇率" align="center" prop="fExrate">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fExrate"
|
|
|
- placeholder="汇率"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="金额" align="center" prop="fAmount">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fAmount"
|
|
|
- placeholder="金额"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="true"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="税率" align="center" prop="fTaxrate">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fTaxrate"
|
|
|
- placeholder="税率"
|
|
|
- v-input-limit="2"
|
|
|
- :disabled="disabled"
|
|
|
+ </div>
|
|
|
+ <el-table :data="feesList" style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ prop="fCorpid"
|
|
|
+ label="结算单位"
|
|
|
+ align="center"
|
|
|
+ width="180"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fCorpid"
|
|
|
+ placeholder="请输入客户名称"
|
|
|
+ :clearable="true"
|
|
|
+ filterable
|
|
|
+ size="mini"
|
|
|
+ style="width: 160px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions2"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column label="备注" align="center" prop="remarks">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.remarks"
|
|
|
- placeholder="备注"
|
|
|
- :disabled="disabled"
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fFeeid"
|
|
|
+ label="费用名称"
|
|
|
+ align="center"
|
|
|
+ width="120"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fFeeid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ placeholder="费用名称"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fWbuOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="fDc" label="收付" align="center" width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select v-model="scope.row.fDc" placeholder="请选择">
|
|
|
+ <el-option label="收" value="D"></el-option>
|
|
|
+ <el-option label="付" value="C"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fFeeunitid"
|
|
|
+ label="计费单位"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fFeeunitid"
|
|
|
+ placeholder="请选择计费单位"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in jFeetunitOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- width="100"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- @click.native.prevent="deleteRow(scope.$index, DList)"
|
|
|
- :disabled="disabled"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- </el-collapse-item> -->
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fBillingQty"
|
|
|
+ label="计费数量"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fBillingQty"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ @input="total(scope.row)"
|
|
|
+ v-input-limit="2"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fUnitprice"
|
|
|
+ label="单价"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fUnitprice"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ @input="total(scope.row)"
|
|
|
+ v-input-limit="2"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fCurrency"
|
|
|
+ label="币种"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fCurrency"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fExrate"
|
|
|
+ label="汇率"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fExrate"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fAmount"
|
|
|
+ label="金额"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fAmount"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fTaxrate"
|
|
|
+ label="税率"
|
|
|
+ align="center"
|
|
|
+ width="100"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fTaxrate"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="remarks"
|
|
|
+ label="备注"
|
|
|
+ align="center"
|
|
|
+ width="180"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.remarks"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="remarks" label="费用来源" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.actId == 1080">费用确认</span>
|
|
|
+ <span v-if="scope.row.actId == 1090">追加费用</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ fixed="right"
|
|
|
+ width="100px"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ @click.native.prevent="deleteRow(scope.$index)"
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-collapse-item>
|
|
|
<el-collapse-item>
|
|
|
<template slot="title">
|
|
|
<i class="header-icon el-icon-circle-plus" style="font-size: 16px"
|
|
|
@@ -1169,7 +1044,7 @@ import {
|
|
|
} from "@/api/fleet/ftmsorderbillscars";
|
|
|
import { getBasicInformation } from "@/api/kaihe/basicdata/container";
|
|
|
import { listGoods } from "@/api/basicdata/goods";
|
|
|
-import { listCorps } from "@/api/basicdata/corps";
|
|
|
+import { listCorps,selectCorpList } from "@/api/basicdata/corps";
|
|
|
import { listFees } from "@/api/basicdata/fees";
|
|
|
import UploadFile from "@/components/Uploadfile";
|
|
|
import Cookies from "js-cookie";
|
|
|
@@ -1199,6 +1074,10 @@ export default {
|
|
|
type: Array,
|
|
|
default: [],
|
|
|
},
|
|
|
+ feesList: {
|
|
|
+ type: Array,
|
|
|
+ default: [],
|
|
|
+ },
|
|
|
},
|
|
|
components: {
|
|
|
UploadFile,
|
|
|
@@ -1207,42 +1086,6 @@ export default {
|
|
|
return {
|
|
|
// 控制弹出框显示隐藏
|
|
|
showDialog: false,
|
|
|
- // 表单校验
|
|
|
- rules: {
|
|
|
- // fCorpId: [
|
|
|
- // { required: true, message: "请输入客户名称", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // billType: [
|
|
|
- // { required: true, message: "请选择业务类型", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // transType: [
|
|
|
- // { required: true, message: "请选择运输方式", trigger: "blur" },
|
|
|
- // ],
|
|
|
- // // loadAddr: [
|
|
|
- // // { required: true, message: "请输入提箱地点", trigger: "blur" },
|
|
|
- // // ],
|
|
|
- // loadAttntel: [
|
|
|
- // {
|
|
|
- // pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
|
|
|
- // message: "请正确输入手机号",
|
|
|
- // trigger: "blur",
|
|
|
- // },
|
|
|
- // ],
|
|
|
- // mdLoadAttnTel: [
|
|
|
- // {
|
|
|
- // pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
|
|
|
- // message: "请正确输入手机号",
|
|
|
- // trigger: "blur",
|
|
|
- // },
|
|
|
- // ],
|
|
|
- // unLoadAttnTel: [
|
|
|
- // {
|
|
|
- // pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
|
|
|
- // message: "请正确输入手机号",
|
|
|
- // trigger: "blur",
|
|
|
- // },
|
|
|
- // ],
|
|
|
- },
|
|
|
billTypeList: [],
|
|
|
transTypeList: [],
|
|
|
transPropList: [],
|
|
|
@@ -1253,6 +1096,7 @@ export default {
|
|
|
username: null,
|
|
|
collapses: [],
|
|
|
fMblnoOptions: [],
|
|
|
+ fMblnoOptions2: [],
|
|
|
cntrId2List: [],
|
|
|
goodsOptions: [],
|
|
|
fWbuOptions: [],
|
|
|
@@ -1263,9 +1107,15 @@ export default {
|
|
|
headers: {
|
|
|
Authorization: "Bearer " + getToken(),
|
|
|
},
|
|
|
+ jFeetunitOptions:[]
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
+ this.getDicts("data_unitfees").then((response) => {
|
|
|
+ if (response.data) {
|
|
|
+ this.jFeetunitOptions = response.data;
|
|
|
+ }
|
|
|
+ });
|
|
|
this.getDicts("data_billType").then((response) => {
|
|
|
this.billTypeList = response.data;
|
|
|
});
|
|
|
@@ -1298,6 +1148,9 @@ export default {
|
|
|
listCorps().then((response) => {
|
|
|
this.fMblnoOptions = response.rows;
|
|
|
});
|
|
|
+ // selectCorpList().then((response) => {
|
|
|
+ // this.allfMblnoOptions = response;
|
|
|
+ // });
|
|
|
listGoods().then((response) => {
|
|
|
this.goodsOptions = response.rows;
|
|
|
});
|
|
|
@@ -1370,6 +1223,275 @@ export default {
|
|
|
this.$set(this.relevantAttachments[list], "attachName", row.fileName);
|
|
|
}
|
|
|
},
|
|
|
+ addRelevt2() {
|
|
|
+ let arr = this.feesList;
|
|
|
+ arr.filter((e) => e.actId == "1080");
|
|
|
+ if (arr.length > 0) {
|
|
|
+ this.$confirm("已生成费用信息, 是否重新生成?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.$nextTick().then(() => {
|
|
|
+ this.feesList = this.feesList.filter((e) => e.actId != "1080");
|
|
|
+ });
|
|
|
+ this.$nextTick().then(() => {
|
|
|
+ this.addRelevt3();
|
|
|
+ });
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.$message({
|
|
|
+ type: "info",
|
|
|
+ message: "已取消",
|
|
|
+ });
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.addRelevt3();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ addRelevt3() {
|
|
|
+ if (this.form.oilAmt > 0) {
|
|
|
+ this.feesList.push({
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 52,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.oilAmt,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.oilAmt,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costRemarks,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if (this.form.driverbonus > 0) {
|
|
|
+ this.feesList.push({
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 53,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.driverbonus,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.driverbonus,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costRemarks,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if (this.form.costOth > 0) {
|
|
|
+ this.feesList.push({
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 54,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costOth,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costOth,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costRemarks,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if (this.form.costomAmt03 > 0) {
|
|
|
+ this.feesList.push(
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.fCorpId,
|
|
|
+ fFeeid: 55,
|
|
|
+ fDc: "D",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt03,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt03,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr02,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 55,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt03,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt03,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr02,
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if (this.form.costomAmt04 > 0) {
|
|
|
+ this.feesList.push(
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.fCorpId,
|
|
|
+ fFeeid: 56,
|
|
|
+ fDc: "D",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt04,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt04,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr02,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 56,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt04,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt04,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr02,
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if (this.form.costomAmt02 > 0) {
|
|
|
+ this.feesList.push(
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.fCorpId,
|
|
|
+ fFeeid: 57,
|
|
|
+ fDc: "D",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt02,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt02,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr02,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 57,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt02,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt02,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr02,
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if (this.form.costomAmt05 > 0) {
|
|
|
+ this.feesList.push(
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.fCorpId,
|
|
|
+ fFeeid: 58,
|
|
|
+ fDc: "D",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt05,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt05,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr01,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 58,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt05,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt05,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr01,
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if (this.form.costomAmt06 > 0) {
|
|
|
+ this.feesList.push(
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.fCorpId,
|
|
|
+ fFeeid: 59,
|
|
|
+ fDc: "D",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt06,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt06,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr01,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 59,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt06,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt06,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr01,
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if (this.form.costomAmt01 > 0) {
|
|
|
+ this.feesList.push(
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.fCorpId,
|
|
|
+ fFeeid: 60,
|
|
|
+ fDc: "D",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt01,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt01,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr01,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ actId: "1080",
|
|
|
+ fCorpid: this.form.driverUserId,
|
|
|
+ fFeeid: 60,
|
|
|
+ fDc: "C",
|
|
|
+ fFeeunitid: "6",
|
|
|
+ fBillingQty: 1,
|
|
|
+ fUnitprice: this.form.costomAmt01,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fTaxrate: 3,
|
|
|
+ fAmount: this.form.costomAmt01,
|
|
|
+ fExrate: 1,
|
|
|
+ remarks: this.form.costomStr01,
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
+ },
|
|
|
// 弹出框关闭后触发
|
|
|
handleClose() {
|
|
|
// 子组件调用父组件方法，并传递参数
|
|
|
@@ -1381,13 +1503,13 @@ export default {
|
|
|
submitForm(butType) {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if(this.form.costOth>0&&!this.form.costRemarks){
|
|
|
+ if (this.form.costOth > 0 && !this.form.costRemarks) {
|
|
|
return this.$message.error("请输入花销备注");
|
|
|
}
|
|
|
- if(this.form.costomAmt02>0&&!this.form.costomStr02){
|
|
|
+ if (this.form.costomAmt02 > 0 && !this.form.costomStr02) {
|
|
|
return this.$message.error("请输入费用备注");
|
|
|
}
|
|
|
- if(this.form.costomAmt01>0&&!this.form.costomStr01){
|
|
|
+ if (this.form.costomAmt01 > 0 && !this.form.costomStr01) {
|
|
|
return this.$message.error("请输入费用备注");
|
|
|
}
|
|
|
this.DList.map((e) => {
|
qukaidi