Merge branch 'develop' of http://code.dashoo.cn/chengjian/opms_frontend into develop

src/views/base/product/index.vue

@@ -219,9 +219,10 @@
           prodClass: '',
           prodName: '',
         }
+        this.fetchData()
       },
       getOptions() {
-        Promise.all([this.getDicts('base_product_class')])
+        Promise.all([this.getDicts('sys_product_line')])
           .then(([productType]) => {
             this.prodClassOptions = productType.data.values || []
           })

src/views/base/productAuth/index.vue

@@ -40,7 +40,9 @@
       </el-table-column>
       <el-table-column align="center" label="操作" width="120px">
         <template #default="{ row }">
-          <el-button v-permissions="['base:productLine:grant']" type="text" @click="handleAuth(row)">授权</el-button>
+          <el-button v-permissions="['base:productLineAuth:grant']" type="text" @click="handleAuth(row)">
+            授权
+          </el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/system/role/components/RoleEdit.vue

@@ -123,7 +123,11 @@
             } else {
               this.form.menuCheckStrictly = '20'
             }
-
+            if (this.form.deptCheckStrictly) {
+              this.form.deptCheckStrictly = '10'
+            } else {
+              this.form.deptCheckStrictly = '20'
+            }
             this.form.menuIds = this.getMenuAllCheckedKeys()
             if (this.form.id) {
               const { msg } = await roleApi.doEdit(this.form)