diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js index 2c9d8895..a8b6dd82 100644 --- a/src/api/distribution/distributionStockArticle.js +++ b/src/api/distribution/distributionStockArticle.js @@ -365,7 +365,7 @@ export const $_Modifywaybillrecipient = data => { }); }; -// 修改运单收货人 +/** 查看零担二维码 */ export const postShowOrderCode = params => { return request({ url: '/api/logpm-distribution/distributionStockArticle/showOrderCode', @@ -394,8 +394,6 @@ export const getCollectt = params => { }); }; - - // 在库订单详情 export const $_signforListDetail = params => { return request({ @@ -403,4 +401,4 @@ export const $_signforListDetail = params => { method: 'get', params, }); -}; \ No newline at end of file +}; diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 0ea4d3af..3ac5c95b 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -380,18 +380,8 @@ const isHaveSelection = ref(false); let selectarr = ref([]); /** 设置每行颜色 */ const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => { - // let sfcheck = false; - let item = ''; - - for (let value of selectarr.value) { - if (value == row) { - item = value; - break; - } - } - - if (item) { - return 'table-SelectedRow-bgcolor'; + for (let i = 0; i < selectarr.value.length; i++) { + if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor'; } if (props.tableRowClassName) return props.tableRowClassName(row, rowIndex); @@ -434,7 +424,7 @@ onMounted(() => { /** 勾选 */ function handleCheckSelect(select: any[]) { console.log('select :>> ', select); - console.log(props.isselectfun,'props.isselectfun'); + console.log(props.isselectfun, 'props.isselectfun'); if (select.length !== 0) { for (const item of select) { if (props.isselectfun) { diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js index 59c45359..e3db9336 100644 --- a/src/option/distribution/TripartiteTransfer.js +++ b/src/option/distribution/TripartiteTransfer.js @@ -351,7 +351,7 @@ export const detailsColumnList = [ { prop: 'scanStatusName', label: '装卸状态', - type: 3, + type: 14, values: '', width: '130', checkarr: [], diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index 14db4b00..2f8b8237 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -49,7 +49,7 @@ v-if="permissionObj.truckLoadingDetails_changePlanWarehouse" type="primary" icon="Edit" - @click="handleShowTransfer('add')" + @click="handleChooseWarehouse" > 计划仓更改 @@ -116,39 +116,55 @@ " >