bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面操作问题修改

This commit is contained in:
zzyuan 2025-08-07 14:23:46 +08:00
parent af993f60f7
commit cde7dd3d05
10 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/foodManage/pickManage/materialPicking/index.vue
View File

@ -90,8 +90,7 @@
</el-table-column>
<el-table-column label="单据编号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" />
<el-table-column label="采购领料标题" align="center" prop="title" :show-overflow-tooltip="true" />
<!-- <el-table-column label="领料单状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
<el-table-column label="领料单状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-if="scope.row.commitStatus==1">待提交</span>
<span v-if="scope.row.commitStatus==2">已提交</span>
@ -99,10 +98,12 @@
</el-table-column>
<el-table-column label="领取状态" align="center" prop="fetchStatus" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-if="scope.row.fetchStatus==1">未领取</span>
<span v-if="scope.row.fetchStatus==2">已领取</span>
<span v-if="scope.row.fetchStatus==1">已领取</span>
<span v-if="scope.row.fetchStatus==2">未领取</span>
</template>
</el-table-column>
<!--
<el-table-column label="领料单审核" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-if="scope.row.approveStatus==1">待审批</span>

1
src/views/foodManage/purchaseManage/contractList/edit.vue
View File

@ -11,6 +11,7 @@
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="baseInfo.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:disabled="contractMaterialList.length>0"
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的

2
src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
View File

@ -33,6 +33,7 @@
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="baseInfo.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:disabled="materialList.length>0"
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
@ -283,7 +284,6 @@ export default {
this.baseInfo = response.data;
console.log("this.baseInfo",this.baseInfo);
this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])
this.$set(this.baseInfo,'supplierIds',this.baseInfo.supplierIds.split(','))
this.materialList = this.baseInfo.detailList;
supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
this.supplierOptions = response.rows||[];

5
src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
View File

@ -16,6 +16,7 @@
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="baseInfo.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:disabled="materialList.length>0"
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
@ -24,7 +25,7 @@
</el-cascader>
</el-form-item>
<el-form-item label="送货仓库" prop="deliveryWarehouseId">
<el-select v-model="baseInfo.deliveryWarehouseId" clearable placeholder="请选择送货仓库" style="width: 100%;">
<el-select v-model="baseInfo.deliveryWarehouseId" clearable placeholder="请选择送货仓库" :disabled="materialList.length>0" style="width: 100%;">
<el-option v-for="item in wareHouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
@ -33,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item label="送货供应商" prop="deliverySupplierId">
<el-select v-model="baseInfo.deliverySupplierId" placeholder="请选择供应商" style="width: 240px;">
<el-select v-model="baseInfo.deliverySupplierId" placeholder="请选择供应商" :disabled="materialList.length>0" style="width: 240px;">
<el-option v-for="item in supplierOptions"
:key="item.supplierId"
:label="item.supplierName"

11
src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
View File

@ -19,6 +19,7 @@
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="baseInfo.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:disabled="materialList.length>0"
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
@ -627,6 +628,14 @@ export default {
confirmChosen(){
if(this.batchChosenMaterial.length>0){
this.loading = true
if(this.baseInfo.purchasePlanCode&&this.baseInfo.purchasePlanCode!=""){
this.$modal.confirm('是否确认覆盖货品明细?').then(() => {
this.baseInfo.purchasePlanCode = null
this.materialList = this.batchChosenMaterial
this.loading = false
this.openDialog=false
}).catch(() => {});
}else{
let items = [...this.materialList,...this.batchChosenMaterial]
let uniqueItems = items.filter((item, index, array) => {
return array.findIndex((t) => (t.materialId === item.materialId)) === index;
@ -637,6 +646,8 @@ export default {
this.openDialog=false
},500)
}
}
},
//保存草稿
confirmSave(){

1
src/views/foodManage/purchaseManage/purchasePlan/edit.vue
View File

@ -24,6 +24,7 @@
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="baseInfo.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:disabled="materialList.length>0"
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的

2
src/views/foodManage/stockManage/depotManage/materialStock.vue
View File

@ -82,7 +82,7 @@
<el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.inventoryStatus==1">正常</span>
<span v-if="scope.row.inventoryStatus==2">即将缺货</span>
<span v-if="scope.row.inventoryStatus==2">不足</span>
<span v-if="scope.row.inventoryStatus==3">超额</span>
</template>
</el-table-column>

2
src/views/foodManage/stockManage/totalStock/index.vue
View File

@ -82,7 +82,7 @@
<el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.inventoryStatus==1" style="color: #1890ff;">正常</span>
<span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">即将缺货</span>
<span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">不足</span>
<span v-if="scope.row.inventoryStatus==3" style="color: red;">超额</span>
</template>
</el-table-column>

13
src/views/foodManage/stockManage/warehouseIn/edit.vue
View File

@ -494,6 +494,14 @@ export default {
confirmChosen(){
if(this.batchChosenMaterial.length>0){
this.loading = true
if(this.baseInfo.relateOrderGoodsId&&this.baseInfo.relateOrderGoodsId!=""){
this.$modal.confirm('是否确认覆盖货品明细?').then(() => {
this.baseInfo.relateOrderGoodsId = null
this.materialList = this.batchChosenMaterial
this.loading = false
this.openDialog=false
}).catch(() => {});
}else{
let items = [...this.materialList,...this.batchChosenMaterial]
let uniqueItems = items.filter((item, index, array) => {
return array.findIndex((t) => (t.materialId === item.materialId)) === index;
@ -504,6 +512,7 @@ export default {
this.openDialog=false
},500)
}
}
},
//保存草稿
confirmSave(){
@ -684,8 +693,8 @@ export default {
this.$set(item,"unitPrice",Number(item.singlePrice)/100)
this.$set(item,"purNum",item.orderNum)
})
// this.baseInfo.relateOrderGoodsId = this.importRow.orderGoodsCode;
// this.$set(this.baseInfo,"remark","导入采购订单")
this.baseInfo.relateOrderGoodsId = this.importRow.orderGoodsCode;
this.$set(this.baseInfo,"remark","导入采购订单")
setTimeout(()=>{
this.openImportDialog=false
},500)

2
src/views/foodManage/stockReport/stockWarning/index.vue
View File

@ -51,7 +51,7 @@
<el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.inventoryStatus==1" style="color: #1890ff;">正常</span>
<span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">即将缺货</span>
<span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">不足</span>
<span v-if="scope.row.inventoryStatus==3" style="color: red;">超额</span>
</template>
</el-table-column>