修改流程样式

src/views/permissionApplication/components/reportDialog.vue

@@ -4,26 +4,31 @@
     title="添加报告"
     :visible.sync="dialogVisible"
     width="50%"
-
+    class="addreport"
     :before-close="handleClose">
-    <div class="tag-search">
-      <el-row>
-        <el-col :span="12">
-          <div class="tag-item">
-            <label class="tag-title">报告年份</label>
-            <el-select v-model="q.year" multiple collapse-tags placeholder="请选择报告年份">
+      <el-form
+        :model="searchForm "
+        inline
+        class="search-area search-new "
+
+        @keyup.enter.native="search">
+      <el-row :gutter="24">
+        <el-col :xl="8" :lg="8">
+
+            <el-form-item label="报告年份" class="search-item">
+            <el-select v-model="searchForm.year" multiple collapse-tags placeholder="请选择报告年份">
               <template v-for="item in yearList">
                 <el-option :label="item" :value="item" :key="item"></el-option>
               </template>
             </el-select>
-          </div>
+            </el-form-item>
         </el-col>
-        <el-col :span="12" align="right" class="tag-btns">
-          <el-button type="primary" @click="search">查询</el-button>
-          <el-button type="default" @click="reset">重置</el-button>
+        <el-col :xl="8" :lg="8" align="right" class="tag-btns">
+          <el-button    type="primary" size="small" @click="search">查询</el-button>
+          <el-button type="default" size="small" @click="reset">重置</el-button>
         </el-col>
       </el-row>
-    </div>
+      </el-form>
     <div class="table">
       <vxe-table :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe height="auto"
                  ref="xTable" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
@@ -63,10 +68,10 @@ export default {
       total: 0,
       q: {
         pageSize: 10,
-        pageNo: 1,
-        labelOneId: [],
-        labelTwoId: [],
-        labelThreeId: []
+        pageNo: 1
+      },
+      searchForm: {
+
       },
       checkIds: [],
       dialogVisible: false,
@@ -143,7 +148,7 @@ export default {
     },
     // 列表
     reportList () {
-      this.$api.report.reportList(this.q).then(({ data }) => {
+      this.$api.report.reportList({ ...this.q, ...this.searchForm }).then(({ data }) => {
         this.tableData = data.records
         this.total = data.total
         this.q.pageNo = data.current
@@ -191,6 +196,19 @@ export default {
   width: 100%;
   height: 550px;
 }
+.addreport{
+  ::v-deep .el-dialog__header {
+    padding: 0 20px;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #ddd;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 15px 20px 20px 20px;
+  }
+}
 .done {
   margin: 30px 20px 10px;
   text-align: right;

src/views/permissionApplication/components/reportTable.vue

@@ -201,10 +201,12 @@ export default {
     margin-bottom: 20px;
   }
   .addbtn{
+    border: none;
     background-color: #8400FF;
     color: #fff;
   }
   .delbtn{
+    border: none;
     background-color: #d9001b;
     color: #fff;
   }

src/views/permissionApplication/launch.vue

@@ -94,7 +94,7 @@
       <orgTable :visible.sync="visibleOrgTable" title="人员列表" dialog-model :config="{
       value: orgTableVal,
         valueName: orgTableValName
-     }" :workNumFlag="true" :maxSelected="100" @confirm="isTreeOk"></orgTable>
+     }" :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
           </div>
         </div>
       </template>
@@ -205,7 +205,7 @@ export default {
         this.assignForm.name2Id = parts.toString()
         this.assignForm.name2 = partsName.toString()
       }
-      console.log(this.assignForm.name1Id,this.assignForm.name2Id)
+      console.log(this.assignForm.name1Id, this.assignForm.name2Id)
     },
     // 获取表格列表 吧查询到的值传给子组件
     reportList (ids) {
@@ -229,7 +229,13 @@ export default {
         this.$refs.applicationFormRef.validate(m => {
           if (v && m) {
             // 过了校验  需要把数据都整合 this.tableData  this.applicationForm   this.assignForm
-
+            // 表格数据没有不能提交  需要提示
+            if (this.tableData.length > 0) {
+              this.$message.warning('至少需要选择一条报告数据')
+            } else {
+              // 调用流程数据
+              console.log("发送数据")
+            }
           } else {
             this.$message.warning('请检查表单填写完整')
           }
@@ -240,6 +246,6 @@ export default {
 }
 </script>
 
-      <style scoped>
+<style scoped>
 
-      </style>
+</style>