Merge branch 'dev' into 'master'

Dev

See merge request !1

src/api/system/sysRole.js

@@ -14,7 +14,6 @@ export function getPage(parameter) {
     url: api.getPage,
     method: 'post',
     data: parameter,
-    useFullLoading: true
   })
 }
 

src/api/system/sysUserApi.js

@@ -18,7 +18,6 @@ export function getPage(parameter) {
     url: api.getPage,
     method: 'post',
     data: parameter,
-    useFullLoading: true
   })
 }
 

src/components/page/GlobalLayout.vue

@@ -126,9 +126,10 @@ export default {
     }
   },
   created() {
-    this.menus = this.filterHidenRouter(
-      this.mainMenu.find((item) => item.path === '/').children
-    )
+    const root = this.mainMenu.find((item) => item.path === '/')
+    this.menus = this.filterHidenRouter(root.children)
+    console.info('main menu', this.mainMenu, this.menus)
+    console.info('root', root)
   },
   methods: {
     ...mapActions(['setSidebar']),
@@ -143,6 +144,7 @@ export default {
       }
     },
     filterHidenRouter(routes, init = []) {
+      
       for (let i = 0; i < routes.length; i++) {
         let item = routes[i]
         if (item.hidden == true) {

src/store/modules/user.js

@@ -78,8 +78,11 @@ const user = {
           commit('SET_NAME', data.userInfo.realName || data.userInfo.username);
           commit('SET_AVATAR', data.userInfo.avatar);
           commit('SET_BUTTONS', buttonAuthList);
-
-          SocketService.init()
+          try {
+            SocketService.init()
+          } catch (e) {
+            console.error(e)
+          }
 
 
           resolve(response)

src/views/banner/BannerEdit.vue

@@ -18,12 +18,32 @@
         :form="form"
       />
       <a-form-item label="排序">
-        <a-input-number v-decorator="['showOrder']" />
+        <a-input-number v-decorator="['showOrder']" defaultValue="0" />
+      </a-form-item>
+      <a-form-item label="跳转类型">
+        <a-select
+          v-decorator="['type']"
+          defaultValue="0"
+          :options="[
+            { label: '不跳转', value: 0 },
+            { label: '公众号文章', value: 2 }
+          ]"
+          @change="typeChange"
+        />
+      </a-form-item>
+      <a-form-item v-if="type == 2" label="文章链接">
+        <a-input
+          v-decorator="[
+            'mpArticle',
+            { rules: [{ required: true, message: '请输入文章链接' }] }
+          ]"
+        />
       </a-form-item>
     </a-form>
+
     <div class="drawer-form-bottom-toolbar">
       <a-button :style="{ marginRight: '8px' }" @click="close"> 取消 </a-button>
-      <a-button type="primary" @click="submit"> 保存 </a-button>
+      <a-button type="primary" v-if="hasPerm('SYS02102.EDIT')" @click="submit"> 保存 </a-button>
     </div>
   </a-drawer>
 </template>
@@ -39,7 +59,8 @@ export default {
     return {
       form: this.$form.createForm(this),
       visible: false,
-      id: null
+      id: null,
+      type: 0
     }
   },
   methods: {
@@ -49,7 +70,10 @@ export default {
       this.visible = true
       if (this.id) {
         getDetail(this.id).then(({ data }) => {
-          this.form.setFieldsValue(data)
+          this.type = data.type
+          this.$nextTick(() => {
+            this.form.setFieldsValue(data)
+          })
           this.$refs.image.setValue([data.url])
         })
       }
@@ -58,14 +82,18 @@ export default {
       this.id = null
       this.$refs.image.reset()
       this.form.resetFields()
+      this.type = 0
+      this.form.setFieldsValue({ type: 0 })
       this.visible = false
     },
+    typeChange(value) {
+      this.type = value
+    },
     submit() {
       this.form.validateFields((err, values) => {
         if (err) {
           return
         }
-        console.info('values', values, this.$refs.image.getValue())
         const reqData = {
           ...values,
           url: this.$refs.image.getValue()[0],

src/views/banner/BannerList.vue

 <template>
   <table-template :soul="this">
-    <template #preview="{ record }">
-      <a @click="preview(record.url)"><a-icon type="eye" /></a>
-    </template>
     <template #switch="{ record, index }">
       <a-switch
         :checked="dataSource[index].enabled"
@@ -10,12 +7,13 @@
         un-checked-children="禁用"
         :loading="loadingKeys.includes(record.id)"
         @click="enableChange(record, index)"
+        v-if="hasPerm('SYS02102.ENABLE')"
       />
     </template>
     <template #action="{ record }">
       <a-space>
         <a @click="edit(record.id)">编辑</a>
-        <a style="color: red" @click="deleteRow(record.id)">删除</a>
+        <a style="color: red" v-if="hasPerm('SYS02102.DELETE')" @click="deleteRow(record.id)">删除</a>
       </a-space>
     </template>
     <template #free>
@@ -32,12 +30,6 @@ import BannerEdit from './BannerEdit.vue'
 const columns = [
   { title: '描述', dataIndex: 'description' },
   { title: '排序号', dataIndex: 'showOrder', width: 120 },
-  {
-    title: '预览',
-    width: 120,
-    align: 'center',
-    scopedSlots: { customRender: 'preview' }
-  },
   {
     title: '启用/禁用',
     width: 120,
@@ -59,7 +51,7 @@ const columns = [
 ]
 
 export default {
-  name: 'ErrorLogList',
+  name: 'BannerList',
   mixins: [TableScript],
   components: { TableTemplate, BannerEdit },
   data() {
@@ -85,9 +77,6 @@ export default {
     edit(id) {
       this.$refs.BannerEdit.show(id)
     },
-    preview(value) {
-      console.info(value)
-    },
     deleteRow(id) {
       const _this = this
       this.$confirm({

src/views/notice/HomeNotice.vue

@@ -8,7 +8,7 @@
         >
           发布
         </a>
-        <a v-if="record.releaseStatus == 2" @click="revoke(record)">撤销</a>
+        <a v-if="hasPerm('SYS02103.PUBLISH') && record.releaseStatus == 2" @click="revoke(record)">撤销</a>
         <a @click="detail(record.id)">详情</a>
         <a
           style="color: red"
@@ -78,7 +78,8 @@ export default {
       toolbar: [
         {
           text: '新建',
-          handler: 'add'
+          handler: 'add',
+          bizCode: 'SYS02103.EDIT'
         }
       ]
     }

src/views/notice/NoticeDetail.vue

 <template>
-  <a-drawer :width="500" :visible="visible" title="服务类别" @close="close">
+  <a-drawer :width="500" :visible="visible" title="首页通知" @close="close">
     <a-form :form="form" layout="vertical">
       <a-form-item label="名称">
-        <a-input
-          v-decorator="[
-            'title',
-            {
-              rules: [{ required: true }]
-            }
-          ]"
-        />
+        <a-input v-decorator="['title']" />
       </a-form-item>
       <a-form-item label="内容(18字)">
         <a-input
@@ -17,12 +10,8 @@
             'content',
             {
               rules: [
-                {
-                  required: true
-                },
-                {
-                  max: 18
-                }
+                { required: true, message: '请填写内容' },
+                { max: 18, message: '为了显示效果内容应少于18字' }
               ]
             }
           ]"
@@ -34,7 +23,7 @@
     </a-form>
     <div class="drawer-form-bottom-toolbar">
       <a-button :style="{ marginRight: '8px' }" @click="close"> 取消 </a-button>
-      <a-button type="primary" @click="submit"> 保存 </a-button>
+      <a-button v-if="hasPerm('SYS02103.EDIT')" type="primary" @click="submit"> 保存 </a-button>
     </div>
   </a-drawer>
 </template>

src/views/order/ChooseWorker.vue

@@ -35,7 +35,6 @@
       </a-radio-group>
     </div>
     <div v-show="step == 1">
-      <span>选择上门时间</span>
       <a-form :form="form">
         <a-form-item label="备注">
           <a-textarea

src/views/order/OrderDetail.vue

@@ -58,6 +58,7 @@
         </a-descriptions>
       </div>
       <div id="order-detail-drawer-box-timeline">
+        <h3>订单流程</h3>
         <a-timeline>
           <template v-for="(log, i) in order.process">
             <a-timeline-item :key="i">
@@ -80,6 +81,7 @@
           @click="sendPrice"
           type="primary"
           v-if="
+            hasPerm('SYS02201.SEND') &&
             !past &&
             (order.orderStatus == STATUS.RESERVE ||
               order.orderStatus == STATUS.VALUATION)
@@ -89,32 +91,32 @@
         </a-button>
         <a-button
           @click="sendValuator"
-          v-if="!past && order.orderStatus == STATUS.RESERVE"
+          v-if="hasPerm('SYS02201.VALUATOR') && !past && order.orderStatus == STATUS.RESERVE"
         >
           现场估价
         </a-button>
         <a-button
           @click="reSendValuator"
-          v-if="order.orderStatus == STATUS.VALUATION"
+          v-if="hasPerm('SYS02201.VALUATOR') && !past && order.orderStatus == STATUS.VALUATION"
         >
           重新指派估价员
         </a-button>
         <a-button
-          v-if="!past && order.orderStatus == STATUS.PAY"
+          v-if="hasPerm('SYS02201.WORKER') && !past && order.orderStatus == STATUS.PAY"
           type="primary"
           @click="dispatch"
         >
           派单
         </a-button>
         <a-button
-          v-if="!past && order.orderStatus == STATUS.DISPATCH"
+          v-if="hasPerm('SYS02201.WORKER') && !past && order.orderStatus == STATUS.DISPATCH"
           @click="reDispatch"
         >
           重新派单
         </a-button>
         <a-button
           @click="finish"
-          v-if="past && order.orderStatus == STATUS.DISPATCH"
+          v-if="hasPerm('SYS02201.FINISH') && past && order.orderStatus == STATUS.DISPATCH"
           type="primary"
         >
           完成
@@ -214,7 +216,7 @@ export default {
   mounted() {}
 }
 </script>
-<style lang="less" scoped>
+<style lang="less">
 #order-detail-drawer-box {
   height: 100%;
   display: flex;
@@ -225,7 +227,14 @@ export default {
     width: 40%;
     max-height: 100%;
     overflow-y: auto;
-    padding-top: 10px;
+    h3 {
+      margin-bottom: 30px;
+      font-weight: bold;
+    }
+  }
+  .ant-descriptions-item-label {
+    margin-top: 5px;
+    font-weight: bold;
   }
 }
 </style>
\ No newline at end of file

src/views/serv/CategoryEdit.vue

@@ -12,7 +12,7 @@
       </a-form-item>
     </a-form>
     <div class="drawer-form-bottom-toolbar">
-      <a-button :style="{ marginRight: '8px' }" @click="close"> 取消 </a-button>
+      <a-button :style="{ marginRight: '8px' }" v-if="hasPerm('SYS0210101.CATEGORY')" @click="close"> 取消 </a-button>
       <a-button type="primary" @click="submit"> 保存 </a-button>
     </div>
   </a-drawer>

src/views/serv/ServiceList.vue

@@ -13,7 +13,7 @@
     </template>
     <template #enable="{ record, index }">
       <a-switch
-        v-if="record.type == 2"
+        v-if="hasPerm('SYS0210101.ENABLE') && record.type == 2"
         :checked="record.enabled"
         checked-children="启用"
         un-checked-children="禁用"

src/views/serv/SubClassEdit.vue

@@ -52,7 +52,7 @@
     </a-form>
     <div class="drawer-form-bottom-toolbar">
       <a-button :style="{ marginRight: '8px' }" @click="close"> 取消 </a-button>
-      <a-button type="primary" @click="submit"> 保存 </a-button>
+      <a-button type="primary" v-if="hasPerm('SYS0210101.EDIT')" @click="submit"> 保存 </a-button>
     </div>
   </a-drawer>
 </template>

src/views/serviceWorker/ServiceWorkerEdit.vue

@@ -15,7 +15,7 @@
     </a-form>
     <div class="drawer-form-bottom-toolbar">
       <a-button :style="{ marginRight: '8px' }" @click="close"> 取消 </a-button>
-      <a-button type="primary" @click="submit"> 保存 </a-button>
+      <a-button type="primary" @click="submit" v-if="hasPerm('SYS0200201.EDIT')"> 保存 </a-button>
     </div>
   </a-drawer>
 </template>

src/views/serviceWorker/ServiceWorkerList.vue

@@ -3,7 +3,7 @@
     <template #action="{ record }">
       <a-space>
         <a @click="edit(record.id)">编辑</a>
-        <a style="color: red" @click="deleteRow(record.id)">删除</a>
+        <a v-if="hasPerm('SYS0200201.DELETE')" style="color: red" @click="deleteRow(record.id)">删除</a>
       </a-space>
     </template>
     <template #free>
@@ -53,7 +53,8 @@ export default {
       toolbar: [
         {
           text: '新增',
-          handler: 'add'
+          handler: 'add',
+          bizCode: 'SYS0200201.EDIT'
         }
       ]
     }

src/views/system/role/SysRoleList.vue

@@ -78,7 +78,7 @@
               checkedChildren="启用"
               unCheckedChildren="禁用"
               @click="setStatus(record)"
-              :checked="record.available"
+              :checked="record.isEnabled"
               :key="record.id"/>
           </span>
       </a-table>

src/views/system/user/SysUserList.vue

 <template>
   <table-template :soul="this">
-    <template #tags="{ record }">
+    <template #tags="{ record, index }">
       <a-switch
         :disabled="record.id == 1"
         checkedChildren="启用"
         unCheckedChildren="禁用"
         @click="setStatus(record)"
-        :checked="record.available"
+        :checked="dataSource[index].isEnabled"
       />
     </template>
     <template #action="{ record }">

src/views/user/UserList.vue

@@ -6,8 +6,8 @@
     <template #userType="{ record }">
       <span
         >{{record.roleTypeValue}} &nbsp;
-        <a-dropdown :trigger="['click']">
-          <a><a-icon type="edit" @click="(e) => e.preventDefault()" /></a>
+        <a-dropdown :trigger="['click']" v-if="hasPerm">
+          <a><a-icon type="edit" @click="(e) => e.preventDefault('SYS0200101.EDIT')" /></a>
           <a-menu slot="overlay" @click="({ key }) => edit(key, record)">
             <a-menu-item key="0"> 修改为 普通用户 </a-menu-item>
             <a-menu-item key="1"> 修改为 客服 </a-menu-item>