Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

src/api/second/coordinationManage/approvalCooperation.js

@@ -0,0 +1,6 @@
+import axios from "@/config/axios"
+export default {
+  getDataList(params) {
+    return axios.post('', params)
+  }
+}

src/views/second/assessmentResults/results/basicTarget.vue

@@ -100,11 +100,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 305,
+      tableHeight: document.documentElement.clientHeight - 355,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 355 - 45) / 45
         ),
       },
       count: 0,

src/views/second/assessmentResults/results/constraint.vue

@@ -96,11 +96,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 310,
+      tableHeight: document.documentElement.clientHeight - 355,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 310 - 45) / 45
+          (document.documentElement.clientHeight - 355 - 45) / 45
         ),
       },
       count: 0,

src/views/second/assessmentResults/results/reward.vue

@@ -101,11 +101,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 305,
+      tableHeight: document.documentElement.clientHeight - 355,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 355 - 45) / 45
         ),
       },
       count: 0,

src/views/second/assessmentResults/scoreChart.vue

@@ -99,11 +99,11 @@ export default {
   data () {
     return {
       dataList: [],
-      tableHeight: document.documentElement.clientHeight - 205,
+      tableHeight: document.documentElement.clientHeight - 210,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 210 - 45) / 45
         ),
       },
       count: 0,

src/views/second/assessmentResults/scoreRules/basicTarget.vue

@@ -42,7 +42,12 @@
         align="center"
         prop="points"
       ></el-table-column>
-
+      <el-table-column
+        label="分数规则"
+        min-width="95"
+        align="center"
+        prop=""
+      ></el-table-column>
       <el-table-column
         label="区牵头单位"
         min-width="95 "
@@ -102,48 +107,36 @@
       :destroy-on-close="true"
       @closed="form = {}"
     >
-      <el-table
-        :data="dataList"
-        highlight-current-row
-        ref="table"
-      >
-        <el-table-column type="index" label="序号" align="center" width="50">
-        </el-table-column>
-        <el-table-column
-          label="牵头部门名称"
-          min-width="80"
-          align="center"
-          prop="quota1"
-        ></el-table-column>
-
-        <el-table-column
-          label="考核得分"
-          min-width="80"
-          align="center"
-          prop="quota2"
-        ></el-table-column>
-      </el-table>
-      <el-table
-        :data="dataList"
-        highlight-current-row
-        ref="table"
-      >
-        <el-table-column type="index" label="序号" align="center" width="50">
-        </el-table-column>
-        <el-table-column
-          label="配合部门名称"
-          min-width="80"
-          align="center"
-          prop="quota1"
-        ></el-table-column>
-
-        <el-table-column
-          label="考核得分"
-          min-width="80"
-          align="center"
-          prop="quota2"
-        ></el-table-column>
-      </el-table>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">序号</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">牵头部门名称</div></el-col>
+        <el-col :span="10"><div class="grid-content bg-purple">考核得分</div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">1</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">党政办公室</div></el-col>
+        <el-col :span="10">
+          <div class="grid-content bg-purple">
+            <el-input size="mini" v-model="form.leaderPoints"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+       <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">序号</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">配合部门名称</div></el-col>
+        <el-col :span="10"><div class="grid-content bg-purple">考核得分</div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">1</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">党群办公室</div></el-col>
+        <el-col :span="10">
+          <div class="grid-content bg-purple">
+            <el-input size="mini" v-model="form.coorPoints"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      
       <div slot="footer">
         <el-button @click="showEdit = false">取消</el-button>&nbsp;
         <el-button type="primary" @click="save">保存</el-button>
@@ -162,11 +155,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 305,
+      tableHeight: document.documentElement.clientHeight - 350,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 350 - 45) / 45
         ),
       },
       count: 0,
@@ -194,5 +187,15 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
+  /deep/.el-dialog__body {
+    padding: 10px 20px;
+  }
+  .el-row {
+    height: 45px;
+    line-height: 45px;
+  }
+  .el-divider {
+    margin: 10px 0px;
+  }
 </style>

src/views/second/assessmentResults/scoreRules/constraint.vue

@@ -36,7 +36,12 @@
         align="center"
         prop="points"
       ></el-table-column>
-
+      <el-table-column
+        label="分数规则"
+        min-width="95"
+        align="center"
+        prop=""
+      ></el-table-column>
       <el-table-column
         label="区牵头单位"
         min-width="95 "
@@ -66,6 +71,17 @@
           <pre>{{ row.leaderPrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
+      <el-table-column label="操作" width="125" align="center">
+        <template slot-scope="{ row }">
+          <el-link
+            @click="edit(row)"
+            icon="el-icon-edit"
+            type="primary"
+            :underline="false"
+            >编辑</el-link
+          >
+        </template>
+      </el-table-column>
     </el-table>
 
     <el-pagination
@@ -79,7 +95,50 @@
       :flat="true"
       @current-change="getDataList()"
     />
-   
+    <el-dialog
+      title="自定义考核得分规则"
+      :visible.sync="showEdit"
+      width="400px"
+      custom-class="ele-dialog-form"
+      :lock-scroll="false"
+      :destroy-on-close="true"
+      @closed="form = {}"
+    >
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">序号</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">牵头部门名称</div></el-col>
+        <el-col :span="10"><div class="grid-content bg-purple">考核得分</div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">1</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">党政办公室</div></el-col>
+        <el-col :span="10">
+          <div class="grid-content bg-purple">
+            <el-input size="mini" v-model="form.leaderPoints"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+       <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">序号</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">配合部门名称</div></el-col>
+        <el-col :span="10"><div class="grid-content bg-purple">考核得分</div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">1</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">党群办公室</div></el-col>
+        <el-col :span="10">
+          <div class="grid-content bg-purple">
+            <el-input size="mini" v-model="form.coorPoints"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      
+      <div slot="footer">
+        <el-button @click="showEdit = false">取消</el-button>&nbsp;
+        <el-button type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -92,11 +151,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 310,
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 310 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,
@@ -107,7 +166,7 @@ export default {
   },
   methods: {
     getDataList() {},
-    edit() {
+    edit(row) {
       this.showEdit = true;
     },
     save() {},
@@ -122,5 +181,15 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
+   /deep/.el-dialog__body {
+    padding: 10px 20px;
+  }
+  .el-row {
+    height: 45px;
+    line-height: 45px;
+  }
+  .el-divider {
+    margin: 10px 0px;
+  }
 </style>

src/views/second/assessmentResults/scoreRules/reward.vue

@@ -42,7 +42,12 @@
         align="center"
         prop="points"
       ></el-table-column>
-
+      <el-table-column
+        label="分数规则"
+        min-width="95"
+        align="center"
+        prop=""
+      ></el-table-column>
       <el-table-column
         label="区牵头单位"
         min-width="95 "
@@ -73,13 +78,15 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" width="125" align="center">
-        <el-link
-          @click="edit(row)"
-          icon="el-icon-edit"
-          type="primary"
-          :underline="false"
-          >编辑</el-link
-        >
+        <template slot-scope="{ row }">
+          <el-link
+            @click="edit(row)"
+            icon="el-icon-edit"
+            type="primary"
+            :underline="false"
+            >编辑</el-link
+          >
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -94,7 +101,7 @@
       @current-change="getDataList()"
     />
     <el-dialog
-      title="申请成为配合部门"
+      title="自定义考核得分规则"
       :visible.sync="showEdit"
       width="400px"
       custom-class="ele-dialog-form"
@@ -102,22 +109,36 @@
       :destroy-on-close="true"
       @closed="form = {}"
     >
-      <el-form
-        :model="form"
-        label-width="82px"
-        width="400px"
-        :lock-scroll="false"
-        :destroy-on-close="true"
-        @closed="form = {}"
-      >
-        <el-form-item label="申请理由：">
-          <el-input
-            type="textarea"
-            placeholder="请输入申请理由"
-            :rows="5"
-          ></el-input>
-        </el-form-item>
-      </el-form>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">序号</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">牵头部门名称</div></el-col>
+        <el-col :span="10"><div class="grid-content bg-purple">考核得分</div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">1</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">党政办公室</div></el-col>
+        <el-col :span="10">
+          <div class="grid-content bg-purple">
+            <el-input size="mini" v-model="form.leaderPoints"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+       <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">序号</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">配合部门名称</div></el-col>
+        <el-col :span="10"><div class="grid-content bg-purple">考核得分</div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">1</div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple">党群办公室</div></el-col>
+        <el-col :span="10">
+          <div class="grid-content bg-purple">
+            <el-input size="mini" v-model="form.coorPoints"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+      
       <div slot="footer">
         <el-button @click="showEdit = false">取消</el-button>&nbsp;
         <el-button type="primary" @click="save">保存</el-button>
@@ -136,11 +157,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 305,
+      tableHeight: document.documentElement.clientHeight - 350,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 350 - 45) / 45
         ),
       },
       count: 0,
@@ -168,5 +189,15 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
+  /deep/.el-dialog__body {
+    padding: 10px 20px;
+  }
+  .el-row {
+    height: 45px;
+    line-height: 45px;
+  }
+  .el-divider {
+    margin: 10px 0px;
+  }
 </style>

src/views/second/coordinationManage/approvalCooperation/basicTarget.vue

@@ -136,6 +136,7 @@
 
 <script>
 import search from "../../search";
+import { mapGetters } from "vuex"; 
 export default {
   components: {
     search,
@@ -143,11 +144,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 355,
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 355 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,
@@ -160,8 +161,16 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['user']),
+  },
+  created() {
+    this.getDataList()
+  },
   methods: {
-    getDataList() {},
+    getDataList() {
+      console.log(this.user.user.deptId);
+    },
     edit(flag) {
       this.showEdit = true;
       if (flag) {

src/views/second/coordinationManage/approvalCooperation/constraint.vue

@@ -136,11 +136,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 310,
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 310 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,

src/views/second/coordinationManage/approvalCooperation/reward.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="reward" v-loading="loading">
     <search :type="2" />
-    <el-table
+   <el-table
       :data="dataList"
       border
       highlight-current-row
@@ -53,7 +53,7 @@
       ></el-table-column>
       <el-table-column
         label="分值"
-        width="50"
+        min-width="60"
         align="center"
         prop="points"
       ></el-table-column>
@@ -65,29 +65,29 @@
         prop="leaderUnit"
       ></el-table-column>
 
-      <el-table-column label="牵头部门" width="100" align="center">
+      <el-table-column label="牵头部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" width="80" align="center">
+      <el-table-column label="责任领导" min-width="80" align="center">
         <template slot-scope="{ row }">
           <pre>{{ row.leaderPrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
-      <el-table-column label="配合部门" width="100" align="center">
+      <el-table-column label="配合部门" min-width="80" align="center">
         <template slot-scope="{ row }">
           <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" width="80" align="center">
+      <el-table-column label="责任领导" min-width="80" align="center">
         <template slot-scope="{ row }">
           <pre>{{ row.leaderPrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="100" align="center">
+      <el-table-column label="操作" width="125" align="center">
         <el-link @click="edit(true)" type="primary" :underline="false"
           >同意</el-link
         >
@@ -143,11 +143,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 355,
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 355 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,

src/views/second/coordinationManage/cooperateList/basicTarget.vue

@@ -114,11 +114,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 355,
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 355 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,

src/views/second/coordinationManage/cooperateList/constraint.vue

@@ -108,11 +108,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 310,
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 310 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,

src/views/second/coordinationManage/cooperateList/reward.vue

@@ -114,11 +114,11 @@ export default {
   data() {
     return {
       dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 355,
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 355 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,