Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/components/common/menu/index2.vue

@@ -80,7 +80,7 @@ export default {
 }
 </script>
 <style>
-.el-popover{
+.menuPopover .el-popover{
     min-width: 100px;
     padding: 0;
 }

RMS-FrontEnd/src/views/layout/components/field.vue

@@ -41,8 +41,8 @@
                    <p @click="handleEdit(scope.row)" v-if="$permission('/workspace/common/customField/modify')">编辑</p>
                    <p v-else :disabled="true">编辑</p>
                     <el-dropdown-menu slot="dropdown" class="text-align_center">
-                      <el-dropdown-item @click.native="handleEditOption(scope.row)" v-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1 && $permission('/workspace/common/customField/managementOptions')">选项管理</el-dropdown-item>
-                      <el-dropdown-item v-else-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1" type="primary" size="small" @click.native="handleEditOption(scope.row)">选项查看</el-dropdown-item>
+                      <el-dropdown-item @click.native="handleEditOption(scope.row)" v-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1 ">选项管理</el-dropdown-item>
+                      <!-- <el-dropdown-item v-else-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1" type="primary" size="small" @click.native="handleEditOption(scope.row)">选项查看</el-dropdown-item> -->
                       <!-- <el-dropdown-item :disabled="!$permission('/workspace/common/customField/copy')" @click.native="handleCopy(scope.row)">复制</el-dropdown-item> -->
                       <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)" :disabled="!$permission('/workspace/common/customField/delete')" divided>删除</el-dropdown-item>
                     </el-dropdown-menu>
@@ -101,7 +101,7 @@
               >
                 <div class="custom-tree-node" slot-scope="{ node, data }">
                   <el-input v-model="data.name" placeholder="请输入内容" size="small" class="r" @focus="lockOption = true" @input="valueChange = true" @blur="submitOption(data)"></el-input>
-                  <div class="o" v-if="$permission('/workspace/common/customField/managementOptions')">
+                  <div class="o">
                     <span class="el-icon-plus" @click="handleAddTreeNode(data)" title="添加"></span>
                     <span class="el-icon-delete" @click="handleDeleteTreeNode(node, data)" title="删除"></span>
                   </div>
@@ -111,13 +111,13 @@
             <template v-else>
               <div v-for="(item, index) in ruleForm.option" class="option">
                 <el-input v-model="item.name" placeholder="请输入内容" size="small" class="t" @focus="lockOption = true" @input="valueChange = true" @blur="submitOption(item)"></el-input>
-                <div class="o" v-if="$permission('/workspace/common/customField/managementOptions')">
+                <div class="o">
                   <span class="el-icon-delete" @click="handleDeleteOption(item, index)" title="删除"></span>
                 </div>
               </div>
             </template>
           </el-main>
-          <el-footer v-if="$permission('/workspace/common/customField/managementOptions')">
+          <el-footer >
             <el-button type="primary" size="small" @click="handleAddOption()" :disabled="lockOption">添加</el-button>
           </el-footer>
         </el-container>
@@ -357,9 +357,9 @@ export default {
       },
       //选项卡输入
       submitOption(item) {
-        if (!this.$permission('/workspace/common/customField/managementOptions')) {
-          return false
-        }
+        // if (!this.$permission('/workspace/common/customField/managementOptions')) {
+        //   return false
+        // }
         if (!item.name) {
           this.$message.error('请输入内容')
           return false