|
|
@@ -255,6 +255,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
+ v-if="scope.row.fBillstatus === '6'"
|
|
|
@click="handleUpdate(scope.row, true)"
|
|
|
v-hasPermi="['warehouseBusiness:warehousebills:edit']"
|
|
|
>查看
|
|
|
@@ -263,6 +264,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
+ v-if="scope.row.fBillstatus !== '6'"
|
|
|
@click="handleUpdate(scope.row, false)"
|
|
|
v-hasPermi="['warehouseBusiness:warehousebills:edit']"
|
|
|
>修改
|
|
|
@@ -271,8 +273,8 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
- v-if="scope.row.fBillstatus !== '6'"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
+ v-if="scope.row.fBillstatus !== '6'"
|
|
|
v-hasPermi="['warehouseBusiness:warehousebills:remove']"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
@@ -302,7 +304,7 @@
|
|
|
v-model="form.fCorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
placeholder="请选择货权方"
|
|
|
@@ -322,7 +324,7 @@
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -338,7 +340,7 @@
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
<el-input
|
|
|
v-model="form.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
placeholder="手工输入"
|
|
|
/>
|
|
|
@@ -352,7 +354,7 @@
|
|
|
v-model="form.fBsdate"
|
|
|
style="width: 250px"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
@change="changefBsdate"
|
|
|
value-format="timestamp"
|
|
|
placeholder="业务日期"
|
|
|
@@ -367,7 +369,7 @@
|
|
|
v-model="form.fStorekeeper"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
:remote-method="userRemoteMethod"
|
|
|
placeholder="请选择仓管员"
|
|
|
@@ -386,7 +388,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
remote
|
|
|
style="width: 250px"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
@@ -420,7 +422,7 @@
|
|
|
v-model="form.fIfdamage"
|
|
|
placeholder="请选择是否破损"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -438,7 +440,7 @@
|
|
|
v-model="form.fIfweigh"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -459,7 +461,7 @@
|
|
|
v-model="form.fIfpledge"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -476,7 +478,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fBankcorpid"
|
|
|
laceholder="质押银行"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -487,7 +489,7 @@
|
|
|
v-model="form.fFeetunit"
|
|
|
placeholder="请选择计费单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -506,7 +508,7 @@
|
|
|
style="width: 100%"
|
|
|
v-model="form.remark"
|
|
|
type="textarea"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
placeholder="请输入内容"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -525,7 +527,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fContacts"
|
|
|
style="width: 250px"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
placeholder="仓库联系人"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -534,7 +536,7 @@
|
|
|
<el-form-item label="仓库电话" prop="fTel">
|
|
|
<el-input
|
|
|
v-model="form.fTel"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
style="width: 250px"
|
|
|
placeholder="请输仓库入电话"
|
|
|
/>
|
|
|
@@ -545,7 +547,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fVslvoy"
|
|
|
style="width: 250px"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
placeholder="船名航次"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -558,7 +560,7 @@
|
|
|
v-model="form.fEta"
|
|
|
style="width: 250px"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
value-format="timestamp"
|
|
|
placeholder="到港日期"
|
|
|
>
|
|
|
@@ -570,7 +572,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fCustomno"
|
|
|
style="width: 250px"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
laceholder="报关单号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -582,7 +584,7 @@
|
|
|
v-model="form.fSbu"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
:remote-method="fSbuRemoteMethod"
|
|
|
style="width: 250px"
|
|
|
placeholder="请选择经营单位"
|
|
|
@@ -613,7 +615,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fTrademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
clearable
|
|
|
style="width: 250px"
|
|
|
>
|
|
|
@@ -675,7 +677,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fMarks"
|
|
|
style="width: 250px"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="creditStatus"
|
|
|
placeholder="唛头"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -689,6 +691,9 @@
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addRelevant()"
|
|
|
>添加
|
|
|
</el-button>
|
|
|
+ <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
|
|
|
+ >入库确认
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="dataList"
|
|
|
@@ -697,11 +702,17 @@
|
|
|
border
|
|
|
stripe
|
|
|
:summary-method="getSummaries"
|
|
|
- @selection-change="Selectinventory"
|
|
|
+ @selection-change="dataListChange"
|
|
|
show-summary
|
|
|
>
|
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="序号" type="index" width="80">
|
|
|
+ <el-table-column
|
|
|
+ type="selection"
|
|
|
+ width="55">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="序号"
|
|
|
+ type="index"
|
|
|
+ width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="fBsdate"
|
|
|
@@ -715,7 +726,7 @@
|
|
|
v-model="scope.row.fBsdate"
|
|
|
style="width: 150px"
|
|
|
type="date"
|
|
|
- disabled
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
value-format="timestamp"
|
|
|
placeholder="入库日期"
|
|
|
>
|
|
|
@@ -732,9 +743,9 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
v-model="scope.row.fGoodsid"
|
|
|
- filterable
|
|
|
- :disabled="browseStatus"
|
|
|
remote
|
|
|
+ filterable
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
:remote-method="goodsRemoteMethod"
|
|
|
placeholder="请选择品名"
|
|
|
>
|
|
|
@@ -757,9 +768,9 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fCntrtype"
|
|
|
placeholder="箱型"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -773,10 +784,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fCntqty"
|
|
|
placeholder="箱量"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -790,10 +801,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fPlangrossweight"
|
|
|
placeholder="计划毛重"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -807,9 +818,9 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fPlannetweight"
|
|
|
- :disabled="browseStatus"
|
|
|
placeholder="计划净重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
@@ -825,9 +836,9 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fPlanvolumn"
|
|
|
placeholder="尺码"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -841,10 +852,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fPlanqty"
|
|
|
placeholder="件数"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -858,10 +869,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fGrossweight"
|
|
|
placeholder="入库毛重"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -875,10 +886,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fNetweight"
|
|
|
placeholder="入库净重"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -892,10 +903,27 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fQty"
|
|
|
placeholder="入库件数"
|
|
|
- :disabled="browseStatus"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fVolumn"
|
|
|
+ header-align="center"
|
|
|
+ width="180px"
|
|
|
+ align="center"
|
|
|
+ label="入库尺码"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
+ v-model="scope.row.fVolumn"
|
|
|
+ placeholder="入库尺码"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -909,10 +937,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fPackagespecs"
|
|
|
placeholder="包装规格"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -929,8 +957,8 @@
|
|
|
v-model="scope.row.fWarehouselocid"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="browseStatus"
|
|
|
:remote-method="kqhouseRemoteMethod"
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
placeholder="请选择库区"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -953,8 +981,8 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.fCntrno"
|
|
|
placeholder="箱号"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -967,10 +995,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fGoodsval"
|
|
|
placeholder="货值"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -985,9 +1013,9 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.fTruckno"
|
|
|
placeholder="车号"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1001,9 +1029,9 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
v-model="scope.row.remark"
|
|
|
placeholder="备注"
|
|
|
- :disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1016,6 +1044,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
+ :disabled="scope.row.fBillstatus === '7'"
|
|
|
@click.native.prevent="deleteRow(scope.$index, dataList)"
|
|
|
size="small"
|
|
|
>移除</el-button
|
|
|
@@ -1216,11 +1245,11 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fQty"
|
|
|
placeholder="数量"
|
|
|
:disabled="browseStatus"
|
|
|
- @change="changeEstmateAmt(scope.row)"
|
|
|
+ @change="changeContractAmt(scope.row)"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1250,15 +1279,6 @@
|
|
|
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="fCurrency"
|
|
|
@@ -1285,6 +1305,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
+ oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.'))}"
|
|
|
v-model="scope.row.fExrate"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="汇率"
|
|
|
@@ -1333,6 +1354,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="small">审核费用</el-button>
|
|
|
<el-button
|
|
|
+ :disabled="browseStatus"
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
|
|
|
size="small"
|
|
|
>移除</el-button
|
|
|
@@ -1476,15 +1498,6 @@
|
|
|
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="fCurrency"
|
|
|
@@ -1511,6 +1524,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
+ oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.'))}"
|
|
|
v-model="scope.row.fExrate"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="汇率"
|
|
|
@@ -1559,6 +1573,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="small">审核费用</el-button>
|
|
|
<el-button
|
|
|
+ :disabled="browseStatus"
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
|
|
|
size="small"
|
|
|
>移除</el-button
|
|
|
@@ -1581,15 +1596,8 @@
|
|
|
@click="showEditDialog_s"
|
|
|
>入库单
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- type="danger"
|
|
|
- size="mini"
|
|
|
- prop="打印"
|
|
|
- @click="showEditDialog_sss"
|
|
|
- >作业单
|
|
|
- </el-button>
|
|
|
- <el-button type="primary" @click="submitForm(2)">暂 存</el-button>
|
|
|
- <el-button type="primary" @click="submitForm(6)">提 交</el-button>
|
|
|
+ <el-button v-if="!browseStatus" type="primary" @click="submitForm(2)">暂 存</el-button>
|
|
|
+ <el-button v-if="!browseStatus" type="primary" @click="submitForm(6)">费用提交</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
<el-dialog
|
|
|
@@ -1895,10 +1903,11 @@
|
|
|
<script>
|
|
|
import print from "print-js";
|
|
|
import {
|
|
|
- listWarehousebills,
|
|
|
+ addWhgenleg,
|
|
|
getWarehousebills,
|
|
|
delWarehousebills,
|
|
|
addWarehousebills,
|
|
|
+ listWarehousebills,
|
|
|
updateWarehousebills,
|
|
|
exportWarehousebills,
|
|
|
} from "@/api/warehouseBusiness/warehouseInStock";
|
|
|
@@ -1925,20 +1934,15 @@ export default {
|
|
|
// 修改查看状态
|
|
|
browseStatus: false,
|
|
|
detailsHidden: false,
|
|
|
- fTruckno: '',
|
|
|
- fBsdate: '',
|
|
|
- fCntrtype: '',
|
|
|
- fGoodsids: '',
|
|
|
- fPlangrossweight: "",
|
|
|
- fPlannetweight: "",
|
|
|
- fPlanvolumn: "",
|
|
|
- fPlanqty: "",
|
|
|
- fFeeUnitid: "",
|
|
|
- fFeeUnitids: "",
|
|
|
- fGrossweight: "",
|
|
|
- fCntqty: "",
|
|
|
- fNetweight: "",
|
|
|
- fQty: "",
|
|
|
+ fPlannetweight: null,
|
|
|
+ fPlanvolumn: null,
|
|
|
+ fPlanqty: null,
|
|
|
+ fFeeUnitid: null,
|
|
|
+ fFeeUnitids: null,
|
|
|
+ fGrossweight: null,
|
|
|
+ fCntqty: null,
|
|
|
+ fNetweight: null,
|
|
|
+ fQty: null,
|
|
|
fPlangrossweight: 0,
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
@@ -1951,6 +1955,7 @@ export default {
|
|
|
deptId: null,
|
|
|
},
|
|
|
queryForm: {},
|
|
|
+ creditStatus: false,
|
|
|
// 添加用户对话框
|
|
|
editDialogVisible_s: false,
|
|
|
editDialogVisible_ss: false,
|
|
|
@@ -1979,6 +1984,8 @@ export default {
|
|
|
// 货权方(客户数据)
|
|
|
// 客户名称
|
|
|
KHblnoOptions: [],
|
|
|
+ // 库存明细入账数组
|
|
|
+ dataListSelection: [],
|
|
|
fSbuOptions: [],
|
|
|
// 操作员
|
|
|
userOptions: [],
|
|
|
@@ -2180,6 +2187,7 @@ export default {
|
|
|
fPlanqty: 0,
|
|
|
fGrossweight: 0,
|
|
|
fQty: 0,
|
|
|
+ fBillstatus: null,
|
|
|
fPackagespecs: null,
|
|
|
fWarehouselocid: null,
|
|
|
fBoxno: null,
|
|
|
@@ -2205,12 +2213,12 @@ export default {
|
|
|
fCorpid: null,
|
|
|
fFeeid: null,
|
|
|
fFeeUnitid: null,
|
|
|
- fQty: null,
|
|
|
- fUnitprice: null,
|
|
|
- fAmount: null,
|
|
|
- fCurrency: null,
|
|
|
- fCxrate: null,
|
|
|
- fRate: null,
|
|
|
+ fQty: 0,
|
|
|
+ fUnitprice: 0,
|
|
|
+ fAmount: 0,
|
|
|
+ fCurrency: 0,
|
|
|
+ fCxrate: 0,
|
|
|
+ fRate: 0,
|
|
|
remarks: null,
|
|
|
});
|
|
|
},
|
|
|
@@ -2219,12 +2227,12 @@ export default {
|
|
|
fCorpid: null,
|
|
|
fFeeid: null,
|
|
|
fFeeUnitid: null,
|
|
|
- fQty: null,
|
|
|
- fUnitprice: null,
|
|
|
- fAmount: null,
|
|
|
- fCurrency: null,
|
|
|
- fCxrate: null,
|
|
|
- fRate: null,
|
|
|
+ fQty: 0,
|
|
|
+ fUnitprice: 0,
|
|
|
+ fAmount: 0,
|
|
|
+ fCurrency: 0,
|
|
|
+ fCxrate: 0,
|
|
|
+ fRate: 0,
|
|
|
remarks: null,
|
|
|
});
|
|
|
},
|
|
|
@@ -2248,7 +2256,6 @@ export default {
|
|
|
this.loading = true;
|
|
|
listWarehousebills(this.queryParams).then((response) => {
|
|
|
this.warehousebillsList = response.rows;
|
|
|
- console.log(response.rows);
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
@@ -2395,7 +2402,6 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
- console.log(status);
|
|
|
this.browseStatus = status;
|
|
|
this.reset();
|
|
|
const fId = row.fId || this.ids;
|
|
|
@@ -2407,31 +2413,31 @@ export default {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
this.KHblnoOptions = response.data.corps;
|
|
|
this.fSbuOptions = response.data.corps;
|
|
|
- }
|
|
|
- if (response.data.feesList) {
|
|
|
- this.fWbuOptions = response.data.feesList;
|
|
|
- }
|
|
|
- if (response.data.warehouse) {
|
|
|
- this.warehouseOptions = response.data.warehouse;
|
|
|
- }
|
|
|
- if (response.data.warehouseBillsItem) {
|
|
|
- this.dataList = response.data.warehouseBillsItem;
|
|
|
- }
|
|
|
- if (response.data.enclosures) {
|
|
|
- this.relevantAttachments = response.data.enclosures;
|
|
|
- }
|
|
|
+ }
|
|
|
+ if(response.data.feesList){
|
|
|
+ this.fWbuOptions = response.data.feesList;
|
|
|
+ }
|
|
|
+ if(response.data.warehouse){
|
|
|
+ this.warehouseOptions = response.data.warehouse;
|
|
|
+ }
|
|
|
+ if(response.data.warehouseBillsItem) {
|
|
|
+ this.dataList = response.data.warehouseBillsItem;
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ if (!this.creditStatus && this.dataList[list].fBillstatus === '7') {
|
|
|
+ this.creditStatus = true
|
|
|
+ }
|
|
|
+ this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(response.data.enclosures) {
|
|
|
+ this.relevantAttachments = response.data.enclosures;
|
|
|
+ }
|
|
|
this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
|
|
|
this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
this.$set(this.form, "createTime", Date.parse(this.form.createTime));
|
|
|
this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
|
|
|
|
|
|
- for (let list in this.dataList) {
|
|
|
- this.$set(
|
|
|
- this.dataList[list],
|
|
|
- "fBsdate",
|
|
|
- Date.parse(this.dataList[list].fBsdate)
|
|
|
- );
|
|
|
- }
|
|
|
+
|
|
|
this.goodsOptions = response.data.goodsList;
|
|
|
this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
@@ -2456,9 +2462,13 @@ export default {
|
|
|
this.title = "修改仓入库)";
|
|
|
});
|
|
|
},
|
|
|
+ // 库存明细多选框结果
|
|
|
+ dataListChange (row) {
|
|
|
+ console.log(JSON.stringify(row))
|
|
|
+ this.dataListSelection = row
|
|
|
+ },
|
|
|
// 合计
|
|
|
getSummaries(param) {
|
|
|
- console.log(param);
|
|
|
const { columns, data } = param;
|
|
|
const sums = [];
|
|
|
var values = [];
|
|
|
@@ -2576,7 +2586,7 @@ export default {
|
|
|
if (row.fQty) {
|
|
|
fQty = row.fQty;
|
|
|
}
|
|
|
- this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
|
|
|
+ this.$set(row, "fAmount", parseFloat(Number(fUnitprice) * Number(fQty)).toFixed(2))
|
|
|
},
|
|
|
changefBsdate(row) {
|
|
|
if (this.dataList.length > 0) {
|
|
|
@@ -2587,8 +2597,6 @@ export default {
|
|
|
},
|
|
|
// 变更计价单位
|
|
|
changeFeeUnit(row) {
|
|
|
- console.log(this.fCntqty);
|
|
|
- console.log(row);
|
|
|
if (!row.fFeeUnitid) {
|
|
|
return false;
|
|
|
}
|
|
|
@@ -2598,32 +2606,46 @@ export default {
|
|
|
this.$set(row, "fQty", this.fGrossweight);
|
|
|
}
|
|
|
if (row.fUnitprice) {
|
|
|
- this.$set(
|
|
|
- row,
|
|
|
- "fAmount",
|
|
|
- parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
|
|
|
- );
|
|
|
+ this.$set(row, "fAmount", parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
- changefBsdate(row) {
|
|
|
- if (this.dataList.length > 0) {
|
|
|
- for (var i = 0; i < this.dataList.length; i++) {
|
|
|
- this.$set(this.dataList[i], "fBsdate", row);
|
|
|
+ // 入账
|
|
|
+ creditClick () {
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form))
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection))
|
|
|
+ formData.append("whgenleg", JSON.stringify(this.relevantAttachments))
|
|
|
+ addWhgenleg(formData).then((response) => {
|
|
|
+ this.creditStatus = true
|
|
|
+ this.msgSuccess("入账成功");
|
|
|
+ for (let li in this.dataListSelection) {
|
|
|
+ for (let i in this.dataList) {
|
|
|
+ let fQty = this.dataList[i].fQty === this.dataListSelection[li].fQty;
|
|
|
+ let fBsdate = this.dataList[i].fBsdate === this.dataListSelection[li].fBsdate;
|
|
|
+ let fGoodsid = this.dataList[i].fGoodsid === this.dataListSelection[li].fGoodsid;
|
|
|
+ let fcntrtype = this.dataList[i].fcntrtype === this.dataListSelection[li].fcntrtype;
|
|
|
+ let fNetweight = this.dataList[i].fNetweight === this.dataListSelection[li].fNetweight;
|
|
|
+ let fGrossweight = this.dataList[i].fGrossweight === this.dataListSelection[li].fGrossweight;
|
|
|
+ if (fBsdate && fGoodsid && fcntrtype && fGrossweight && fNetweight && fQty) {
|
|
|
+ this.$set(this.dataList[i], 'fBillstatus', '7')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
- }
|
|
|
+ })
|
|
|
+ console.log('有东西')
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm(status) {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (status === 2) {
|
|
|
- console.log("@@");
|
|
|
- console.log(this.form);
|
|
|
- console.log(this.dataList);
|
|
|
- console.log(this.warehouseCrList);
|
|
|
- console.log(this.warehouseDrList);
|
|
|
if (valid) {
|
|
|
- this.form.fBillstatus = status;
|
|
|
+ if (!this.form.fBillstatus) {
|
|
|
+ this.form.fBillstatus = status;
|
|
|
+
|
|
|
this.form.fNetweight = this.fNetweight;
|
|
|
this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
this.form.fPlannetweight = this.fPlannetweight;
|
|
|
@@ -2761,6 +2783,47 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+ if (valid) {
|
|
|
+ this.form.fBillstatus = status;
|
|
|
+ this.form.fNetweight = this.fNetweight;
|
|
|
+ this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
+ this.form.fPlannetweight = this.fPlannetweight;
|
|
|
+ this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
+ this.form.fPlanqty = this.fPlanqty;
|
|
|
+ this.form.fGrossweight = this.fGrossweight;
|
|
|
+ this.form.fQty = this.fQty;
|
|
|
+ let formData = new window.FormData();
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
+ // 库存明细
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsitems",
|
|
|
+ JSON.stringify(this.dataList)
|
|
|
+ );
|
|
|
+ // 附件数据
|
|
|
+ formData.append(
|
|
|
+ "tWhgenleg",
|
|
|
+ JSON.stringify(this.relevantAttachments)
|
|
|
+ );
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+ // 收款
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ addWarehousebills(formData).then((response) => {
|
|
|
+ this.msgSuccess("提交成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
});
|
|
|
},
|
|
|
/** 删除按钮操作 */
|
tong