Merge remote-tracking branch 'origin/Additional_authority' into feature/权限配置

src/components/template/operation_mixin.js

@@ -56,7 +56,7 @@ export default {
                   if (opt[key]?.prompt) {
                     return role && (opt[key]?.conditions ? opt[key]?.conditions({ row, index, column }) : true) ? (
                       <el-popconfirm
-                        title={opt[key]?.prompt}
+                        title={setBtnName(opt[key]?.prompt, { row, index, column })}
                         onConfirm={() => {
                           opt[key]?.click({ row, index, column })
                         }}

src/components/template/template-page-1.vue

@@ -151,7 +151,7 @@ export default {
             click: this.export,
             loading: false
           }
-          // this.optionsEvensAuth("export", {
+          // this.optionsEvensAuth("exp", {
           //   click: this.export,
           //   loading: false
           // })

src/views/workOrder/workOrderPool/index.vue

@@ -115,10 +115,19 @@ export default {
       return [
         [
           [
+          this.optionsEvensAuth(["createWorkOrder", "createWbWorkOrder"], {
+              name: '创建工单',
+              click: () => { }
+            }),
             this.optionsEvensAuth("createWorkOrder", {
               click: () => {
                 this.createFormBool = true
               }
+            }),
+            this.optionsEvensAuth("createWbWorkOrder", {
+              click: () => {
+                this.createFormBool = true
+              }
             })
           ],
           [