From 579ce77ad56677d5ec7ec90d8064f2f38241396e Mon Sep 17 00:00:00 2001 From: "271556543@qq.com" <271556543@qq.com> Date: Thu, 8 Sep 2022 17:37:47 +0800 Subject: [PATCH] 2022.9.8 --- src/api/collectMoney/index.js | 34 ++ src/api/productType/index.js | 5 +- src/api/schedule/index.js | 2 +- src/api/serveDetail/index.js | 9 + src/api/sku/index.js | 34 ++ src/main.js | 2 +- src/router/index.js | 30 +- src/views/customer/createCustomer.vue | 435 ----------------- src/views/customer/customer.vue | 21 +- src/views/customer/detailCustomer.vue | 231 ---------- src/views/finance/collectMoney.vue | 79 ++++ .../finance/component/addcollectMoney.vue | 88 ++++ src/views/finance/salaryList.vue | 59 +++ src/views/finance/serveDetail.vue | 59 +++ src/views/order/applyDetail.vue | 186 -------- src/views/order/applyManage.vue | 72 --- src/views/order/order.vue | 2 +- src/views/order/schedulingManage.vue | 436 ------------------ src/views/people/operatorManage.vue | 52 --- src/views/people/siteManage.vue | 58 --- .../product/productComponent/addProduct.vue | 52 ++- src/views/product/productManage.vue | 7 +- src/views/product/sku.vue | 114 +++++ src/views/product/skuComponent/addSku.vue | 131 ++++++ src/views/product/skuType.vue | 60 ++- .../product/skuTypeComponent/addSkuType.vue | 86 +++- src/views/schedule/component/addSchedule.vue | 177 +++++-- src/views/schedule/schedule.vue | 5 +- src/views/schedule/scheduleList.vue | 58 ++- 29 files changed, 991 insertions(+), 1593 deletions(-) create mode 100644 src/api/collectMoney/index.js create mode 100644 src/api/serveDetail/index.js create mode 100644 src/api/sku/index.js delete mode 100644 src/views/customer/createCustomer.vue delete mode 100644 src/views/customer/detailCustomer.vue create mode 100644 src/views/finance/collectMoney.vue create mode 100644 src/views/finance/component/addcollectMoney.vue create mode 100644 src/views/finance/salaryList.vue create mode 100644 src/views/finance/serveDetail.vue delete mode 100644 src/views/order/applyDetail.vue delete mode 100644 src/views/order/applyManage.vue delete mode 100644 src/views/order/schedulingManage.vue delete mode 100644 src/views/people/operatorManage.vue delete mode 100644 src/views/people/siteManage.vue create mode 100644 src/views/product/sku.vue create mode 100644 src/views/product/skuComponent/addSku.vue diff --git a/src/api/collectMoney/index.js b/src/api/collectMoney/index.js new file mode 100644 index 0000000..baef6be --- /dev/null +++ b/src/api/collectMoney/index.js @@ -0,0 +1,34 @@ +import request from "@/utils/request"; + +export function getList(params,isLoading=true){ + return request({ + method:'get', + url:'/api/admin/collect-money/get-list', + params, + isLoading + }) +} + +export function getForm(id,params){ + return request({ + method:'get', + url:`/api/admin/collect-money/get-form/${id}`, + params + }) +} + +export function save(data){ + return request({ + method:'post', + url:'/api/admin/collect-money/save', + data + }) +} + +export function destroy(id,data){ + return request({ + method:'post', + url:`/api/admin/collect-money/delete/${id}`, + data + }) +} diff --git a/src/api/productType/index.js b/src/api/productType/index.js index 4ed1b2d..eb32f29 100644 --- a/src/api/productType/index.js +++ b/src/api/productType/index.js @@ -1,10 +1,11 @@ import request from "@/utils/request"; -export function getList(params){ +export function getList(params,isLoading=true){ return request({ method:'get', url:'/api/admin/product-type/get-list', - params + params, + isLoading }) } diff --git a/src/api/schedule/index.js b/src/api/schedule/index.js index 35f67a2..ffbb49f 100644 --- a/src/api/schedule/index.js +++ b/src/api/schedule/index.js @@ -18,7 +18,7 @@ export function customerDetail(params){ export function scheduleSave(params){ return request({ - method:'get', + method:'post', url:'/api/admin/schedule/schedule-save', params }) diff --git a/src/api/serveDetail/index.js b/src/api/serveDetail/index.js new file mode 100644 index 0000000..6efb266 --- /dev/null +++ b/src/api/serveDetail/index.js @@ -0,0 +1,9 @@ +import request from "@/utils/request"; + +export function getList(params){ + return request({ + method:'get', + url:'/api/admin/serve-detail/get-list', + params + }) +} diff --git a/src/api/sku/index.js b/src/api/sku/index.js new file mode 100644 index 0000000..018501e --- /dev/null +++ b/src/api/sku/index.js @@ -0,0 +1,34 @@ +import request from "@/utils/request"; + +export function getList(params,isLoading=true){ + return request({ + method:'get', + url:'/api/admin/sku/get-list', + params, + isLoading + }) +} + +export function getForm(id,params){ + return request({ + method:'get', + url:`/api/admin/sku/get-form/${id}`, + params + }) +} + +export function save(data){ + return request({ + method:'post', + url:'/api/admin/sku/save', + data + }) +} + +export function destroy(id,data){ + return request({ + method:'post', + url:`/api/admin/sku/delete/${id}`, + data + }) +} diff --git a/src/main.js b/src/main.js index 88295a9..c35181c 100644 --- a/src/main.js +++ b/src/main.js @@ -89,7 +89,7 @@ Vue.prototype.$successMessage = (type,name) => { word = '删除' break; default: - word = '操作' + word = type } Vue.prototype.$message({ type:'success', diff --git a/src/router/index.js b/src/router/index.js index 33cbe90..7c5491a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -31,10 +31,10 @@ import Layout from '@/layout' * all roles can be accessed */ export const constantRoutes = [{ - path: '/login', - component: () => import('@/views/login/index'), - hidden: true - }, + path: '/login', + component: () => import('@/views/login/index'), + hidden: true +}, { path: '/404', @@ -54,27 +54,7 @@ export const constantRoutes = [{ icon: 'dashboard' } }, - { - path: 'detailCustomer/:id', - name: '详细信息', - hidden:true, - component: () => import('@/views/customer/detailCustomer'), - meta: { - title: '详细信息', - icon: '' - } - }, - { - path: 'applyDetail/:id', - name: '申请详情', - hidden:true, - component: () => import('@/views/order/applyDetail'), - meta: { - title: '详细信息', - icon: '' - } - } - ] + ] } ] diff --git a/src/views/customer/createCustomer.vue b/src/views/customer/createCustomer.vue deleted file mode 100644 index 48f91ee..0000000 --- a/src/views/customer/createCustomer.vue +++ /dev/null @@ -1,435 +0,0 @@ - - - - - - - diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue index 5b755e0..3fda54b 100644 --- a/src/views/customer/customer.vue +++ b/src/views/customer/customer.vue @@ -20,7 +20,15 @@ - + @@ -28,7 +36,7 @@ - - - diff --git a/src/views/finance/collectMoney.vue b/src/views/finance/collectMoney.vue new file mode 100644 index 0000000..3b65303 --- /dev/null +++ b/src/views/finance/collectMoney.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/src/views/finance/component/addcollectMoney.vue b/src/views/finance/component/addcollectMoney.vue new file mode 100644 index 0000000..db4e45f --- /dev/null +++ b/src/views/finance/component/addcollectMoney.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/views/finance/salaryList.vue b/src/views/finance/salaryList.vue new file mode 100644 index 0000000..dec4b93 --- /dev/null +++ b/src/views/finance/salaryList.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/views/finance/serveDetail.vue b/src/views/finance/serveDetail.vue new file mode 100644 index 0000000..7e8dc37 --- /dev/null +++ b/src/views/finance/serveDetail.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/views/order/applyDetail.vue b/src/views/order/applyDetail.vue deleted file mode 100644 index a9ac333..0000000 --- a/src/views/order/applyDetail.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - diff --git a/src/views/order/applyManage.vue b/src/views/order/applyManage.vue deleted file mode 100644 index e9f9f89..0000000 --- a/src/views/order/applyManage.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - diff --git a/src/views/order/order.vue b/src/views/order/order.vue index 24f5820..ae7e269 100644 --- a/src/views/order/order.vue +++ b/src/views/order/order.vue @@ -21,7 +21,7 @@ :table-item="table" :list="list" @editor="editor" - @destroy="destroy" + @delete="destroy" @pageSizeChange="e => select.page_size = e" @pageIndexChange="e => {select.page = e;getOrder()}"> diff --git a/src/views/order/schedulingManage.vue b/src/views/order/schedulingManage.vue deleted file mode 100644 index 45ac280..0000000 --- a/src/views/order/schedulingManage.vue +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - diff --git a/src/views/people/operatorManage.vue b/src/views/people/operatorManage.vue deleted file mode 100644 index 8becf4b..0000000 --- a/src/views/people/operatorManage.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/src/views/people/siteManage.vue b/src/views/people/siteManage.vue deleted file mode 100644 index faebf7e..0000000 --- a/src/views/people/siteManage.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - diff --git a/src/views/product/productComponent/addProduct.vue b/src/views/product/productComponent/addProduct.vue index a030a5a..fb115aa 100644 --- a/src/views/product/productComponent/addProduct.vue +++ b/src/views/product/productComponent/addProduct.vue @@ -105,8 +105,12 @@ *关联服务：
- - + +
@@ -116,7 +120,7 @@ + + diff --git a/src/views/product/skuComponent/addSku.vue b/src/views/product/skuComponent/addSku.vue new file mode 100644 index 0000000..54aa6e5 --- /dev/null +++ b/src/views/product/skuComponent/addSku.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/views/product/skuType.vue b/src/views/product/skuType.vue index 95df5a6..c9d087d 100644 --- a/src/views/product/skuType.vue +++ b/src/views/product/skuType.vue @@ -7,33 +7,79 @@
-
- + + + diff --git a/src/views/schedule/component/addSchedule.vue b/src/views/schedule/component/addSchedule.vue index 322e6f2..a4ffa1d 100644 --- a/src/views/schedule/component/addSchedule.vue +++ b/src/views/schedule/component/addSchedule.vue @@ -1,9 +1,9 @@ diff --git a/src/views/schedule/schedule.vue b/src/views/schedule/schedule.vue index 704c93b..a650dc3 100644 --- a/src/views/schedule/schedule.vue +++ b/src/views/schedule/schedule.vue @@ -12,7 +12,6 @@ - @@ -70,8 +69,9 @@ export default { let {$refs} = this return ( { $refs['addSchedule'].form.product_id = scope.row.product_id $refs['addSchedule'].form.customer_id = scope.row.customer_id + $refs['addSchedule'].form.order_id = scope.row.id $refs['addSchedule'].isShow = true } }}>排班 diff --git a/src/views/schedule/scheduleList.vue b/src/views/schedule/scheduleList.vue index 2df594f..b6dd376 100644 --- a/src/views/schedule/scheduleList.vue +++ b/src/views/schedule/scheduleList.vue @@ -5,14 +5,14 @@
-
{{ item }} +
{{ item.name }}
-
{{ item }} +
{{ item.value }}
@@ -26,7 +26,7 @@
-
{{select.month}}月 {{select.area}} {{select.type}}
+
{{select.month}}月 {{ areaFormatter(select.area) }} {{ typeFormatter(select.type) }}
@@ -49,21 +49,28 @@
-
{{ i }}
+