添加共性分解表

src/api/assessingTarget/commonquotatask.js

@@ -0,0 +1,7 @@
+import axios from "@/config/axios"
+export default{
+    getList(params){
+        console.log(params)
+        return axios.get("/commonquotatask/index",{params})
+    }
+}

src/views/assessingTarget/commonquotatask.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="basic-target ele-body">
+    <el-card shadow="never">
+      <el-table
+        :data="dataList"
+        border
+        highlight-current-row
+        :height="tableHeight"
+        v-loading="loading"
+      >
+         <el-table-column
+          label="类别"
+          min-width="80"
+          align="center"
+          prop="categoryName"
+        ></el-table-column>
+        <el-table-column type="index" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          label="指标名称"
+          min-width="150"
+          align="center"
+          prop="quotaName"
+        ></el-table-column>
+        <el-table-column
+          label="单位"
+          min-width="60"
+          align="center"
+          prop="quotaUnit"
+        ></el-table-column>
+        <el-table-column
+          label="江宁开发区"
+          min-width="80"
+          align="center"
+          prop="jiangningDevzone"
+        ></el-table-column>
+        <el-table-column
+          label="江宁高新区"
+          min-width="80"
+          align="center"
+          prop="jiangningHighzone"
+        ></el-table-column>
+        <el-table-column
+          label="滨江开发区"
+          min-width="80"
+          align="center"
+          prop="binjiangDevzone"
+        ></el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page.sync="page.page"
+        :page-size="page.limit"
+        :total="count"
+        :background="true"
+        layout="total, prev, pager, next, jumper"
+        :pager-count="5"
+        class="ele-pagination-circle"
+        @current-change="getDataList()"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import api from "@/api/assessingTarget/commonquotatask";
+export default {
+  components: {
+
+    },
+  data() {
+    return {
+      dataList: [],
+      loading: false,
+      count: 0,
+      tableHeight:document.documentElement.clientHeight - 470,
+      page: {
+        page: 1,
+        limit: Math.floor(
+          (document.documentElement.clientHeight - 470 - 45) / 45
+        ),
+      },
+    };
+  },
+  created() {
+    this.getDataList();
+  },
+  methods: {
+   
+    getDataList(params) {
+      this.loading = true;
+      api
+        .getList(params ? Object.assign(this.page, params) : this.page)
+        .then((res) => {
+          console.log(res.data);
+          this.loading = false;
+          let data = res.data.data
+          this.dataList = data;
+          this.count = res.data.data.total;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.count = 0;
+        });
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/basicTable/conventional.vue

@@ -64,11 +64,7 @@
           min-width="80"
           prop="num"
         ></el-table-column>
-        <!-- <el-table-column
-          label="操作"
-          min-width="150"
-          align="center"
-        ></el-table-column> -->
+      
       </el-table>
       <el-pagination
         :current-page.sync="page.page"
@@ -213,6 +209,7 @@ export default {
         .getList(Object.assign({},this.searchParams,this.page))
         .then((res) => {
           this.loading = false;
+          console.log(res.data.data.records);
           let data = res.data.data.records;
           data = data.map((item) => {
             item.year = item.year + "";

src/views/system/user/index.vue

@@ -61,7 +61,7 @@
               </el-tag>
             </template>
           </el-table-column>
-           <el-table-column prop="levelName" label="部门" sortable="custom" show-overflow-tooltip min-width="100"/>
+           <el-table-column prop="deptId" label="部门" sortable="custom" show-overflow-tooltip min-width="100"/>
           <el-table-column prop="levelName" label="职级" sortable="custom" show-overflow-tooltip min-width="100"/>
           <el-table-column prop="positionName" label="岗位" sortable="custom" show-overflow-tooltip min-width="100"/>
           <el-table-column label="创建时间" sortable="custom" show-overflow-tooltip min-width="160">
@@ -114,14 +114,10 @@
             </el-form-item>
              <el-form-item label="部门:" prop="roleIds">
               <el-select v-model="editForm.roleIds" placeholder="请选择部门" class="ele-block" clearable multiple>
-                <el-option v-for="(item,index) in roleList" :key="index" :label="item.name" :value="item.id"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="角色:" prop="roleIds">
-              <el-select v-model="editForm.roleIds" placeholder="请选择角色" class="ele-block" clearable multiple>
                 <el-option v-for="(item,index) in departmentsList" :key="index" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
+           
           </el-col>
           <el-col :sm="12">
             <el-form-item label="手机号:">
@@ -143,6 +139,11 @@
             <el-form-item label="登录密码:" prop="password" v-if="!editForm.id">
               <el-input v-model="editForm.password" placeholder="请输入登录密码" show-password/>
             </el-form-item>
+             <el-form-item label="角色:" prop="roleIds">
+              <el-select v-model="editForm.roleIds" placeholder="请选择角色" class="ele-block" clearable multiple>
+                <el-option v-for="(item,index) in roleList" :key="index" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -318,6 +319,21 @@ export default {
       }).catch(e => {
         this.$message.error(e.message);
       });
+    },
+    /**
+     * 获取部门列表
+     */
+     getDepList() {
+      this.$http.get('/dept/getDeptList/1').then(res => {
+        if (res.data.code === 0) {
+          this.departmentsList = res.data.data;
+          console.log(this.departmentsList);
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      }).catch(e => {
+        this.$message.error(e.message);
+      });
     }
   }
 }