diff --git a/compoment/CheckBox/CheckBox.vue b/compoment/CheckBox/CheckBox.vue
index 9c09e5c..f5d8890 100644
--- a/compoment/CheckBox/CheckBox.vue
+++ b/compoment/CheckBox/CheckBox.vue
@@ -1,12 +1,6 @@
-
-
@@ -22,7 +16,7 @@
modelValue: {
default: false,
},
- // 最大值
+ // 点击事件
click: {
type: Function,
default: null
diff --git a/compoment/MyTable/MyTable.vue b/compoment/MyTable/MyTable.vue
new file mode 100644
index 0000000..ef7b0da
--- /dev/null
+++ b/compoment/MyTable/MyTable.vue
@@ -0,0 +1,280 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+ handleCheckItem(value, index)">
+
+
+
+
+
+
+
+ {{value[item.prop]}}
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/compoment/saomiao2.vue b/compoment/saomiao2.vue
index 838edb4..c7647e1 100644
--- a/compoment/saomiao2.vue
+++ b/compoment/saomiao2.vue
@@ -2,7 +2,7 @@
handleTouchStart(e)" @touchmove="handleTouchMove" @touchend="(e) => handleTouchEnd(e)"
id="scanBtn">
diff --git a/config/host.js b/config/host.js
index b2c2e09..a1231e9 100644
--- a/config/host.js
+++ b/config/host.js
@@ -29,9 +29,9 @@ const devhost = 'http://test.api.huo5you.com/'
/**
* 正式域名
* */
-const prohost = 'http://h5uapi.huitongys.com/'
+// const prohost = 'http://h5uapi.huitongys.com/'
// const prohost = 'https://h5uapi.huitongys.com/' // 小程序
-// const prohost = 'http://test.api.huo5you.com/'
+const prohost = 'http://test.api.huo5you.com/'
/**
* 图片域名
* */
diff --git a/main.js b/main.js
index 14fefd3..8a145d9 100644
--- a/main.js
+++ b/main.js
@@ -37,6 +37,8 @@ import RadioBox from '@/compoment/RadioBox/RadioBox.vue'
import MyInput from '@/compoment/MyInput/MyInput';
/** 抽屉组件 */
import MyDrawer from '@/compoment/MyDrawer/MyDrawer';
+/** 表格 */
+import MyTable from '@/compoment/MyTable/MyTable';
import saomiao1 from '@/compoment/saomiao1.vue'
import saomiao2 from '@/compoment/saomiao2.vue'
import saomiao3 from '@/compoment/saomiao3.vue'
@@ -72,6 +74,7 @@ export function createApp() {
.component('RadioBox', RadioBox)
.component('MyInput', MyInput)
.component('MyDrawer', MyDrawer)
+ .component('MyTable', MyTable)
uni.$u.config.unit = 'rpx'
return {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index fba27e3..e7606eb 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -177,9 +177,9 @@
}
// 关于我们
else if (item.type == 5) {
- // uni.navigateTo({
- // url: '/pagesUser/pages/about/about'
- // })
+ uni.navigateTo({
+ url: '/pagesUser/pages/about/about'
+ })
} else if (item.type == 6) {
updateApp()
} else if (item.type == 8) {
diff --git a/pagesHome/pages/Check/Check.vue b/pagesHome/pages/Check/Check.vue
index 726c33e..e63256e 100644
--- a/pagesHome/pages/Check/Check.vue
+++ b/pagesHome/pages/Check/Check.vue
@@ -21,9 +21,7 @@
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue
index 4320a53..6544113 100644
--- a/pagesHome/pages/CustomerSign/CustomerSign.vue
+++ b/pagesHome/pages/CustomerSign/CustomerSign.vue
@@ -171,9 +171,7 @@
})
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
console.log('onShow')
initpage()
getconfig()
diff --git a/pagesHome/pages/DownGoodsType/DownGoodsType.vue b/pagesHome/pages/DownGoodsType/DownGoodsType.vue
index 073d240..ea11665 100644
--- a/pagesHome/pages/DownGoodsType/DownGoodsType.vue
+++ b/pagesHome/pages/DownGoodsType/DownGoodsType.vue
@@ -34,9 +34,7 @@
utils.ttsspke('请选择下架方式')
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
function gotourl(item : any) {
let url = '/pagesHome/pages/DownGoods/DownGoods?type=' + item.type + '&pageName=' + item.name
diff --git a/pagesHome/pages/DownScan/DownScan.vue b/pagesHome/pages/DownScan/DownScan.vue
index c5a5fbb..68d3fdd 100644
--- a/pagesHome/pages/DownScan/DownScan.vue
+++ b/pagesHome/pages/DownScan/DownScan.vue
@@ -12,9 +12,7 @@
onUnload
} from '@dcloudio/uni-app'
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
diff --git a/pagesHome/pages/Listinginboundtrains/Listinginboundtrains.vue b/pagesHome/pages/Listinginboundtrains/Listinginboundtrains.vue
index 3df1046..ee3b766 100644
--- a/pagesHome/pages/Listinginboundtrains/Listinginboundtrains.vue
+++ b/pagesHome/pages/Listinginboundtrains/Listinginboundtrains.vue
@@ -26,9 +26,7 @@
const query = ref({})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
onLoad((op) => {
diff --git a/pagesHome/pages/LoadingDetails/LoadingDetails.vue b/pagesHome/pages/LoadingDetails/LoadingDetails.vue
index d05b35a..a33e01d 100644
--- a/pagesHome/pages/LoadingDetails/LoadingDetails.vue
+++ b/pagesHome/pages/LoadingDetails/LoadingDetails.vue
@@ -144,9 +144,7 @@
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
const timer = setTimeout(() => {
basicContainer.value.startPullDownRefresh()
clearTimeout(timer)
diff --git a/pagesHome/pages/LoadingScan/LoadingScan.vue b/pagesHome/pages/LoadingScan/LoadingScan.vue
index 802001a..5292922 100644
--- a/pagesHome/pages/LoadingScan/LoadingScan.vue
+++ b/pagesHome/pages/LoadingScan/LoadingScan.vue
@@ -170,9 +170,7 @@
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
const timer = setTimeout(() => {
basicContainer.value.startPullDownRefresh()
clearTimeout(timer)
diff --git a/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue b/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue
index 2e1ca2e..d089bc4 100644
--- a/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue
+++ b/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue
@@ -150,9 +150,7 @@
trayCode.value = op.tray
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
init()
})
function goorderdetail(item) {
diff --git a/pagesHome/pages/OfflineUpload/OfflineUpload.vue b/pagesHome/pages/OfflineUpload/OfflineUpload.vue
index e04b6d3..2684e71 100644
--- a/pagesHome/pages/OfflineUpload/OfflineUpload.vue
+++ b/pagesHome/pages/OfflineUpload/OfflineUpload.vue
@@ -33,9 +33,7 @@
const tip = ref(null)
let taslarr = ref(null)
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
console.log('onshow');
taslarr.value = uni.getStorageSync('HistoryDate')
})
diff --git a/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue b/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue
index fbfb893..da9f46d 100644
--- a/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue
+++ b/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue
@@ -197,9 +197,7 @@
details.trayCode = op.trayCode
})
onShow(async () => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
initpage()
})
onPullDownRefresh(() => {
diff --git a/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue b/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue
index d675cb2..d53b658 100644
--- a/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue
+++ b/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue
@@ -22,9 +22,7 @@
let pageType = ref(null)
let trayCode = ref(null)
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
onLoad((op) => {
pageType.value = op.type
diff --git a/pagesHome/pages/RelayScanList/RelayScanList.vue b/pagesHome/pages/RelayScanList/RelayScanList.vue
index 35decdd..9441564 100644
--- a/pagesHome/pages/RelayScanList/RelayScanList.vue
+++ b/pagesHome/pages/RelayScanList/RelayScanList.vue
@@ -172,9 +172,7 @@
}
onShow(async () => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
await nextTick()
basicContainer.value.startPullDownRefresh()
})
diff --git a/pagesHome/pages/ScanSortingType/ScanSortingType.vue b/pagesHome/pages/ScanSortingType/ScanSortingType.vue
index e70353b..9c92b25 100644
--- a/pagesHome/pages/ScanSortingType/ScanSortingType.vue
+++ b/pagesHome/pages/ScanSortingType/ScanSortingType.vue
@@ -25,9 +25,7 @@
const query = ref({})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
onLoad((op) => {
diff --git a/pagesHome/pages/ScanUpType/ScanUpType.vue b/pagesHome/pages/ScanUpType/ScanUpType.vue
index 3e2f263..0efc44e 100644
--- a/pagesHome/pages/ScanUpType/ScanUpType.vue
+++ b/pagesHome/pages/ScanUpType/ScanUpType.vue
@@ -21,9 +21,7 @@
let pageType = ref(null)
let trayCode = ref(null)
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
onLoad((op) => {
diff --git a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
index d7279d9..846be8b 100644
--- a/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
+++ b/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
@@ -238,9 +238,7 @@
// date.value[1] = (uni as any).$u.timeFormat((new Date().valueOf()), 'yyyy-mm-dd')
})
onShow(async () => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
// 初始化获取搜索值
const pageSearchInfo = searchInfo.value['SelfPickupScan']
console.log('pageSearchInfo :>> ', pageSearchInfo);
diff --git a/pagesHome/pages/SetPrice/SetPrice.vue b/pagesHome/pages/SetPrice/SetPrice.vue
index ee4c1a3..9a50516 100644
--- a/pagesHome/pages/SetPrice/SetPrice.vue
+++ b/pagesHome/pages/SetPrice/SetPrice.vue
@@ -115,9 +115,7 @@
details.items = JSON.parse(op.item)
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
init()
})
diff --git a/pagesHome/pages/SignDetailScan/SignDetailScan.vue b/pagesHome/pages/SignDetailScan/SignDetailScan.vue
index 380a507..8b4c3bd 100644
--- a/pagesHome/pages/SignDetailScan/SignDetailScan.vue
+++ b/pagesHome/pages/SignDetailScan/SignDetailScan.vue
@@ -156,9 +156,7 @@
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
})
onLoad((op) => {
diff --git a/pagesHome/pages/StorageLocationList/StorageLocationList.vue b/pagesHome/pages/StorageLocationList/StorageLocationList.vue
index 127b8d2..e426f4d 100644
--- a/pagesHome/pages/StorageLocationList/StorageLocationList.vue
+++ b/pagesHome/pages/StorageLocationList/StorageLocationList.vue
@@ -134,9 +134,7 @@
})
onShow(async () => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
await nextTick()
diff --git a/pagesHome/pages/UnorderTask/UnorderTask.vue b/pagesHome/pages/UnorderTask/UnorderTask.vue
index a93ba6e..c9be3f5 100644
--- a/pagesHome/pages/UnorderTask/UnorderTask.vue
+++ b/pagesHome/pages/UnorderTask/UnorderTask.vue
@@ -280,11 +280,9 @@
}
onShow(async () => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
await nextTick()
- // if (!details.notRefresh) basicContainer.value.startPullDownRefresh()
+ if (!details.notRefresh) basicContainer.value.startPullDownRefresh()
})
onLoad(async () => {
date.value[0] = (uni as any).$u.timeFormat((new Date().valueOf() - 1000 * 60 * 60 * 24 * 3), 'yyyy-mm-dd')
diff --git a/pagesHome/pages/billsList/billsList.vue b/pagesHome/pages/billsList/billsList.vue
index 3886dba..fea702e 100644
--- a/pagesHome/pages/billsList/billsList.vue
+++ b/pagesHome/pages/billsList/billsList.vue
@@ -74,7 +74,7 @@
-
+
diff --git a/pagesHome/pages/orderDetails/orderDetails.vue b/pagesHome/pages/orderDetails/orderDetails.vue
index 6f278f2..d556c55 100644
--- a/pagesHome/pages/orderDetails/orderDetails.vue
+++ b/pagesHome/pages/orderDetails/orderDetails.vue
@@ -158,9 +158,7 @@
console.log('details.orderCode', details.orderCode);
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
initpage()
})
diff --git a/pagesHome/pages/pickingScan/pickingScan.vue b/pagesHome/pages/pickingScan/pickingScan.vue
index c343a0a..61b9b39 100644
--- a/pagesHome/pages/pickingScan/pickingScan.vue
+++ b/pagesHome/pages/pickingScan/pickingScan.vue
@@ -174,9 +174,7 @@
}
onShow(async () => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
// 初始化获取搜索值
const pageSearchInfo = searchInfo.value['pickingScan']
diff --git a/pagesHome/pages/signOrderScan/signOrderScan.vue b/pagesHome/pages/signOrderScan/signOrderScan.vue
index 30776d9..71f78db 100644
--- a/pagesHome/pages/signOrderScan/signOrderScan.vue
+++ b/pagesHome/pages/signOrderScan/signOrderScan.vue
@@ -53,37 +53,40 @@
库存品
-
-
-
-
-
-
-
- 订单编号:{{item.orderCode}}
-
+
+
+
+
+
+
+
+ 订单编号:{{item.orderCode}}
+
-
- 运单号:{{item.waybillNumber}}
-
+
+ 运单号:{{item.waybillNumber}}
+
-
- 计划:{{item.reservationNum}}
- 装车:{{item.loadingNub}}
- 签收:{{item.signforNub}}
-
+
+ 计划:{{item.reservationNum}}
+ 装车:{{item.loadingNub}}
+ 签收:{{item.signforNub}}
+
-
- 异常装车:{{item.abnormalLoading}}
- 异常签收:{{item.abnormalSignature}}
-
+
+ 异常装车:{{item.abnormalLoading}}
+ 异常签收:{{item.abnormalSignature}}
+
+
+
-
-
-
-
- 包条码
-
+
+
+
+ 包条码
+
-
- 货物品类
-
+
+ 货物品类
+
-
- 签收状态
-
+
+ 签收状态
+
-
- 异常状态
+
+ 异常状态
+
-
-
-
-
-
- {{ite.type === 1? ite.orderPackageCode: ite.orderPackageCode || '未备货'}}
-
+
+
+
+
+ {{ite.type === 1? ite.orderPackageCode: ite.orderPackageCode || '未备货'}}
+
- {{ite.Product || '暂无数据'}}
-
+ {{ite.Product || '暂无数据'}}
+
-
- {{ite.isSignfor === 1?'已签':'未签'}}
-
+
+ {{ite.isSignfor === 1?'已签':'未签'}}
+
-
- {{ite.isAbnormal === 1 ? '异常' : '/'}}
+
+ {{ite.isAbnormal === 1 ? '异常' : '/'}}
+
-
-
+
+
-
-
- {{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}
-
+
-
-
-
-
-
- 订单编号:{{item.orderCode}}
-
+
+ {{item.signforNub==0?'未扫':item.signforNub==item.reservationNum?'齐套':'部分扫'}}
+
+
+
+
+
+
+
+ 订单编号:{{item.orderCode}}
-
- 产品名称:{{item.descriptionGoods}}
-
+
+
+ 产品名称:{{item.descriptionGoods}}
-
- 计划签收:{{item.reservationNum}}
- 实际签收:{{(item.distributionParcelNumberVOS || []).reduce((cur, item)=>cur += item.signingNum || 0 ,0)}}
-
+
+
+ 计划签收:{{item.reservationNum}}
+ 实际签收:{{(item.distributionParcelNumberVOS || []).reduce((cur, item)=>cur += item.signingNum || 0 ,0)}}
+
-
- {{item.complete}}
-
+
+ {{item.complete}}
-
-
-
-
-
- SKU:{{item.sku}}
-
-
- 包条码:{{item.orderPackageCode}}
-
-
- 物品:{{item.descriptionGoods}}
- 规格:{{item.specification}}
-
-
- 单位:{{item.logpmUnit}}
-
-
-
+
+
+
+ SKU:{{item.sku}}
+
+
+ 包条码:{{item.orderPackageCode}}
+
+
+ 物品:{{item.descriptionGoods}}
+ 规格:{{item.specification}}
+
+
+ 单位:{{item.logpmUnit}}
+
+
+
-
- {{item.signforNub==0?'未扫':'已扫'}}
-
+
+ {{item.signforNub==0?'未扫':'已扫'}}
-
-
+
+
+
-
-
-
+
+
详情扫描
@@ -375,7 +380,7 @@
onMounted(async () => {
await nextTick()
- utils.getViewDistanceFormTop('.scve').then(res => {
+ utils.getViewDistanceFormTop('.mabx').then(res => {
console.log('res :>> ', res);
details.scrollHeight = res
})
@@ -601,11 +606,21 @@
return null
}
}
- function setcheckindex(index : number) {
+ async function setcheckindex(index : number, item) {
if (details.listcheckindex == index) {
details.listcheckindex = -1
} else {
details.listcheckindex = index
+
+ await nextTick()
+
+ uni.createSelectorQuery().select('#packageBox' + index + ' .xialaxz').boundingClientRect(async function (rect) {
+ // console.log('元素的高度是:', rect.height);
+ console.log('rect :>> ', rect);
+ await nextTick()
+ item.packageBoxHieght = rect.height + 'px'
+ }).exec();
+ // item.packageBoxHieght =
}
}
@@ -712,6 +727,11 @@
details.listcheckindex = index
}
}
+
+ const handleMove = (e) => {
+ e.preventDefault()
+ // console.log('e :>> ', e);
+ }
const { listcheckindex, inputtxt, orderStatus, datalist, items, typearr, schanvalue } = toRefs(details)
@@ -732,10 +752,12 @@
}
.xialaxz {
- zoom: 0.9;
+ // zoom: 0.9;
overflow-x: scroll;
word-wrap: break-word;
word-break: break-all;
+ font-size: 0.9rem;
+ width: 100%;
}
.tabtip {
@@ -769,78 +791,81 @@
}
}
- .scve {
- width: 100%;
- height: 62.2vh;
+ // .scve {
+ // width: 100%;
+ // height: 62.2vh;
+ // margin-top: 20upx;
+
+ .mabx {
+ // display: flex;
+ // flex-direction: column;
+ // align-items: center;
margin-top: 20upx;
+ padding: 20upx;
+ overflow-y: scroll;
- .mabx {
- display: flex;
- flex-direction: column;
- align-items: center;
+ .itec {
+ width: 686upx;
+ background: #FFFFFF;
+ border-radius: 8upx;
+ padding: 20upx;
+ box-sizing: border-box;
+ position: relative;
+ margin-bottom: 20upx;
- >.itec {
- width: 686upx;
- // height: 176upx;
- background: #FFFFFF;
- border-radius: 8upx;
- padding: 20upx;
- box-sizing: border-box;
- position: relative;
+ &:nth-last-child(1) {
+ margin-bottom: 0;
+ }
+
+ .contenbx1 {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 28upx;
+ color: #092C4D;
margin-bottom: 20upx;
- &:nth-last-child(1) {
+ &:nth-last-child(2) {
margin-bottom: 0;
}
- >.contenbx1 {
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-size: 28upx;
- color: #092C4D;
- margin-bottom: 20upx;
-
- &:nth-last-child(2) {
- margin-bottom: 0;
- }
-
- >view {
- flex: 1;
- }
+ >view {
+ flex: 1;
}
+ }
- .tip {
- position: absolute;
- right: 0;
- top: 0;
- width: 96upx;
- height: 48upx;
- border-radius: 0 8upx 0 8upx;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 24upx;
- }
+ .tip {
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: 96upx;
+ height: 48upx;
+ border-radius: 0 8upx 0 8upx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 24upx;
+ }
- .tp1 {
- background-color: #0086F120;
- color: #0086F1;
- }
+ .tp1 {
+ background-color: #0086F120;
+ color: #0086F1;
+ }
- .tp2 {
- background-color: #F8544B20;
- color: #F8544B;
- }
+ .tp2 {
+ background-color: #F8544B20;
+ color: #F8544B;
+ }
- .tp3 {
- background-color: #FA8C1620;
- color: #FA8C16;
- }
+ .tp3 {
+ background-color: #FA8C1620;
+ color: #FA8C16;
}
}
}
+ // }
+
.hdstop {
width: 100%;
padding: 20upx;
@@ -992,11 +1017,17 @@
>view {
background: #eee;
+ color: #092C4D !important;
}
}
.main_row {
+ $boder: 1upx solid #999;
+
display: flex;
+ width: fit-content;
+ border-top: $boder;
+ border-left: $boder;
&.green {
color: #0a0;
@@ -1008,12 +1039,14 @@
>view {
padding: 10upx 5upx;
- font-size: 0.9rem;
+ font-size: 0.8rem;
word-break: break-all;
text-align: center;
- border-bottom: 1upx dashed #999;
+ border-bottom: $boder;
+ border-right: $boder;
width: 240upx;
flex: none;
+ color: #777;
// &:nth-child(3) {
@@ -1052,7 +1085,13 @@
}
.jpScorllView {
- width: 100%;
- overflow: scroll;
+ width: fit-content;
+ max-height: 400upx;
+ overflow-y: scroll;
+ }
+
+ .packageBox {
+ transition: all 0.3s;
+ overflow: hidden;
}
\ No newline at end of file
diff --git a/pagesHome/pages/signinScan/signinScan.vue b/pagesHome/pages/signinScan/signinScan.vue
index 88257b9..77664c2 100644
--- a/pagesHome/pages/signinScan/signinScan.vue
+++ b/pagesHome/pages/signinScan/signinScan.vue
@@ -185,9 +185,7 @@
// init()
})
onShow(() => {
- // #ifdef APP
uni.$off('scancodedate')
- // #endif
// 页面显示延时调用组件刷新函数
const timer = setTimeout(() => {
basicContainer.value.startPullDownRefresh()
diff --git a/pagesHome/pages/trayInquiry/trayInquiry.vue b/pagesHome/pages/trayInquiry/trayInquiry.vue
index e2cdb8f..9aa23a4 100644
--- a/pagesHome/pages/trayInquiry/trayInquiry.vue
+++ b/pagesHome/pages/trayInquiry/trayInquiry.vue
@@ -46,14 +46,14 @@
打托方式:
- {{(scansortingType.find(val=> val.type === info.trayType || {})).name || '暂无数据'}}
+ {{(scansortingType.find(val=> val.type + '' === info.trayType + '' )|| {}).name || '暂无数据'}}
- 商场:
+ 名称:
- {{info.marketName || '暂无数据'}}
+ {{info.filterValue || '暂无数据'}}
@@ -114,50 +114,53 @@
-
- selectionChange(index, 'order')">
-
+
+ selectionChange(index, 'order')">
+
+
+ 包条码
+ 合同号
+
+ 一级品
+ 二级品
+ 三级品
+ 物料名称
+ 物料编码
+ 仓库
+ 数量
+
+
+
- 包条码
- 合同号
-
- 一级品
- 二级品
- 三级品
- 物料名称
- 物料编码
- 仓库
- 数量
+
+ {{item.orderPackageCode}}
+
+ {{item.orderCode}}
+
+
+
+ {{item.firsts}}
+
+ {{item.seconds}}
+
+ {{item.thirds}}
+
+ {{item.materialName}}
+
+ {{item.materialCode}}
+
+ {{item.warehouseName}}
+
+ {{item.num}}
-
-
-
-
- {{item.orderPackageCode}}
-
- {{item.orderCode}}
-
-
-
- {{item.firsts}}
-
- {{item.seconds}}
-
- {{item.thirds}}
-
- {{item.materialName}}
-
- {{item.materialCode}}
-
- {{item.warehouseName}}
-
- {{item.num}}
-
-
+
-
-
+
+
+
+
@@ -276,17 +279,17 @@
/** 详情 */
const info = ref({ trayInfo: {} })
- // 订单状态字典
- const orderStateDictionaries = reactive({
- '10': '部分入库',
- '20': '已入库',
- '30': '部分出库',
- '40': '已出库',
- '50': '部分装车',
- '60': '已装车',
- '70': '部分签收',
- '80': '已签收',
- })
+ const columnList = ref([
+ { label: '包条码', width: '10rem', prop: 'orderPackageCode' },
+ { label: '合同号', width: '10rem', prop: 'orderCode' },
+ { label: '一级品', width: '10rem', prop: 'firsts' },
+ { label: '二级品', width: '10rem', prop: 'seconds' },
+ { label: '三级品', width: '10rem', prop: 'thirds' },
+ { label: '物料名称', width: '10rem', prop: 'materialName' },
+ { label: '物料编码', width: '10rem', prop: 'materialCode' },
+ { label: '仓库', width: '10rem', prop: 'warehouseName' },
+ { label: '数量', width: '10rem', prop: 'num' },
+ ])
/** 打托方式类型 */
const scansortingType = reactive([
@@ -581,7 +584,6 @@
display: flex;
justify-content: space-around;
font-size: 32upx;
- // font-weight: bold;
margin: 20upx 0;
&>view {
@@ -589,22 +591,9 @@
flex: 1;
text-align: center;
position: relative;
- // background: #fff;
transition: all 0.3s;
border-radius: 10upx;
- // &::after {
- // content: '';
- // display: block;
- // position: absolute;
- // height: 4upx;
- // width: 0;
- // // background: var(--subjectColor);
- // top: 100%;
- // left: 50%;
- // transition: all 0.5s;
- // }
-
&.active {
background: var(--subjectColor);
color: #fff;
@@ -647,7 +636,6 @@
.uni-table-td,
.uni-table-th {
- // color: var(--subjectColor);
color: #000;
padding: 10upx;
word-break: break-all;
diff --git a/pagesUser/pages/about/about.vue b/pagesUser/pages/about/about.vue
index 5ef4025..fa6ab7d 100644
--- a/pagesUser/pages/about/about.vue
+++ b/pagesUser/pages/about/about.vue
@@ -1,36 +1,48 @@
+
+
+
+
\ No newline at end of file
diff --git a/pagesUser/pages/securitySettings/securitySettings.vue b/pagesUser/pages/securitySettings/securitySettings.vue
index 4513e22..01c9dee 100644
--- a/pagesUser/pages/securitySettings/securitySettings.vue
+++ b/pagesUser/pages/securitySettings/securitySettings.vue
@@ -4,14 +4,14 @@
:autoBack="true" leftIconSize='35'>
-
+
-
+
设置密码:
-
+
@@ -206,9 +206,12 @@