Compare commits

..

No commits in common. "a6416d85d1cb3189a36961d2f961be1be757bdf2" and "0795a713abe844aa11af700d7544f2104d3372f3" have entirely different histories.

32 changed files with 36 additions and 71 deletions

View File

@ -50,7 +50,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const state = reactive({
id: "",

View File

@ -18,6 +18,7 @@ import plateInput from "@/components/uni-plate-input/uni-plate-input.vue";
const props = defineProps<{
show: boolean;
isShipment: boolean;
}>();
const emit = defineEmits(["handleDialog", "changeCarNo"]);
const statePlate = reactive({

View File

@ -32,7 +32,6 @@
:customStyle="{}"
border="none"
@change="(e:any) => {handleInput(e, item)}"
@blur="(e:any) => {handleBlur(e, item)}"
:disabled="item.type === 'select'"
:disabledColor="
['卡号', '供应商分类'].indexOf(item.name) > -1
@ -109,14 +108,6 @@ const handleInput = (e: any, item: any) => {
}, 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>({
formData: {},
});

View File

@ -56,6 +56,7 @@
</template>
<script setup lang="ts">
import { CustomerApi } from "@/services";
import { UsersType } from "@/utils/enum";
import PageView from "@/components/PageView/index.vue";
import type { Customer } from "@/types/user";
import SmallModal from "@/components/Modal/smallModal.vue";
@ -76,7 +77,7 @@ const pageList: PageResult<Customer> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -187,7 +187,7 @@ const pageList: PageResult<any> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -187,7 +187,7 @@ const pageList: PageResult<any> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -153,7 +153,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -343,7 +343,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {

View File

@ -83,7 +83,7 @@ const pageList: PageResult<{
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -75,7 +75,7 @@ const pageList: PageResult<{ reCategoryName: string; id: number }> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -80,7 +80,7 @@ const pageList: PageResult<{
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -181,7 +181,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -376,7 +376,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {

View File

@ -86,7 +86,7 @@ const pageList: PageResult<{
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -39,7 +39,6 @@
"
@change="(e:any) => {handleInput(e, item)}"
@clear="handleClear(item)"
@blur="(e:any) => {handleBlur(e, item)}"
>
<template #suffix>
<text v-if="item.key === 'subtractNum'">
@ -121,6 +120,7 @@
</template>
<script setup lang="ts">
import {
CustomerApi,
DeviceApi,
GoodsApi,
PictureApi,
@ -191,22 +191,6 @@ const handleInput = (e: any, item: any) => {
model1.order[item.key] = temp;
}, 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>({

View File

@ -85,7 +85,7 @@ const pageList: PageResult<{
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -84,7 +84,7 @@ const pageList: PageResult<StockCard> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
const obj = {

View File

@ -90,7 +90,7 @@ const pageList: PageResult<Supplier> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -73,7 +73,7 @@ const pageList: PageResult<SupplierType> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -81,7 +81,7 @@ const pageList: PageResult<User> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const add = () => {
uni.navigateTo({

View File

@ -62,7 +62,7 @@ const pageList: PageResult<any> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;
@ -114,7 +114,7 @@ const handleItem = (item: any) => {
MsgType.ToBeReview === item.msgType
) {
ReceiveApi.getOrderPage({
pageSize: 100,
pageSize: 10,
pageNumber: 1,
receiptNumber: item.business,
}).then((res) => {
@ -155,7 +155,7 @@ const handleItem = (item: any) => {
MsgType.ToBeShipmentReview === item.msgType
) {
ShipmentApi.getOrderPage({
pageSize: 100,
pageSize: 10,
pageNumber: 1,
orderNumber: item.business,
}).then((res) => {

View File

@ -86,7 +86,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const keyword = ref("");

View File

@ -42,13 +42,12 @@
"
:noMoreData="pageList.noMoreData"
:list="pageList.list"
:height="ScaleStatus.Paid === currentTab ? 160 : 200"
:height="ScaleStatus.Paid === currentTab ? 160 : 240"
:isLoading="pageList.isLoading"
>
<block v-for="(item, index) in pageList.list" :key="index">
<view class="c-layout">
<view style="min-width: 20px">
<!-- {{ index }}-{{ item.id }} -->
<checkbox
v-if="
ScaleStatus.ToBeReview === currentTab ||
@ -58,7 +57,7 @@
:color="'#00D2E3'"
:checked="item.isChecked"
style="transform: scale(0.7)"
@click="item.isChecked = !item.isChecked;"
@click="item.isChecked = !item.isChecked"
/></view>
<view class="inner-box">
<view class="top-flex-box">
@ -209,7 +208,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const keyword = ref("");
const state = reactive<{
@ -287,7 +286,6 @@ const updateStatus = (status: number, key: number) => {
return { ...item, paymentMethod: key };
});
}
uni.showToast({ icon: "none", title: "当前选中" + paramsList.length });
ReceiveApi.updateOrderIn({ orderInPos: paramsList }).then((res) => {
if (res.code === 200) {
resetPageList();

View File

@ -152,7 +152,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -35,7 +35,6 @@
:disabled="item.disabled || item.type === 'select'"
:disabledColor="item.name === '出货产品' ? '#ffffff' : '#f5f7fa'"
@change="(e:any) => {handleInput(e, item)}"
@blur="(e:any) => {handleBlur(e, item)}"
@clear="handleClear(item)"
>
<template #suffix>
@ -159,15 +158,6 @@ const handleInput = (e: any, item: any) => {
}, 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>({
order: {
id: 0,

View File

@ -58,7 +58,7 @@ const pageList: PageResult<Order> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -197,7 +197,7 @@ const pageList: PageResult<Shipment> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const keyword = ref("");
const state = reactive<{

View File

@ -86,7 +86,7 @@ const pageList: PageResult<Shipment> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const keyword = ref("");

View File

@ -198,7 +198,7 @@ const pageList: PageResult<Shipment> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const keyword = ref("");
const state = reactive<{

View File

@ -147,7 +147,7 @@ const pageList: PageResult<Shipment> = reactive({
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
});
const resetPageList = () => {
pageList.noMoreData = false;

View File

@ -55,7 +55,7 @@ export enum PaymentMethod {
NoPay = 0,
Cash = 1,
BankCard = 2,
WeChat = 3,
WeChat = 2,
Alipay = 4
}
//用户类型0刷脸1刷卡

View File

@ -164,7 +164,7 @@ export function pageListInit() {
total: 0,
list: [],
pageNum: 1,
pageSize: 100,
pageSize: 10,
};
}
// 过滤掉属性值为null的