|
|
@@ -294,10 +294,10 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
- v-if="scope.row.fBillstatus > 3 && scope.row.fBillstatus < 6"
|
|
|
+ v-if="scope.row.fBillstatus === 4 || scope.row.fBillstatus === 5"
|
|
|
@click="handleUpdate(scope.row, false)"
|
|
|
v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
|
|
|
- >查看审批
|
|
|
+ >审批进度
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
@@ -356,6 +356,7 @@
|
|
|
remote
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
+ @change="changefCorpid(form)"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
placeholder="请选择新货权方"
|
|
|
>
|
|
|
@@ -1019,7 +1020,7 @@
|
|
|
v-model="scope.row.fQty"
|
|
|
placeholder="数量"
|
|
|
:disabled="browseStatus"
|
|
|
- @change="changeEstmateAmt(scope.row)"
|
|
|
+ @change="changeContractAmt(scope.row)"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -2112,9 +2113,9 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 撤回入账
|
|
|
+ // 撤回货转
|
|
|
withdrawClick() {
|
|
|
- // 撤回入库
|
|
|
+ // 撤回货转
|
|
|
let formData = new window.FormData()
|
|
|
let withdrawList = JSON.parse(JSON.stringify(this.dataWithdrawList))
|
|
|
formData.append('warehousebillsitems', JSON.stringify(withdrawList))
|
|
|
@@ -2408,12 +2409,19 @@
|
|
|
}else if (row.fFeeunitid === 5) {
|
|
|
this.$set(row, 'fQty', fixed)
|
|
|
}
|
|
|
-
|
|
|
- console.log(fQty+',,,' + fGrossweight+',,,' + fNetweight+',,,' + volumn+',,,' + fixed)
|
|
|
if (row.fUnitprice) {
|
|
|
this.$set(row, 'fAmount', parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))
|
|
|
}
|
|
|
},
|
|
|
+ // 选择新货权方自动带出结算方式
|
|
|
+ changefCorpid(row) {
|
|
|
+ this.$set(row, "fSbu", row.fCorpid);
|
|
|
+ for (let corp in this.fMblnoOptions) {
|
|
|
+ if (row.fTocorpid === this.fMblnoOptions[corp].fId) {
|
|
|
+ this.$set(this.form, "fStltypeid", this.fMblnoOptions[corp].fStltypeid + '');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
/* 远程模糊查询用户 */
|
|
|
corpsRemoteMethod(name) {
|
|
|
if (name == null || name === '') {
|
阿伏兔