Browse Source

修复部分bug

dev-xx
qb 9 months ago
parent
commit
f27febc9e7
  1. 3
      src/views/distribution/artery/VehicleStowage.vue
  2. 2
      src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
  3. 11
      src/views/waybill/TemporaryStorageList.vue

3
src/views/distribution/artery/VehicleStowage.vue

@ -251,6 +251,7 @@
<el-text
v-if="
permissionObj.VehicleStowage_edit &&
Number(slotProps.scope.row.loadStatus) === 0 &&
Mydata.id === slotProps.scope.row.nowWarehouseId
"
@click="handleEditStowage(slotProps.scope)"
@ -276,6 +277,7 @@
<el-dropdown-item
v-if="
permissionObj.VehicleStowage_handleDirectGoMarketVesited &&
Number(slotProps.scope.row.loadStatus) === 0 &&
Mydata.id === slotProps.scope.row.nowWarehouseId
"
>
@ -298,6 +300,7 @@
v-if="
permissionObj.VehicleStowage_ManualLoading &&
Mydata.id === slotProps.scope.row.nowWarehouseId &&
Number(slotProps.scope.row.loadStatus) === 0 &&
Number(slotProps.scope.row.loadingType) === 1
"
>

2
src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@ -112,7 +112,7 @@
v-model="slotProps.scope.row[slotProps.scope.column.property]"
:controls="false"
:precision="0"
:min="slotProps.scope.row.realNum || 0"
:min="0"
:max="slotProps.scope.row.planNum"
/>
</template>

11
src/views/waybill/TemporaryStorageList.vue

@ -1,4 +1,3 @@
<template>
<basic-container v-loading="loadingObj.pageLoading">
<div class="avue-crud">
@ -854,34 +853,28 @@ const details = reactive<any>({
const permissionObj = reactive({
/** 订单转运单 */
TemporaryStorageList_orderTransitionWaybill: computed(() => {
return true
return $store.getters.permission.TemporaryStorageList_orderTransitionWaybill;
}),
/** 修改客户信息 */
TemporaryStorageList_editClientInfo: computed(() => {
return true
return $store.getters.permission.TemporaryStorageList_editClientInfo;
}),
/** 删除 */
TemporaryStorageList_delete: computed(() => {
return true
return $store.getters.permission.TemporaryStorageList_delete;
}),
/** 开标签 */
TemporaryStorageList_openLabel: computed(() => {
return true
return (
$store.getters.permission.TemporaryStorageList_openLabel && details.orderStatus === 'haveData'
);
}),
/** 批量开标签导入 */
TemporaryStorageList_batchOpenLableUpload: computed(() => {
return true
return $store.getters.permission.TemporaryStorageList_batchOpenLableUpload;
}),
/** 欧派数据导入 */
TemporaryStorageList_opInfoUpload: computed(() => {
return true
return (
$store.getters.permission.TemporaryStorageList_opInfoUpload &&
details.orderStatus === 'haveData'
@ -889,12 +882,10 @@ const permissionObj = reactive({
}),
/** 冻结 */
TemporaryStorageList_freeze: computed(() => {
return true
return $store.getters.permission.TemporaryStorageList_freeze;
}),
/** 包明细 */
TemporaryStorageList_packageDetail: computed(() => {
return true
return (
$store.getters.permission.TemporaryStorageList_packageDetail &&
details.orderStatus === 'haveData'
@ -1414,7 +1405,7 @@ const handleDownLoadFile = () => {
const url =
details.ouPaiChooseType === 1
? 'http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx'
: 'http://8.137.14.82:9000/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx?Content-Disposition=attachment%3B%20filename%3D%22upload%2F20240612%2F%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx%22&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20240612%2F%2Fs3%2Faws4_request&X-Amz-Date=20240612T115253Z&X-Amz-Expires=432000&X-Amz-SignedHeaders=host&X-Amz-Signature=f5f10451397865d890f2414c1d8e66b35e78e918528db7f5e29fd6276c0c3551';
: 'http://8.137.14.82:9000/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx';
const name =
details.ouPaiChooseType === 1
? '包条导入模版(货无忧-生成包条).xlsx'

Loading…
Cancel
Save