1

unimall-admin/config/dev.env.js

@@ -1,8 +1,10 @@
 module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
-    HOST: '"http://192.168.110.82:8999"',
-    BASE_API: '"http://192.168.110.82:8999/m.api"'
-        // HOST: '"http://121.5.163.150:8999"',
-        // BASE_API: '"http://121.5.163.150:8999/m.api"'
+    // HOST: '"http://localhost:8999"',
+    // BASE_API: '"http://localhost:8999/m.api"'
+    // HOST: '"http://192.168.110.82:8999"',
+    // BASE_API: '"http://192.168.110.82:8999/m.api"'
+    HOST: '"http://121.5.163.150:8999"',
+    BASE_API: '"http://121.5.163.150:8999/m.api"'
 }

unimall-admin/dist/static/css/chunk-9df0.deb1360c.css

@@ -0,0 +1 @@
+.member-info[data-v-11c0ad3c]{display:-webkit-box;display:-ms-flexbox;display:flex}.row[data-v-11c0ad3c]{margin-right:40px}.print-row[data-v-11c0ad3c]{margin-bottom:20px}.el-checkbox[data-v-11c0ad3c]{width:180px}

unimall-admin/dist/static/js/UZQo.85cdbf52.js → unimall-admin/dist/static/js/UZQo.10540f7a.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["UZQo"],{UZQo:function(t,e,i){"use strict";i.r(e);var n={name:"Druid",data:function(){return{src:"http://123.56.171.94:8181/druid/index.html",height:document.documentElement.clientHeight-94.5+"px;",loading:!0}},mounted:function(){var t=this;setTimeout(function(){t.loading=!1},230);var e=this;window.onresize=function(){e.height=document.documentElement.clientHeight-94.5+"px;"}}},o=i("KHd+"),a=Object(o.a)(n,function(){var t=this.$createElement,e=this._self._c||t;return e("div",{directives:[{name:"loading",rawName:"v-loading",value:this.loading,expression:"loading"}],style:"height:"+this.height},[e("iframe",{staticStyle:{width:"100%",height:"100%"},attrs:{src:this.src,frameborder:"no",scrolling:"auto"}})])},[],!1,null,null,null);a.options.__file="index.vue";e.default=a.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([["UZQo"],{UZQo:function(t,e,i){"use strict";i.r(e);var n={name:"Druid",data:function(){return{src:"http://121.5.163.150:8999/druid/index.html",height:document.documentElement.clientHeight-94.5+"px;",loading:!0}},mounted:function(){var t=this;setTimeout(function(){t.loading=!1},230);var e=this;window.onresize=function(){e.height=document.documentElement.clientHeight-94.5+"px;"}}},o=i("KHd+"),a=Object(o.a)(n,function(){var t=this.$createElement,e=this._self._c||t;return e("div",{directives:[{name:"loading",rawName:"v-loading",value:this.loading,expression:"loading"}],style:"height:"+this.height},[e("iframe",{staticStyle:{width:"100%",height:"100%"},attrs:{src:this.src,frameborder:"no",scrolling:"auto"}})])},[],!1,null,null,null);a.options.__file="index.vue";e.default=a.exports}}]);

unimall-admin/dist/static/js/chunk-5e99.7442b10e.js → unimall-admin/dist/static/js/chunk-5b2f.2b515930.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-5e99"],{QH6g:function(n,t,r){"use strict";var e=r("rUqk");r.n(e).a},RYB4:function(n,t,r){"use strict";r.r(t);var e={components:{},data:function(){return{src:"http://123.56.171.94:8181/info/"}}},s=(r("QH6g"),r("KHd+")),i=Object(s.a)(e,function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"app-container"},[t("iframe",{attrs:{src:this.src,frameborder:"no",border:"0"}})])},[],!1,null,null,null);i.options.__file="api.vue";t.default=i.exports},rUqk:function(n,t,r){}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-5b2f"],{QH6g:function(n,t,r){"use strict";var e=r("rUqk");r.n(e).a},RYB4:function(n,t,r){"use strict";r.r(t);var e={components:{},data:function(){return{src:"http://121.5.163.150:8999/info/"}}},s=(r("QH6g"),r("KHd+")),i=Object(s.a)(e,function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"app-container"},[t("iframe",{attrs:{src:this.src,frameborder:"no",border:"0"}})])},[],!1,null,null,null);i.options.__file="api.vue";t.default=i.exports},rUqk:function(n,t,r){}}]);

unimall-admin/src/api/unimall/serviceMangerType.js

@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 查询服务分类列表
+export function listServiceMangerType(query) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.unimall.serviceMangerType',
+      _mt: 'list',
+      ...query
+    }
+  })
+}
+
+// 查询服务分类详细
+export function getServiceMangerType(id) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.unimall.serviceMangerType',
+      _mt: 'get',
+      id: id
+    }
+  })
+}
+
+// 新增服务分类
+export function addServiceMangerType(data) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.unimall.serviceMangerType',
+      _mt: 'add',
+      serviceMangerType: data
+    }
+  })
+}
+
+// 修改服务分类
+export function updateServiceMangerType(data) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.unimall.serviceMangerType',
+      _mt: 'update',
+      serviceMangerType: data
+    }
+  })
+}
+
+// 删除服务分类
+export function delServiceMangerType(id) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.unimall.serviceMangerType',
+      _mt: 'delete',
+      id: id
+    }
+  })
+}
+
+// 导出服务分类
+export function exportServiceMangerType(query) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.unimall.serviceMangerType',
+      _mt: 'export',
+      ...query
+    }
+  })
+}

unimall-admin/src/api/unimall/serviceMangerTypeColor.js

@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 查询服务颜色列表
+export function listServiceMangerTypeColor(query) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.unimall.serviceMangerTypeColor',
+      _mt: 'list',
+      ...query
+    }
+  })
+}
+
+// 查询服务颜色详细
+export function getServiceMangerTypeColor(id) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.unimall.serviceMangerTypeColor',
+      _mt: 'get',
+      id: id
+    }
+  })
+}
+
+// 新增服务颜色
+export function addServiceMangerTypeColor(data) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.unimall.serviceMangerTypeColor',
+      _mt: 'add',
+      serviceMangerTypeColor: data
+    }
+  })
+}
+
+// 修改服务颜色
+export function updateServiceMangerTypeColor(data) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.unimall.serviceMangerTypeColor',
+      _mt: 'update',
+      serviceMangerTypeColor: data
+    }
+  })
+}
+
+// 删除服务颜色
+export function delServiceMangerTypeColor(id) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.unimall.serviceMangerTypeColor',
+      _mt: 'delete',
+      id: id
+    }
+  })
+}
+
+// 导出服务颜色
+export function exportServiceMangerTypeColor(query) {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.unimall.serviceMangerTypeColor',
+      _mt: 'export',
+      ...query
+    }
+  })
+}

unimall-admin/src/router/route copy.json

@@ -0,0 +1,195 @@
+[
+
+    {
+        "redirect": "noredirect",
+        "path": "/sys",
+        "children": [{
+            "path": "admin",
+            "meta": {
+                "noCache": true,
+                "icon": "admin",
+                "perms": [
+                    "admin:admin:list",
+                    "admin:admin:create",
+                    "admin:admin:update",
+                    "admin:admin:delete"
+                ],
+                "title": "管理员"
+            },
+            "name": "admin",
+            "page": "/sys/admin"
+        }, {
+            "path": "role",
+            "meta": {
+                "noCache": true,
+                "icon": "role",
+                "perms": [
+                    "admin:role:list",
+                    "admin:role:create",
+                    "admin:role:delete",
+                    "admin:role:update",
+                    "admin:role:permissionList",
+                    "admin:permission:list"
+                ],
+                "title": "角色管理"
+            },
+            "name": "role",
+            "page": "/sys/role"
+        }],
+        "meta": {
+            "icon": "sys",
+            "title": "系统管理"
+        },
+        "name": "sysManage",
+        "alwaysShow": true
+    },
+    {
+        "redirect": "noredirect",
+        "name": "sysTools",
+        "path": "/tools",
+        "meta": {
+            "icon": "tools",
+            "title": "系统工具"
+        },
+        "alwaysShow": true,
+        "children": [{
+                "path": "api",
+                "name": "api",
+                "page": "/tools/api/api",
+                "meta": {
+                    "title": "API文档",
+                    "icon": "api",
+                    "noCache": true,
+                    "perms": [
+                        "tools:api:list"
+                    ]
+                }
+            },
+            {
+                "path": "gen",
+                "name": "gen",
+                "page": "/tools/gen",
+                "meta": {
+                    "title": "代码生成",
+                    "icon": "gen",
+                    "noCache": true,
+                    "perms": [
+                        "tools:gen:list",
+                        "tools:gen:create",
+                        "tools:gen:delete",
+                        "tools:gen:update"
+                    ]
+                }
+            },
+            {
+                "path": "gen/edit/:tableId(\\d+)",
+                "hidden": true,
+                "meta": {
+                    "noCache": true,
+                    "perms": [],
+                    "title": "配置项修改"
+                },
+                "name": "genEdit",
+                "page": "/tools/gen/editTable"
+            }
+
+        ]
+    },
+    {
+        "redirect": "noredirect",
+        "name": "management",
+        "path": "/management",
+        "meta": {
+            "icon": "log",
+            "title": "会员管理"
+        },
+        "alwaysShow": true,
+        "children": [{
+                "path": "management",
+                "name": "management",
+                "page": "/management",
+                "meta": {
+                    "title": "会员列表",
+                    "icon": "memberInfo",
+                    "noCache": true
+                }
+            },
+            {
+                "path": "salesSlip",
+                "name": "salesSlip",
+                "page": "/salesSlip",
+                "meta": {
+                    "title": "销售单",
+                    "icon": "memberInfo",
+                    "noCache": true
+                }
+            },
+            {
+                "path": "serviceManger",
+                "name": "serviceManger",
+                "page": "/serviceManger",
+                "meta": {
+                    "title": "服务项目",
+                    "icon": "memberInfo",
+                    "noCache": true
+                }
+            },
+            {
+                "path": "moneyHis",
+                "name": "moneyHis",
+                "page": "/moneyHis",
+                "meta": {
+                    "title": "消费记录",
+                    "icon": "memberInfo",
+                    "noCache": true
+                }
+            }
+        ]
+    },
+    {
+        "redirect": "noredirect",
+        "name": "sysLog",
+        "path": "/log",
+        "meta": {
+            "icon": "log",
+            "title": "日志管理"
+        },
+        "alwaysShow": true,
+        "children": [{
+            "path": "logininfor",
+            "name": "logininfor",
+            "page": "/log/logininfor",
+            "meta": {
+                "title": "登陆日志",
+                "icon": "logininfor",
+                "noCache": true,
+                "perms": [
+                    "log:logininfor:list",
+                    "log:logininfor:create",
+                    "log:logininfor:delete",
+                    "log:logininfor:update"
+                ]
+            }
+        }]
+    },
+    {
+        "redirect": "noredirect",
+        "path": "/profile",
+        "hidden": true,
+        "children": [{
+            "path": "password",
+            "meta": {
+                "noCache": true,
+                "title": "修改密码"
+            },
+            "name": "password",
+            "page": "/profile/password"
+        }],
+        "alwaysShow": true
+    },
+    {
+        "redirect": "/404",
+        "path": "*",
+        "hidden": true
+    }
+]

unimall-admin/src/router/route.json

@@ -1,54 +1,45 @@
 [{
         "redirect": "noredirect",
-        "name": "sysTools",
-        "path": "/tools",
-        "meta": {
-            "icon": "tools",
-            "title": "系统工具"
-        },
-        "alwaysShow": true,
+        "path": "/sys",
         "children": [{
-                "path": "api",
-                "name": "api",
-                "page": "/tools/api/api",
-                "meta": {
-                    "title": "API文档",
-                    "icon": "api",
-                    "noCache": true,
-                    "perms": [
-                        "tools:api:list"
-                    ]
-                }
+            "path": "admin",
+            "meta": {
+                "noCache": true,
+                "icon": "admin",
+                "perms": [
+                    "admin:admin:list",
+                    "admin:admin:create",
+                    "admin:admin:update",
+                    "admin:admin:delete"
+                ],
+                "title": "管理员"
             },
-            {
-                "path": "gen",
-                "name": "gen",
-                "page": "/tools/gen",
-                "meta": {
-                    "title": "代码生成",
-                    "icon": "gen",
-                    "noCache": true,
-                    "perms": [
-                        "tools:gen:list",
-                        "tools:gen:create",
-                        "tools:gen:delete",
-                        "tools:gen:update"
-                    ]
-                }
+            "name": "admin",
+            "page": "/sys/admin"
+        }, {
+            "path": "role",
+            "meta": {
+                "noCache": true,
+                "icon": "role",
+                "perms": [
+                    "admin:role:list",
+                    "admin:role:create",
+                    "admin:role:delete",
+                    "admin:role:update",
+                    "admin:role:permissionList",
+                    "admin:permission:list"
+                ],
+                "title": "角色管理"
             },
-            {
-                "path": "gen/edit/:tableId(\\d+)",
-                "hidden": true,
-                "meta": {
-                    "noCache": true,
-                    "perms": [],
-                    "title": "配置项修改"
-                },
-                "name": "genEdit",
-                "page": "/tools/gen/editTable"
-            }
-
-        ]
+            "name": "role",
+            "page": "/sys/role"
+        }],
+        "meta": {
+            "icon": "sys",
+            "title": "系统管理"
+        },
+        "name": "sysManage",
+        "alwaysShow": true
     }, {
         "redirect": "noredirect",
         "name": "management",
@@ -88,6 +79,26 @@
                     "noCache": true
                 }
             },
+            {
+                "path": "serviceMangerTypeColor",
+                "name": "serviceMangerTypeColor",
+                "page": "/serviceMangerTypeColor",
+                "meta": {
+                    "title": "服务颜色",
+                    "icon": "memberInfo",
+                    "noCache": true
+                }
+            },
+            {
+                "path": "serviceMangerType",
+                "name": "serviceMangerType",
+                "page": "/serviceMangerType",
+                "meta": {
+                    "title": "服务分类",
+                    "icon": "memberInfo",
+                    "noCache": true
+                }
+            },
             {
                 "path": "moneyHis",
                 "name": "moneyHis",

unimall-admin/src/views/layout/components/Navbar.vue

@@ -79,7 +79,7 @@ export default {
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        window.location.href = 'http://106.14.75.12:9999/'
+        window.location.href = 'http://121.5.163.150:9997/'
         // location.reload() // In order to re-instantiate the vue-router object to avoid bugs
       })
     }

unimall-admin/src/views/management/index.vue

@@ -171,7 +171,7 @@
           @click="handleUpdate"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           v-permission="['unimall:management:remove']"
           :disabled="multiple"
@@ -179,7 +179,7 @@
           icon="el-icon-delete"
           size="mini"
           @click="handleDelete"
-        >删除</el-button>
+        >删除</el-button> -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -256,12 +256,12 @@
             icon="el-icon-delete"
             @click="handleDelete1(scope.row)"
           >注销</el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+          >删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -269,8 +269,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
     <el-dialog :visible.sync="open1" title="账单" width="500px">
@@ -412,8 +412,8 @@ export default {
       open1: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         companyId: undefined,
         userName: undefined,
         phone: undefined,
@@ -489,7 +489,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */
@@ -574,7 +574,8 @@ export default {
                     serviceObject: 1,
                     money: this.form.money,
                     remark1: this.form.userName,
-                    remark2: this.form.phone
+                    remark2: this.form.phone,
+                    remark3: this.form.cartNo
 
                   }).then(response => {
                     if (response.data) {

unimall-admin/src/views/moneyHis/index.vue

@@ -191,8 +191,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -287,8 +287,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         xiaofeiId: undefined,
         companyId: undefined,
         serviceObject: undefined,
@@ -326,7 +326,7 @@ export default {
         if (index === 0) {
           sums[index] = '总价'
           return
-        } else if (index==4) {
+        } else if (index==5) {
           const values = data.map(item => Number(item[column.property]))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -381,7 +381,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page= 1
       this.getList()
     },
     /** 重置按钮操作 */

unimall-admin/src/views/salesSlip/index.vue

@@ -251,8 +251,8 @@
     <pagination
       v-show="total > 0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList" />
     <el-dialog :visible.sync="isShowPrint" title="打印小票" width="400px">
       <div id="box" style="font-size: 12px;">
@@ -329,13 +329,13 @@
         </el-form-item>
         <el-form-item label="服务分类">
           <el-select v-model="form.serviceType" placeholder="请选择服务分类" style="width:100%">
-            <el-option v-for="item in serviceType" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in serviceType" :key="item.type" :label="item.type" :value="item.type" />
           </el-select>
         </el-form-item>
         <el-form-item label="颜色" prop="color">
           <!-- <el-input v-model="form.color" placeholder="请输入颜色" /> -->
           <el-select v-model="form.color" placeholder="请选择服务颜色" style="width:100%">
-            <el-option v-for="item in colorList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in colorList" :key="item.color" :label="item.color" :value="item.color" />
           </el-select>
         </el-form-item>
         <el-form-item label="属性" prop="attribute">
@@ -345,15 +345,17 @@
           </el-select>
         </el-form-item>
         <el-form-item label="数量" prop="count">
-          <el-input v-model="form.count" placeholder="请输入数量" type="number" @input="inputVal"/>
+          <el-input v-model="form.count" placeholder="请输入数量" type="number" disabled @input="inputVal"/>
         </el-form-item>
         <el-form-item label="服务项目" prop="serviceItems">
           <!-- <el-input v-model="form.serviceItems" placeholder="请输入服务项目" /> -->
-          <el-checkbox-group v-model="checkList" style="display: flex;" @change="changeCheckbox">
-            <div v-for="(item,index) in serviceList" :key="index" style="margin-right: 20px;">
-              <el-checkbox :label="item.route" :key="item.id"/>
-            <el-input v-model="item.unitPrice" placeholder="价格" style="width: 50px;" @input="inputVal(item)"/></div>
+          <el-checkbox-group v-model="checkList" @change="changeCheckbox">
+            <div v-for="(item,index) in serviceList" :key="index" style="display: inline-block; width: 380px;">
+              <el-checkbox :label="item.route" :key="item.id" />
 
+              <el-input v-model="item.unitPrice" placeholder="价格" style="width: 70px;" @input="inputVal(item)"/>
+              <el-input v-model="item.total" placeholder="数量" style="width: 70px;" @input="inputVal(item)"/>
+            </div>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="金额" prop="money">
@@ -406,6 +408,8 @@
 </template>
 
 <script>
+import { listServiceMangerType } from '@/api/unimall/serviceMangerType'
+import { listServiceMangerTypeColor } from '@/api/unimall/serviceMangerTypeColor'
 import { listSalesSlip, getSalesSlip, delSalesSlip, addSalesSlip, updateSalesSlip, exportSalesSlip } from '@/api/unimall/salesSlip'
 import { listServiceManger } from '@/api/unimall/serviceManger'
 import { listManagement } from '@/api/unimall/management'
@@ -420,10 +424,7 @@ export default {
         // 其他配置项，
       },
       cartNo: '',
-      serviceType: [{
-        name: '鞋类清洗',
-        id: 1
-      }],
+      serviceType: [],
       attributeList: [{
         name: '男款',
         id: 1
@@ -436,13 +437,7 @@ export default {
         name: '鞋类',
         id: 1
       }],
-      colorList: [{
-        name: '黑色',
-        id: 1
-      }, {
-        name: '白色',
-        id: 2
-      }
+      colorList: [
       ],
       memberInfo: {},
       checkList: [],
@@ -465,8 +460,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         companyId: undefined,
         serviceObject: undefined,
         serviceType: undefined,
@@ -505,15 +500,22 @@ export default {
       console.log(this.serviceList)
       const that = this
       this.form.money = 0
+      this.form.count = 0
       const getPlace = function(name) {
         for (let k = 0; k<that.serviceList.length; k++) {
           if (name==that.serviceList[k].route) {
-            return Number(that.serviceList[k].unitPrice)
+            return Number(that.serviceList[k].unitPrice)*that.serviceList[k].total
           }
         }
       }
       for (let i = 0; i<this.checkList.length; i++) {
-        this.form.money+=(Number(getPlace(this.checkList[i]))*this.form.count)
+        this.form.money+=(Number(getPlace(this.checkList[i])))
+        for (let k=0; k<this.serviceList.length; k++) {
+          if (this.checkList[i]==this.serviceList[k].route) {
+            this.form.count+=(Number(this.serviceList[k].total))
+            break
+          }
+        }
       }
     },
     getSummaries(param) {
@@ -567,16 +569,23 @@ export default {
     changeCheckbox(e) {
       const that = this
       this.form.money = 0
+      this.form.count = 0
       console.log(this.checkList)
       const getPlace = function(name) {
         for (let k = 0; k<that.serviceList.length; k++) {
           if (name==that.serviceList[k].route) {
-            return that.serviceList[k].unitPrice
+            return that.serviceList[k].unitPrice*that.serviceList[k].total
           }
         }
       }
       for (let i = 0; i<this.checkList.length; i++) {
-        this.form.money+=(Number(getPlace(this.checkList[i]))*this.form.count)
+        this.form.money+=(Number(getPlace(this.checkList[i])))
+        for (let k=0; k<this.serviceList.length; k++) {
+          if (this.checkList[i]==this.serviceList[k].route) {
+            this.form.count+=(Number(this.serviceList[k].total))
+            break
+          }
+        }
       }
     },
     /** 查询销售单列表 */
@@ -587,8 +596,20 @@ export default {
         this.total = response.data.data.count
         this.loading = false
       })
-      listServiceManger().then(response => {
+      listServiceManger().then(response => { debugger
+        for (let i = 0; i<response.data.data.items.length; i++) {
+          response.data.data.items[i].total = 1
+        }
+
         this.serviceList = response.data.data.items
+
+        console.log('s', this.serviceList)
+      })
+      listServiceMangerTypeColor().then(response => {
+        this.colorList = response.data.data.items
+      })
+      listServiceMangerType().then(response => {
+        this.serviceType = response.data.data.items
       })
     },
     // 取消按钮
@@ -602,8 +623,8 @@ export default {
         id: undefined,
         companyId: undefined,
         serviceObject: '鞋类',
-        serviceType: '鞋类清洗',
-        color: '黑色',
+        serviceType: '',
+        color: '',
         attribute: '男款',
         serviceItems: undefined,
         money: 0,
@@ -616,13 +637,13 @@ export default {
         gmtUpdate: undefined,
         userId: undefined,
         adminId: undefined,
-        count: 1
+        count: 0
       }
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */
@@ -655,6 +676,11 @@ export default {
       const id = row.id || this.ids.join(',')
       getSalesSlip(id).then(response => {
         this.form = response.data.data
+        this.checkList = []
+        const _list = this.form.serviceItems.split(',')
+        for (let i = 0; i<_list.length; i++) {
+          this.checkList.push(_list[i])
+        }
         this.open = true
         this.title = '修改销售单'
       })
@@ -675,6 +701,7 @@ export default {
             this.msgError('请勾选服务项目！')
             return
           }
+          this.form.serviceItems = this.checkList.toString()
           if (this.form.id != undefined) {
             updateSalesSlip(this.form).then(response => {
               if (response.data) {
@@ -686,9 +713,8 @@ export default {
               }
             })
           } else {
-            this.form.serviceItems = this.checkList.toString()
             addSalesSlip(this.form).then(response => {
-              if (response.data) { debugger
+              if (response.data) {
                 this.phone = ''
                 this.checkList = []
                 this.msgSuccess('新增成功')
@@ -760,4 +786,7 @@ export default {
   .print-row{
     margin-bottom: 20px;
   }
+  .el-checkbox{
+    width: 180px;
+  }
 </style>

unimall-admin/src/views/serviceManger/index.vue

@@ -163,8 +163,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -251,8 +251,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         companyId: undefined,
         route: undefined,
         unitPrice: undefined,
@@ -312,7 +312,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */

unimall-admin/src/views/serviceMangerType/index.vue

@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="" prop="companyId">
+        <el-input
+          v-model="queryParams.companyId"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+        <el-form-item label="服务分类" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择服务分类" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="0：否" prop="deleteFlag">
+        <el-input
+          v-model="queryParams.deleteFlag"
+          placeholder="请输入0：否"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="gmtCreate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.gmtCreate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="gmtUpdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.gmtUpdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="adminId">
+        <el-input
+          v-model="queryParams.adminId"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form> -->
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerType:add']"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerType:edit']"
+          :disabled="single"
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerType:remove']"
+          :disabled="multiple"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerType:export']"
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col> -->
+    </el-row>
+
+    <el-table v-loading="loading" :data="serviceMangerTypeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="" align="center" prop="id" />
+      <el-table-column label="" align="center" prop="companyId" /> -->
+      <el-table-column label="服务分类" align="center" prop="type" />
+      <!-- <el-table-column label="备注1" align="center" prop="remark1" />
+      <el-table-column label="备注2" align="center" prop="remark2" />
+      <el-table-column label="备注3" align="center" prop="remark3" />
+      <el-table-column label="0：否" align="center" prop="deleteFlag" />
+      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmtCreate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" prop="gmtUpdate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" prop="userId" />
+      <el-table-column label="" align="center" prop="adminId" /> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['unimall:serviceMangerType:edit']"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            v-permission="['unimall:serviceMangerType:remove']"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改服务分类对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <!-- <el-form-item label="" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入" />
+        </el-form-item> -->
+        <el-form-item label="服务分类">
+          <el-input v-model="form.type" placeholder="请输入内容" />
+        </el-form-item>
+        <!-- <el-form-item label="备注1" prop="remark1">
+          <el-input v-model="form.remark1" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注2" prop="remark2">
+          <el-input v-model="form.remark2" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注3" prop="remark3">
+          <el-input v-model="form.remark3" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="0：否" prop="deleteFlag">
+          <el-input v-model="form.deleteFlag" placeholder="请输入0：否" />
+        </el-form-item>
+        <el-form-item label="" prop="gmtCreate">
+          <el-date-picker
+            v-model="form.gmtCreate"
+            clearable
+            size="small"
+            style="width: 200px"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择"/>
+        </el-form-item>
+        <el-form-item label="" prop="gmtUpdate">
+          <el-date-picker
+            v-model="form.gmtUpdate"
+            clearable
+            size="small"
+            style="width: 200px"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择"/>
+        </el-form-item>
+        <el-form-item label="" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入" />
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listServiceMangerType, getServiceMangerType, delServiceMangerType, addServiceMangerType, updateServiceMangerType, exportServiceMangerType } from '@/api/unimall/serviceMangerType'
+
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 服务分类表格数据
+      serviceMangerTypeList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        page: 1,
+        limit: 10,
+        companyId: undefined,
+        type: undefined,
+        remark1: undefined,
+        remark2: undefined,
+        remark3: undefined,
+        deleteFlag: undefined,
+        gmtCreate: undefined,
+        gmtUpdate: undefined,
+        userId: undefined,
+        adminId: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deleteFlag: [
+          { required: true, message: '0：否（默认） 1：是不能为空', trigger: 'blur' }
+        ] }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询服务分类列表 */
+    getList() {
+      this.loading = true
+      listServiceMangerType(this.queryParams).then(response => {
+        this.serviceMangerTypeList = response.data.data.items
+        this.total = response.data.data.count
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        companyId: undefined,
+        type: undefined,
+        remark1: undefined,
+        remark2: undefined,
+        remark3: undefined,
+        deleteFlag: undefined,
+        gmtCreate: undefined,
+        gmtUpdate: undefined,
+        userId: undefined,
+        adminId: undefined
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.page = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加服务分类'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids.join(',')
+      getServiceMangerType(id).then(response => {
+        this.form = response.data.data
+        this.open = true
+        this.title = '修改服务分类'
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateServiceMangerType(this.form).then(response => {
+              if (response.data) {
+                this.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addServiceMangerType(this.form).then(response => {
+              if (response.data) {
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids.join(',')
+      this.$confirm('是否确认删除服务分类编号为"' + ids + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delServiceMangerType(ids)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      }).catch(function() {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有服务分类数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exportServiceMangerType(queryParams)
+      }).then(response => {
+        this.download(response.data.data)
+      }).catch(function() {})
+    }
+  }
+}
+</script>

unimall-admin/src/views/serviceMangerTypeColor/index.vue

@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="" prop="companyId">
+        <el-input
+          v-model="queryParams.companyId"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+        <el-form-item label="服务颜色" prop="color">
+        <el-select v-model="queryParams.color" placeholder="请选择服务颜色" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="0：否" prop="deleteFlag">
+        <el-input
+          v-model="queryParams.deleteFlag"
+          placeholder="请输入0：否"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="gmtCreate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.gmtCreate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="gmtUpdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.gmtUpdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="adminId">
+        <el-input
+          v-model="queryParams.adminId"
+          placeholder="请输入"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item> -->
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerTypeColor:add']"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerTypeColor:edit']"
+          :disabled="single"
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerTypeColor:remove']"
+          :disabled="multiple"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          v-permission="['unimall:serviceMangerTypeColor:export']"
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col> -->
+    </el-row>
+
+    <el-table v-loading="loading" :data="serviceMangerTypeColorList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="" align="center" prop="id" />
+      <el-table-column label="" align="center" prop="companyId" /> -->
+      <el-table-column label="服务颜色" align="center" prop="color" />
+      <!-- <el-table-column label="备注1" align="center" prop="remark1" />
+      <el-table-column label="备注2" align="center" prop="remark2" />
+      <el-table-column label="备注3" align="center" prop="remark3" />
+      <el-table-column label="0：否" align="center" prop="deleteFlag" />
+      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmtCreate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" prop="gmtUpdate" width="180">
+      <template slot-scope="scope">
+        <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
+      </template>
+      </el-table-column>
+      <el-table-column label="" align="center" prop="userId" />
+      <el-table-column label="" align="center" prop="adminId" />-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['unimall:serviceMangerTypeColor:edit']"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            v-permission="['unimall:serviceMangerTypeColor:remove']"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改服务颜色对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <!-- <el-form-item label="" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入" />
+        </el-form-item> -->
+        <el-form-item label="服务颜色">
+          <el-input v-model="form.color" placeholder="请输入内容" />
+        </el-form-item>
+        <!-- <el-form-item label="备注1" prop="remark1">
+          <el-input v-model="form.remark1" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注2" prop="remark2">
+          <el-input v-model="form.remark2" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注3" prop="remark3">
+          <el-input v-model="form.remark3" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="0：否" prop="deleteFlag">
+          <el-input v-model="form.deleteFlag" placeholder="请输入0：否" />
+        </el-form-item>
+        <el-form-item label="" prop="gmtCreate">
+          <el-date-picker
+            v-model="form.gmtCreate"
+            clearable
+            size="small"
+            style="width: 200px"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择"/>
+        </el-form-item>
+        <el-form-item label="" prop="gmtUpdate">
+          <el-date-picker
+            v-model="form.gmtUpdate"
+            clearable
+            size="small"
+            style="width: 200px"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择"/>
+        </el-form-item>
+        <el-form-item label="" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入" />
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listServiceMangerTypeColor, getServiceMangerTypeColor, delServiceMangerTypeColor, addServiceMangerTypeColor, updateServiceMangerTypeColor, exportServiceMangerTypeColor } from '@/api/unimall/serviceMangerTypeColor'
+
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 服务颜色表格数据
+      serviceMangerTypeColorList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        page: 1,
+        limit: 10,
+        companyId: undefined,
+        color: undefined,
+        remark1: undefined,
+        remark2: undefined,
+        remark3: undefined,
+        deleteFlag: undefined,
+        gmtCreate: undefined,
+        gmtUpdate: undefined,
+        userId: undefined,
+        adminId: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deleteFlag: [
+          { required: true, message: '0：否（默认） 1：是不能为空', trigger: 'blur' }
+        ] }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询服务颜色列表 */
+    getList() {
+      this.loading = true
+      listServiceMangerTypeColor(this.queryParams).then(response => {
+        this.serviceMangerTypeColorList = response.data.data.items
+        this.total = response.data.data.count
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        companyId: undefined,
+        color: undefined,
+        remark1: undefined,
+        remark2: undefined,
+        remark3: undefined,
+        deleteFlag: undefined,
+        gmtCreate: undefined,
+        gmtUpdate: undefined,
+        userId: undefined,
+        adminId: undefined
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.page = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加服务颜色'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids.join(',')
+      getServiceMangerTypeColor(id).then(response => {
+        this.form = response.data.data
+        this.open = true
+        this.title = '修改服务颜色'
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateServiceMangerTypeColor(this.form).then(response => {
+              if (response.data) {
+                this.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addServiceMangerTypeColor(this.form).then(response => {
+              if (response.data) {
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids.join(',')
+      this.$confirm('是否确认删除服务颜色编号为"' + ids + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delServiceMangerTypeColor(ids)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      }).catch(function() {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有服务颜色数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exportServiceMangerTypeColor(queryParams)
+      }).then(response => {
+        this.download(response.data.data)
+      }).catch(function() {})
+    }
+  }
+}
+</script>