From 9ce21008a3462248ee134eb3cfb02d451b8e9200 Mon Sep 17 00:00:00 2001 From: zhengw <247276359@qq.com> Date: Fri, 6 Feb 2026 14:49:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E6=90=9C=E7=B4=A2=E5=87=BD?= =?UTF-8?q?=E6=95=B0,=20=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/app.json | 1 + miniprogram/assets/icons/生产任务.svg | 1 + miniprogram/pages/base/account/account.ts | 18 +-- miniprogram/pages/base/account/account.wxml | 6 +- miniprogram/pages/base/customer/customer.ts | 18 +-- miniprogram/pages/base/customer/customer.wxml | 6 +- miniprogram/pages/base/supplier/supplier.ts | 18 +-- miniprogram/pages/base/supplier/supplier.wxml | 6 +- .../date-picker-plugin.wxml | 4 +- .../components/page-plugin/page-plugin.ts | 2 +- .../select-plugin/select-plugin.wxml | 8 +- miniprogram/pages/finance/flow/flow.ts | 18 +-- miniprogram/pages/finance/flow/flow.wxml | 12 +- miniprogram/pages/finance/giro/giro.ts | 18 +-- miniprogram/pages/finance/giro/giro.wxml | 12 +- miniprogram/pages/finance/income/income.ts | 18 +-- miniprogram/pages/finance/income/income.wxml | 16 +- miniprogram/pages/finance/outcome/outcome.ts | 18 +-- .../pages/finance/outcome/outcome.wxml | 16 +- miniprogram/pages/logs/loginLog/loginLog.ts | 26 ++- miniprogram/pages/logs/loginLog/loginLog.wxml | 6 +- .../pages/logs/operateLog/operateLog.ts | 26 ++- .../pages/logs/operateLog/operateLog.wxml | 6 +- .../pages/manage/department/department.ts | 18 +-- .../pages/manage/department/department.wxml | 12 +- miniprogram/pages/manage/group/group.ts | 18 +-- miniprogram/pages/manage/group/group.wxml | 12 +- miniprogram/pages/manage/staff/staff.ts | 18 +-- miniprogram/pages/manage/staff/staff.wxml | 13 +- .../pages/orders/orderSort/orderSort.ts | 7 +- .../pages/orders/ordersList/ordersList.ts | 18 +-- .../pages/orders/ordersList/ordersList.wxml | 28 ++-- miniprogram/pages/other/batch/batch.ts | 26 ++- miniprogram/pages/other/batch/batch.wxml | 16 +- .../pages/other/batchDetail/batchDetail.ts | 26 ++- miniprogram/pages/other/goods/goods.ts | 26 ++- miniprogram/pages/other/goods/goods.wxml | 14 +- .../pages/other/goodsDetail/goodsDetail.ts | 19 +-- .../pages/other/goodsDetail/goodsDetail.wxml | 8 +- miniprogram/pages/other/outbound/outbound.ts | 18 +-- .../pages/other/outbound/outbound.wxml | 12 +- miniprogram/pages/other/transfer/transfer.ts | 18 +-- .../pages/other/transfer/transfer.wxml | 12 +- .../pages/produce/orderTask/orderTask.json | 18 +++ .../pages/produce/orderTask/orderTask.ts | 150 ++++++++++++++++++ .../pages/produce/orderTask/orderTask.wxml | 76 +++++++++ .../pages/produce/orderTask/orderTask.wxss | 0 .../produce/processManage/processManage.json | 3 +- .../produce/processManage/processManage.ts | 17 +- .../processManageDetail.ts | 17 +- .../processManageDetail.wxml | 14 +- .../pages/purchase/backOrder/backOrder.ts | 18 +-- .../pages/purchase/backOrder/backOrder.wxml | 14 +- .../pages/purchase/buyInOrder/buyInOrder.ts | 18 +-- .../pages/purchase/buyInOrder/buyInOrder.wxml | 17 +- .../pages/purchase/buyOrder/buyOrder.ts | 18 +-- .../pages/purchase/buyOrder/buyOrder.wxml | 16 +- .../purchase/requestOrder/requestOrder.ts | 18 +-- .../purchase/requestOrder/requestOrder.wxml | 16 +- miniprogram/utils/https.ts | 4 +- miniprogram/utils/menuConfig.ts | 10 +- miniprogram/utils/util.ts | 6 +- package-lock.json | 3 +- package.json | 6 +- 64 files changed, 519 insertions(+), 559 deletions(-) create mode 100644 miniprogram/assets/icons/生产任务.svg create mode 100644 miniprogram/pages/produce/orderTask/orderTask.json create mode 100644 miniprogram/pages/produce/orderTask/orderTask.ts create mode 100644 miniprogram/pages/produce/orderTask/orderTask.wxml create mode 100644 miniprogram/pages/produce/orderTask/orderTask.wxss diff --git a/miniprogram/app.json b/miniprogram/app.json index 5933b62..648399c 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -4,6 +4,7 @@ "pages/agreement/agreement", "pages/my/my", "pages/processEntry/processEntry", + "pages/produce/orderTask/orderTask", "pages/produce/processManage/processManage", "pages/produce/processManageDetail/processManageDetail", "pages/orders/ordersList/ordersList", diff --git a/miniprogram/assets/icons/生产任务.svg b/miniprogram/assets/icons/生产任务.svg new file mode 100644 index 0000000..4cb834e --- /dev/null +++ b/miniprogram/assets/icons/生产任务.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/miniprogram/pages/base/account/account.ts b/miniprogram/pages/base/account/account.ts index 9979791..28426e8 100644 --- a/miniprogram/pages/base/account/account.ts +++ b/miniprogram/pages/base/account/account.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -34,12 +35,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -47,16 +43,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/base/account/account.wxml b/miniprogram/pages/base/account/account.wxml index 4856c96..95b1849 100644 --- a/miniprogram/pages/base/account/account.wxml +++ b/miniprogram/pages/base/account/account.wxml @@ -5,11 +5,11 @@ hideMore="{{true}}"> diff --git a/miniprogram/pages/base/customer/customer.ts b/miniprogram/pages/base/customer/customer.ts index 3b20766..5bed1f4 100644 --- a/miniprogram/pages/base/customer/customer.ts +++ b/miniprogram/pages/base/customer/customer.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -34,12 +35,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -47,16 +43,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/base/customer/customer.wxml b/miniprogram/pages/base/customer/customer.wxml index 621cbf9..115bf74 100644 --- a/miniprogram/pages/base/customer/customer.wxml +++ b/miniprogram/pages/base/customer/customer.wxml @@ -4,12 +4,12 @@ bind:reset="searchReset" value="{{params.crm_name}}" data-key="crm_name"> + bind:change="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/base/supplier/supplier.ts b/miniprogram/pages/base/supplier/supplier.ts index 9405900..ba3cc80 100644 --- a/miniprogram/pages/base/supplier/supplier.ts +++ b/miniprogram/pages/base/supplier/supplier.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -34,12 +35,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -47,16 +43,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/base/supplier/supplier.wxml b/miniprogram/pages/base/supplier/supplier.wxml index f72f19b..14e9b46 100644 --- a/miniprogram/pages/base/supplier/supplier.wxml +++ b/miniprogram/pages/base/supplier/supplier.wxml @@ -4,12 +4,12 @@ bind:reset="searchReset" value="{{params.crm_name}}" data-key="crm_name"> + bind:change="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/components/date-picker-plugin/date-picker-plugin.wxml b/miniprogram/pages/components/date-picker-plugin/date-picker-plugin.wxml index 08ac617..1b7a194 100644 --- a/miniprogram/pages/components/date-picker-plugin/date-picker-plugin.wxml +++ b/miniprogram/pages/components/date-picker-plugin/date-picker-plugin.wxml @@ -1,7 +1,7 @@ - {{value || ''}} - + {{value || ''}} + {{placeholder || title || '选择日期'}} diff --git a/miniprogram/pages/components/page-plugin/page-plugin.ts b/miniprogram/pages/components/page-plugin/page-plugin.ts index 5bb9fbd..2148a57 100644 --- a/miniprogram/pages/components/page-plugin/page-plugin.ts +++ b/miniprogram/pages/components/page-plugin/page-plugin.ts @@ -78,7 +78,7 @@ Component({ this.triggerEvent('handleLogin', true); } }) - .catch((err) => { + .catch(() => { this.triggerEvent('handleLogin', false); }); } else { diff --git a/miniprogram/pages/components/select-plugin/select-plugin.wxml b/miniprogram/pages/components/select-plugin/select-plugin.wxml index 7c95bb8..9824e47 100644 --- a/miniprogram/pages/components/select-plugin/select-plugin.wxml +++ b/miniprogram/pages/components/select-plugin/select-plugin.wxml @@ -1,15 +1,13 @@ - {{note || ''}} - + {{note || ''}} + {{placeholder || title}} - - {{item.label}} - + {{item.label}} \ No newline at end of file diff --git a/miniprogram/pages/finance/flow/flow.ts b/miniprogram/pages/finance/flow/flow.ts index 327934c..ee054be 100644 --- a/miniprogram/pages/finance/flow/flow.ts +++ b/miniprogram/pages/finance/flow/flow.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -39,12 +40,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -52,16 +48,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/finance/flow/flow.wxml b/miniprogram/pages/finance/flow/flow.wxml index b004b6d..29b46f1 100644 --- a/miniprogram/pages/finance/flow/flow.wxml +++ b/miniprogram/pages/finance/flow/flow.wxml @@ -5,19 +5,19 @@ + bind:change="searchChange" /> --> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/finance/giro/giro.ts b/miniprogram/pages/finance/giro/giro.ts index c557d22..e442b86 100644 --- a/miniprogram/pages/finance/giro/giro.ts +++ b/miniprogram/pages/finance/giro/giro.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -39,12 +40,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -52,16 +48,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/finance/giro/giro.wxml b/miniprogram/pages/finance/giro/giro.wxml index fa2cb53..5285d7b 100644 --- a/miniprogram/pages/finance/giro/giro.wxml +++ b/miniprogram/pages/finance/giro/giro.wxml @@ -5,19 +5,19 @@ + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/finance/income/income.ts b/miniprogram/pages/finance/income/income.ts index 0020bf4..ab6ad99 100644 --- a/miniprogram/pages/finance/income/income.ts +++ b/miniprogram/pages/finance/income/income.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -39,12 +40,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -52,16 +48,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/finance/income/income.wxml b/miniprogram/pages/finance/income/income.wxml index 4e832d8..ba177e2 100644 --- a/miniprogram/pages/finance/income/income.wxml +++ b/miniprogram/pages/finance/income/income.wxml @@ -4,23 +4,23 @@ bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no"> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/finance/outcome/outcome.ts b/miniprogram/pages/finance/outcome/outcome.ts index bd9e9fb..3c52096 100644 --- a/miniprogram/pages/finance/outcome/outcome.ts +++ b/miniprogram/pages/finance/outcome/outcome.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -39,12 +40,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -52,16 +48,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/finance/outcome/outcome.wxml b/miniprogram/pages/finance/outcome/outcome.wxml index f785b73..aceb35b 100644 --- a/miniprogram/pages/finance/outcome/outcome.wxml +++ b/miniprogram/pages/finance/outcome/outcome.wxml @@ -4,23 +4,23 @@ bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no"> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/logs/loginLog/loginLog.ts b/miniprogram/pages/logs/loginLog/loginLog.ts index a55fda8..cbced03 100644 --- a/miniprogram/pages/logs/loginLog/loginLog.ts +++ b/miniprogram/pages/logs/loginLog/loginLog.ts @@ -1,5 +1,12 @@ import { loginStatus, post } from '@/utils/https'; -import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + toArray, + toNumber, +} from '@/utils/util'; const defaultParams = { curr_page: 1, page_count: 20 }; @@ -25,12 +32,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -38,16 +40,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/logs/loginLog/loginLog.wxml b/miniprogram/pages/logs/loginLog/loginLog.wxml index b3b7e8e..d5f1811 100644 --- a/miniprogram/pages/logs/loginLog/loginLog.wxml +++ b/miniprogram/pages/logs/loginLog/loginLog.wxml @@ -4,11 +4,11 @@ bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name"> + bind:change="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/logs/operateLog/operateLog.ts b/miniprogram/pages/logs/operateLog/operateLog.ts index 86a34dc..b41844a 100644 --- a/miniprogram/pages/logs/operateLog/operateLog.ts +++ b/miniprogram/pages/logs/operateLog/operateLog.ts @@ -1,5 +1,12 @@ import { loginStatus, post } from '@/utils/https'; -import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + toArray, + toNumber, +} from '@/utils/util'; const defaultParams = { curr_page: 1, page_count: 20 }; @@ -25,12 +32,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -38,16 +40,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/logs/operateLog/operateLog.wxml b/miniprogram/pages/logs/operateLog/operateLog.wxml index 57d5ee2..7204f08 100644 --- a/miniprogram/pages/logs/operateLog/operateLog.wxml +++ b/miniprogram/pages/logs/operateLog/operateLog.wxml @@ -4,12 +4,12 @@ bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name"> + bind:change="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/manage/department/department.ts b/miniprogram/pages/manage/department/department.ts index a401e51..cafa75e 100644 --- a/miniprogram/pages/manage/department/department.ts +++ b/miniprogram/pages/manage/department/department.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -37,12 +38,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -50,16 +46,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/manage/department/department.wxml b/miniprogram/pages/manage/department/department.wxml index f9ca661..f82d7cf 100644 --- a/miniprogram/pages/manage/department/department.wxml +++ b/miniprogram/pages/manage/department/department.wxml @@ -4,19 +4,19 @@ bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no"> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/manage/group/group.ts b/miniprogram/pages/manage/group/group.ts index 3b7cdff..8473143 100644 --- a/miniprogram/pages/manage/group/group.ts +++ b/miniprogram/pages/manage/group/group.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -37,12 +38,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -50,16 +46,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/manage/group/group.wxml b/miniprogram/pages/manage/group/group.wxml index a1b292f..18926b7 100644 --- a/miniprogram/pages/manage/group/group.wxml +++ b/miniprogram/pages/manage/group/group.wxml @@ -4,19 +4,19 @@ bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no"> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/manage/staff/staff.ts b/miniprogram/pages/manage/staff/staff.ts index 6238b15..943e52b 100644 --- a/miniprogram/pages/manage/staff/staff.ts +++ b/miniprogram/pages/manage/staff/staff.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -44,12 +45,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -57,16 +53,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/manage/staff/staff.wxml b/miniprogram/pages/manage/staff/staff.wxml index 1c09a35..bad6d4c 100644 --- a/miniprogram/pages/manage/staff/staff.wxml +++ b/miniprogram/pages/manage/staff/staff.wxml @@ -4,18 +4,17 @@ bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name"> + bind:change="searchChange" /> - + bind:change="searchChange" mode="radio" options="{{depOption}}" data-key="department_id" /> + + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/orders/orderSort/orderSort.ts b/miniprogram/pages/orders/orderSort/orderSort.ts index 3b6cabd..c7955e0 100644 --- a/miniprogram/pages/orders/orderSort/orderSort.ts +++ b/miniprogram/pages/orders/orderSort/orderSort.ts @@ -22,10 +22,9 @@ Page({ post('Orders/getLiteOrders') .then((res: any) => { const list = toArray(res.data); - wx.stopPullDownRefresh(); - this.setData({ list: list }); + this.setData({ list }); }) - .catch(() => { + .finally(() => { wx.stopPullDownRefresh(); }); }, @@ -45,7 +44,7 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(options) {}, + onLoad(_options) {}, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pages/orders/ordersList/ordersList.ts b/miniprogram/pages/orders/ordersList/ordersList.ts index 4d6b8bc..5ba4227 100644 --- a/miniprogram/pages/orders/ordersList/ordersList.ts +++ b/miniprogram/pages/orders/ordersList/ordersList.ts @@ -9,6 +9,7 @@ import { getAuthInfo, getDataSet, getDay, + searchValueFormat, showModal, sleep, toArray, @@ -67,12 +68,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -80,16 +76,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/orders/ordersList/ordersList.wxml b/miniprogram/pages/orders/ordersList/ordersList.wxml index c2862d3..dea2bc2 100644 --- a/miniprogram/pages/orders/ordersList/ordersList.wxml +++ b/miniprogram/pages/orders/ordersList/ordersList.wxml @@ -4,36 +4,36 @@ bind:reset="searchReset" value="{{params.order_no}}" data-key="order_no"> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> - - + + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/other/batch/batch.ts b/miniprogram/pages/other/batch/batch.ts index d81e8fd..a5a74d2 100644 --- a/miniprogram/pages/other/batch/batch.ts +++ b/miniprogram/pages/other/batch/batch.ts @@ -1,5 +1,12 @@ import { loginStatus, post } from '@/utils/https'; -import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + toArray, + toNumber, +} from '@/utils/util'; const defaultParams = { curr_page: 1, page_count: 20 }; @@ -30,12 +37,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -43,16 +45,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/other/batch/batch.wxml b/miniprogram/pages/other/batch/batch.wxml index aac6c06..5e69add 100644 --- a/miniprogram/pages/other/batch/batch.wxml +++ b/miniprogram/pages/other/batch/batch.wxml @@ -4,23 +4,23 @@ bind:reset="searchReset" value="{{params.batch_no}}" data-key="batch_no"> - + bind:change="searchChange" data-key="depot_id" /> + bind:change="searchChange" data-key="supplier_id" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/other/batchDetail/batchDetail.ts b/miniprogram/pages/other/batchDetail/batchDetail.ts index b48a6b3..cbd8b1e 100644 --- a/miniprogram/pages/other/batchDetail/batchDetail.ts +++ b/miniprogram/pages/other/batchDetail/batchDetail.ts @@ -1,5 +1,12 @@ import { loginStatus, post } from '@/utils/https'; -import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + toArray, + toNumber, +} from '@/utils/util'; const defaultParams = { curr_page: 1, page_count: 20, batch_id: '' }; @@ -28,12 +35,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -41,16 +43,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/other/goods/goods.ts b/miniprogram/pages/other/goods/goods.ts index 1eecf9a..b5c5a73 100644 --- a/miniprogram/pages/other/goods/goods.ts +++ b/miniprogram/pages/other/goods/goods.ts @@ -1,5 +1,12 @@ import { loginStatus, post } from '@/utils/https'; -import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + toArray, + toNumber, +} from '@/utils/util'; const defaultParams = { curr_page: 1, page_count: 20 }; @@ -28,12 +35,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -41,16 +43,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/other/goods/goods.wxml b/miniprogram/pages/other/goods/goods.wxml index a584d3a..28ce935 100644 --- a/miniprogram/pages/other/goods/goods.wxml +++ b/miniprogram/pages/other/goods/goods.wxml @@ -4,20 +4,20 @@ bind:reset="searchReset" value="{{params.goods_name}}" data-key="goods_name"> + bind:change="searchChange" /> + bind:change="searchChange" /> - + bind:change="searchChange" data-key="depot_id" /> + bind:change="searchChange" data-key="goods_class" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/other/goodsDetail/goodsDetail.ts b/miniprogram/pages/other/goodsDetail/goodsDetail.ts index 1976f97..1db70bf 100644 --- a/miniprogram/pages/other/goodsDetail/goodsDetail.ts +++ b/miniprogram/pages/other/goodsDetail/goodsDetail.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -31,17 +32,11 @@ Page({ }, init() { this.setData({ authInfo: getAuthInfo() }); - this.getGoodsAttr(); }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -49,16 +44,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(); }, diff --git a/miniprogram/pages/other/goodsDetail/goodsDetail.wxml b/miniprogram/pages/other/goodsDetail/goodsDetail.wxml index cce94ff..f7b3c8a 100644 --- a/miniprogram/pages/other/goodsDetail/goodsDetail.wxml +++ b/miniprogram/pages/other/goodsDetail/goodsDetail.wxml @@ -4,15 +4,15 @@ bind:reset="searchReset" value="{{params.order_no}}" data-key="order_no"> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/other/outbound/outbound.ts b/miniprogram/pages/other/outbound/outbound.ts index f8a3dc1..db88964 100644 --- a/miniprogram/pages/other/outbound/outbound.ts +++ b/miniprogram/pages/other/outbound/outbound.ts @@ -4,6 +4,7 @@ import { getAuthInfo, getDataSet, getDay, + searchValueFormat, showModal, sleep, toArray, @@ -40,12 +41,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -53,16 +49,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/other/outbound/outbound.wxml b/miniprogram/pages/other/outbound/outbound.wxml index 7fa8d16..6c5eb6d 100644 --- a/miniprogram/pages/other/outbound/outbound.wxml +++ b/miniprogram/pages/other/outbound/outbound.wxml @@ -4,19 +4,19 @@ bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no"> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/other/transfer/transfer.ts b/miniprogram/pages/other/transfer/transfer.ts index bbda755..1ccdb59 100644 --- a/miniprogram/pages/other/transfer/transfer.ts +++ b/miniprogram/pages/other/transfer/transfer.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -39,12 +40,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -52,16 +48,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/other/transfer/transfer.wxml b/miniprogram/pages/other/transfer/transfer.wxml index e6f3620..5df7ed2 100644 --- a/miniprogram/pages/other/transfer/transfer.wxml +++ b/miniprogram/pages/other/transfer/transfer.wxml @@ -4,18 +4,18 @@ bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no"> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/produce/orderTask/orderTask.json b/miniprogram/pages/produce/orderTask/orderTask.json new file mode 100644 index 0000000..859ef2b --- /dev/null +++ b/miniprogram/pages/produce/orderTask/orderTask.json @@ -0,0 +1,18 @@ +{ + "usingComponents": { + "search-popup": "/pages/components/search-popup/search-popup", + "card-plugin": "/pages/components/card-plugin/card-plugin", + "card-item-plugin": "/pages/components/card-item-plugin/card-item-plugin", + "option-cell-plugin": "/pages/components/option-cell-plugin/option-cell-plugin", + "date-picker-plugin": "/pages/components/date-picker-plugin/date-picker-plugin", + "sort-plugin": "/pages/components/sort-plugin/sort-plugin", + "count-plugin": "/pages/components/count-plugin/count-plugin", + "total-bar-plugin": "/pages/components/total-bar-plugin/total-bar-plugin", + "popup-plugin": "/pages/components/popup-plugin/popup-plugin", + "pagination-plugin": "/pages/components/pagination-plugin/pagination-plugin", + "search-input": "/pages/components/search-input/search-input", + "t-cell": "tdesign-miniprogram/cell/cell", + "t-cell-group": "tdesign-miniprogram/cell-group/cell-group" + }, + "navigationBarTitleText": "生产任务" +} \ No newline at end of file diff --git a/miniprogram/pages/produce/orderTask/orderTask.ts b/miniprogram/pages/produce/orderTask/orderTask.ts new file mode 100644 index 0000000..b80b2da --- /dev/null +++ b/miniprogram/pages/produce/orderTask/orderTask.ts @@ -0,0 +1,150 @@ +import { loginStatus, post } from '@/utils/https'; +import { SaleOrderProcessStateOption } from '@/utils/config'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + toArray, + toNumber, +} from '@/utils/util'; + +const defaultParams = { curr_page: 1, page_count: 20, process_state: [200] }; + +Page({ + /** + * 页面的初始数据 + */ + data: { + params: cloneLite(defaultParams) as any, + list: [] as any[], + count: 0, + saleOrderProcessStateOption: SaleOrderProcessStateOption, + sort: [{ label: '创建日期', value: 'create_date' }], + detail: { show: false, title: '', data: [] as any[] }, + }, + handleLogin(e: any) { + this.setData({ isLogin: e.detail }); + if (e.detail) { + this.init(); + } + }, + init() { + this.setData({ authInfo: getAuthInfo() }); + this.getList(); + }, + searchChange(e: any) { + const key = getDataSet(e).key; + const val = searchValueFormat(e.detail.value); + if (val) { + this.data.params[key] = val; + } else { + delete this.data.params[key]; + } + this.setData({ params: this.data.params }); + }, + searchOk() { + this.getList(1); + }, + searchReset() { + this.data.params = cloneLite(defaultParams); + this.getList(1); + }, + onSort(e: any) { + this.data.params.order = e.detail.value; + this.setData({ params: this.data.params }); + this.getList(1); + }, + paginationChange(e: any) { + this.getList(e.detail.curr_page); + }, + getList(curr: number = 1) { + this.data.params.curr_page = curr; + this.setData({ params: this.data.params }); + const temp = cloneLite(this.data.params); + if (temp.process_state && temp.process_state.length) { + temp.process_state = temp.process_state.join(','); + } else { + delete temp.process_state; + } + + post('ProduceOrder/getListV2', temp).then((res: any) => { + const list = toArray(res.data); + if (list.length == 0 && this.data.params.curr_page > 1) { + this.getList(this.data.params.curr_page - 1); + } + this.setData({ count: toNumber(res.count), list }); + }); + }, + + onDetail(e: any) { + const data = getDataSet(e); + const index = data.index; + const index2 = data.index2; + const item = this.data.list[index]; + const item2 = item?.produce_info[index2] || {}; + // console.log(index, index2, item); + this.setData({ + detail: { + show: true, + title: `${item2.goods_name} 流程配置`, + data: toArray(item2.produce_info_process), + }, + }); + }, + onClose() { + this.data.detail.show = false; + this.setData({ detail: this.data.detail }); + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(_options) {}, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.setData({ loading: true }); + loginStatus() + .then(() => { + this.setData({ isLogin: true, loading: false }); + this.init(); + }) + .catch((err) => { + this.setData({ isLogin: false, loading: false }); + console.log('调用登录状态请求失败', err); + }); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/produce/orderTask/orderTask.wxml b/miniprogram/pages/produce/orderTask/orderTask.wxml new file mode 100644 index 0000000..9134da6 --- /dev/null +++ b/miniprogram/pages/produce/orderTask/orderTask.wxml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.order_no }} + + + + + + + + + + + + + + + + + + + + + + {{ item.p_process_name }} + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/produce/orderTask/orderTask.wxss b/miniprogram/pages/produce/orderTask/orderTask.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/produce/processManage/processManage.json b/miniprogram/pages/produce/processManage/processManage.json index 7471c83..7b0e7f3 100644 --- a/miniprogram/pages/produce/processManage/processManage.json +++ b/miniprogram/pages/produce/processManage/processManage.json @@ -1,5 +1,6 @@ { "usingComponents": { }, - "navigationBarTitleText": "流程管理" + "navigationBarTitleText": "流程管理", + "enablePullDownRefresh": true } diff --git a/miniprogram/pages/produce/processManage/processManage.ts b/miniprogram/pages/produce/processManage/processManage.ts index 082307c..18d852c 100644 --- a/miniprogram/pages/produce/processManage/processManage.ts +++ b/miniprogram/pages/produce/processManage/processManage.ts @@ -8,6 +8,7 @@ Page({ data: { process: [] as any[], isFirstEnter: true, + isLogin: false, }, navDetail(e: any) { const index = getDataSet(e).index.split(','); @@ -31,9 +32,13 @@ Page({ this.getList(); }, getList() { - post('CompanyProcessV2/getAllProcessNum').then((res: any) => { - this.setData({ process: toArray(res.data) }); - }); + post('CompanyProcessV2/getAllProcessNum') + .then((res: any) => { + this.setData({ process: toArray(res.data) }); + }) + .finally(() => { + wx.stopPullDownRefresh(); + }); }, /** * 生命周期函数--监听页面加载 @@ -78,7 +83,11 @@ Page({ /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh() {}, + onPullDownRefresh() { + if (this.data.isLogin) { + this.getList(); + } + }, /** * 页面上拉触底事件的处理函数 diff --git a/miniprogram/pages/produce/processManageDetail/processManageDetail.ts b/miniprogram/pages/produce/processManageDetail/processManageDetail.ts index a5d45c3..133aa12 100644 --- a/miniprogram/pages/produce/processManageDetail/processManageDetail.ts +++ b/miniprogram/pages/produce/processManageDetail/processManageDetail.ts @@ -1,5 +1,13 @@ import { loginStatus, post } from '@/utils/https'; -import { cloneLite, getAuthInfo, getDataSet, toArray, toastSuccess, toNumber } from '@/utils/util'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + toArray, + toastSuccess, + toNumber, +} from '@/utils/util'; const defaultParams = { curr_page: 1, page_count: 20, state: '1', process_id: '' }; @@ -30,12 +38,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { diff --git a/miniprogram/pages/produce/processManageDetail/processManageDetail.wxml b/miniprogram/pages/produce/processManageDetail/processManageDetail.wxml index d52f5e1..5d5f64a 100644 --- a/miniprogram/pages/produce/processManageDetail/processManageDetail.wxml +++ b/miniprogram/pages/produce/processManageDetail/processManageDetail.wxml @@ -4,19 +4,19 @@ bind:change="searchChange" bind:ok="searchOk" bind:reset="searchReset"> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> diff --git a/miniprogram/pages/purchase/backOrder/backOrder.ts b/miniprogram/pages/purchase/backOrder/backOrder.ts index d7f4a2e..af58219 100644 --- a/miniprogram/pages/purchase/backOrder/backOrder.ts +++ b/miniprogram/pages/purchase/backOrder/backOrder.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + searchValueFormat, showModal, sleep, toArray, @@ -41,12 +42,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -54,16 +50,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/purchase/backOrder/backOrder.wxml b/miniprogram/pages/purchase/backOrder/backOrder.wxml index e1edc0b..a721d30 100644 --- a/miniprogram/pages/purchase/backOrder/backOrder.wxml +++ b/miniprogram/pages/purchase/backOrder/backOrder.wxml @@ -5,21 +5,21 @@ + bind:change="searchChange" /> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> --> diff --git a/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts b/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts index 89d0ac0..5c98948 100644 --- a/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts +++ b/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts @@ -4,6 +4,7 @@ import { getAuthInfo, getDataSet, getDay, + searchValueFormat, showModal, sleep, toArray, @@ -42,12 +43,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -55,16 +51,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml b/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml index 3ec49c0..92d3ec5 100644 --- a/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml +++ b/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml @@ -5,22 +5,21 @@ + bind:change="searchChange" /> + bind:change="searchChange" /> - + + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/purchase/buyOrder/buyOrder.ts b/miniprogram/pages/purchase/buyOrder/buyOrder.ts index 051098a..2f33ea4 100644 --- a/miniprogram/pages/purchase/buyOrder/buyOrder.ts +++ b/miniprogram/pages/purchase/buyOrder/buyOrder.ts @@ -4,6 +4,7 @@ import { getAuthInfo, getDataSet, getDay, + searchValueFormat, showModal, sleep, toArray, @@ -40,12 +41,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -53,16 +49,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/purchase/buyOrder/buyOrder.wxml b/miniprogram/pages/purchase/buyOrder/buyOrder.wxml index a2f6b55..1ffe3c3 100644 --- a/miniprogram/pages/purchase/buyOrder/buyOrder.wxml +++ b/miniprogram/pages/purchase/buyOrder/buyOrder.wxml @@ -5,23 +5,23 @@ + bind:change="searchChange" /> + bind:change="searchChange" /> + bind:change="searchChange" /> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/pages/purchase/requestOrder/requestOrder.ts b/miniprogram/pages/purchase/requestOrder/requestOrder.ts index 8c10453..208496c 100644 --- a/miniprogram/pages/purchase/requestOrder/requestOrder.ts +++ b/miniprogram/pages/purchase/requestOrder/requestOrder.ts @@ -4,6 +4,7 @@ import { getAuthInfo, getDataSet, getDay, + searchValueFormat, showModal, sleep, toArray, @@ -40,12 +41,7 @@ Page({ }, searchChange(e: any) { const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - searchChange2(e: any) { - const key = getDataSet(e).key; - const val = `${e.detail.value || ''}`.trim(); + const val = searchValueFormat(e.detail.value); if (val) { this.data.params[key] = val; } else { @@ -53,16 +49,6 @@ Page({ } this.setData({ params: this.data.params }); }, - onOptionChange(e: any) { - const key = getDataSet(e).key; - this.data.params[key] = e.detail.value; - this.setData({ params: this.data.params }); - }, - datePickerConfirm(e: any) { - const data = getDataSet(e); - this.data.params[data.key] = e.detail.value; - this.setData({ params: this.data.params }); - }, searchOk() { this.getList(1); }, diff --git a/miniprogram/pages/purchase/requestOrder/requestOrder.wxml b/miniprogram/pages/purchase/requestOrder/requestOrder.wxml index ef4cb9f..7984012 100644 --- a/miniprogram/pages/purchase/requestOrder/requestOrder.wxml +++ b/miniprogram/pages/purchase/requestOrder/requestOrder.wxml @@ -5,23 +5,23 @@ + bind:change="searchChange" /> --> - + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> + bind:confirm="searchChange" /> diff --git a/miniprogram/utils/https.ts b/miniprogram/utils/https.ts index ecb1467..cf06fb9 100644 --- a/miniprogram/utils/https.ts +++ b/miniprogram/utils/https.ts @@ -74,12 +74,12 @@ const request = (url: string, options: any, config = { showLoading: true, showEr }; // 封装get方法 -export const get = (url: string, data = {}, config?: any): any => { +export const get = (url: string, data = {}, config?: any) => { return request(url, { method: 'GET', data }, config); }; // 封装post方法 -export const post = (url: string, data = {}, config?: any): any => { +export const post = (url: string, data = {}, config?: any) => { return request(url, { method: 'POST', data }, config); }; diff --git a/miniprogram/utils/menuConfig.ts b/miniprogram/utils/menuConfig.ts index c8d4309..e6048d6 100644 --- a/miniprogram/utils/menuConfig.ts +++ b/miniprogram/utils/menuConfig.ts @@ -25,11 +25,11 @@ export const menuConfig = [ icon: 'tools', iconColor: iconColor, children: [ - // { - // title: "生产任务", - // url: "/pages/produce/orderTask/orderTask", - // auth: "SF_ERP_PRODUCT_TASK_VIEW", - // }, + { + title: '生产任务', + url: '/pages/produce/orderTask/orderTask', + auth: 'SF_ERP_PRODUCT_TASK_VIEW', + }, { title: '流程管理', url: '/pages/produce/processManage/processManage', diff --git a/miniprogram/utils/util.ts b/miniprogram/utils/util.ts index 3bb9543..6c18407 100644 --- a/miniprogram/utils/util.ts +++ b/miniprogram/utils/util.ts @@ -357,9 +357,6 @@ export const numRetentionDigitsString = (value?: number) => { /** * sleep - * @param callback 回调函数 - * @param ms 毫秒, 默认300ms - * @returns */ export const sleep = (callback?: () => void, ms = 300): Promise => { return new Promise((resolve) => { @@ -370,6 +367,9 @@ export const sleep = (callback?: () => void, ms = 300): Promise => { }); }; +export const searchValueFormat = (value: any) => + isArray(value) || isObject(value) ? value : `${value || ''}`.trim(); + export const cloneLite = (data: any) => JSON.parse(JSON.stringify(data)); /** 转换文件大小 */ diff --git a/package-lock.json b/package-lock.json index 3992f6a..b2ec688 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,12 +8,12 @@ "name": "miniprogram-ts-quickstart", "version": "1.0.0", "dependencies": { + "@types/big.js": "^6.2.2", "big.js": "v6.2.2", "dayjs": "^1.11.19", "tdesign-miniprogram": "^1.12.1" }, "devDependencies": { - "@types/big.js": "^6.2.2", "miniprogram-api-typings": "^4.1.2" } }, @@ -21,7 +21,6 @@ "version": "6.2.2", "resolved": "https://registry.npmjs.org/@types/big.js/-/big.js-6.2.2.tgz", "integrity": "sha512-e2cOW9YlVzFY2iScnGBBkplKsrn2CsObHQ2Hiw4V1sSyiGbgWL8IyqE3zFi1Pt5o1pdAtYkDAIsF3KKUPjdzaA==", - "dev": true, "license": "MIT" }, "node_modules/big.js": { diff --git a/package.json b/package.json index 7c3f230..6b3656f 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,17 @@ "name": "miniprogram-ts-quickstart", "version": "1.0.0", "description": "", - "scripts": {}, - "keywords": [], + "scripts": { }, + "keywords": [ ], "author": "", "license": "", "dependencies": { + "@types/big.js": "^6.2.2", "big.js": "v6.2.2", "dayjs": "^1.11.19", "tdesign-miniprogram": "^1.12.1" }, "devDependencies": { - "@types/big.js": "^6.2.2", "miniprogram-api-typings": "^4.1.2" } }