diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js index dd47c52c..7e48e288 100644 --- a/src/api/distribution/distributionStockList.js +++ b/src/api/distribution/distributionStockList.js @@ -131,7 +131,7 @@ export const update = (row) => { */ export const getInventoryList = (current, size, params) => { return request({ - url: '/api/logpm-distribution/distributionStockList/getLnventoryList', + url: '/api/logpm-distribution/distributionStockList/getInventoryList', method: 'get', params: { ...params, diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index ceff5233..ffb1c38b 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -157,21 +157,11 @@ - {{ column.label }} - + {{ + column.label + }} - @@ -347,6 +337,8 @@ function godowns(url) { let shownm = ref(false); function copyalls(column: TableColumnType) { + const _isReturn = column.type == 1 || column.type == 2 || column.type == 3; + if (!_isReturn) return; let text = ''; props.tableData.map((item, index) => { if (index < props.tableData.length - 1) { diff --git a/src/views/basic/line/basicLine.vue b/src/views/basic/line/basicLine.vue index 4a86656c..d90f6bf2 100644 --- a/src/views/basic/line/basicLine.vue +++ b/src/views/basic/line/basicLine.vue @@ -285,7 +285,7 @@ export default { :deep(.avue-form__group--flex) { display: flex; flex-direction: row; - justify-content: flex-start; + justify-content: space-between; } :deep(.avue-form__row){ max-width:324px; diff --git a/src/views/basic/property/basicPropertyDetails.vue b/src/views/basic/property/basicPropertyDetails.vue index a6c8db0f..f1c6a3bf 100644 --- a/src/views/basic/property/basicPropertyDetails.vue +++ b/src/views/basic/property/basicPropertyDetails.vue @@ -639,7 +639,7 @@ export default { \ No newline at end of file diff --git a/src/views/basicdata/brand/basicdataStoreBrand.vue b/src/views/basicdata/brand/basicdataStoreBrand.vue index ac204578..7a7b8676 100644 --- a/src/views/basicdata/brand/basicdataStoreBrand.vue +++ b/src/views/basicdata/brand/basicdataStoreBrand.vue @@ -434,4 +434,14 @@ export default { }; - + diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index e9734e73..7193b6b1 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -811,7 +811,7 @@ export default {