Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/product/components/framework/viewIndex.vue

@@ -8,22 +8,22 @@
             <p>{{ typesOf==1?'产品类别名称：':'产品名称：' }}{{ row.name }}</p>
           </div>
           <div>
-            <el-dropdown split-button type="primary" size="small" @click="handleCommand('0')"
-              @command="handleCommand($event)">
-              <span>导 入</span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="1">复制</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
+            <el-button type="primary" size="small" @click="handleImport">导 入</el-button>
           </div>
         </div>
       </el-header>
       <el-container>
-        <el-aside width="380px" style="height: 100%;padding: 10px;">
+        <el-aside width="400px" style="height: 100%;padding: 10px;">
           <div style="display:flex;margin-bottom:10px;">
             <el-input v-model="productName" size="small" placeholder="请输入名称" style="margin-right:10px;"></el-input>
             <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
-            <el-button type="primary" size="small" @click="handleAppend">新增分类节点</el-button>
+            <!-- <el-button type="primary" size="small" @click="handleAppend">新增分类节点</el-button> -->
+            <el-dropdown split-button type="primary" size="small" @click="handleAppend">
+              <span>新增分类节点</span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="handleCopy">复制分类架构节点</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
           </div>
           <div>
             <el-tree ref="tree" :data="treeData" :props="defaultProps" @node-click="handleNodeClick"
@@ -52,6 +52,13 @@
                     </el-tooltip>
                   </el-button>
                 </span>
+                <span style="padding-left: 10px;">
+                  <el-button type="text" size="mini" @click.stop.native="copy(data, node)">
+                    <el-tooltip class="item" effect="dark" content="复制分类架构节点" placement="bottom-start">
+                      <i class="el-icon-document-copy" style="font-size: 16px;"></i>
+                    </el-tooltip>
+                  </el-button>
+                </span>
               </span>
             </el-tree>
           </div>
@@ -163,24 +170,8 @@ export default {
       //1表示展开行2表示基础表格
       this.getTableList()
     },
-    //导入、复制等按钮事件
-    handleCommand(event) {
-      switch (event) {
-        case '0'://导入专利
-          this.importProject()
-          break;
-        case '1'://复制其他分类节点
-          this.nodeCopy()
-          break;
-
-        default:
-          break;
-      }
-    },
     // 专利导入
-    importProject() { },
-    // 节点复制
-    nodeCopy() { },
+    handleImport() { },
     // 子组件传来的消息,新增成功、编辑成功
     handleSuccess(val) {
       this.getList()
@@ -287,6 +278,10 @@ export default {
     remove(data, node) {
       this.deleNode(data)
     },
+    // 树节点上复制分类架构
+    copy(data, node) {
+      
+    },
     // 树节点点击事件
     handleNodeClick(data, node) {
       // console.log(data, node);
@@ -295,7 +290,10 @@ export default {
         this.getTableList()
       }
     },
-
+    // 按钮复制分类架构
+    handleCopy() {
+      
+    },
     // 请求数据（tree）
     async getList() {
       let params = {
@@ -406,7 +404,9 @@ export default {
   .el-divider--horizontal {
     margin: 15px 0,
   }
-
+  .el-dropdown .el-button-group{
+    display: flex;
+  }
 }
 </style>
 <style lang="scss" scoped>

src/views/report/components/dialog/addAndEditReport.vue

@@ -291,13 +291,13 @@ export default {
       //是否懒加载
       isLazy: true,
       matterType: null,
-      // 报告id
-      reportId:null,
       /*审核弹窗所需变量start*/
       showTask: false,
+      // 任务表单
       taskForm: {},
       isEndTime: true,
       isEndTimes: null,
+      // 任务表单校验
       TaskForm: {
         taskName: [{ required: true, message: '请输入任务名称', trigger: 'blur' },],
         personnelId: [{ required: true, message: '请选择审核人', trigger: 'change' },],
@@ -305,6 +305,9 @@ export default {
       },
       /*审核弹窗所需变量end*/
       /*无效应对报告下一步弹窗所需变量start*/
+      // 报告id
+      reportId: null,
+      // 控制弹窗的关闭
       showEvidenceAndRequest:false,
       /*无效应对报告下一步弹窗所需变量end*/
     };