diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js
index 627cc5c2..603f6e96 100644
--- a/src/option/distribution/addVehicleStowage.js
+++ b/src/option/distribution/addVehicleStowage.js
@@ -781,6 +781,18 @@ export const detailsColumnList = [
isshowSummary: true,
sortable: true,
},
+ {
+ prop: 'goodsName',
+ label: '货物名称',
+ type: 2,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ isColumnMerge: true,
+ isshowSummary: false,
+ sortable: true,
+ },
{
prop: 'orderNum',
label: '件数',
@@ -866,7 +878,6 @@ export const detailsColumnList = [
width: '130',
checkarr: [],
fixed: false,
- isshowSummary: true,
sortable: true,
},
// {
diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js
index 9e4a7378..bc78a06e 100644
--- a/src/option/finance/WaybillAudit.js
+++ b/src/option/finance/WaybillAudit.js
@@ -131,7 +131,7 @@ export const columnList = [
head: false,
},
{
- prop: 'createTime',
+ prop: 'openTime',
label: '开单时间',
type: 1,
values: '',
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index fd548add..72c28c80 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -1332,9 +1332,11 @@ const onLoad = async () => {
const _item = this.selectQuery[key];
// 单选
- if (getObjType(_item) === 'string') {
+ if (getObjType(_item) === 'string' && _item) {
+ console.log('222 :>> ', 222);
if (_item !== value[key]) _flag = false;
- } else if (getObjType(_item) === 'array') {
+ } else if (getObjType(_item) === 'array' && _item.length > 0) {
+ console.log('123 :>> ', 123);
if (!_item.includes(value[key])) _flag = false;
}
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 76eea8cd..c3b315c3 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -196,7 +196,7 @@
class="w100"
ref="oldColumnListNode"
:columnList="details.detailsColumnList"
- :tableData="details.renderData"
+ :tableData="detailsRenderData"
:loading="loadingObj.oldListLoading"
@inputTxt="inputsc"
@timeCheck="timesc"
@@ -230,7 +230,7 @@
class="w100"
ref="oldColumnListNode"
:columnList="details.detailsColumnList"
- :tableData="details.renderData"
+ :tableData="detailsRenderData"
:loading="loadingObj.oldListLoading"
@inputTxt="inputsc"
@timeCheck="timesc"
@@ -445,7 +445,7 @@
@@ -468,6 +468,7 @@ import {
nextTick,
watch,
defineAsyncComponent,
+ shallowRef,
} from 'vue';
import functions from '@/utils/functions';
import dayjs from 'dayjs';
@@ -662,6 +663,8 @@ const details = reactive({
abnormalSelectionList: [],
});
+const detailsRenderData = shallowRef([]);
+
const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, popUpShow, form } =
toRefs(details);
@@ -915,7 +918,7 @@ const handleData = async () => {
console.log('_data :>> ', _data);
- if (_data.length === 0) return (details.renderData = []);
+ if (_data.length === 0) return (detailsRenderData.value = []);
// 合并起始索引
let mergeStartIndex = 0;
@@ -944,9 +947,9 @@ const handleData = async () => {
console.log('_data :>> ', _data);
- details.renderData = _data;
- handleTranslationDataSeclect(details.renderData, details.detailsColumnList);
- console.log('details.renderData :>> ', details.renderData);
+ detailsRenderData.value = _data;
+ handleTranslationDataSeclect(detailsRenderData.value, details.detailsColumnList);
+ console.log('detailsRenderData.value :>> ', detailsRenderData.value);
};
/** 表格表头输入框搜索 */
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 2945cb85..a70e5ff9 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -326,7 +326,7 @@
@@ -545,13 +545,8 @@
-
-
+
+
@@ -916,7 +911,7 @@
@@ -1320,13 +1315,6 @@ const details = reactive({
return curr;
}, 0);
}),
- /** 总运费 */
- totalFreight: computed(() => {
- return details.goodsList.reduce((curr, item) => {
- if (item.subtotalFreight) return computeNumber(curr, '+', item.subtotalFreight).result;
- return curr;
- }, 0);
- }),
},
/** 是否开启搜索 */
search: true,
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 49a3099e..fb1dde84 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -4010,6 +4010,7 @@ const handleAssignmentItemPriceTrunkline = (value, trunkLine, template, chargeTy
/** 金牌 -- 干线特殊处理 */
const handleSpecialBrandPrice = (value, trunkLine, template) => {
if (!isDisabled.value) return;
+ console.log('isDisabled.value :>> ', isDisabled.value);
// 总件数小于15件 && 总方数小于0.8 && 总方数 / 总件数小于0.11 则按件计费, 否则以按方计费
const { totalCount, totalVolume } = details.totalObj;
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index d9fb0b5f..3ad2999a 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -67,7 +67,7 @@
批量作废
@@ -691,7 +691,7 @@ const editOrder = () => {
const _item = details.selectionList[0];
- if (_item.checkUserName) return ElMessage.warning('该运单已审核，无法进行改单操作');
+ if (Number(_item.checkStatus) === 1) return ElMessage.warning('该运单已审核，无法进行改单操作');
if (Number(_item.waybillType) === 1 || _item.orderNo) {
$store.commit('DEL_ONCE_TAG', '/distribution/inventory/CreateOrder');