diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index b5ea54d2..c676f07d 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -57,7 +57,7 @@ @keyup.enter="handleInput" /> @@ -123,28 +123,27 @@ {{ scope.row[column.prop] }} -
- - +
+
- - - @@ -537,8 +518,8 @@ const handleSelectionChange = (param: TableDataType[]) => { selectarr.value = param; try { // 重置数据 - for (const iterator of selectCount.value) { - iterator.value = 0; + for (let i = 0; i < selectCount.value.length; i++) { + selectCount.value[i].value = 0; } if (selectarr.value.length === 0) return; @@ -546,8 +527,9 @@ const handleSelectionChange = (param: TableDataType[]) => { for (let index = 0; index < selectarr.value.length; index++) { const val = selectarr.value[index]; - for (let item of selectCount.value) { - if (index === 0) item.value = 0; + for (let j = 0; j < selectCount.value.length; j++) { + const item = selectCount.value[j]; + item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result; } } @@ -556,7 +538,7 @@ const handleSelectionChange = (param: TableDataType[]) => { } finally { emit('selection', param); } - }, 50); + }, 10); }; // 计算是否清空表格复选框值 const handleUserSelcet = list => { diff --git a/src/views/system/client.vue b/src/views/system/client.vue index eefb86ed..df80f62f 100644 --- a/src/views/system/client.vue +++ b/src/views/system/client.vue @@ -112,6 +112,10 @@ export default { label: 'social', value: 'social', }, + { + label: 'local_server', + value: 'local_server', + }, ], rules: [ { @@ -360,17 +364,17 @@ export default { }; - diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index df9d7408..fc779555 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -372,9 +372,11 @@ drag :headers="details.header" :action=" - details.ouPaiChooseType === 1 && details.orderStatus === 'haveData' + details.orderStatus === 'notHaveData' + ? '/api/logpm-trunkline/openOrder/importOrderNoPackage' + : details.ouPaiChooseType === 1 ? '/api/logpm-trunkline/openOrder/openLabelHasPacakage' - : '/api/logpm-trunkline/openOrder/importOrderNoPackage' + : '/api/logpm-trunkline/openOrder/batchOpenLabel' " :before-upload="handleBeforeUpload" :on-success="handleSuccess"