lex-xin 4 år sedan
förälder
incheckning
b132c3f590

+ 2 - 4
src/views/businessManager/orderManager/orderAudit/index.vue

@@ -151,15 +151,13 @@
                   type="text"
                   v-permission="'routeOrder/query'"
                   @click="lookDetail(scope.row)"
-                  >查看</el-button
-                >
+                  >查看</el-button>
                 <el-button
                   type="text"
                   v-permission="'routeOrder/update'"
                   v-if="scope.row.auditStatus == 'REJECT'"
                   @click="resetDetail(scope.row)"
-                  >修改</el-button
-                >
+                  >修改</el-button>
               </div>
             </template>
           </el-table-column>

+ 3 - 2
src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -225,7 +225,7 @@
           </el-form-item>
           <el-form-item
             class="setWidth"
-            style="margin-right: 10px"
+            style="margin-right: 10px;margin-left: 10px;"
             :prop="'goodsList.' + index + '.number'"
           >
             <!--  :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
@@ -243,6 +243,7 @@
             icon="el-icon-minus"
             :disabled="!isAdd"
             v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
+            style="margin-bottom: 22px;"
             circle
             @click.prevent="removeGoodsList(goodsList)"
           ></el-button>
@@ -252,7 +253,7 @@
             v-if="auditStatus == 'REJECT'"
             @click.prevent="addGoodsList"
             circle
-            style="margin-left: 5px"
+            style="margin-left: 5px; margin-bottom: 22px;"
           ></el-button>
         </div>
       </div>

+ 4 - 2
src/views/categroyManager/generalSettings/earlyWarning.vue

@@ -2,7 +2,7 @@
   <div class='m-container'>
     <!-- <h2>错误类型管理</h2> -->
     <div class="m-core">
-      <auth auths="sysConfig/update" style="margin-bottom: 20px">
+      <auth auths="sysConfig/update/insert" style="margin-bottom: 20px">
         <el-button type="primary" @click="openTypes('create')">添加</el-button>
       </auth>
 
@@ -55,9 +55,11 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <auth auths="sysConfig/update">
+              <auth auths="sysConfig/update/update">
                 <el-button @click="openTypes('update', scope.row)"
                          type="text">修改</el-button>
+              </auth>
+              <auth auths="sysConfig/update/del">
                 <el-button @click="onTypesDel(scope.row)"
                          type="text">删除</el-button>
               </auth>

+ 1 - 1
src/views/categroyManager/generalSettings/holidaySetting.vue

@@ -5,7 +5,7 @@
       <!-- 列表 -->
       <calendar class="calendarComponent" v-if="dataStatus" :first-day-of-week="1" multiple :select-date="dateList" width="800px"/>
       <div v-if="dataStatus" style="width: 800px; margin: 10px auto; text-align: center;">
-        <el-button type="primary" @click="onSave" style="padding: 16px 33px; font-size: 18px;">保&nbsp;&nbsp;存</el-button>
+        <el-button v-permission="'sysConfig/update/holidaySetting'" type="primary" @click="onSave" style="padding: 16px 33px; font-size: 18px;">保&nbsp;&nbsp;存</el-button>
       </div>
     </div>
   </div>

+ 1 - 1
src/views/categroyManager/generalSettings/overallManager.vue

@@ -13,7 +13,7 @@
                       v-if="config.description[1]">{{ config.description[1] }}</template>
           </el-input>
           <el-button @click="onSave(config, index)"
-                     v-permission="'sysConfig/update'"
+                     v-permission="'sysConfig/update/overallManager'"
                      type="primary">保存</el-button>
         </el-col>
       </el-row>

+ 1 - 1
src/views/categroyManager/generalSettings/overallManagerTwo.vue

@@ -13,7 +13,7 @@
                       v-if="config.description[1]">{{ config.description[1] }}</template>
           </el-input>
           <el-button @click="onSave(config, index)"
-                     v-permission="'sysConfig/update'"
+                     v-permission="'sysConfig/update/overallManagerTwo'"
                      type="primary">保存</el-button>
         </el-col>
       </el-row>

+ 3 - 3
src/views/categroyManager/insideSetting/adminManager.vue

@@ -5,7 +5,7 @@
     </h2>
     <div class="m-core">
       <div @click="onAdminOperation('create')"
-           v-permission="'/adminOperation'"
+           v-permission="'role/add'"
            class='newBand'>添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
@@ -23,7 +23,7 @@
                            label="操作">
             <template slot-scope="scope">
               <el-button @click="onAdminOperation('update', scope.row)"
-                         v-permission="'/adminOperation'"
+                         v-permission="'role/update'"
                          type="text">修改</el-button>
             </template>
           </el-table-column>
@@ -84,7 +84,7 @@ export default {
     },
     onAdminOperation (type, row) {
       let params = {
-        path: '/specialSetup/adminoperation',
+        path: '/systemManager/parameter/adminoperation',
         query: {
           type: type,
           page: this.pageInfo.page

+ 2 - 2
src/views/categroyManager/insideSetting/adminOperation.vue

@@ -135,7 +135,7 @@ export default {
       if (res.code == 200) {
         this.$message.success('修改成功')
         this.$store.dispatch('delVisitedViews', this.$route)
-        this.$router.push({ path: '/specialSetup/adminManager', query: { page: this.page } })
+        this.$router.push({ path: '/systemManager/parameter/adminManager', query: { page: this.page } })
       } else {
         this.$message.error(res.msg)
       }
@@ -240,7 +240,7 @@ export default {
     onCancel () {
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: '/specialSetup/adminManager',
+        path: '/systemManager/parameter/adminManager',
         query: {
           page: this.$route.query.page
         }

+ 4 - 4
src/views/categroyManager/specialSetup/musicalManager.vue

@@ -9,7 +9,7 @@
           一级分类
           <el-popover placement="right"
                       width="300"
-                      v-permission="'subject/upset'"
+                      v-permission="'subject/upset/insert'"
                       trigger="click">
             <el-input v-model.trim="oneTypeName"
                       size="medium"
@@ -35,7 +35,7 @@
       <el-row v-for="(item, index) in subjectList"
               :key="item.id">
         <el-col :span="6">
-          <el-button @click="subjectDelete(item)" v-permission="'subject/upset'"
+          <el-button @click="subjectDelete(item)" v-permission="'subject/upset/del'"
                      icon="el-icon-delete"
                      circle></el-button>
           <span class="one_name">{{ item.name }}</span>
@@ -47,7 +47,7 @@
                   :key="s.id"
                   type="info"
                   effect="dark"
-                  closable
+                  :closable="$helper.permission('subject/upset/del')"
                   :disable-transitions="false"
                   @close="subjectDelete(s)"> {{s.name}}</el-tag>
           <span style="display: inline-block;">
@@ -63,7 +63,7 @@
                        type="primary"
                        size="mini"
                        round
-                       v-permission="'subject/upset'"
+                       v-permission="'subject/upset/insert'"
                        icon="el-icon-plus"
                        @click="item.inputStatus = true">添加</el-button>
             <el-button v-if="item.inputStatus"

+ 3 - 1
src/views/categroyManager/specialSetup/musicalManagerOut.vue

@@ -9,6 +9,7 @@
           一级分类
           <el-popover placement="right"
                       width="300"
+                      v-permission="'subject/upset/insert2'"
                       trigger="click">
             <el-input v-model.trim="oneTypeName"
                       size="medium"
@@ -46,7 +47,7 @@
                   :key="s.id"
                   type="info"
                   effect="dark"
-                  closable
+                  :closable="$helper.permission('subject/upset/del2')"
                   :disable-transitions="false"
                   @close="subjectDelete(s)"> {{s.name}}</el-tag>
           <span style="display: inline-block;">
@@ -62,6 +63,7 @@
                        type="primary"
                        size="mini"
                        round
+                       v-permission="'subject/upset/insert2'"
                        icon="el-icon-plus"
                        @click="item.inputStatus = true">添加</el-button>
             <el-button v-if="item.inputStatus"