|
@@ -14,12 +14,12 @@
|
|
<el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName" style="color: #8890b1" />
|
|
<el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName" style="color: #8890b1" />
|
|
</el-select>
|
|
</el-select>
|
|
<div style='width:50%;margin-right:10px;display: flex;'>
|
|
<div style='width:50%;margin-right:10px;display: flex;'>
|
|
- <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange"
|
|
|
|
|
|
+ <!-- <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange"
|
|
style="margin: 0 10px">
|
|
style="margin: 0 10px">
|
|
<el-option key="全部货名" label="全部货名" value="0" style="color: #8890b1" />
|
|
<el-option key="全部货名" label="全部货名" value="0" style="color: #8890b1" />
|
|
<el-option v-for="(item,index) in goodsList" :key="item.id" :label="item.goodsName"
|
|
<el-option v-for="(item,index) in goodsList" :key="item.id" :label="item.goodsName"
|
|
:value="(index+1)" style="color: #8890b1" />
|
|
:value="(index+1)" style="color: #8890b1" />
|
|
- </el-select>
|
|
|
|
|
|
+ </el-select> -->
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<template slot="right">
|
|
<template slot="right">
|
|
@@ -48,9 +48,9 @@
|
|
`warehouseManagement.warehousingOrder.View`
|
|
`warehouseManagement.warehousingOrder.View`
|
|
">盘亏
|
|
">盘亏
|
|
</ws-button>
|
|
</ws-button>
|
|
- <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
|
|
|
|
|
|
+ <!-- <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
|
|
`warehouseManagement.warehousingOrder.View`">待审核
|
|
`warehouseManagement.warehousingOrder.View`">待审核
|
|
- </ws-button>
|
|
|
|
|
|
+ </ws-button> -->
|
|
</el-col>
|
|
</el-col>
|
|
<el-col style='text-align:right;' :span="12">
|
|
<el-col style='text-align:right;' :span="12">
|
|
|
|
|
|
@@ -135,13 +135,13 @@
|
|
<el-form-item label="实际剩余(吨)">
|
|
<el-form-item label="实际剩余(吨)">
|
|
<el-input :disabled='disabled' v-model="form.num"></el-input>
|
|
<el-input :disabled='disabled' v-model="form.num"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="仓位">
|
|
|
|
|
|
+ <!-- <el-form-item label="仓位">
|
|
<el-select :disabled='disabled' @focus="warehousefocus" @change="warehousechange" v-model="form.binNo"
|
|
<el-select :disabled='disabled' @focus="warehousefocus" @change="warehousechange" v-model="form.binNo"
|
|
filterable placeholder="请选择">
|
|
filterable placeholder="请选择">
|
|
<el-option v-for="item in options" :key="item.id" :label="item.binNumber" :value="item.binNumber">
|
|
<el-option v-for="item in options" :key="item.id" :label="item.binNumber" :value="item.binNumber">
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
- </el-form-item>
|
|
|
|
|
|
+ </el-form-item> -->
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</div>
|
|
<span v-if='title=="审核"' slot="footer" class="dialog-footer">
|
|
<span v-if='title=="审核"' slot="footer" class="dialog-footer">
|
|
@@ -553,7 +553,7 @@
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if(this.title=='盘盈'){
|
|
if(this.title=='盘盈'){
|
|
- this.form.plValue=this.form.num-this.form.surplusWeight
|
|
|
|
|
|
+ this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
|
|
this.form.flag=0
|
|
this.form.flag=0
|
|
if(this.form.num<this.form.surplusWeight){
|
|
if(this.form.num<this.form.surplusWeight){
|
|
this.$notify.warning({
|
|
this.$notify.warning({
|
|
@@ -565,7 +565,7 @@
|
|
title='确定提交盘盈数据?'
|
|
title='确定提交盘盈数据?'
|
|
}
|
|
}
|
|
if(this.title=='盘亏'){
|
|
if(this.title=='盘亏'){
|
|
- this.form.plValue=this.form.num-this.form.surplusWeight
|
|
|
|
|
|
+ this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
|
|
this.form.flag=1
|
|
this.form.flag=1
|
|
if(this.form.num>this.form.surplusWeight){
|
|
if(this.form.num>this.form.surplusWeight){
|
|
this.$notify.warning({
|
|
this.$notify.warning({
|