|
|
@@ -653,772 +653,59 @@
|
|
|
<i class="el-icon-circle-plus" style="font-size: 16px"></i>
|
|
|
<span style="font-size: 16px; font-weight: bolder; margin-left: 5px">收款信息</span>
|
|
|
</template>
|
|
|
- <div
|
|
|
- class="dialogTableTitle flex a-center jlr"
|
|
|
- style="
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- align-items: center;
|
|
|
- margin: 10px 0;
|
|
|
- ">
|
|
|
- <div>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
- @click.prevent="addCollection()">新行
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- :disabled="browseStatus"
|
|
|
- @click="saveForm"
|
|
|
- >保 存</el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- @click.prevent="handleSelect(3)"
|
|
|
- type="danger"
|
|
|
- >作业费协议</el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="primary"
|
|
|
- @click="feesConfirm"
|
|
|
- v-if="isShowFeesConfirm == 0"
|
|
|
- >费用确认单</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- v-if="browseStatus"
|
|
|
- @click="feeChange('D')">
|
|
|
- 费用变更
|
|
|
- </el-button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <el-table
|
|
|
- :data="warehouseDrList"
|
|
|
- ref="table"
|
|
|
- tooltip-effect="dark"
|
|
|
- border
|
|
|
- stripe
|
|
|
- show-summary
|
|
|
- @selection-change="Collectionoptions"
|
|
|
- :summary-method="warehouseDrSummaries"
|
|
|
- >
|
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="序号" type="index" width="80">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fCorpid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="300px"
|
|
|
- label="客户名称"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="客户名称"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fFeeid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="240px"
|
|
|
- label="费用名称"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeid"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="费用名称"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- @change="feeChoice(scope.row)"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fDNameOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fBusinessType"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
- label="作业类型"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- style="width: 80%"
|
|
|
- v-model="scope.row.fBusinessType"
|
|
|
- filterable
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in businessTypeOption"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fFeeUnitid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
- label="计价单位">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
- placeholder="请选择计价单位"
|
|
|
- clearable
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- @change="changeFeeUnit(scope.row)">
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fFeetUnitOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"/>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fQty"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="数量">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
|
|
|
- v-model="scope.row.fQty"
|
|
|
- placeholder="数量"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- @change="changeContractAmt(scope.row)"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fUnitprice"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="单价"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fUnitprice"
|
|
|
- placeholder="单价"
|
|
|
- :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
|
|
|
- @change="changeContractAmt(scope.row)"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fAmount"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="金额">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fAmount"
|
|
|
- placeholder="金额"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fStltypeid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="结算方式">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fStltypeid"
|
|
|
- placeholder="请选择结算表票结、月结"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6">
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fStltypeOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fCurrency"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="币别">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="币别"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fExrate"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="汇率">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="汇率"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fTaxrate"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="税率">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="税率"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fMblno"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="提单号">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="提单号"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fProductName"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="140px"
|
|
|
- label="品名">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="品名"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fMarks"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="品牌">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="品牌"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fSrcTypeId"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="来源">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="scope.row.fSrcTypeId === 0">录入</span>
|
|
|
- <span v-if="scope.row.fSrcTypeId == 1">协议</span>
|
|
|
- <span v-if="scope.row.fSrcTypeId == 10">变更</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fAccamount"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="对账金额"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fStlamount"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="结算金额"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fStlamountDate"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="结算日期"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="remark"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="备注">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.remark"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="备注"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="操作"
|
|
|
- width="200px"
|
|
|
- fixed="right">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
|
|
|
- size="small"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- >移除</el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- @click="listCheck(scope.row)"
|
|
|
- v-if="scope.row.fBillstatus < 6"
|
|
|
- :disabled="browseStatus"
|
|
|
- >请核</el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- @click="revokeListCheck(scope.row)"
|
|
|
- v-if="scope.row.fBillstatus == 6"
|
|
|
- :disabled="browseStatus"
|
|
|
- >撤销请核</el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
+ <income-money
|
|
|
+ :browseStatus="browseStatus"
|
|
|
+ @chiSave="saveForm"
|
|
|
+ @chiAdd="addCollection"
|
|
|
+ @feeChangeD="feeChange"
|
|
|
+ :warehouseDrList="warehouseDrList"
|
|
|
+ :businessTypeOption="businessTypeOption"
|
|
|
+ :fDNameOptions="fDNameOptions"
|
|
|
+ :fMblnoOptions="fMblnoOptions"
|
|
|
+ :fFeetUnitOptions="fFeetUnitOptions"
|
|
|
+ :fStltypeOptions="fStltypeOptions"
|
|
|
+ :fGrossweight="fGrossweight"
|
|
|
+ :fQty="fQty"
|
|
|
+ :fNetweight="fNetweight"
|
|
|
+ :fCntqty="fCntqty"
|
|
|
+ :form="form"
|
|
|
+ :company="company"
|
|
|
+ :CntrTable="CntrTable"
|
|
|
+ :cntrList="cntrList"
|
|
|
+ :goodsOptions="goodsOptions"
|
|
|
+ :fCompanyName="fCompanyName"
|
|
|
+ :printFeeConfirm="printFeeConfirm"
|
|
|
+ tableName="货转收款"
|
|
|
+ ></income-money>
|
|
|
</el-collapse-item>
|
|
|
<el-collapse-item>
|
|
|
<template slot="title">
|
|
|
<i class="el-icon-remove" style="font-size: 16px"></i>
|
|
|
<span style="font-size: 16px; font-weight: bolder; margin-left: 5px">付款信息</span>
|
|
|
</template>
|
|
|
- <div
|
|
|
- class="dialogTableTitle flex a-center jlr"
|
|
|
- style="
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- align-items: center;
|
|
|
- margin: 10px 0;
|
|
|
- ">
|
|
|
- <div>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
- @click.prevent="addpayment()"
|
|
|
- size="small">新行
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="saveForm"
|
|
|
- :disabled="browseStatus"
|
|
|
- >保 存</el-button>
|
|
|
- <el-button
|
|
|
- type="danger"
|
|
|
- size="small"
|
|
|
- @click.prevent="handleSelect(1)"
|
|
|
- >作业费协议</el-button>
|
|
|
- <el-button
|
|
|
- type="info"
|
|
|
- size="small"
|
|
|
- @click.prevent="printCr"
|
|
|
- v-if="isShowInvoice == 0"
|
|
|
- >请款单
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="primary"
|
|
|
- @click="feesCrConfirm"
|
|
|
- v-if="isShowFeesConfirm == 0"
|
|
|
- >请款单</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- v-if="browseStatus"
|
|
|
- @click="feeChange('C')"
|
|
|
- >费用变更</el-button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <el-table
|
|
|
- :data="warehouseCrList"
|
|
|
- ref="table"
|
|
|
- tooltip-effect="dark"
|
|
|
- border
|
|
|
- stripe
|
|
|
- show-summary
|
|
|
- :summary-method="warehouseDrSummaries"
|
|
|
- @selection-change="SelectCr">
|
|
|
- <el-table-column type="selection" width="50" align="center" fixed />
|
|
|
- <el-table-column
|
|
|
- label="序号"
|
|
|
- type="index"
|
|
|
- width="50"
|
|
|
- fixed
|
|
|
- align="center"/>
|
|
|
- <el-table-column
|
|
|
- prop="fCorpid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="300px"
|
|
|
- label="客户名称">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="客户名称"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6">
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fFeeid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="240px"
|
|
|
- label="费用名称">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeid"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="费用名称"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- @change="feeChoice(scope.row)">
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fCNameOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fBusinessType"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
- label="作业类型">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- style="width: 80%"
|
|
|
- v-model="scope.row.fBusinessType"
|
|
|
- filterable
|
|
|
- disabled>
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in businessTypeOption"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fFeeUnitid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
- label="计价单位">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
- placeholder="请选择计价单位"
|
|
|
- clearable
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- @change="changeFeeUnit(scope.row)">
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fFeetUnitOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"/>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fQty"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="数量">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
|
|
|
- v-model="scope.row.fQty"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- @change="changeContractAmt(scope.row)"
|
|
|
- placeholder="数量"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fUnitprice"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="单价">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fUnitprice"
|
|
|
- :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
|
|
|
- @change="changeContractAmt(scope.row)"
|
|
|
- placeholder="单价"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fAmount"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="金额">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fAmount"
|
|
|
- placeholder="金额"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fStltypeid"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="结算方式">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fStltypeid"
|
|
|
- placeholder="请选择结算表票结、月结"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6">
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fStltypeOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fCurrency"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="币别">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="币别"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fExrate"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="汇率">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="汇率"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fTaxrate"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="税率">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="税率"
|
|
|
- show-word-limit/>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fMblno"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="提单号">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="提单号"
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fProductName"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="140px"
|
|
|
- label="品名"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="品名"
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column
|
|
|
- prop="fMarks"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="品牌"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="品牌"
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fSrcTypeId"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="来源"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="scope.row.fSrcTypeId === 0">录入</span>
|
|
|
- <span v-if="scope.row.fSrcTypeId == 1">协议</span>
|
|
|
- <span v-if="scope.row.fSrcTypeId == 10">变更</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fAccamount"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="对账金额"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fStlamount"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="结算金额"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fStlamountDate"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="130px"
|
|
|
- label="结算日期"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="remark"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="备注"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- v-model="scope.row.remark"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- placeholder="备注"
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="200px"
|
|
|
- label="操作"
|
|
|
- fixed="right"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <!-- <el-button size="small">审核费用</el-button> -->
|
|
|
- <el-button
|
|
|
- @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
|
|
|
- size="small"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
- >移除</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- @click="listCheck(scope.row)"
|
|
|
- v-if="scope.row.fBillstatus < 6"
|
|
|
- :disabled="browseStatus"
|
|
|
- >请核</el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- @click="revokeListCheck(scope.row)"
|
|
|
- v-if="scope.row.fBillstatus == 6"
|
|
|
- :disabled="browseStatus"
|
|
|
- >撤销请核</el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
+ <pay-money
|
|
|
+ :browseStatus="browseStatus"
|
|
|
+ @chiSave="saveForm"
|
|
|
+ @chiAdd="addpayment"
|
|
|
+ @checkRow="checkRow"
|
|
|
+ @revokeRow="revokeRow"
|
|
|
+ @feeChangeC="feeChange"
|
|
|
+ :warehouseCrList="warehouseCrList"
|
|
|
+ :businessTypeOption="businessTypeOption"
|
|
|
+ :fCNameOptions="fCNameOptions"
|
|
|
+ :fMblnoOptions="fMblnoOptions"
|
|
|
+ :fFeetUnitOptions="fFeetUnitOptions"
|
|
|
+ :fStltypeOptions="fStltypeOptions"
|
|
|
+ :fGrossweight="fGrossweight"
|
|
|
+ :fQty="fQty"
|
|
|
+ :fNetweight="fNetweight"
|
|
|
+ :fCntqty="fCntqty"
|
|
|
+ :form="form"
|
|
|
+ :goodsOptions="goodsOptions"
|
|
|
+ :CntrTable="CntrTable"
|
|
|
+ :cntrList="cntrList"
|
|
|
+ tableName="货转付款"
|
|
|
+ ></pay-money>
|
|
|
</el-collapse-item>
|
|
|
</el-collapse>
|
|
|
<el-dialog
|
|
|
@@ -2163,6 +1450,8 @@ import Cookies from "js-cookie";
|
|
|
import { addSet, select, resetModule } from "@/api/system/set";
|
|
|
import draggable from "vuedraggable";
|
|
|
import upLoad from "../components/upLoad";
|
|
|
+import incomeMoney from '../components/incomeMoney'
|
|
|
+import payMoney from '../components/payMoney'
|
|
|
export default {
|
|
|
name: "inStock",
|
|
|
props: {
|
|
|
@@ -2182,6 +1471,8 @@ export default {
|
|
|
ApprovalComments,
|
|
|
draggable,
|
|
|
upLoad,
|
|
|
+ incomeMoney,
|
|
|
+ payMoney,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -2675,7 +1966,7 @@ export default {
|
|
|
this.fIfdamageOptions = response.data;
|
|
|
});
|
|
|
this.getDicts("st_goodstf_type").then((response) => {
|
|
|
- this.businessTypeOption = response.data;
|
|
|
+ this.businessTypeOption = response.data?response.data:[];
|
|
|
localStorage.setItem("businessTypeList", JSON.stringify(response.data));
|
|
|
});
|
|
|
this.getDicts("storage_type").then((response) => {
|
|
|
@@ -2751,7 +2042,7 @@ export default {
|
|
|
},
|
|
|
activated() {
|
|
|
this.getDicts("st_goodstf_type").then((response) => {
|
|
|
- this.businessTypeOption = response.data;
|
|
|
+ this.businessTypeOption = response.data?response.data:[];
|
|
|
localStorage.setItem("businessTypeList", JSON.stringify(response.data));
|
|
|
});
|
|
|
this.getDicts("storage_type").then((response) => {
|
|
|
@@ -4091,6 +3382,55 @@ export default {
|
|
|
this.dataWithdrawList = [];
|
|
|
this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 6);
|
|
|
},
|
|
|
+ // 付款信息请核
|
|
|
+ checkRow(index, rows) {
|
|
|
+ if (!rows[index].fQty) {
|
|
|
+ this.$message.error('请维护数量')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!rows[index].fUnitprice) {
|
|
|
+ this.$message.error('请维护单价')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!rows[index].fAmount) {
|
|
|
+ this.$message.error('请维护金额')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ rows[index].fBillstatus = 6
|
|
|
+ let formData = new window.FormData()
|
|
|
+ formData.append('tWarehouseBills', JSON.stringify(this.form))
|
|
|
+ // 库存明细
|
|
|
+ formData.append('tWarehousebillsitems', JSON.stringify(this.detailList))
|
|
|
+ // 附件数据
|
|
|
+ formData.append('tEnclosure', JSON.stringify(this.relevantAttachments))
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
|
|
|
+ // 收款
|
|
|
+ formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
|
|
|
+ formData.append('mblnoStatus', JSON.stringify(this.mblnoStatus))
|
|
|
+ formData.append('tCntr', JSON.stringify(this.CntrTable))
|
|
|
+ addWarehousebills(formData).then(res => {
|
|
|
+ this.msgSuccess('请核成功')
|
|
|
+ })
|
|
|
+ },
|
|
|
+ revokeRow(index, rows) {
|
|
|
+ rows[index].fBillstatus = 2
|
|
|
+ let formData = new window.FormData()
|
|
|
+ formData.append('tWarehouseBills', JSON.stringify(this.form))
|
|
|
+ // 库存明细
|
|
|
+ formData.append('tWarehousebillsitems', JSON.stringify(this.detailList))
|
|
|
+ // 附件数据
|
|
|
+ formData.append('tEnclosure', JSON.stringify(this.relevantAttachments))
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
|
|
|
+ // 收款
|
|
|
+ formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
|
|
|
+ formData.append('mblnoStatus', JSON.stringify(this.mblnoStatus))
|
|
|
+ formData.append('tCntr', JSON.stringify(this.CntrTable))
|
|
|
+ addWarehousebills(formData).then(res => {
|
|
|
+ this.msgSuccess('撤销成功')
|
|
|
+ })
|
|
|
+ },
|
|
|
// 合计
|
|
|
getSummaries(param) {
|
|
|
const { columns, data } = param;
|
qukaidi