diff --git a/src/components/SelectBox/SelectBox.vue b/src/components/SelectBox/SelectBox.vue
index fe2584ee..4c95168f 100644
--- a/src/components/SelectBox/SelectBox.vue
+++ b/src/components/SelectBox/SelectBox.vue
@@ -9,6 +9,7 @@
@change="handleChange"
:clearable="props.clearable !== false"
:disabled="props.disabled === true"
+ :maxlength="30"
>
{
console.log('props.columnListName :>> ', props.columnListName);
- postSaveTableSeting({
- tableKey: $route.path + props.columnListName,
- tableSetCongig: JSON.stringify(props.columnList),
- });
+ // postSaveTableSeting({
+ // tableKey: $route.path + props.columnListName,
+ // tableSetCongig: JSON.stringify(props.columnList),
+ // });
};
defineExpose({ handleCheckSelect, handleClearSelect });
diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js
index d074aa26..02c54fd5 100644
--- a/src/option/finance/ReconciliationDepositSlip.js
+++ b/src/option/finance/ReconciliationDepositSlip.js
@@ -114,18 +114,18 @@ export const columnList = [
width: '150',
checkarr: [
{
- label:'商配',
- value:1
- },
- {
- label:'市配',
- value:2
- },
- {
- label:'自提',
- value:3
- },
- ],
+ label: '商配',
+ value: 1,
+ },
+ {
+ label: '市配',
+ value: 2,
+ },
+ {
+ label: '自提',
+ value: 3,
+ },
+ ],
fixed: false,
sortable: true,
head: false,
@@ -152,6 +152,28 @@ export const columnList = [
sortable: true,
head: false,
},
+ {
+ prop: 'goodsNum',
+ label: '品类件数',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'goodsPrice',
+ label: '品类单价',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'totalNum',
label: '总件数',
@@ -726,18 +748,18 @@ export const columnListB = [
width: '150',
checkarr: [
{
- label:'商配1',
- value:1
- },
- {
- label:'市配',
- value:2
- },
- {
- label:'自提',
- value:3
- },
- ],
+ label: '商配1',
+ value: 1,
+ },
+ {
+ label: '市配',
+ value: 2,
+ },
+ {
+ label: '自提',
+ value: 3,
+ },
+ ],
fixed: false,
sortable: true,
head: false,
@@ -764,6 +786,28 @@ export const columnListB = [
sortable: true,
head: false,
},
+ {
+ prop: 'goodsNum',
+ label: '品类件数',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'goodsPrice',
+ label: '品类单价',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'totalNum',
label: '总件数',
@@ -1291,4 +1335,4 @@ export const confirmColumnList = [
head: false,
isshowSummary: true,
},
-];
\ No newline at end of file
+];
diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue
index ca11436d..95968d3e 100644
--- a/src/views/distribution/artery/abnormalList.vue
+++ b/src/views/distribution/artery/abnormalList.vue
@@ -159,7 +159,9 @@
:align-center="true"
v-model="details.popUpShow.abnormalVisited"
>
-
包条码 ({{ details.abnormalInfo.orderPackageCode }})
+
+ 包条码 ({{ details.abnormalInfo.orderPackageCode }})
+
@@ -560,7 +562,7 @@ const handleAbnormal = (dealType, title) => {
const handleBatchAbnormarl = () => {
if (details.selectionList.length === 0) return ElMessage.warning('请选择需要处理的异常数据');
- if (details.selectionList.length > 30) return ElMessage.warning('最大数暂时支持30条')
+ if (details.selectionList.length > 30) return ElMessage.warning('最大数暂时支持30条');
const _abnormalType = details.selectionList[0].abnormalType;