|
|
@@ -107,6 +107,7 @@
|
|
|
v-model="form.fMblno"
|
|
|
style="width: 80%"
|
|
|
placeholder="请输入提单号"
|
|
|
+ @change="judgmentWarehouse"
|
|
|
:disabled="detailList.length != 0"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -193,7 +194,7 @@
|
|
|
placeholder="请选择"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(item, index) in warehouseOptions"
|
|
|
+ v-for="(item, index) in form.fMblno && form.fCorpid && !form.fId?warehouseSwitching:warehouseOptions"
|
|
|
:key="index.fId"
|
|
|
:label="item.fName"
|
|
|
:value="item.fId"
|
|
|
@@ -553,7 +554,6 @@
|
|
|
v-model="form.fTrademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
:disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
- clearable
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -856,13 +856,13 @@
|
|
|
>
|
|
|
<el-button
|
|
|
size="small"
|
|
|
- :disabled="entryPrinting == 0?dataListSelection.length <= 0 || browseStatus || entryPrinting == 1:Printinglist.length != 1 || browseStatus || Printinglist.length !== 1?true:Printinglist[0].fBillstatus ==40"
|
|
|
+ :disabled="dataListSelection.length <= 0 || deliveryConfirmation"
|
|
|
@click="creditClick"
|
|
|
>出库确认
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
size="small"
|
|
|
- :disabled="dataWithdrawList.length <= 0 || browseStatus"
|
|
|
+ :disabled="dataWithdrawList.length <= 0 || cancelDelivery"
|
|
|
@click.prevent="withdrawClick"
|
|
|
>撤回出库
|
|
|
</el-button>
|
|
|
@@ -872,10 +872,10 @@
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item command="d">标准出库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="b">出库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="c">理货单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="e">出库确认</el-dropdown-item>
|
|
|
- <el-dropdown-item command="e">劳务确认</el-dropdown-item>
|
|
|
+<!-- <el-dropdown-item command="b">出库单</el-dropdown-item>-->
|
|
|
+<!-- <el-dropdown-item command="c">理货单</el-dropdown-item>-->
|
|
|
+<!-- <el-dropdown-item command="e">出库确认</el-dropdown-item>-->
|
|
|
+<!-- <el-dropdown-item command="e">劳务确认</el-dropdown-item>-->
|
|
|
<el-dropdown-item command="f">叉车出库单</el-dropdown-item>
|
|
|
<el-dropdown-item command="g">单车出库单</el-dropdown-item>
|
|
|
<el-dropdown-item command="h">装车存档出库单</el-dropdown-item>
|
|
|
@@ -1211,8 +1211,14 @@
|
|
|
:disabled="browseStatus"
|
|
|
type="danger"
|
|
|
>作业费协议
|
|
|
- </el-button
|
|
|
- >
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ @click="calculationFee"
|
|
|
+ size="small"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ type="warning"
|
|
|
+ >计算仓储费
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table
|
|
|
@@ -1299,7 +1305,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fFeeUnitid"
|
|
|
+ prop="fBillingway"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
@@ -1307,7 +1313,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
+ v-model="scope.row.fBillingway"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
:disabled="browseStatus"
|
|
|
@@ -1323,7 +1329,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fQty"
|
|
|
+ prop="fUnitprice"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="130px"
|
|
|
@@ -1332,7 +1338,7 @@
|
|
|
<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.fQty"
|
|
|
+ v-model="scope.row.fUnitprice"
|
|
|
placeholder="数量"
|
|
|
:disabled="browseStatus"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
@@ -1341,7 +1347,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fUnitprice"
|
|
|
+ prop="fQty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="130px"
|
|
|
@@ -1350,7 +1356,7 @@
|
|
|
<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"
|
|
|
+ v-model="scope.row.fQty"
|
|
|
placeholder="单价"
|
|
|
:disabled="browseStatus || scope.row.fSrcTypeId !== 0"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
@@ -1507,7 +1513,162 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="remarks"
|
|
|
+ prop="fBilltype"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="业务来源"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fBilltype === 'SJRK'">入库</span>
|
|
|
+ <span v-if="scope.row.fBilltype === 'SJCK'">出库</span>
|
|
|
+ <span v-if="scope.row.fBilltype === 'KCZZ'">库存总账</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fMblno"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="业务单号"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.fMblno" :disabled="browseStatus" placeholder="请输入业务单号"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fMarks"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="唛头"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.fMarks" :disabled="browseStatus" placeholder="请输入唛头"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fBsdate"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="165px"
|
|
|
+ label="业务日期"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-date-picker
|
|
|
+ style="width: 100%;"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ v-model="scope.row.fBsdate"
|
|
|
+ type="date"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fBillingway"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="180px"
|
|
|
+ label="计费单位"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fBillingway"
|
|
|
+ placeholder="请选择计费单位"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fFeetUnitOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fBillingQty"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="计费数量"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.fBillingQty" :disabled="browseStatus" placeholder="请输入计费数量"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fChargedate"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="165px"
|
|
|
+ label="计费起始日期"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-date-picker
|
|
|
+ style="width: 100%;"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ v-model="scope.row.fChargedate"
|
|
|
+ type="date"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fBillingDeadline"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="165px"
|
|
|
+ label="计费截止日期"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-date-picker
|
|
|
+ style="width: 100%;"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ v-model="scope.row.fBillingDeadline"
|
|
|
+ type="date"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fBillingDays"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="计费天数"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.fBillingDays" :disabled="browseStatus" placeholder="请输入计费天数"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fInventoryDays"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="库存天数"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.fInventoryDays" :disabled="browseStatus" placeholder="请输入库存天数"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fAmt"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="计费金额"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.fAmt" :disabled="browseStatus" placeholder="请输入计费金额"
|
|
|
+ @change="calculationFAmt(scope.row)"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="remark"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
@@ -1515,9 +1676,9 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.Remarks"
|
|
|
+ v-model="scope.row.remark"
|
|
|
:disabled="browseStatus"
|
|
|
- placeholder="备1注"
|
|
|
+ placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -2139,7 +2300,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司作业单
|
|
|
+ {{ company }}作业单
|
|
|
</div>
|
|
|
<div
|
|
|
style="
|
|
|
@@ -2244,7 +2405,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司出库单
|
|
|
+ {{ company }}出库单
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
<table
|
|
|
@@ -2263,7 +2424,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>保管方</td>
|
|
|
- <td width="200">{{ company }}有限公司</td>
|
|
|
+ <td width="200">{{ company }}</td>
|
|
|
<td>联系人</td>
|
|
|
<td>{{ form.fContacts }}</td>
|
|
|
<td>电话</td>
|
|
|
@@ -2364,55 +2525,55 @@
|
|
|
style="box-shadow:none"
|
|
|
width="70%">
|
|
|
<section ref="print">
|
|
|
- <p><span class="no-print">打印日期:</span><span style="padding-left: 100px">{{ new Date().toLocaleDateString().replace(/\//g,"-") }}</span></p>
|
|
|
+ <p><span class="no-print">打印日期:</span><span style="padding-left: 100px">{{ new Date().toLocaleDateString().replace(/\//g, "-") }}</span></p>
|
|
|
<table class="table" valign="center">
|
|
|
<tr>
|
|
|
<td style="width: 9%;"><span class="no-print">提 单 号</span></td>
|
|
|
- <td style="width: 14%;">{{ Printinglist.length === 1?Printinglist[0].fMblno:'' }}</td>
|
|
|
+ <td style="width: 14%;">{{ Printinglist.length === 1 ? Printinglist[0].fMblno : '' }}</td>
|
|
|
<td style="width: 8%;"><span class="no-print">合 同 号</span></td>
|
|
|
- <td style="width: 13%;">{{ Printinglist.length === 1?Printinglist[0].fSerialNumber:'' }}</td>
|
|
|
+ <td style="width: 13%;">{{ Printinglist.length === 1 ? Printinglist[0].fSerialNumber : '' }}</td>
|
|
|
<td style="width: 9%;"><span class="no-print">品 名</span></td>
|
|
|
- <td style="width: 16%;">{{ Printinglist.length === 1?Printinglist[0].fGoodsid:'' }}</td>
|
|
|
+ <td style="width: 16%;">{{ Printinglist.length === 1 ? Printinglist[0].fGoodsid : '' }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td><span class="no-print">件 数</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fQty:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fQty : '' }}</td>
|
|
|
<td><span class="no-print">重 量</span></td>
|
|
|
- <td>{{Printinglist.length === 1?Printinglist[0].fNetweight:''}}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fNetweight : '' }}</td>
|
|
|
<td><span class="no-print">尺 码</span></td>
|
|
|
<td></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td><span class="no-print">原箱号</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fCntrno:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fCntrno : '' }}</td>
|
|
|
<td><span class="no-print">现箱号</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fNowCarton:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fNowCarton : '' }}</td>
|
|
|
<td><span class="no-print">铅封号</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fSealno:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fSealno : '' }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td><span class="no-print">出库日</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fBsdate:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fBsdate : '' }}</td>
|
|
|
<td><span class="no-print">预计到厂日</span></td>
|
|
|
- <td>{{ form.fPredictBranch?form.fPredictBranch:'' }}</td>
|
|
|
+ <td>{{ form.fPredictBranch ? form.fPredictBranch : '' }}</td>
|
|
|
<td><span class="no-print">等级</span></td>
|
|
|
- <td>{{ form.fGrade?form.fGrade:'' }}</td>
|
|
|
+ <td>{{ form.fGrade ? form.fGrade : '' }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td><span class="no-print">车牌号</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fTruckno:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fTruckno : '' }}</td>
|
|
|
<td><span class="no-print">司机姓名</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fDriverName:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fDriverName : '' }}</td>
|
|
|
<td><span class="no-print">司机电话</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fDriverTel:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fDriverTel : '' }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td style="height: 70px;"><span class="no-print">送货详情</span></td>
|
|
|
- <td colspan="5">{{ form.fDeliveryDetails?form.fDeliveryDetails:'' }}</td>
|
|
|
+ <td colspan="5">{{ form.fDeliveryDetails ? form.fDeliveryDetails : '' }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td><span class="no-print">送货备注</span></td>
|
|
|
- <td colspan="5">{{ Printinglist.length === 1?Printinglist[0].remark:'' }}</td>
|
|
|
+ <td colspan="5">{{ Printinglist.length === 1 ? Printinglist[0].remark : '' }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td><span class="no-print">到厂名称</span></td>
|
|
|
@@ -2435,10 +2596,10 @@
|
|
|
<tr>
|
|
|
<td><span class="no-print">业务员</span></td>
|
|
|
<td v-for="item in fSalesmanId" v-if="form.fSalesmanId === item.userId">
|
|
|
- {{item.userName}}
|
|
|
+ {{ item.userName }}
|
|
|
</td>
|
|
|
<td><span class="no-print">叉车工</span></td>
|
|
|
- <td>{{ Printinglist.length === 1?Printinglist[0].fForkliftman:'' }}</td>
|
|
|
+ <td>{{ Printinglist.length === 1 ? Printinglist[0].fForkliftman : '' }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td style="height: 200px"><span class="no-print">车队注意事项</span></td>
|
|
|
@@ -2483,7 +2644,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司出库单
|
|
|
+ {{ company }}出库单
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
<table
|
|
|
@@ -2529,7 +2690,8 @@
|
|
|
</td>
|
|
|
<td colspan="2" v-else></td>
|
|
|
<td colspan="2">身份证号</td>
|
|
|
- <td colspan="2"></td>
|
|
|
+ <td colspan="2" v-if="Printinglist.length">{{Printinglist[0].fDriverIdCar}}</td>
|
|
|
+ <td colspan="2" v-else></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>地址</td>
|
|
|
@@ -2580,7 +2742,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司
|
|
|
+ {{ company }}
|
|
|
</div>
|
|
|
<div
|
|
|
style="
|
|
|
@@ -2696,7 +2858,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司
|
|
|
+ {{ company }}
|
|
|
</div>
|
|
|
<div
|
|
|
style="
|
|
|
@@ -2755,9 +2917,7 @@
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
|
- <div
|
|
|
- style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
- >
|
|
|
+ <div style="display: flex; justify-content: space-between; font-size: 12px">
|
|
|
<div>库管：{{ form.fContacts }}</div>
|
|
|
<div style="width: 100px">叉车：</div>
|
|
|
</div>
|
|
|
@@ -2790,7 +2950,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司
|
|
|
+ {{ company }}
|
|
|
</div>
|
|
|
|
|
|
<div
|
|
|
@@ -2896,7 +3056,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司
|
|
|
+ {{ company }}
|
|
|
</div>
|
|
|
|
|
|
<div
|
|
|
@@ -2995,7 +3155,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司
|
|
|
+ {{ company }}
|
|
|
</div>
|
|
|
|
|
|
<div
|
|
|
@@ -3293,6 +3453,8 @@ import {
|
|
|
submitWarehousingApproval,
|
|
|
ordersRevoke,
|
|
|
checkCode,
|
|
|
+ deliveryCalculation,
|
|
|
+ matchWarehouse
|
|
|
} from "@/api/warehouseBusiness/warehouseOutStock";
|
|
|
import {operationAgreement} from "@/api/agreement/agreement";
|
|
|
import {listCorps} from "@/api/basicdata/corps";
|
|
|
@@ -3318,6 +3480,7 @@ import {getToken} from "@/utils/auth";
|
|
|
import {addSet, select, resetModule} from "@/api/system/set";
|
|
|
import upLoad from "../components/upLoad";
|
|
|
import draggable from "vuedraggable";
|
|
|
+import {queryClerkRoleList} from "@/api/warehouseBusiness/warehouseInStock";
|
|
|
|
|
|
export default {
|
|
|
name: "inStock",
|
|
|
@@ -3375,6 +3538,7 @@ export default {
|
|
|
browseStatus: false,
|
|
|
goodsOptions: [],
|
|
|
warehouseOptions: [],
|
|
|
+ warehouseSwitching: [],
|
|
|
userOptions: [],
|
|
|
businessTypeOption: [],
|
|
|
fCompanyOptIons: [],
|
|
|
@@ -3424,6 +3588,8 @@ export default {
|
|
|
allfQty: 0,
|
|
|
fixdetaiNum: null,
|
|
|
dataListSelection: [],
|
|
|
+ deliveryConfirmation: true,
|
|
|
+ cancelDelivery: true,
|
|
|
dataWithdrawList: [],
|
|
|
title: "",
|
|
|
fCNameOptions: [],
|
|
|
@@ -3675,7 +3841,7 @@ export default {
|
|
|
name: "备注",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
- },{
|
|
|
+ }, {
|
|
|
surface: "30",
|
|
|
label: "fNowCarton",
|
|
|
name: "现箱号",
|
|
|
@@ -3793,7 +3959,7 @@ export default {
|
|
|
showApproval: null,
|
|
|
allfPlanqty: 0,
|
|
|
ckTime: null,
|
|
|
- entryPrinting:1,
|
|
|
+ entryPrinting: 1,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -3809,8 +3975,7 @@ export default {
|
|
|
this.detailsHidden2 = true;
|
|
|
}
|
|
|
});
|
|
|
- selectUserByRole().then(res =>{
|
|
|
- console.log(res)
|
|
|
+ selectUserByRole().then(res => {
|
|
|
this.fSalesmanId = res.rows
|
|
|
})
|
|
|
this.getConfigKey("entry.printing").then((response) => {
|
|
|
@@ -3863,8 +4028,8 @@ export default {
|
|
|
listCorps().then((response) => {
|
|
|
this.fSbuOptions = response.rows;
|
|
|
});
|
|
|
- listUser().then((response) => {
|
|
|
- this.userOptions = response.rows;
|
|
|
+ queryClerkRoleList().then((response) => {
|
|
|
+ this.userOptions = response.data;
|
|
|
});
|
|
|
listGoods({fStatus: 0, delFlag: 0}).then((response) => {
|
|
|
this.goodsOptions = response.rows;
|
|
|
@@ -3881,7 +4046,7 @@ export default {
|
|
|
this.getDicts("unload_mode").then((response) => {
|
|
|
this.unloadModes = response.data;
|
|
|
});
|
|
|
- this.company = localStorage.getItem("companyName");
|
|
|
+ this.company = Cookies.get("companyName")
|
|
|
this.queryUser();
|
|
|
this.getRow();
|
|
|
this.getRow2();
|
|
|
@@ -4075,6 +4240,14 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ calculationFAmt(row) {
|
|
|
+ row.fAmt = Number(row.fAmt)
|
|
|
+ if (row.fAmt) {
|
|
|
+ row.fAmt = row.fAmt.toFixed(2)
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ },
|
|
|
//重置列表
|
|
|
delRow2() {
|
|
|
this.data = {
|
|
|
@@ -4283,7 +4456,15 @@ export default {
|
|
|
this.$refs.ApprovalComments.init(form.fId, status, 120);
|
|
|
});
|
|
|
},
|
|
|
+ judgmentWarehouse(){
|
|
|
+ if (this.form.fMblno && this.form.fCorpid){
|
|
|
+ matchWarehouse({fMblno:this.form.fMblno,fCorpid:this.form.fCorpid}).then(res =>{
|
|
|
+ this.warehouseSwitching = res.data
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
changefStltype(row) {
|
|
|
+ this.judgmentWarehouse()
|
|
|
this.fMblnoOptions.map((e) => {
|
|
|
if (row == e.fId) {
|
|
|
this.$set(this.form, "fStltypeid", e.fStltypeid.toString());
|
|
|
@@ -4421,7 +4602,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
- this.msgSuccess("卸货成功");
|
|
|
+ this.msgSuccess("装货成功");
|
|
|
this.$set(this.form, "fItemsStatus", 3);
|
|
|
}
|
|
|
});
|
|
|
@@ -4451,7 +4632,7 @@ export default {
|
|
|
if (!this.Printinglist[item].fId) {
|
|
|
return this.$message.error("请存在未保存的数据");
|
|
|
}
|
|
|
- if(this.entryPrinting == 0){
|
|
|
+ if (this.entryPrinting == 0) {
|
|
|
if (
|
|
|
this.Printinglist[item].fBillstatus == 10 &&
|
|
|
this.stockoi == "0"
|
|
|
@@ -4562,11 +4743,7 @@ export default {
|
|
|
this.$set(this.form, "fCartype", this.form.fCartype.toString());
|
|
|
}
|
|
|
if (this.form.fTrademodeid) {
|
|
|
- this.$set(
|
|
|
- this.form,
|
|
|
- "fTrademodeid",
|
|
|
- this.form.fTrademodeid.toString()
|
|
|
- );
|
|
|
+ this.$set(this.form,"fTrademodeid",this.form.fTrademodeid.toString());
|
|
|
}
|
|
|
response.data.warehouseItem.map((e) => {
|
|
|
e.fBsdate = Date.parse(e.fBsdate);
|
|
|
@@ -4700,6 +4877,7 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
this.msgSuccess("撤回成功");
|
|
|
+ this.$refs.multipleTable.clearSelection();
|
|
|
this.$set(this.form, "fItemsStatus", 1);
|
|
|
this.$set(this.form, "fDateChanged", response.msg);
|
|
|
});
|
|
|
@@ -4741,6 +4919,41 @@ export default {
|
|
|
const timeFormat = year + "-" + month + "-" + day;
|
|
|
return timeFormat;
|
|
|
},
|
|
|
+ calculationFee() {
|
|
|
+ if (this.detailList.length !== 0) {
|
|
|
+ let list = []
|
|
|
+ let i = 0
|
|
|
+ try {
|
|
|
+ this.detailList.forEach(item => {
|
|
|
+ i++
|
|
|
+ if (item.fBillstatus === 40) {
|
|
|
+ list.push({
|
|
|
+ fCorpid: this.form.fCorpid,
|
|
|
+ fBillingDeadline: item.fBsdate,
|
|
|
+ fMblno: item.fMblno,
|
|
|
+ fGoodsid: item.fGoodsid,
|
|
|
+ fId:item.fId
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$message.error('第' + i + '条出库明细未出库');
|
|
|
+ throw new Error("EndIterative")
|
|
|
+ }
|
|
|
+ })
|
|
|
+ deliveryCalculation(list).then(res => {
|
|
|
+ this.warehouseDrList = res.data
|
|
|
+ this.warehouseDrList.forEach(index => {
|
|
|
+ index.fBillingway = JSON.stringify(index.fBillingway)
|
|
|
+ index.fBusinessType = this.form.fBusinessType
|
|
|
+ index.fAmt = index.fAmt.toFixed(2)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ } catch (e) {
|
|
|
+ if (e.message !== "EndIterative") throw e;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$message.error('出库明细不能为空');
|
|
|
+ }
|
|
|
+ },
|
|
|
getForm() {
|
|
|
getWarehousebills(this.chiId).then((response) => {
|
|
|
this.form = response.data.warehousebills;
|
|
|
@@ -4799,6 +5012,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
+ this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
|
|
|
if (response.data.tCntrList) {
|
|
|
this.CntrTable = response.data.tCntrList;
|
|
|
} else {
|
|
|
@@ -5193,6 +5407,11 @@ export default {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ this.detailList.forEach(item => {
|
|
|
+ if (item.srcId !== null) {
|
|
|
+ item.fStorageFeeDeadline = item.fBsdate
|
|
|
+ }
|
|
|
+ })
|
|
|
// 库存明细
|
|
|
formData.append(
|
|
|
"warehousebillsitems",
|
|
|
@@ -5294,17 +5513,37 @@ export default {
|
|
|
// 库存明细多选
|
|
|
Selectinventory(selection) {
|
|
|
this.Printinglist = selection;
|
|
|
+ //允许撤销入库list
|
|
|
+ this.dataWithdrawList = selection;
|
|
|
//允许确认入库list
|
|
|
- this.dataListSelection = [];
|
|
|
- if (this.stockoi == "0") {
|
|
|
- this.dataListSelection = selection.filter((e) => e.fBillstatus == 30);
|
|
|
+ this.dataListSelection = selection;
|
|
|
+ if (this.dataWithdrawList.length === 0) {
|
|
|
+ this.cancelDelivery = true
|
|
|
} else {
|
|
|
- this.dataListSelection = selection;
|
|
|
+ for (let item in this.dataWithdrawList) {
|
|
|
+ if (this.dataWithdrawList[item].fBillstatus === 40) {
|
|
|
+ this.cancelDelivery = false
|
|
|
+ this.deliveryConfirmation = true
|
|
|
+ for (let li in this.dataWithdrawList){
|
|
|
+ if (this.entryPrinting != 0?this.dataWithdrawList[li].fBillstatus === 10:this.dataWithdrawList[li].fBillstatus === 30){
|
|
|
+ this.deliveryConfirmation = true
|
|
|
+ this.cancelDelivery = true
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (this.entryPrinting != 0?this.dataWithdrawList[item].fBillstatus === 10:this.dataWithdrawList[item].fBillstatus === 30){
|
|
|
+ this.deliveryConfirmation = false
|
|
|
+ this.cancelDelivery = true
|
|
|
+ for (let li in this.dataWithdrawList){
|
|
|
+ if (this.dataWithdrawList[li].fBillstatus === 40){
|
|
|
+ this.deliveryConfirmation = true
|
|
|
+ this.cancelDelivery = true
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- //允许撤销入库list
|
|
|
- this.dataWithdrawList = [];
|
|
|
- this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40);
|
|
|
},
|
|
|
// 合计
|
|
|
getSummaries(param) {
|
|
|
@@ -5377,10 +5616,10 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
const values = data.map((item) => Number(item[column.property]));
|
|
|
+ // column.property === "fQty"
|
|
|
if (
|
|
|
column.property === "fUnitprice" ||
|
|
|
- column.property === "fAmount" ||
|
|
|
- column.property === "fQty"
|
|
|
+ column.property === "fAmount"
|
|
|
) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
const value = Number(curr);
|
|
|
@@ -5465,18 +5704,16 @@ export default {
|
|
|
this.dialogWhgenlegList = [];
|
|
|
this.whgenlegTotal = 0;
|
|
|
this.whgenlegVisible = true;
|
|
|
+ this.$set(this.whgenlegParams, 'fMblno', this.form.fMblno)
|
|
|
this.getDetailsList();
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
// 查询库存总账信息
|
|
|
getDetailsList() {
|
|
|
- if (this.detailList.length == 0) {
|
|
|
- this.whgenlegParams.fMblno = this.form.fMblno;
|
|
|
- }
|
|
|
- this.whgenlegParams.fCorpid = this.form.fCorpid;
|
|
|
- this.whgenlegParams.fWarehouseid = this.form.fWarehouseid;
|
|
|
- this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
|
|
|
+ this.$set(this.whgenlegParams, 'fCorpid', this.form.fCorpid)
|
|
|
+ this.$set(this.whgenlegParams, 'fWarehouseid', this.form.fWarehouseid)
|
|
|
+ this.$set(this.whgenlegParams, 'fTrademodeid', this.form.fTrademodeid)
|
|
|
listWhgenleg(this.whgenlegParams).then((response) => {
|
|
|
response.rows.map((e) => {
|
|
|
e.fQtyblc2 = e.fQtyblc;
|
|
|
@@ -5510,26 +5747,26 @@ export default {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
}
|
|
|
},
|
|
|
- detailedApproval(command){
|
|
|
- if (command === 'QH'){
|
|
|
- deliveryDetails(this.form.fId).then(res =>{
|
|
|
+ detailedApproval(command) {
|
|
|
+ if (command === 'QH') {
|
|
|
+ deliveryDetails(this.form.fId).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.msgSuccess("请核成功");
|
|
|
- this.$set(this.form,'fItemstatus',4)
|
|
|
+ this.$set(this.form, 'fItemstatus', 4)
|
|
|
}
|
|
|
})
|
|
|
- }else if(command === 'CK'){
|
|
|
+ } else if (command === 'CK') {
|
|
|
this.addOrUpdateVisible = true;
|
|
|
let actId = "180";
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.addOrUpdate.init(this.form.fId, actId, 'f_itemstatus');
|
|
|
});
|
|
|
- }else if(command === 'SP'){
|
|
|
+ } else if (command === 'SP') {
|
|
|
this.addOrUpdateVisib = true;
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.ApprovalComments.init(this.form.fId, 'f_itemstatus', 180);
|
|
|
});
|
|
|
- }else if(command === 'CX'){
|
|
|
+ } else if (command === 'CX') {
|
|
|
let data = {
|
|
|
actId: 180,
|
|
|
billId: this.form.fId,
|
|
|
@@ -5540,7 +5777,7 @@ export default {
|
|
|
if (data.code === 200) {
|
|
|
this.browseStatus = false;
|
|
|
this.msgSuccess("撤销成功");
|
|
|
- this.$set(this.form,'fItemstatus',2)
|
|
|
+ this.$set(this.form, 'fItemstatus', 2)
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -5688,6 +5925,7 @@ export default {
|
|
|
fMarks: this.form.fMarks,
|
|
|
fBusinessType: this.form.fBusinessType,
|
|
|
fSrcTypeId: 0,
|
|
|
+ fBilltype: 'SJCK'
|
|
|
});
|
|
|
this.fWbuOptions = [];
|
|
|
let queryParams = {pageNum: 1, fDc: "D"};
|
|
|
@@ -5821,7 +6059,7 @@ export default {
|
|
|
this.$set(this.form, "fStorekeeper", this.userVal.nickName);
|
|
|
this.$set(this.form, "fIfdamage", "1");
|
|
|
this.$set(this.form, "fIfweigh", "1");
|
|
|
- this.$set(this.form, "fTrademodeid", "2");
|
|
|
+ this.$set(this.form, "fTrademodeid", "1");
|
|
|
this.$set(this.form, "createTime", Date.parse(new Date()));
|
|
|
this.$set(this.form, "fBstime", Date.parse(new Date()));
|
|
|
this.$set(this.form, "fBusinessType", "5");
|
caojunjie