管理员修改

src/components/pages/PaymentManagement/AllowancePayment.vue

@@ -7,7 +7,7 @@
           <a-select-option value="MEAL">餐补</a-select-option>
         </a-select>
         <a-select placeholder="经办人" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectAgent">
-          <a-select-option v-for="(item, index) in agentList" :key="index" :value="item.ddUserId">{{ item.userName }}</a-select-option>
+          <a-select-option v-for="(item, index) in agentList" :key="index" :value="item.ddUserId">{{ item.name }}</a-select-option>
         </a-select>
         <a-button type="primary" @click="search()">查询</a-button>
         <a-button type="primary" @click="changeModel()" style="margin-left: 20px;"><a-icon type="pay-circle" />发放津贴</a-button>
@@ -182,10 +182,11 @@ export default {
     // 获取收银员列表
     getAgentList () {
       let AgentData = this.$qs.stringify({
-        orgId: localStorage.getItem('orgId')
+        orgId: localStorage.getItem('orgId'),
+        userType: '1'
       })
-      $http.get(`/account/query_user_admin_list?${AgentData}`).then((res) => {
-        this.agentList = res.data.data
+      $http.get(`/cashier/list_cashier_all?${AgentData}`).then((res) => {
+        this.agentList = res.data.data.list
       })
     },
     toAllowanceDetails (record, text, index) {

src/components/pages/PaymentManagement/CashierManagement.vue

 <template>
   <div class="cashierManagement">
-    <a-button type="primary" style="margin-bottom: 20px" @click="choosePeople"><a-icon type="user" />添加收银人</a-button>
+    <a-button type="primary" style="margin-bottom: 20px" @click="choosePeople">添加收银人</a-button>
     <div class="searchUserMessage" v-if="searchSource.UserMessage.emplId">
       <div class="positionDiv"></div>
       <div class="clearUserMessage"><a href="javascript:;" @click="clearUserMessage">清除</a></div>
@@ -83,7 +83,9 @@ export default {
       let DeleteCashierData = this.$qs.stringify({
         ddUserId: record.userId,
         cashierStatus: '1',
-        orgId: localStorage.getItem('orgId')
+        orgId: localStorage.getItem('orgId'),
+        userType: '0',
+        id: record.id
       })
       $http.get(`/cashier/delete_cashier?${DeleteCashierData}`).then((res) => {
         if (res.data.resultCode === '0') {
@@ -100,7 +102,8 @@ export default {
       let CashierListData = this.$qs.stringify({
         pageNumber: this.pagination.defaultPageSize,
         currentPage: this.pagination.current,
-        orgId: localStorage.getItem('orgId')
+        orgId: localStorage.getItem('orgId'),
+        userType: '0'
       })
       $http.get(`/cashier/list_cashier?${CashierListData}`).then((res) => {
         this.pagination.total = parseInt(res.data.data.total)
@@ -124,7 +127,8 @@ export default {
           cashierName: res[0].name,
           ddUserId: res[0].emplId,
           cashierStatus: '0',
-          orgId: localStorage.getItem('orgId')
+          orgId: localStorage.getItem('orgId'),
+          userType: '0'
         })
         $http.get(`/cashier/insert_cashier?${insertCashierData}`).then((res) => {
           if (res.data.resultCode === '0') {

src/components/pages/PaymentManagement/PaymentManagementHome.vue

@@ -13,8 +13,9 @@
             <a-menu-item class="itemFlex" key="rechargeRecord"><div :class="[chooseMenuList === 'rechargeRecord' ? 'menuIcon menuIcon2_2' : 'menuIcon menuIcon2_1']"></div>充值记录</a-menu-item>
             <a-menu-item class="itemFlex" key="allowancePayment"><div :class="[chooseMenuList === 'allowancePayment' ? 'menuIcon menuIcon3_2' : 'menuIcon menuIcon3_1']"></div>津贴发放</a-menu-item>
             <a-menu-item class="itemFlex" key="recordsOfConsumption"><div :class="[chooseMenuList === 'recordsOfConsumption' ? 'menuIcon menuIcon4_2' : 'menuIcon menuIcon4_1']"></div>消费记录</a-menu-item>
-            <a-menu-item class="itemFlex" key="cashierManagement"><div :class="[chooseMenuList === 'cashierManagement' ? 'menuIcon menuIcon5_2' : 'menuIcon menuIcon5_1']"></div>设置管理员</a-menu-item>
             <a-menu-item class="itemFlex" key="systemReconciliation"><div :class="[chooseMenuList === 'systemReconciliation' ? 'menuIcon menuIcon6_2' : 'menuIcon menuIcon6_1']"></div>系统对账</a-menu-item>
+            <a-menu-item class="itemFlex" key="cashierManagement"><div :class="[chooseMenuList === 'cashierManagement' ? 'menuIcon menuIcon5_2' : 'menuIcon menuIcon5_1']"></div>设置收银员</a-menu-item>
+            <a-menu-item class="itemFlex" key="SetAdministrators"><div :class="[chooseMenuList === 'SetAdministrators' ? 'menuIcon menuIcon5_2' : 'menuIcon menuIcon5_1']"></div>设置管理员</a-menu-item>
             <a-menu-item class="itemFlex" key="paymentManagementSetting"><div :class="[chooseMenuList === 'paymentManagementSetting' ? 'menuIcon menuIcon7_2' : 'menuIcon menuIcon7_1']"></div>设置中心</a-menu-item>
             <!-- <a-menu-item key="operationLog">操作日志</a-menu-item> -->
           </a-menu>
@@ -109,4 +110,10 @@ export default {
 .menuIcon7_2{
   background-image: url('../../../assets/menuIcon/paymentManagementSetting2.png');
 }
+.menuIcon8_1{
+  background-image: url('../../../assets/menuIcon/paymentManagementSetting1.png');
+}
+.menuIcon8_2{
+  background-image: url('../../../assets/menuIcon/paymentManagementSetting2.png');
+}
 </style>

src/components/pages/PaymentManagement/RechargeRecord.vue

@@ -3,7 +3,7 @@
     <div class="searchBox">
       <div class="choosePeople" @click="choosePeople" style="width: 120px">选择成员</div>
       <a-select placeholder="经办人" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectAgent">
-        <a-select-option v-for="(item, index) in agentList" :key="index" :value="item.ddUserId">{{ item.userName }}</a-select-option>
+        <a-select-option v-for="(item, index) in agentList" :key="index" :value="item.ddUserId">{{ item.name }}</a-select-option>
       </a-select>
       <a-select placeholder="状态" :allowClear="true" style="width: 120px;margin-right: 20px;" @change="selectHandlestatus">
         <a-select-option value="SUCCESS">已完成</a-select-option>
@@ -112,10 +112,11 @@ export default {
     // 获取收银员列表
     getAgentList () {
       let AgentData = this.$qs.stringify({
-        orgId: localStorage.getItem('orgId')
+        orgId: localStorage.getItem('orgId'),
+        userType: '1'
       })
-      $http.get(`/account/query_user_admin_list?${AgentData}`).then((res) => {
-        this.agentList = res.data.data
+      $http.get(`/cashier/list_cashier_all?${AgentData}`).then((res) => {
+        this.agentList = res.data.data.list
       })
     },
     // 选人组件调用

src/components/pages/PaymentManagement/RecordsOfConsumption.vue

@@ -136,7 +136,8 @@ export default {
   methods: {
     queryAgentList () {
       let CashierListData = this.$qs.stringify({
-        orgId: localStorage.getItem('orgId')
+        orgId: localStorage.getItem('orgId'),
+        userType: '0'
       })
       $http.get(`/cashier/list_cashier_all?${CashierListData}`).then((res) => {
         this.agentList = res.data.data.list

src/router.js

@@ -41,6 +41,12 @@ export default new Router({
               component: resolve => require(['./components/pages/PaymentManagement/CashierManagement.vue'], resolve)
             },
             {
+              path: '/SetAdministrators',
+              name: 'SetAdministrators',
+              meta: { title: '支付管理/收银员管理' },
+              component: resolve => require(['./components/pages/PaymentManagement/SetAdministrators.vue'], resolve)
+            },
+            {
               path: '/allowancePayment',
               name: 'allowancePayment',
               meta: { title: '支付管理/津贴发放' },