Compare commits
2 Commits
0795a713ab
...
a6416d85d1
Author | SHA1 | Date |
---|---|---|
![]() |
a6416d85d1 | |
![]() |
d324dee645 |
|
@ -50,7 +50,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
id: "",
|
id: "",
|
||||||
|
|
|
@ -18,7 +18,6 @@ import plateInput from "@/components/uni-plate-input/uni-plate-input.vue";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
show: boolean;
|
show: boolean;
|
||||||
isShipment: boolean;
|
|
||||||
}>();
|
}>();
|
||||||
const emit = defineEmits(["handleDialog", "changeCarNo"]);
|
const emit = defineEmits(["handleDialog", "changeCarNo"]);
|
||||||
const statePlate = reactive({
|
const statePlate = reactive({
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
:customStyle="{}"
|
:customStyle="{}"
|
||||||
border="none"
|
border="none"
|
||||||
@change="(e:any) => {handleInput(e, item)}"
|
@change="(e:any) => {handleInput(e, item)}"
|
||||||
|
@blur="(e:any) => {handleBlur(e, item)}"
|
||||||
:disabled="item.type === 'select'"
|
:disabled="item.type === 'select'"
|
||||||
:disabledColor="
|
:disabledColor="
|
||||||
['卡号', '供应商分类'].indexOf(item.name) > -1
|
['卡号', '供应商分类'].indexOf(item.name) > -1
|
||||||
|
@ -108,6 +109,14 @@ const handleInput = (e: any, item: any) => {
|
||||||
}, 10);
|
}, 10);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
const handleBlur = (e: any, item: any) => {
|
||||||
|
if (item.key === "phone") {
|
||||||
|
if (!valid.mobile.pattern.test(model1.formData.phone)) {
|
||||||
|
uni.showToast({ icon: "none", title: "请输入正确的手机号" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
const model1 = reactive<any>({
|
const model1 = reactive<any>({
|
||||||
formData: {},
|
formData: {},
|
||||||
});
|
});
|
||||||
|
@ -413,7 +422,7 @@ onLoad((option: any) => {
|
||||||
border-radius: 13rpx 13rpx 0rpx 0rpx;
|
border-radius: 13rpx 13rpx 0rpx 0rpx;
|
||||||
padding: 25rpx 50rpx;
|
padding: 25rpx 50rpx;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
width: calc(100vw - 100rpx);
|
width: calc(100vw - 100rpx);
|
||||||
bottom: 0rpx;
|
bottom: 0rpx;
|
||||||
z-index: 999;
|
z-index: 999;
|
||||||
::v-deep button {
|
::v-deep button {
|
||||||
|
|
|
@ -56,7 +56,6 @@
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { CustomerApi } from "@/services";
|
import { CustomerApi } from "@/services";
|
||||||
import { UsersType } from "@/utils/enum";
|
|
||||||
import PageView from "@/components/PageView/index.vue";
|
import PageView from "@/components/PageView/index.vue";
|
||||||
import type { Customer } from "@/types/user";
|
import type { Customer } from "@/types/user";
|
||||||
import SmallModal from "@/components/Modal/smallModal.vue";
|
import SmallModal from "@/components/Modal/smallModal.vue";
|
||||||
|
@ -77,7 +76,7 @@ const pageList: PageResult<Customer> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -187,7 +187,7 @@ const pageList: PageResult<any> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -187,7 +187,7 @@ const pageList: PageResult<any> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -153,7 +153,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -343,7 +343,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
|
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
|
|
|
@ -83,7 +83,7 @@ const pageList: PageResult<{
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -75,7 +75,7 @@ const pageList: PageResult<{ reCategoryName: string; id: number }> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -80,7 +80,7 @@ const pageList: PageResult<{
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -181,7 +181,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -376,7 +376,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
|
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
|
|
|
@ -86,7 +86,7 @@ const pageList: PageResult<{
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
"
|
"
|
||||||
@change="(e:any) => {handleInput(e, item)}"
|
@change="(e:any) => {handleInput(e, item)}"
|
||||||
@clear="handleClear(item)"
|
@clear="handleClear(item)"
|
||||||
|
@blur="(e:any) => {handleBlur(e, item)}"
|
||||||
>
|
>
|
||||||
<template #suffix>
|
<template #suffix>
|
||||||
<text v-if="item.key === 'subtractNum'">
|
<text v-if="item.key === 'subtractNum'">
|
||||||
|
@ -120,7 +121,6 @@
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {
|
import {
|
||||||
CustomerApi,
|
|
||||||
DeviceApi,
|
DeviceApi,
|
||||||
GoodsApi,
|
GoodsApi,
|
||||||
PictureApi,
|
PictureApi,
|
||||||
|
@ -191,6 +191,22 @@ const handleInput = (e: any, item: any) => {
|
||||||
model1.order[item.key] = temp;
|
model1.order[item.key] = temp;
|
||||||
}, 10);
|
}, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item.key === "phone") {
|
||||||
|
const temp = e?.replace(valid.valid_number, "");
|
||||||
|
setTimeout(() => {
|
||||||
|
model1.order[item.key] = temp;
|
||||||
|
}, 10);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBlur = (e: any, item: any) => {
|
||||||
|
if (item.key === "phone") {
|
||||||
|
if (!valid.mobile.pattern.test(model1.order.phone)) {
|
||||||
|
uni.showToast({ icon: "none", title: "请输入正确的手机号" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const model1 = reactive<any>({
|
const model1 = reactive<any>({
|
||||||
|
|
|
@ -85,7 +85,7 @@ const pageList: PageResult<{
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -84,7 +84,7 @@ const pageList: PageResult<StockCard> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
const obj = {
|
const obj = {
|
||||||
|
|
|
@ -90,7 +90,7 @@ const pageList: PageResult<Supplier> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -73,7 +73,7 @@ const pageList: PageResult<SupplierType> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -81,7 +81,7 @@ const pageList: PageResult<User> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const add = () => {
|
const add = () => {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
|
@ -62,7 +62,7 @@ const pageList: PageResult<any> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
@ -114,7 +114,7 @@ const handleItem = (item: any) => {
|
||||||
MsgType.ToBeReview === item.msgType
|
MsgType.ToBeReview === item.msgType
|
||||||
) {
|
) {
|
||||||
ReceiveApi.getOrderPage({
|
ReceiveApi.getOrderPage({
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
pageNumber: 1,
|
pageNumber: 1,
|
||||||
receiptNumber: item.business,
|
receiptNumber: item.business,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
|
@ -155,7 +155,7 @@ const handleItem = (item: any) => {
|
||||||
MsgType.ToBeShipmentReview === item.msgType
|
MsgType.ToBeShipmentReview === item.msgType
|
||||||
) {
|
) {
|
||||||
ShipmentApi.getOrderPage({
|
ShipmentApi.getOrderPage({
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
pageNumber: 1,
|
pageNumber: 1,
|
||||||
orderNumber: item.business,
|
orderNumber: item.business,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
|
|
|
@ -86,7 +86,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const keyword = ref("");
|
const keyword = ref("");
|
||||||
|
|
||||||
|
|
|
@ -42,12 +42,13 @@
|
||||||
"
|
"
|
||||||
:noMoreData="pageList.noMoreData"
|
:noMoreData="pageList.noMoreData"
|
||||||
:list="pageList.list"
|
:list="pageList.list"
|
||||||
:height="ScaleStatus.Paid === currentTab ? 160 : 240"
|
:height="ScaleStatus.Paid === currentTab ? 160 : 200"
|
||||||
:isLoading="pageList.isLoading"
|
:isLoading="pageList.isLoading"
|
||||||
>
|
>
|
||||||
<block v-for="(item, index) in pageList.list" :key="index">
|
<block v-for="(item, index) in pageList.list" :key="index">
|
||||||
<view class="c-layout">
|
<view class="c-layout">
|
||||||
<view style="min-width: 20px">
|
<view style="min-width: 20px">
|
||||||
|
<!-- {{ index }}-{{ item.id }} -->
|
||||||
<checkbox
|
<checkbox
|
||||||
v-if="
|
v-if="
|
||||||
ScaleStatus.ToBeReview === currentTab ||
|
ScaleStatus.ToBeReview === currentTab ||
|
||||||
|
@ -57,7 +58,7 @@
|
||||||
:color="'#00D2E3'"
|
:color="'#00D2E3'"
|
||||||
:checked="item.isChecked"
|
:checked="item.isChecked"
|
||||||
style="transform: scale(0.7)"
|
style="transform: scale(0.7)"
|
||||||
@click="item.isChecked = !item.isChecked"
|
@click="item.isChecked = !item.isChecked;"
|
||||||
/></view>
|
/></view>
|
||||||
<view class="inner-box">
|
<view class="inner-box">
|
||||||
<view class="top-flex-box">
|
<view class="top-flex-box">
|
||||||
|
@ -208,7 +209,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const keyword = ref("");
|
const keyword = ref("");
|
||||||
const state = reactive<{
|
const state = reactive<{
|
||||||
|
@ -286,6 +287,7 @@ const updateStatus = (status: number, key: number) => {
|
||||||
return { ...item, paymentMethod: key };
|
return { ...item, paymentMethod: key };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
uni.showToast({ icon: "none", title: "当前选中" + paramsList.length });
|
||||||
ReceiveApi.updateOrderIn({ orderInPos: paramsList }).then((res) => {
|
ReceiveApi.updateOrderIn({ orderInPos: paramsList }).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
resetPageList();
|
resetPageList();
|
||||||
|
|
|
@ -152,7 +152,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
:disabled="item.disabled || item.type === 'select'"
|
:disabled="item.disabled || item.type === 'select'"
|
||||||
:disabledColor="item.name === '出货产品' ? '#ffffff' : '#f5f7fa'"
|
:disabledColor="item.name === '出货产品' ? '#ffffff' : '#f5f7fa'"
|
||||||
@change="(e:any) => {handleInput(e, item)}"
|
@change="(e:any) => {handleInput(e, item)}"
|
||||||
|
@blur="(e:any) => {handleBlur(e, item)}"
|
||||||
@clear="handleClear(item)"
|
@clear="handleClear(item)"
|
||||||
>
|
>
|
||||||
<template #suffix>
|
<template #suffix>
|
||||||
|
@ -158,6 +159,15 @@ const handleInput = (e: any, item: any) => {
|
||||||
}, 10);
|
}, 10);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleBlur = (e: any, item: any) => {
|
||||||
|
if (item.key === "phone") {
|
||||||
|
if (!valid.mobile.pattern.test(model1.order.phone)) {
|
||||||
|
uni.showToast({ icon: "none", title: "请输入正确的手机号" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
const model1 = reactive<any>({
|
const model1 = reactive<any>({
|
||||||
order: {
|
order: {
|
||||||
id: 0,
|
id: 0,
|
||||||
|
|
|
@ -58,7 +58,7 @@ const pageList: PageResult<Order> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -197,7 +197,7 @@ const pageList: PageResult<Shipment> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const keyword = ref("");
|
const keyword = ref("");
|
||||||
const state = reactive<{
|
const state = reactive<{
|
||||||
|
|
|
@ -86,7 +86,7 @@ const pageList: PageResult<Shipment> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const keyword = ref("");
|
const keyword = ref("");
|
||||||
|
|
||||||
|
|
|
@ -198,7 +198,7 @@ const pageList: PageResult<Shipment> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const keyword = ref("");
|
const keyword = ref("");
|
||||||
const state = reactive<{
|
const state = reactive<{
|
||||||
|
|
|
@ -147,7 +147,7 @@ const pageList: PageResult<Shipment> = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
});
|
});
|
||||||
const resetPageList = () => {
|
const resetPageList = () => {
|
||||||
pageList.noMoreData = false;
|
pageList.noMoreData = false;
|
||||||
|
|
|
@ -55,7 +55,7 @@ export enum PaymentMethod {
|
||||||
NoPay = 0,
|
NoPay = 0,
|
||||||
Cash = 1,
|
Cash = 1,
|
||||||
BankCard = 2,
|
BankCard = 2,
|
||||||
WeChat = 2,
|
WeChat = 3,
|
||||||
Alipay = 4
|
Alipay = 4
|
||||||
}
|
}
|
||||||
//用户类型0:刷脸1:刷卡
|
//用户类型0:刷脸1:刷卡
|
||||||
|
|
|
@ -164,7 +164,7 @@ export function pageListInit() {
|
||||||
total: 0,
|
total: 0,
|
||||||
list: [],
|
list: [],
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 100,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
// 过滤掉属性值为null的
|
// 过滤掉属性值为null的
|
||||||
|
|
Loading…
Reference in New Issue