Merge branch '03/12permission' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 03/12permission

src/views/businessManager/orderManager/income.vue

@@ -377,9 +377,6 @@ export default {
     }
   },
   mounted() {
-
-
-
     this.$store.dispatch("setBranchs");
     this.getList();
   },

src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -119,13 +119,25 @@
                            label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text"
+                <auth :auths="scope.row.auditStatus == 'ING' ? 'routeOrder/auditOutOrder/shenghetaoqi' : 'routeOrder/query/taoqi'">
+                  <el-button
+                    type="text"
+                    @click="lookDetail(scope.row)"
+                    >{{ scope.row.auditStatus == 'ING' ? '审核' : '查看' }}</el-button>
+                </auth>
+                <auth auths="routeOrder/update/taoqi" v-if="scope.row.auditStatus == 'REJECT'">
+                  <el-button
+                    type="text"
+                    @click="resetDetail(scope.row)"
+                    >修改</el-button>
+                </auth>
+                <!-- <el-button type="text"
                 v-permission="'routeOrder/query'"
                            @click="lookDetail(scope.row)">查看</el-button>
                 <el-button type="text"
-                v-permission="'routeOrder/update'"
+                v-permission="'routeOrder/update/taoqi'"
                            v-if="scope.row.auditStatus == 'REJECT'"
-                           @click="resetDetail(scope.row)">修改</el-button>
+                           @click="resetDetail(scope.row)">修改</el-button> -->
               </div>
             </template>
           </el-table-column>
@@ -153,17 +165,17 @@
       <span slot="footer"
             class="dialog-footer" >
         <el-button v-if="activeRow&&activeRow.auditStatus == 'ING'"
-         v-permission="'routeOrder/auditOutOrder'"
+         v-permission="'routeOrder/auditOutOrder/REJECTtaoqi'"
                    @click="submit('REJECT')">驳回</el-button>
         <el-button v-if="activeRow&&activeRow.auditStatus == 'ING'"
-         v-permission="'routeOrder/auditOutOrder'"
+         v-permission="'routeOrder/auditOutOrder/PASStaoqi'"
                    @click="submit('PASS')"
                    type="primary">审核通过</el-button>
         <el-button @click="orderVisible = false"
 
                    v-if="activeRow&&activeRow.auditStatus == 'REJECT'&&!isLook">取 消</el-button>
         <el-button v-if="activeRow&&activeRow.auditStatus == 'REJECT'&&!isLook"
-         v-permission="'routeOrder/update'"
+         v-permission="'routeOrder/update/taoqi'"
                    @click="submitReaet"
                    type="primary">确 定</el-button>
       </span>
@@ -172,16 +184,16 @@
 </template>
 
 <script>
-import axios from "axios";
-import { getToken } from "@/utils/auth";
+// import axios from "axios";
+// import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
-import load from "@/utils/loading";
-import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
+// import load from "@/utils/loading";
+// import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
 import { orderServerList, orderAuditTypeList } from "@/utils/searchArray";
 import orderAuditDetail from "@/views/businessManager/orderManager/orderAudit/orderAuditDetail";
 import { getRouteOrderList } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
-import { formatData } from "@/utils/utils";
+// import { formatData } from "@/utils/utils";
 import Tooltip from "@/components/Tooltip/index";
 import saveform from '@/components/save-form'
 export default {

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -147,26 +147,18 @@
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button
-                  type="text"
-                  v-permission="'routeOrder/auditOutOrder/shenghe'"
-                  v-if="scope.row.auditStatus == 'ING'"
-                  key="look"
-                  @click="lookDetail(scope.row)"
-                  >审核</el-button>
-                <el-button
-                  type="text"
-                  v-else
-                  key="look"
-                  v-permission="'routeOrder/query/detail'"
-                  @click="lookDetail(scope.row)"
-                  >查看</el-button>
-                <el-button
-                  type="text"
-                  v-permission="'routeOrder/update'"
-                  v-if="scope.row.auditStatus == 'REJECT'"
-                  @click="resetDetail(scope.row)"
-                  >修改</el-button>
+                <auth :auths="scope.row.auditStatus == 'ING' ? 'routeOrder/auditOutOrder/shenghe' : 'routeOrder/query/detail'">
+                  <el-button
+                    type="text"
+                    @click="lookDetail(scope.row)"
+                    >{{ scope.row.auditStatus == 'ING' ? '审核' : '查看' }}</el-button>
+                </auth>
+                <auth auths="routeOrder/update" v-if="scope.row.auditStatus == 'REJECT'">
+                  <el-button
+                    type="text"
+                    @click="resetDetail(scope.row)"
+                    >修改</el-button>
+                </auth>
               </div>
             </template>
           </el-table-column>
@@ -223,16 +215,16 @@
 </template>
 
 <script>
-import axios from "axios";
-import { getToken } from "@/utils/auth";
+// import axios from "axios";
+// import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
-import load from "@/utils/loading";
-import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
+// import load from "@/utils/loading";
+// import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
 import { orderServerList, orderAuditTypeList } from "@/utils/searchArray";
 import orderAuditDetail from "./orderAuditDetail";
 import { getRouteOrderList } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
-import { formatData } from "@/utils/utils";
+// import { formatData } from "@/utils/utils";
 import Tooltip from "@/components/Tooltip/index";
 import saveform from "@/components/save-form";
 export default {