diff --git a/api/user.js b/api/user.js
index d77eb41..cebc9bd 100644
--- a/api/user.js
+++ b/api/user.js
@@ -3353,4 +3353,76 @@ export function postDownPackageCodes(data, loadingObj = {}, canCancel = false) {
loadingObj,
canCancel
);
+}
+
+/** 增值服务 -- 详情 */
+export function postADdvalueAppList(data, loadingObj = {}, canCancel = false) {
+ return request({
+ url: `logpm-distribution/app/addvalue/appList`,
+ method: "get",
+ data
+ },
+ loadingObj,
+ canCancel
+ );
+}
+
+/** 查询车辆 */
+export function postFindCarListByName(data, loadingObj = {}, canCancel = false) {
+ return request({
+ url: `logpm-trunkline/billlading/findCarListByName`,
+ method: "post",
+ data
+ },
+ loadingObj,
+ canCancel
+ );
+}
+
+/** 查询司机 */
+export function postFindDriverListByName(data, loadingObj = {}, canCancel = false) {
+ return request({
+ url: `logpm-trunkline/billlading/findDriverListByName`,
+ method: "post",
+ data
+ },
+ loadingObj,
+ canCancel
+ );
+}
+
+/** 查询仓库 */
+export function postFindWarehouseListByName(data, loadingObj = {}, canCancel = false) {
+ return request({
+ url: `logpm-trunkline/carsLoad/findWarehouseListByName`,
+ method: "post",
+ data
+ },
+ loadingObj,
+ canCancel
+ );
+}
+
+/** 查询仓库 */
+export function postFindLoadInitData(data, loadingObj = {}, canCancel = false) {
+ return request({
+ url: `logpm-trunkline/carsLoad/findLoadInitData`,
+ method: "post",
+ data
+ },
+ loadingObj,
+ canCancel
+ );
+}
+
+/** 新增配载计划 */
+export function postSaveNew(data, loadingObj = {}, canCancel = false) {
+ return request({
+ url: `logpm-trunkline/carsLoad/saveNew`,
+ method: "post",
+ data
+ },
+ loadingObj,
+ canCancel
+ );
}
\ No newline at end of file
diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue
index 2f6a0a2..497c497 100644
--- a/compoment/BasicContainer/BasicContainer.vue
+++ b/compoment/BasicContainer/BasicContainer.vue
@@ -82,6 +82,8 @@
let antiShake : any = null
// 触底加载
onReachBottom(() => {
+ if (props.option.haveReachBottom === false) return
+
// 数据请求完毕, 不再请求
if (props.option.isEnd) {
return uni.showToast({
diff --git a/compoment/CheckBox/CheckBox.vue b/compoment/CheckBox/CheckBox.vue
index 2729309..9c09e5c 100644
--- a/compoment/CheckBox/CheckBox.vue
+++ b/compoment/CheckBox/CheckBox.vue
@@ -1,8 +1,12 @@
-
+
+
+
@@ -46,19 +50,34 @@
width: 40upx;
height: 40upx;
box-sizing: border-box;
- display: flex;
- align-items: center;
- justify-content: center;
color: #8d97a3;
border-radius: 5upx;
+ position: relative;
+ transition: all 0.3s;
- >view {
- transform: rotateY(180deg) rotate(-45deg);
+ &::after {
+ opacity: 0;
+ content: '';
+ border-bottom: 2px solid;
+ border-left: 2px solid;
+ position: absolute;
+ width: 0;
+ height: 0;
+ left: 50%;
+ transform: translateX(-50%) rotateY(180deg) rotate(-45deg);
+ width: 30%;
+ height: 70%;
+ transition: all 0.3s;
}
}
.active {
border-color: var(--subjectColor);
color: var(--subjectColor);
+
+ &::after {
+ opacity: 1;
+ border-color: var(--subjectColor);
+ }
}
\ No newline at end of file
diff --git a/compoment/InputNum/InputNum.vue b/compoment/InputNum/InputNum.vue
index 11468e4..728ac6e 100644
--- a/compoment/InputNum/InputNum.vue
+++ b/compoment/InputNum/InputNum.vue
@@ -1,5 +1,6 @@
-
+
-
\ No newline at end of file
diff --git a/compoment/MyDrawer/MyDrawer.vue b/compoment/MyDrawer/MyDrawer.vue
new file mode 100644
index 0000000..e7ae05a
--- /dev/null
+++ b/compoment/MyDrawer/MyDrawer.vue
@@ -0,0 +1,245 @@
+
+
+ {
+ if (details.cancel) return details.cancel()
+ details.close()
+ } ">
+
+
+
+ 取消
+
+
+ {{confirmText||'确认'}}
+
+
+
+
+ {{details.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ details.cancelText || '取消'}}
+
+
+ {{ details.confirmText||'确认'}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/compoment/MyInput/MyInput.vue b/compoment/MyInput/MyInput.vue
index 771967c..2930a45 100644
--- a/compoment/MyInput/MyInput.vue
+++ b/compoment/MyInput/MyInput.vue
@@ -1,5 +1,7 @@
+
+
@@ -28,7 +30,7 @@
{
inputValue = '';
}" :class="`removeIcon ${!!props.modelValue || props.modelValue === 0 ? 'showClearable' : 'removeClearable'}`">
-
+
@@ -174,8 +176,6 @@
if (props.rules.rulesFn) isSuccess = props.rules.rulesFn(inputValue.value)
else isSuccess = Boolean(inputValue.value || inputValue.value === 0)
- console.log('isSuccess :>> ', isSuccess);
-
isSuccess ? inputClassName.value.success = true : inputClassName.value.error = true
if (isSuccess) {
inputClassName.value.success = true
@@ -230,7 +230,6 @@
}
watch(() => props.modelValue, () => {
- console.log('props.modelValue :>> ', props.modelValue);
handleChangeInputStatus()
})
@@ -269,6 +268,7 @@
.input_container {
display: flex;
+ align-items: center;
position: relative;
// overflow: hidden;
height: 100%;
diff --git a/compoment/RadioBox/RadioBox.vue b/compoment/RadioBox/RadioBox.vue
new file mode 100644
index 0000000..fdb4e45
--- /dev/null
+++ b/compoment/RadioBox/RadioBox.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/host.js b/config/host.js
index ddf62e9..ce131ef 100644
--- a/config/host.js
+++ b/config/host.js
@@ -4,11 +4,11 @@
* 测试域名
* */
//测试域名s
-// const devhost = 'http://test.api.huo5you.com/'
+const devhost = 'http://test.api.huo5you.com/'
// lmy
// const devhost = 'http://192.168.10.123:8889/'
// zhy
-const devhost = 'http://192.168.3.12:13000/'
+// const devhost = 'http://192.168.3.12:13000/'
// xiaohei
// const devhost = 'http://192.168.3.18:13000/'
// tjj
@@ -27,9 +27,9 @@ const devhost = 'http://192.168.3.12:13000/'
/**
* 正式域名
* */
-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 dba67ad..14fefd3 100644
--- a/main.js
+++ b/main.js
@@ -31,8 +31,12 @@ import PullDownBox from '@/compoment/PullDownBox/PullDownBox.vue';
import MyTree from '@/compoment/MyTree/MyTree.vue'
/** 复选框 */
import CheckBox from '@/compoment/CheckBox/CheckBox.vue'
+/** 单选框 */
+import RadioBox from '@/compoment/RadioBox/RadioBox.vue'
/** 输入框组件 */
import MyInput from '@/compoment/MyInput/MyInput';
+/** 抽屉组件 */
+import MyDrawer from '@/compoment/MyDrawer/MyDrawer';
import saomiao1 from '@/compoment/saomiao1.vue'
import saomiao2 from '@/compoment/saomiao2.vue'
import saomiao3 from '@/compoment/saomiao3.vue'
@@ -65,7 +69,9 @@ export function createApp() {
.component('PullDownBox', PullDownBox)
.component('MyTree', MyTree)
.component('CheckBox', CheckBox)
+ .component('RadioBox', RadioBox)
.component('MyInput', MyInput)
+ .component('MyDrawer', MyDrawer)
uni.$u.config.unit = 'rpx'
return {
diff --git a/manifest.json b/manifest.json
index 7cd2c9a..2700e3a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "货无忧",
+ "name" : "货无忧测试版",
"appid" : "__UNI__EB22F37",
"description" : "",
"versionName" : "1.1.40",
diff --git a/pages.json b/pages.json
index fdcd44a..7d53c4f 100644
--- a/pages.json
+++ b/pages.json
@@ -1671,6 +1671,24 @@
}
}
},
+ {
+ "path": "pages/AddStowage/AddStowage",
+ "style": {
+ "navigationBarTitleText": "新增配载",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 1,
+ "navigationStyle": "custom",
+ "app-plus": {
+ "animationDuration": 300,
+ "animationType": "zoom-fade-out",
+ "pullToRefresh": {
+ "support": true,
+ "color": "#d3832a", //小圈圈的颜色
+ "style": "circle" //小圈圈的样式
+ }
+ }
+ }
+ },
{
"path": "pages/integral/integral",
"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a97833a..cf1a5ca 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -40,233 +40,233 @@
const { storageArr } = storeToRefs(storageStore)
const tip = ref(null)
- // let details = reactive({ tablist: [] });
- let details = reactive({
- tablist: [
- {
- type: 1,
- name: '工作台',
- minilist: [
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231016/440a01005f8333bcc76c1254a1d35570.png',
- name: '订单查询',
- router: '/pagesHome/pages/orderInquiry/orderInquiry',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
- name: '运单查询',
- router: '/pagesHome/pages/waybillInquiry/waybillInquiry',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
- name: '库位查询',
- router: '/pagesHome/pages/storageInquiry/storageInquiry',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
- name: '托盘查询',
- router: '/pagesHome/pages/trayInquiry/trayInquiry',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
- name: '库存品查询',
- router: '/pagesHome/pages/inventoryInquiry/inventoryInquiry',
- },
- {
- icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
- name: '物料维护',
- router: '/pagesHome/pages/MaterialMaintenance/MaterialMaintenance',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240320/d22bc792f9deff3f106aafc590ec14fb.png',
- name: '库位列表',
- router: '/pagesHome/pages/StorageLocationList/StorageLocationList',
- },
- {
- icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
- name: '发起工单',
- router: '/pagesHome/pages/CreateAbnormalWorkOrder/CreateAbnormalWorkOrder',
- },
- ]
- },
- {
- type: 1,
- name: '入库',
- minilist: [
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240429/14451e54503266f168edf3651f2ab798.png',
- name: '码板打托',
- router: '/pagesHome/pages/codePlateBracket/codePlateBracket',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png',
- name: '入库扫描',
- router: '/pagesHome/pages/TranNumber/TranNumber',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240429/49254333c9c5c7aed6e9c8aab89c5998.png',
- name: '到车入库',
- router: '/pagesHome/pages/ArrivalList/ArrivalList',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png',
- name: '预入库车次',
- router: '/pagesHome/pages/Preentrytrainnumber/Preentrytrainnumber',
- },
- ]
- },
- {
- type: 1,
- name: '库内',
- minilist: [
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/e2604b3c97ee6001f367df87e3d0fdd1.png',
- name: '分拣打托',
- router: '/pagesHome/pages/scansorting/scansorting',
- },
- // {
- // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
- // name: '订单分拣',
- // router: '/pagesHome/pages/ordersorting/ordersorting',
- // },
- // {
- // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
- // name: '库存品分拣',
- // router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
- // },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/03add918888d36ce0d566da120510840.png',
- name: '扫码上架',
- router: '/pagesHome/pages/ScanUpType/ScanUpType',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7ca70b84ebf6a2f72e74300725132c.png',
- name: '手动上架',
- router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7e477dd35483ca7628567c609657fc.png',
- name: '移库',
- router: '/pagesHome/pages/RelocationType/RelocationType',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/b104c036fc6b6af5b635cc619731db6f.png',
- name: '滞留',
- router: '/pagesHome/pages/Retention/Retention',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/ce45bb522069f1fd154ca964e66069c2.png',
- name: '合托',
- router: '/pagesHome/pages/MergeTray/MergeTray',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/91403695005c2c65ea2c9d4ddadac9c3.png',
- name: '下架',
- router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231017/4ae045f95dcd923e8e8a553ccb374471.png',
- name: '空置托盘',
- router: '/pagesHome/pages/RemoveTray/RemoveTray',
- },
- // {
- // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
- // name: '复核',
- // router: '/pagesHome/pages/Check/Check',
- // },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231217/5d3a466a54b62a60cfb9dc53b0f6ded1.png',
- name: '托盘数据同步',
- router: '/pagesHome/pages/SearchTray/SearchTray',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231017/4ae045f95dcd923e8e8a553ccb374471.png',
- name: '包件解托',
- router: '/pagesHome/pages/PackageRelieveTray/PackageRelieveTray',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/b104c036fc6b6af5b635cc619731db6f.png',
- name: '配送包件回库',
- router: '/pagesHome/pages/PackageBackWarehouse/PackageBackWarehouse',
- },
- ]
- },
- {
- type: 1,
- name: '出库',
- minilist: [
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/b58252914de56c0e3da1bdc75ac51c07.png',
- name: '拣货扫描',
- router: '/pagesHome/pages/pickingScan/pickingScan',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/7a9648ffdefd77f7ab8bb7861a2473e7.png',
- name: '自提扫描',
- router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240429/e5562240ca21316b21306d17f9394abc.png',
- name: '配载装车',
- router: '/pagesHome/pages/StowageList/StowageList',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240429/d58281e6ba1845f313d85a119107e260.png',
- name: '中转装车',
- router: '/pagesHome/pages/RelayScanList/RelayScanList',
- },
- ]
- },
- {
- type: 1,
- name: '配送',
- minilist: [
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/1a9bbc8c842b8b7ef555d6cd79d421be.png',
- name: '装车扫描',
- router: '/pagesHome/pages/LoadingScan/LoadingScan',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20231012/6956f6950cfc291e01c038ea5e13f984.png',
- name: '签收扫描',
- router: '/pagesHome/pages/signinScan/signinScan',
- },
- {
- icon: 'http://47.108.51.143:9000/basic/upload/20240429/16a9b462df1546f2fa6159df00ade62e.png',
- name: '直发商家签收',
- router: '/pagesHome/pages/directGoMarket/directGoMarket',
- },
- ]
- },
- {
- type: 1,
- name: '离线上传',
- minilist: [
- {
- icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
- name: '离线上传',
- router: '/pagesHome/pages/OfflineUpload/OfflineUpload',
- },
- ]
- },
- {
- type: 1,
- name: '考核',
- minilist: [
- {
- icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
- name: '考核指标',
- router: '/pagesHome/pages/integral/integral',
- },
- {
- icon: 'http://8.137.14.82:9000/bladex/upload/20240117/fac9c4fd6c4f0bee599417fc8fbbee62.png',
- name: '我的考核',
- router: '/pagesHome/pages/integralMy/integralMy',
- },
- ]
- },
- ]
- })
+ let details = reactive({ tablist: [] });
+ // let details = reactive({
+ // tablist: [
+ // {
+ // type: 1,
+ // name: '工作台',
+ // minilist: [
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231016/440a01005f8333bcc76c1254a1d35570.png',
+ // name: '订单查询',
+ // router: '/pagesHome/pages/orderInquiry/orderInquiry',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
+ // name: '运单查询',
+ // router: '/pagesHome/pages/waybillInquiry/waybillInquiry',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
+ // name: '库位查询',
+ // router: '/pagesHome/pages/storageInquiry/storageInquiry',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
+ // name: '托盘查询',
+ // router: '/pagesHome/pages/trayInquiry/trayInquiry',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240103/81ac2b693232dd9968ec35c0fa3d21f2.png',
+ // name: '库存品查询',
+ // router: '/pagesHome/pages/inventoryInquiry/inventoryInquiry',
+ // },
+ // {
+ // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+ // name: '物料维护',
+ // router: '/pagesHome/pages/MaterialMaintenance/MaterialMaintenance',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240320/d22bc792f9deff3f106aafc590ec14fb.png',
+ // name: '库位列表',
+ // router: '/pagesHome/pages/StorageLocationList/StorageLocationList',
+ // },
+ // {
+ // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+ // name: '发起工单',
+ // router: '/pagesHome/pages/CreateAbnormalWorkOrder/CreateAbnormalWorkOrder',
+ // },
+ // ]
+ // },
+ // {
+ // type: 1,
+ // name: '入库',
+ // minilist: [
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240429/14451e54503266f168edf3651f2ab798.png',
+ // name: '码板打托',
+ // router: '/pagesHome/pages/codePlateBracket/codePlateBracket',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png',
+ // name: '入库扫描',
+ // router: '/pagesHome/pages/TranNumber/TranNumber',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240429/49254333c9c5c7aed6e9c8aab89c5998.png',
+ // name: '到车入库',
+ // router: '/pagesHome/pages/ArrivalList/ArrivalList',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png',
+ // name: '预入库车次',
+ // router: '/pagesHome/pages/Preentrytrainnumber/Preentrytrainnumber',
+ // },
+ // ]
+ // },
+ // {
+ // type: 1,
+ // name: '库内',
+ // minilist: [
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/e2604b3c97ee6001f367df87e3d0fdd1.png',
+ // name: '分拣打托',
+ // router: '/pagesHome/pages/scansorting/scansorting',
+ // },
+ // // {
+ // // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+ // // name: '订单分拣',
+ // // router: '/pagesHome/pages/ordersorting/ordersorting',
+ // // },
+ // // {
+ // // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+ // // name: '库存品分拣',
+ // // router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
+ // // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/03add918888d36ce0d566da120510840.png',
+ // name: '扫码上架',
+ // router: '/pagesHome/pages/ScanUpType/ScanUpType',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7ca70b84ebf6a2f72e74300725132c.png',
+ // name: '手动上架',
+ // router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/7b7e477dd35483ca7628567c609657fc.png',
+ // name: '移库',
+ // router: '/pagesHome/pages/RelocationType/RelocationType',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/b104c036fc6b6af5b635cc619731db6f.png',
+ // name: '滞留',
+ // router: '/pagesHome/pages/Retention/Retention',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/ce45bb522069f1fd154ca964e66069c2.png',
+ // name: '合托',
+ // router: '/pagesHome/pages/MergeTray/MergeTray',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/91403695005c2c65ea2c9d4ddadac9c3.png',
+ // name: '下架',
+ // router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231017/4ae045f95dcd923e8e8a553ccb374471.png',
+ // name: '空置托盘',
+ // router: '/pagesHome/pages/RemoveTray/RemoveTray',
+ // },
+ // // {
+ // // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+ // // name: '复核',
+ // // router: '/pagesHome/pages/Check/Check',
+ // // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231217/5d3a466a54b62a60cfb9dc53b0f6ded1.png',
+ // name: '托盘数据同步',
+ // router: '/pagesHome/pages/SearchTray/SearchTray',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231017/4ae045f95dcd923e8e8a553ccb374471.png',
+ // name: '包件解托',
+ // router: '/pagesHome/pages/PackageRelieveTray/PackageRelieveTray',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/b104c036fc6b6af5b635cc619731db6f.png',
+ // name: '配送包件回库',
+ // router: '/pagesHome/pages/PackageBackWarehouse/PackageBackWarehouse',
+ // },
+ // ]
+ // },
+ // {
+ // type: 1,
+ // name: '出库',
+ // minilist: [
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/b58252914de56c0e3da1bdc75ac51c07.png',
+ // name: '拣货扫描',
+ // router: '/pagesHome/pages/pickingScan/pickingScan',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/7a9648ffdefd77f7ab8bb7861a2473e7.png',
+ // name: '自提扫描',
+ // router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240429/e5562240ca21316b21306d17f9394abc.png',
+ // name: '配载装车',
+ // router: '/pagesHome/pages/StowageList/StowageList',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240429/d58281e6ba1845f313d85a119107e260.png',
+ // name: '中转装车',
+ // router: '/pagesHome/pages/RelayScanList/RelayScanList',
+ // },
+ // ]
+ // },
+ // {
+ // type: 1,
+ // name: '配送',
+ // minilist: [
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/1a9bbc8c842b8b7ef555d6cd79d421be.png',
+ // name: '装车扫描',
+ // router: '/pagesHome/pages/LoadingScan/LoadingScan',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20231012/6956f6950cfc291e01c038ea5e13f984.png',
+ // name: '签收扫描',
+ // router: '/pagesHome/pages/signinScan/signinScan',
+ // },
+ // {
+ // icon: 'http://47.108.51.143:9000/basic/upload/20240429/16a9b462df1546f2fa6159df00ade62e.png',
+ // name: '直发商家签收',
+ // router: '/pagesHome/pages/directGoMarket/directGoMarket',
+ // },
+ // ]
+ // },
+ // {
+ // type: 1,
+ // name: '离线上传',
+ // minilist: [
+ // {
+ // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+ // name: '离线上传',
+ // router: '/pagesHome/pages/OfflineUpload/OfflineUpload',
+ // },
+ // ]
+ // },
+ // {
+ // type: 1,
+ // name: '考核',
+ // minilist: [
+ // {
+ // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+ // name: '考核指标',
+ // router: '/pagesHome/pages/integral/integral',
+ // },
+ // {
+ // icon: 'http://8.137.14.82:9000/bladex/upload/20240117/fac9c4fd6c4f0bee599417fc8fbbee62.png',
+ // name: '我的考核',
+ // router: '/pagesHome/pages/integralMy/integralMy',
+ // },
+ // ]
+ // },
+ // ]
+ // })
function gopathpage(path : string) {
uni.navigateTo({
diff --git a/pagesHome/pages/AddStowage/AddStowage.vue b/pagesHome/pages/AddStowage/AddStowage.vue
new file mode 100644
index 0000000..d985574
--- /dev/null
+++ b/pagesHome/pages/AddStowage/AddStowage.vue
@@ -0,0 +1,1003 @@
+
+
+
+
+
+
+
+ 车牌号:
+
+
+
+
+ {{ details.form.carNumber || '请选择车牌号' }}
+
+
+
+
+
+
+
+ handleChooseDriver(1)">
+
+ 主驾司机:
+
+
+
+
+ {{ details.form.driverName || '请选择主驾司机'}}
+
+
+
+
+
+
+
+ handleChooseDriver(2)">
+
+ 副驾司机:
+
+
+
+
+ {{ details.form.assistantName || '请选择副驾司机'}}
+
+
+
+
+
+
+
+ handleChooseStowageType(3)">
+
+ 配载类型:
+
+
+
+
+ {{ details.form.loadTypeName || '请选择配载类型'}}
+
+
+
+
+
+
+
+ handleChooseStowageType(4)">
+
+ 分摊方式:
+
+
+
+
+ {{ details.form.chargeTypeName || '请选择分摊方式'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.nodeName}}
+
+
+
+ handleAddNode(index, true)">
+
+
+
+
+ handleAddNode(index, false)">
+
+
+
+
+
+ handleRemoveNode(index)" class="removeButton" hover-class="clickClass">
+
+
+
+
+
+
+
+
+
+ 提 交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pagesHome/pages/ArrivalList/ArrivalList.vue b/pagesHome/pages/ArrivalList/ArrivalList.vue
index 68e38ae..1f07bb9 100644
--- a/pagesHome/pages/ArrivalList/ArrivalList.vue
+++ b/pagesHome/pages/ArrivalList/ArrivalList.vue
@@ -2,19 +2,31 @@
-
-
-
- {{datatime|| '请选择时间'}}
-
-
-
-
+
@@ -78,16 +90,15 @@
线路:{{item.carsLineName}}
-
-
+
+
到车
-
+
按件入库
@@ -255,7 +266,8 @@
datalist: [],
/** 扫描的码值 */
scancode: '',
- scrollheight: '80vh'
+ scrollheight: '80vh',
+ notRefresh: false
})
const carStateDictionaries = reactive([
@@ -295,7 +307,9 @@
// #endif
await nextTick()
- basicContainer.value.startPullDownRefresh()
+ console.log('details.notRefresh :>> ', details.notRefresh);
+ if (!details.notRefresh) basicContainer.value.startPullDownRefresh()
+ details.notRefresh = false
details.scrollheight = await utils.getViewDistanceFormTop('.scvmabx')
})
// onHide(() => {
@@ -305,8 +319,22 @@
const date = ref<(string | number)[]>([])
async function scandata() {
+ basicContainer.value.startPullDownRefresh()
+ }
+
+ const handleScan = () => {
+ details.notRefresh = true
+ console.log('details.notRefresh :>> ', details.notRefresh);
+ uni.scanCode({
+ success(res) {
+ console.log('res :>> ', res);
+ details.scancode = res.result
+ scandata()
+ }
+ })
}
+
async function initpage() {
try {
let submitData = {
@@ -315,6 +343,7 @@
pageSize: details.pageSize,
startDate: date.value[0] || '',
endDate: date.value[1] || '',
+ carsNo: details.scancode
}
const res = await postArriveUnloadPageList(submitData)
if (res.code !== 200) return
@@ -325,8 +354,10 @@
for (let iterator of data.records) {
const _endWarehouseIds = iterator.endWarehouseIds.split(',')
- // 是否在当前节点
+ // 是否在显示控件
iterator.showControl = false
+ // 是否显示到车
+ iterator.showArrivalBtn = false
// 是否为中间节点
iterator.showTruckLoading = false
@@ -343,19 +374,28 @@
const value = _endWarehouseIds[i]
if (iterator.nowWarehouseId === value) _nowIndex = i
- if (_wareHouseId !== value) continue
- _index = i
- break
+ if (_wareHouseId === value) _index = i
}
+ console.log('_nowIndex :>> ', _nowIndex);
+ console.log('_index :>> ', _index);
+ console.log('iterator :>> ', iterator);
+
// 现节点在始发仓, 无法操作
- if (_nowIndex === -1 || _nowIndex < _index || Number(iterator.loadStatus) === 100) continue
+ if (Number(iterator.loadStatus) === 100 || Number(iterator.loadStatus) === 0) continue
+ console.log('111 :>> ', 111);
+
+
+ // 是否显示到车按钮
+ if (_nowIndex < _index && (Number(iterator.loadStatus) === 10 || Number(iterator.loadStatus) === 30)) {
+ iterator.showArrivalBtn = true
+ continue
+ }
// 是否在当前节点
iterator.showControl = true
-
// 是否为中间节点
- if (_index !== _endWarehouseIds.length - 1) iterator.showTruckLoading = true
+ if (_index !== _endWarehouseIds.length - 1 && _nowIndex === _index && Number(iterator.loadStatus) === 20) iterator.showTruckLoading = true
}
details.datalist = [...details.datalist, ...data.records]
}
@@ -447,6 +487,8 @@
\ No newline at end of file
diff --git a/pagesHome/pages/StockUpListZero/StockUpListZero.vue b/pagesHome/pages/StockUpListZero/StockUpListZero.vue
index 21b24c5..d3823ac 100644
--- a/pagesHome/pages/StockUpListZero/StockUpListZero.vue
+++ b/pagesHome/pages/StockUpListZero/StockUpListZero.vue
@@ -87,7 +87,7 @@
import { storeToRefs } from 'pinia';
const { scanState } = storeToRefs(useSystemSettingsStore())
const util = (inject('utils') as any)
- let details = reactive({
+ let details = reactive({
dataList: [],
stockArticleId: '',
orderStatus: '',
diff --git a/pagesHome/pages/StowageList/StowageList.vue b/pagesHome/pages/StowageList/StowageList.vue
index 4c99060..d4b9025 100644
--- a/pagesHome/pages/StowageList/StowageList.vue
+++ b/pagesHome/pages/StowageList/StowageList.vue
@@ -1,23 +1,33 @@
-
- 拣货日期:
-
-
- {{datatime|| '请选择时间'}}
-
-
-
-
+
-
+
@@ -88,7 +98,12 @@
+
+
+
@@ -112,14 +127,15 @@
import { postCarsLoadPageList, postFindFinanceList, postAddContractByLoadId } from '@/api/user.js'
import { timeType } from '@/interfaces/pagesHome/allType'
import functions from '@/utils/functions.js';
- import { inject, reactive, ref, toRefs, watchEffect } from "vue";
+ import { inject, reactive, ref, toRefs, watchEffect, nextTick } from "vue";
import utils from '@/utils/utils';
const option = {
title: '配载装车',
haveData: true,
async pullDownRefreshInitPage() {
- // details.dataList.splice(0)
- return await init()
+ details.pageNum = 1
+ details.dataList.splice(0)
+ return await initpage()
}
}
let details = reactive({
@@ -140,7 +156,10 @@
'2': '支线',
'3': '专车',
},
- imgFileList: []
+ imgFileList: [],
+ scancode: '',
+ notRefresh: false,
+ scrollHeight: '60vh',
})
@@ -165,32 +184,57 @@
basicContainer.value.startPullDownRefresh()
}
- onShow(() => {
+ onShow(async () => {
// #ifdef APP
uni.$off('scancodedate')
// #endif
- const timer = setTimeout(() => {
- basicContainer.value.startPullDownRefresh()
- clearTimeout(timer)
- }, 200)
+ await nextTick()
+ if (!details.notRefresh) basicContainer.value.startPullDownRefresh()
})
- onLoad(() => {
+ onLoad(async () => {
date.value[0] = (uni as any).$u.timeFormat((new Date().valueOf() - 1000 * 60 * 60 * 24 * 3), 'yyyy-mm-dd')
date.value[1] = (uni as any).$u.timeFormat((new Date().valueOf()), 'yyyy-mm-dd')
details.datatime = date.value[0] + ' 至 ' + date.value[1]
// #ifdef APP
utils.ttsspke('请选择配载计划')
// #endif
+
+ await nextTick()
+ details.scrollHeight = await utils.getViewDistanceFormTop('.sccv')
})
async function init() {
details.pageNum = 1
details.dataList.splice(0)
return initpage()
}
+
+ const handleSearch = () => {
+ basicContainer.value.startPullDownRefresh()
+ }
+
function jiazai() {
details.pageNum++
initpage()
}
+
+ function scandata() {
+ basicContainer.value.startPullDownRefresh()
+ }
+
+ /** 扫描 */
+ const handleScan = () => {
+ details.notRefresh = true
+
+ console.log('details.notRefresh :>> ', details.notRefresh);
+ uni.scanCode({
+ success(res) {
+ console.log('res :>> ', res);
+ details.scancode = res.result
+ scandata()
+ }
+ })
+ }
+
async function initpage() {
if (date.value.length === 0) return utils.handleToast('请选择时间')
@@ -205,6 +249,7 @@
startDate: date.value[0],
endDate: date.value[1],
type: details.status,
+ carsNo: details.scancode
}
let response = await postCarsLoadPageList(data)
if (response.code !== 200 || !response.data) return
@@ -379,6 +424,13 @@
})
}
+ /** 新增配载 */
+ const handleAddStowage = () => {
+ uni.navigateTo({
+ url: '/pagesHome/pages/AddStowage/AddStowage'
+ })
+ }
+
const { datatime, dataList, show, status } = toRefs(details)
@@ -411,6 +463,57 @@
}
}
+ .header {
+ background-color: #FFFFFF;
+ padding: 20upx 30upx;
+
+ .input {
+ height: 60upx;
+ background: #F5F5F6;
+ border-radius: 8upx;
+ opacity: 1;
+ border: 2upx solid #00000020;
+ padding: 4upx;
+
+ :deep(.input_container) {
+ border: none;
+ }
+ }
+ }
+
+ .headtop {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ box-sizing: border-box;
+
+ >view:nth-of-type(1) {
+ width: 540upx;
+ border: 2upx solid #00000020;
+ padding: 10upx 20upx;
+ box-sizing: border-box;
+
+ >input {
+ flex: 1;
+ font-size: 28upx;
+ }
+ }
+
+ >view:nth-of-type(2) {
+ width: 128upx;
+ height: 64upx;
+ background: var(--subjectColor);
+ border-radius: 8upx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32upx;
+ font-weight: 400;
+ color: #FFFFFF;
+ }
+ }
+
+
.sccv {
width: 100%;
height: 74vh;
@@ -553,6 +656,7 @@
display: flex;
align-items: center;
justify-content: space-between;
+ position: relative;
>view {
width: 50%;
@@ -650,4 +754,27 @@
:deep(.popUpMask) {
z-index: 99;
}
+
+ .footer_button {
+ height: 60px;
+
+ .button {
+ position: fixed;
+ height: 80upx;
+ line-height: 80upx;
+ padding: 0 60upx;
+ border-radius: 10upx;
+ color: #fff;
+ background: var(--subjectColor);
+ bottom: 20px;
+ left: 50%;
+ transform: translateX(-50%);
+ transition: all 0.3s;
+ zoom: 1;
+
+ &.active {
+ opacity: 0.7;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/pagesHome/pages/StowageListDetails/StowageListDetails.vue b/pagesHome/pages/StowageListDetails/StowageListDetails.vue
index d6ccb7c..4b8bacd 100644
--- a/pagesHome/pages/StowageListDetails/StowageListDetails.vue
+++ b/pagesHome/pages/StowageListDetails/StowageListDetails.vue
@@ -26,10 +26,10 @@
-->
-
+
计划件数
{{details.pageInfo.planLoadingNumber || 0}}
@@ -38,6 +38,11 @@
装车件数
{{details.pageInfo.realLoadingNumber || 0}}
+
+ 在车件数
+ {{details.pageInfo.stockCarsNum || 0}}
+
+
diff --git a/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue b/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
index a39f965..6680111 100644
--- a/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
+++ b/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
@@ -64,10 +64,6 @@
零担
-
-
diff --git a/pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue b/pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue
index ed4783b..9aae1ad 100644
--- a/pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue
+++ b/pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue
@@ -43,12 +43,12 @@
-
+
@@ -56,6 +56,8 @@
+
+
@@ -804,31 +806,14 @@