|
|
@@ -328,22 +328,39 @@
|
|
|
<div slot="title" class="header-title">
|
|
|
<span v-show="dialogTitle" class="title-name">{{ dialogTitle }}</span>
|
|
|
</div>
|
|
|
- <el-form ref="form" :model="form" label-width="120px">
|
|
|
- <el-form-item label="合同编号">
|
|
|
- <el-input disabled v-model="form.accumulatedPrepayment"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ <el-form ref="form" :model="form" label-width="140px">
|
|
|
<el-form-item label="折干前重量（吨）">
|
|
|
<el-input v-model="fieldrationsList.beforeWeight"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="折干前成本(元/吨)">
|
|
|
<el-input disabled placeholder="自动计算，不可编辑" v-model="fieldrationsList.beforeCost"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="折干前仓位">
|
|
|
+ <el-select @focus="warehousefocus" @change="warehousechange" v-model="fieldrationsList.beforeBinNo" filterable placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in options"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.binNumber"
|
|
|
+ :value="item.binNumber">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="折干后重量（吨）">
|
|
|
<el-input @input="afterWeightchange" v-model="fieldrationsList.afterWeight"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="折干后成本(元/吨)">
|
|
|
<el-input disabled placeholder="自动计算，不可编辑" v-model="fieldrationsList.afterCost"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="折干后仓位">
|
|
|
+ <el-select @focus="warehousefocus1" @change="warehousechange1" v-model="fieldrationsList.afterBinNo" filterable placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in options1"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.binNumber"
|
|
|
+ :value="item.binNumber">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -414,7 +431,8 @@
|
|
|
editwarehousingorder,
|
|
|
getExpense,
|
|
|
workflowhandle,
|
|
|
- setExpense
|
|
|
+ getposition,
|
|
|
+ dryout
|
|
|
} from '@/model/warehouse/index'
|
|
|
import {getpayeeinfo,getbuypayeeinfo} from '@/model/profitable/index'
|
|
|
import {
|
|
|
@@ -451,6 +469,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
dialogApproveFormVisible: false,
|
|
|
dataList:[],
|
|
|
payeeinfo:{},
|
|
|
+ options:[],
|
|
|
// 船舶类型
|
|
|
monetaryKey: null,
|
|
|
form:{
|
|
|
@@ -539,6 +558,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
multipleSelection:[],
|
|
|
size: 10,
|
|
|
spanArr: [],
|
|
|
+ options1:[],
|
|
|
id:'',
|
|
|
customerInfo:{},
|
|
|
appendixIdss:[],
|
|
|
@@ -578,6 +598,36 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
+ warehousefocus(){
|
|
|
+ getposition({baseId:this.fieldrationsList.baseId,flag:1}).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ // row.weightedit=false
|
|
|
+ this.options=response
|
|
|
+ })
|
|
|
+ },
|
|
|
+ warehousechange(e){
|
|
|
+ for (let i = 0; i < this.options.length; i++) {
|
|
|
+ if(this.options[i].binNumber==e){
|
|
|
+ this.fieldrationsList.beforePositionId=this.options[i].id
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ },
|
|
|
+ warehousefocus1(){
|
|
|
+ getposition({baseId:this.fieldrationsList.baseId}).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ // row.weightedit=false
|
|
|
+ this.options1=response
|
|
|
+ })
|
|
|
+ },
|
|
|
+ warehousechange1(e){
|
|
|
+ for (let i = 0; i < this.options1.length; i++) {
|
|
|
+ if(this.options1[i].binNumber==e){
|
|
|
+ this.fieldrationsList.afterPositionId=this.options1[i].id
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ },
|
|
|
fujian(row) {
|
|
|
this.id = row.id
|
|
|
this.accessoryTFs = true
|
|
|
@@ -632,8 +682,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
});
|
|
|
var that =this
|
|
|
setTimeout(()=>{
|
|
|
- console.log(that.$refs[`multipleTable${index}`][0])
|
|
|
- that.$refs[`multipleTable${index}`][0].toggleRowSelection(val[i],false);
|
|
|
+ that.$refs[`multipleTable${index}`][0].toggleRowSelection(val[i],false);
|
|
|
},1000)
|
|
|
}else{
|
|
|
val[i].select=true
|
|
|
@@ -825,7 +874,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
// console.log(currectData)
|
|
|
var arr1=currectData
|
|
|
for (let i = 0; i < arr1.length; i++) {
|
|
|
- if(arr1[i].goodsName.indexOf('潮粮')){
|
|
|
+ if(arr1[i].goodsName.indexOf('潮粮')==-1){
|
|
|
this.$message({
|
|
|
message: '只有潮粮可以折干！',
|
|
|
type: 'warning'
|
|
|
@@ -836,6 +885,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
}
|
|
|
// this.currectdata=item
|
|
|
this.currectdata=arr1
|
|
|
+ this.fieldrationsList.id=this.currectdata[0].id
|
|
|
+ this.fieldrationsList.baseId=this.currectdata[0].baseId
|
|
|
this.fieldrationsList.beforeWeight=this.currectdata[0].surplusWeight
|
|
|
this.fieldrationsList.beforeCost=this.currectdata[0].avgCost
|
|
|
this.fieldrationsshow=true
|
|
|
@@ -1077,9 +1128,16 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
+ if(!this.fieldrationsList.beforeBinNo){
|
|
|
+ this.$message({
|
|
|
+ message: '折干前仓位不能为空',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ return
|
|
|
+ }
|
|
|
if(!this.fieldrationsList.afterWeight){
|
|
|
this.$message({
|
|
|
- message: '折干前重量不能为空',
|
|
|
+ message: '折干后重量不能为空',
|
|
|
type: 'warning'
|
|
|
});
|
|
|
return
|
|
|
@@ -1091,23 +1149,30 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
- this.$confirm('确定提交分配金额?', '提示', {
|
|
|
+ if(!this.fieldrationsList.afterBinNo){
|
|
|
+ this.$message({
|
|
|
+ message: '折干后仓位不能为空',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.$confirm('确定提交折干?', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- paymoney({flag:3,money:this.form.distributionIng,warehousingOrderList:arr2,contractId:this.form.contractId}).toPromise()
|
|
|
+ dryout(this.fieldrationsList).toPromise()
|
|
|
.then((response) => {
|
|
|
this.$message({
|
|
|
- message: '分配成功',
|
|
|
+ message: '折干成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
this.form.distributionIng=''
|
|
|
- this.marginshow=false
|
|
|
+ this.fieldrationsshow=false
|
|
|
this.getList()
|
|
|
}).catch(() => {
|
|
|
this.$message({
|
|
|
- message: '分配失败',
|
|
|
+ message: '折干失败',
|
|
|
type: 'warning'
|
|
|
});
|
|
|
})
|
|
|
@@ -1634,7 +1699,7 @@ multiFilter(array, filters) {
|
|
|
width: 92%;
|
|
|
}
|
|
|
.el-select {
|
|
|
- width: 30%;
|
|
|
+ width: 100%;
|
|
|
margin-right: 10px;
|
|
|
}
|
|
|
.col1 {
|
