Browse Source

新增入库页面loading,新增到车页面权限按钮

dev-xx
qb 4 months ago
parent
commit
190f821ff0
  1. 27
      src/views/distribution/artery/VehicleArrivalManagement.vue
  2. 33
      src/views/waybill/orderPackageListDetails.vue

27
src/views/distribution/artery/VehicleArrivalManagement.vue

@ -319,8 +319,10 @@
<el-text @click="handleNodeCost(slotProps.scope)"> 节点费用 </el-text>
</el-dropdown-item>
<!-- 配置直发商家 -->
<el-dropdown-item
v-if="
permissionObj.VehicleArrivalManagement_handleDirectGoMarketVesited &&
Mydata.id === slotProps.scope.row.nowWarehouseId &&
Number(slotProps.scope.row.loadStatus) === 20
"
@ -330,7 +332,13 @@
</el-text>
</el-dropdown-item>
<el-dropdown-item v-if="slotProps.scope.row.isCustomer + '' === '1'">
<!-- 直发商家签收详情 -->
<el-dropdown-item
v-if="
permissionObj.VehicleArrivalManagement_handleDirectGoMarketDetails &&
slotProps.scope.row.isCustomer + '' === '1'
"
>
<el-text @click="handleDirectGoMarketDetails(slotProps.scope)">
签收详情
</el-text>
@ -351,6 +359,7 @@
<!-- 零担装车 -->
<el-dropdown-item
v-if="
permissionObj.VehicleArrivalManagement_ZeroLoading &&
Mydata.id === slotProps.scope.row.nowWarehouseId &&
Number(slotProps.scope.row.loadStatus) === 20
"
@ -839,14 +848,30 @@ const permissionObj = reactive({
VehicleArrivalManagement_shippingSpecification: computed(() => {
return $store.getters.permission.VehicleArrivalManagement_shippingSpecification;
}),
/** 节点费用 */
VehicleArrivalManagement_nodeCost: computed(
() => $store.getters.permission.VehicleArrivalManagement_nodeCost
),
/** 编辑 */
VehicleArrivalManagement_edit: computed(() => {
return $store.getters.permission.VehicleArrivalManagement_edit;
}),
/** 配置直发商家 */
VehicleArrivalManagement_handleDirectGoMarketVesited: computed(
() => $store.getters.permission.VehicleArrivalManagement_handleDirectGoMarketVesited
),
/** 直发商家详情 */
VehicleArrivalManagement_handleDirectGoMarketDetails: computed(
() => $store.getters.permission.VehicleArrivalManagement_handleDirectGoMarketDetails
),
/** 手动装车 */
VehicleArrivalManagement_ManualLoading: computed(() => {
return $store.getters.permission.VehicleArrivalManagement_ManualLoading;
}),
/** 零担装车 */
VehicleArrivalManagement_ZeroLoading: computed(
() => $store.getters.permission.VehicleArrivalManagement_ZeroLoading
),
});
/** 请求页面数据 */

33
src/views/waybill/orderPackageListDetails.vue

@ -748,21 +748,28 @@ const handlePutInStorage = ({ row }) => {
type: 'warning',
})
.then(async () => {
const submitData = {
orderPackageCode: row.orderPackageCode,
/** 直接入库 */
incomingType: '3',
};
try {
details.loadingObj.pageLoading = true;
const submitData = {
orderPackageCode: row.orderPackageCode,
/** 直接入库 */
incomingType: '3',
};
const res = await getopenOrderIncomingPackage(submitData);
const { code } = res.data;
const res = await getopenOrderIncomingPackage(submitData);
const { code } = res.data;
if (code !== 200) return;
initPage();
ElMessage({
type: 'success',
message: '入库成功',
});
if (code !== 200) return;
initPage();
ElMessage({
type: 'success',
message: '入库成功',
});
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
})
.catch(() => {});
};

Loading…
Cancel
Save