|
|
@@ -136,7 +136,7 @@
|
|
|
<span style="margin-top:5px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>
|
|
|
</div>
|
|
|
<el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"&&deptBudgetList.flag!="是"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
|
|
|
- <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
|
|
|
+ <el-table-column width="150" v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select v-model="scope.row.warehouseName" filterable placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
|
|
|
<el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
|
|
|
@@ -152,13 +152,13 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
|
|
|
+ <el-table-column width="200" v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker @change="((value)=>{selectware(value, scope.$index)})" v-model="scope.row.receiptDocDate" type="date" placeholder="请选择日期"
|
|
|
value-format="yyyy-MM-dd" ></el-date-picker>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="日期">
|
|
|
+ <el-table-column width="200" v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="日期">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker @change="((value)=>{receiptDocDatechange(value, scope.$index)})" v-model="scope.row.receiptDocDate" type="date" placeholder="请选择日期"
|
|
|
value-format="yyyy-MM-dd" ></el-date-picker>
|
|
|
@@ -167,27 +167,27 @@
|
|
|
<el-table-column v-if='deptBudgetList.purpose=="库点费用"||deptBudgetList.purpose=="合同费用"' prop="date" label="货源">
|
|
|
<template slot-scope="scope">
|
|
|
<!-- {{scope.row.goodsourcelist}} -->
|
|
|
- <el-select v-if="scope.row.orderId &&confirmFlag==0" v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
|
|
|
+ <el-select class="goodsource" v-if="scope.row.orderId &&confirmFlag==0" v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
|
|
|
<el-option v-for="item in goodsourcelist[scope.$index]" :key="item.id" :label="item.goodsSource" :value="item.id"
|
|
|
style="color: #8890b1" />
|
|
|
</el-select>
|
|
|
- <el-select v-else v-model="scope.row.goodsSource" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
|
|
|
+ <el-select class="goodsource" v-else v-model="scope.row.goodsSource" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
|
|
|
<el-option v-for="item in goodsourcelist[scope.$index]" :key="item.id" :label="item.goodsSource" :value="item.id"
|
|
|
style="color: #8890b1" />
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="货名">
|
|
|
+ <el-table-column width="150" v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="货名">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.goodsName?scope.row.goodsName:'自动获取'}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="inWarehouseWeight" label="入库量（吨）">
|
|
|
+ <el-table-column width="150" prop="inWarehouseWeight" label="入库量（吨）">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.inWarehouseWeight?scope.row.inWarehouseWeight:'自动获取'}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="date" label="分配金额（元）">
|
|
|
+ <el-table-column width="200" prop="date" label="分配金额（元）">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input placeholder="输入费用名称，1-15个字" class="input_css" v-model="scope.row.distributionMoney"></el-input>
|
|
|
</template>
|
|
|
@@ -676,7 +676,7 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'&&this.deptBudgetList.flag!='是'){
|
|
|
+ if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'&&this.mode!='暂不分配'||this.deptBudgetList.purpose=='库点费用'&&this.deptBudgetList.flag!='是'&&this.mode!='暂不分配'){
|
|
|
for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
|
|
|
// if(!this.feeDetailsDistributions[i].goodsSource){
|
|
|
// this.$message({
|
|
|
@@ -1095,4 +1095,7 @@
|
|
|
width: 110px;
|
|
|
height:140px;
|
|
|
}
|
|
|
+.goodsource{
|
|
|
+ width:100%;
|
|
|
+}
|
|
|
</style>
|
