测试问题修改
This commit is contained in:
parent
857f5201a8
commit
ed84a6638e
|
|
@ -129,7 +129,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col> -->
|
</el-col> -->
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="商品简介22" prop="description">
|
<el-form-item label="商品简介" prop="description">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
:rows="3"
|
:rows="3"
|
||||||
|
|
|
||||||
|
|
@ -474,6 +474,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -418,13 +418,16 @@ export default {
|
||||||
this.contractMaterialList.splice(index,1)
|
this.contractMaterialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
if(this.baseInfo.areaId!=undefined){
|
if(this.baseInfo.areaId!=undefined){
|
||||||
this.openDialog=true
|
this.openDialog=true
|
||||||
this.resetQuery()
|
this.resetQuery()
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
this.$refs.multipleTable1.clearSelection()
|
this.$refs.multipleTable1.clearSelection()
|
||||||
},300)
|
},300)
|
||||||
}else{
|
}else{
|
||||||
|
|
|
||||||
|
|
@ -487,6 +487,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -97,12 +97,12 @@
|
||||||
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
|
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="邀请供应商(家)" align="center" prop="inquirySupplierNum" :show-overflow-tooltip="true" />
|
<el-table-column label="邀请供应商(家)" align="center" prop="inquirySupplierNum" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="已报价供应商(家)" align="center" prop="supplierNum" :show-overflow-tooltip="true" />
|
<el-table-column label="已报价供应商(家)" align="center" prop="supplierNum" :show-overflow-tooltip="true" />
|
||||||
<!-- <el-table-column label="中选状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
|
<el-table-column label="中选状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.status==3">已中选</span>
|
<span v-if="scope.row.status==2">已中选</span>
|
||||||
<span v-if="scope.row.status!=3">未中选</span>
|
<span v-if="scope.row.status!=2">未中选</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column>
|
||||||
<el-table-column label="中选供应商" align="center" prop="" :show-overflow-tooltip="true" />
|
<el-table-column label="中选供应商" align="center" prop="" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="中选金额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
|
<el-table-column label="中选金额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
|
||||||
<!-- <template slot-scope="scope">
|
<!-- <template slot-scope="scope">
|
||||||
|
|
|
||||||
|
|
@ -774,12 +774,14 @@ export default {
|
||||||
obj.detailDate = this.dateRangeList[i].applyDate
|
obj.detailDate = this.dateRangeList[i].applyDate
|
||||||
obj.dishesId=dishItem.dishesId;
|
obj.dishesId=dishItem.dishesId;
|
||||||
obj.dishesName=dishItem.dishesName;
|
obj.dishesName=dishItem.dishesName;
|
||||||
|
obj.goodsType=1;
|
||||||
obj.dishesNum=Number(dishItem.dishesNum);
|
obj.dishesNum=Number(dishItem.dishesNum);
|
||||||
obj.mealtimeName=this.dateRangeList[0].detailList[j].mealtimeName;
|
obj.mealtimeName=this.dateRangeList[0].detailList[j].mealtimeName;
|
||||||
obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType;
|
obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType;
|
||||||
obj.dishesNum=dishItem.dishesNum;
|
|
||||||
obj.sizeType=dishItem.sizeType;
|
obj.sizeType=dishItem.sizeType;
|
||||||
param.productionPlanDetailAddList.push(obj)
|
if(obj.dishesNum>0){
|
||||||
|
param.productionPlanDetailAddList.push(obj)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -795,11 +797,13 @@ export default {
|
||||||
obj.dishesId=dishItem.dishesId;
|
obj.dishesId=dishItem.dishesId;
|
||||||
obj.dishesName=dishItem.dishesName;
|
obj.dishesName=dishItem.dishesName;
|
||||||
obj.dishesNum=Number(dishItem.dishesNum);
|
obj.dishesNum=Number(dishItem.dishesNum);
|
||||||
|
obj.goodsType=1;
|
||||||
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
||||||
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
||||||
obj.dishesNum=dishItem.dishesNum;
|
|
||||||
obj.sizeType=dishItem.sizeType;
|
obj.sizeType=dishItem.sizeType;
|
||||||
param.productionPlanDetailAddList.push(obj)
|
if(obj.dishesNum>0){
|
||||||
|
param.productionPlanDetailAddList.push(obj)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -819,6 +823,7 @@ export default {
|
||||||
obj.dishesId=dishItem.dishesId;
|
obj.dishesId=dishItem.dishesId;
|
||||||
obj.dishesName=dishItem.dishesName;
|
obj.dishesName=dishItem.dishesName;
|
||||||
obj.dishesNum=Number(dishItem.dishesNum);
|
obj.dishesNum=Number(dishItem.dishesNum);
|
||||||
|
obj.goodsType=1;
|
||||||
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
||||||
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
||||||
obj.dishesNum=dishItem.dishesNum;
|
obj.dishesNum=dishItem.dishesNum;
|
||||||
|
|
@ -894,11 +899,13 @@ export default {
|
||||||
obj.dishesId=dishItem.dishesId;
|
obj.dishesId=dishItem.dishesId;
|
||||||
obj.dishesName=dishItem.dishesName;
|
obj.dishesName=dishItem.dishesName;
|
||||||
obj.dishesNum=Number(dishItem.dishesNum);
|
obj.dishesNum=Number(dishItem.dishesNum);
|
||||||
|
obj.goodsType=1;
|
||||||
obj.mealtimeName=this.dateRangeList[0].detailList[j].mealtimeName;
|
obj.mealtimeName=this.dateRangeList[0].detailList[j].mealtimeName;
|
||||||
obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType;
|
obj.mealtimeType=this.dateRangeList[0].detailList[j].mealtimeType;
|
||||||
obj.dishesNum=dishItem.dishesNum;
|
|
||||||
obj.sizeType=dishItem.sizeType;
|
obj.sizeType=dishItem.sizeType;
|
||||||
param.productionPlanDetailAddList.push(obj)
|
if(obj.dishesNum>0){
|
||||||
|
param.productionPlanDetailAddList.push(obj)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -914,11 +921,13 @@ export default {
|
||||||
obj.dishesId=dishItem.dishesId;
|
obj.dishesId=dishItem.dishesId;
|
||||||
obj.dishesName=dishItem.dishesName;
|
obj.dishesName=dishItem.dishesName;
|
||||||
obj.dishesNum=Number(dishItem.dishesNum);
|
obj.dishesNum=Number(dishItem.dishesNum);
|
||||||
|
obj.goodsType=1;
|
||||||
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
||||||
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
||||||
obj.dishesNum=dishItem.dishesNum;
|
|
||||||
obj.sizeType=dishItem.sizeType;
|
obj.sizeType=dishItem.sizeType;
|
||||||
param.productionPlanDetailAddList.push(obj)
|
if(obj.dishesNum>0){
|
||||||
|
param.productionPlanDetailAddList.push(obj)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -938,11 +947,13 @@ export default {
|
||||||
obj.dishesId=dishItem.dishesId;
|
obj.dishesId=dishItem.dishesId;
|
||||||
obj.dishesName=dishItem.dishesName;
|
obj.dishesName=dishItem.dishesName;
|
||||||
obj.dishesNum=Number(dishItem.dishesNum);
|
obj.dishesNum=Number(dishItem.dishesNum);
|
||||||
|
obj.goodsType=1;
|
||||||
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
obj.mealtimeName=this.dateRangeList[i].detailList[j].mealtimeName;
|
||||||
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
obj.mealtimeType=this.dateRangeList[i].detailList[j].mealtimeType;
|
||||||
obj.dishesNum=dishItem.dishesNum;
|
|
||||||
obj.sizeType=dishItem.sizeType;
|
obj.sizeType=dishItem.sizeType;
|
||||||
addList.push(obj)
|
if(obj.dishesNum>0){
|
||||||
|
addList.push(obj)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -972,7 +983,7 @@ export default {
|
||||||
this.loadingBtn=true;
|
this.loadingBtn=true;
|
||||||
if (this.baseInfo.planId != undefined) {
|
if (this.baseInfo.planId != undefined) {
|
||||||
editProductionPlanApi(param).then((response) => {
|
editProductionPlanApi(param).then((response) => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("提交成功");
|
||||||
this.loadingBtn=false
|
this.loadingBtn=false
|
||||||
this.jumpList()
|
this.jumpList()
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
|
@ -980,7 +991,7 @@ export default {
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addProductionPlanApi(param).then((response) => {
|
addProductionPlanApi(param).then((response) => {
|
||||||
this.$modal.msgSuccess("保存成功");
|
this.$modal.msgSuccess("提交成功");
|
||||||
this.loadingBtn=false
|
this.loadingBtn=false
|
||||||
this.jumpList()
|
this.jumpList()
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
|
|
||||||
|
|
@ -492,6 +492,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -575,6 +575,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -347,6 +347,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -342,6 +342,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -366,6 +366,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -367,17 +367,20 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
if(this.baseInfo.areaId!=undefined){
|
if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId!=undefined){
|
||||||
this.openDialog=true
|
this.openDialog=true
|
||||||
this.resetQuery()
|
this.resetQuery()
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
this.$refs.multipleTable1.clearSelection()
|
this.$refs.multipleTable1.clearSelection()
|
||||||
},300)
|
},300)
|
||||||
}else{
|
}else{
|
||||||
this.$modal.msgError("请先选择区域");
|
this.$modal.msgError("请先选择区域,仓库");
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -448,6 +448,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
@ -680,6 +683,8 @@ export default {
|
||||||
"pageNum": this.queryParams2.pageNum,
|
"pageNum": this.queryParams2.pageNum,
|
||||||
"orderGoodsCode": this.queryParams2.orderGoodsCode,
|
"orderGoodsCode": this.queryParams2.orderGoodsCode,
|
||||||
"orderStatus":2,
|
"orderStatus":2,
|
||||||
|
"isInspect":2,
|
||||||
|
"ifAllInto":2,
|
||||||
"areaId": this.baseInfo.areaId,
|
"areaId": this.baseInfo.areaId,
|
||||||
"warehouseId": this.baseInfo.warehouseId,
|
"warehouseId": this.baseInfo.warehouseId,
|
||||||
"supplierId": this.baseInfo.deliverySupplierId,
|
"supplierId": this.baseInfo.deliverySupplierId,
|
||||||
|
|
|
||||||
|
|
@ -374,6 +374,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -354,6 +354,9 @@ export default {
|
||||||
this.materialList.splice(index,1)
|
this.materialList.splice(index,1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
|
},300)
|
||||||
},
|
},
|
||||||
//添加货品
|
//添加货品
|
||||||
addMaterial(){
|
addMaterial(){
|
||||||
|
|
|
||||||
|
|
@ -824,8 +824,8 @@ export default {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 状态修改
|
// 状态修改
|
||||||
handleStatusChange(row) {
|
handleStatusChange(row) {
|
||||||
let text = row.status === '1' ? '启用' : '停用'
|
let text = row.status == '1' ? '启用' : '停用'
|
||||||
let param = {
|
let param = {
|
||||||
supplierId:row.supplierId,
|
supplierId:row.supplierId,
|
||||||
status:row.status
|
status:row.status
|
||||||
|
|
@ -835,7 +835,7 @@ export default {
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$modal.msgSuccess(text + '成功')
|
this.$modal.msgSuccess(text + '成功')
|
||||||
}).catch(function() {
|
}).catch(function() {
|
||||||
row.status = row.status === '1' ? '2' : '1'
|
row.status = row.status == '1' ? '2' : '1'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
|
|
|
||||||
|
|
@ -65,8 +65,8 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="采购订单数量" align="center" prop="orderNum" :show-overflow-tooltip="true" />
|
<el-table-column label="采购订单数量" align="center" prop="orderNum" :show-overflow-tooltip="true" />
|
||||||
<!-- <el-table-column label="最近一次采购中标日期" align="center" prop="areaName" :show-overflow-tooltip="true"/>
|
<el-table-column label="最近一次采购中标日期" align="center" prop="" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="最近一次采购中标金额" align="center" prop="areaName" :show-overflow-tooltip="true"/> -->
|
<el-table-column label="最近一次采购中标金额" align="center" prop="" :show-overflow-tooltip="true"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue