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

src/store/modules/base.js

@@ -23,8 +23,12 @@ export default {
         department: [],
         quota: [],
         principalList: [],
+        currentPage:null,
     },
     mutations: {
+        SET_CURRENT_PAGE(state,data){
+            state.currentPage=data;
+        },
         SET_DEPARTMENT(state, data) {
             state.department = data;
         },

src/views/second/segmentation/basicTable.vue

@@ -17,7 +17,7 @@
         :span-method="arraySpanMethod"
         ref="table"
       >
-      <el-table-column
+        <el-table-column
           type="index"
           width="50"
           align="center"
@@ -59,12 +59,16 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-          <el-table-column label="第一牵头部门" width="150" align="center">
+        <el-table-column label="第一牵头部门" width="150" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="第一牵头部门责任领导" width="170" align="center">
+        <el-table-column
+          label="第一牵头部门责任领导"
+          width="170"
+          align="center"
+        >
           <template slot-scope="{ row }">
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
@@ -74,7 +78,11 @@
             <pre>{{ row.otherDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="其他牵头部门责任领导" width="170" align="center">
+        <el-table-column
+          label="其他牵头部门责任领导"
+          width="170"
+          align="center"
+        >
           <template slot-scope="{ row }">
             <pre>{{ row.otherPrincipalList | formatList }}</pre>
           </template>
@@ -101,10 +109,12 @@
         </el-table-column>
         <el-table-column label="操作" width="80" align="center">
           <template slot-scope="{ row }">
-            <router-link
+            <!-- <router-link
               :to="{ name: 'segmentation', params: { id:row.basicTaskId, type: 1 } }"
               >分项</router-link
-            >
+            > -->
+            <!-- <span @click="toSegmentation(row)">分项</span> -->
+            <el-link @click="toSegmentation(row)" type="primary" >分项</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -154,13 +164,24 @@ export default {
     mergeSpan([
       { name: "quota1", col: [1] },
       { name: "quota2", col: [2] },
-      { name: "content", col: [3,13] },
+      { name: "content", col: [3, 13] },
     ]),
   ],
   created() {
     this.getDataList();
+    let page=this.page;
+    page.page=this.$store.state.base.currentPage||1;
+    this.$store.commit("base/SET_CURRENT_PAGE", null);
+    this.page=page
   },
   methods: {
+    toSegmentation(row) {
+      this.$store.commit("base/SET_CURRENT_PAGE", this.page.page);
+      this.$router.push({
+        name: "segmentation",
+        params: { id: row.basicTaskId, type: 1 },
+      });
+    },
     updateParams(data) {
       this.searchParams = data;
       this.resetCurrentPage();

src/views/second/segmentation/constraint.vue

@@ -53,12 +53,16 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-          <el-table-column label="第一牵头部门" width="150" align="center">
+        <el-table-column label="第一牵头部门" width="150" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="第一牵头部门责任领导" width="170" align="center">
+        <el-table-column
+          label="第一牵头部门责任领导"
+          width="170"
+          align="center"
+        >
           <template slot-scope="{ row }">
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
@@ -68,7 +72,11 @@
             <pre>{{ row.otherDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="其他牵头部门责任领导" width="170" align="center">
+        <el-table-column
+          label="其他牵头部门责任领导"
+          width="170"
+          align="center"
+        >
           <template slot-scope="{ row }">
             <pre>{{ row.otherPrincipalList | formatList }}</pre>
           </template>
@@ -95,10 +103,14 @@
         </el-table-column>
         <el-table-column label="操作" width="80" align="center">
           <template slot-scope="{ row }">
-            <router-link
-              :to="{ name: 'segmentation', params: { id: row.rigidityConstraintId, type: 3 } }"
+            <!-- <router-link
+              :to="{
+                name: 'segmentation',
+                params: { id: row.rigidityConstraintId, type: 3 },
+              }"
               >分项</router-link
-            >
+            > -->
+            <el-link @click="toSegmentation(row)" type="primary">分项</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -147,13 +159,24 @@ export default {
   mixins: [
     mergeSpan([
       { name: "quota", col: [1] },
-      { name: "content", col: [2,12] },
+      { name: "content", col: [2, 12] },
     ]),
   ],
   created() {
     this.getDataList();
+    let page = this.page;
+    page.page = this.$store.state.base.currentPage || 1;
+    this.$store.commit("base/SET_CURRENT_PAGE", null);
+    this.page = page;
   },
   methods: {
+    toSegmentation(row) {
+      this.$store.commit("base/SET_CURRENT_PAGE", this.page.page);
+      this.$router.push({
+        name: "segmentation",
+        params: { id: row.rigidityConstraintId, type: 3 },
+      });
+    },
     updateParams(data) {
       this.searchParams = data;
       this.resetCurrentPage();

src/views/second/segmentation/contentDetail.vue

@@ -41,27 +41,15 @@
                 <pre>{{ data.leaderDeptList | formatList }}</pre>
               </span></el-col
             >
-            <el-col :span="5" class="grey"><span>牵头部门责任领导</span></el-col>
+            <el-col :span="5" class="grey"
+              ><span>牵头部门责任领导</span></el-col
+            >
             <el-col :span="7"
               ><span>
                 <pre>{{ data.leaderPrincipalList | formatList }}</pre>
               </span></el-col
             >
           </el-row>
-          <!-- <el-row type="flex">
-            <el-col :span="5" class="grey"><span>其他牵头部门</span></el-col>
-            <el-col :span="7"
-              ><span>
-                <pre>{{ data.otherDeptList | formatList }}</pre>
-              </span></el-col
-            >
-            <el-col :span="5" class="grey"><span>其他牵头部门责任领导</span></el-col>
-            <el-col :span="7"
-              ><span>
-                <pre>{{ data.otherPrincipalList | formatList }}</pre>
-              </span></el-col
-            >
-          </el-row> -->
           <el-row type="flex">
             <el-col :span="5" class="grey"><span>配合部门</span></el-col>
             <el-col :span="7"
@@ -69,7 +57,9 @@
                 <pre>{{ data.cooperateDeptList | formatList }}</pre>
               </span></el-col
             >
-            <el-col :span="5" class="grey"><span>配合部门责任领导</span></el-col>
+            <el-col :span="5" class="grey"
+              ><span>配合部门责任领导</span></el-col
+            >
             <el-col :span="7"
               ><span>
                 <pre>{{ data.cooperatePrincipalList | formatList }}</pre>
@@ -163,7 +153,11 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="第一牵头部门责任领导" align="center" width="180">
+            <el-table-column
+              label="第一牵头部门责任领导"
+              align="center"
+              width="180"
+            >
               <template slot-scope="{ row }">
                 <treeselect
                   :disable-branch-nodes="true"
@@ -220,7 +214,11 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="其他牵头部门责任领导" align="center" width="180">
+            <el-table-column
+              label="其他牵头部门责任领导"
+              align="center"
+              width="180"
+            >
               <template slot-scope="{ row }">
                 <treeselect
                   :disable-branch-nodes="true"
@@ -278,7 +276,11 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="配合部门责任领导" align="center" width="180">
+            <el-table-column
+              label="配合部门责任领导"
+              align="center"
+              width="180"
+            >
               <template slot-scope="{ row }">
                 <treeselect
                   :disable-branch-nodes="true"
@@ -787,6 +789,12 @@ export default {
     change(type, index, row) {
       if (!this.reducing) {
         if (type == "add") {
+          // document.documentElement.scrollTop =
+          //   document.documentElement.offsetHeight;
+          window.scroll({
+            top: document.documentElement.offsetHeight,
+            behavior: "smooth",
+          });
           this.form = {};
           let data = this.data;
           data[map[this.type]].push({ add: true });
@@ -817,7 +825,6 @@ export default {
       }
     },
     close() {
-      console.log("===============");
       this.$router.back(-1);
     },
     add(data) {

src/views/second/segmentation/reward.vue

@@ -59,12 +59,16 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-         <el-table-column label="第一牵头部门" width="150" align="center">
+        <el-table-column label="第一牵头部门" width="150" align="center">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="第一牵头部门责任领导" width="170" align="center">
+        <el-table-column
+          label="第一牵头部门责任领导"
+          width="170"
+          align="center"
+        >
           <template slot-scope="{ row }">
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
@@ -74,7 +78,11 @@
             <pre>{{ row.otherDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="其他牵头部门责任领导" width="170" align="center">
+        <el-table-column
+          label="其他牵头部门责任领导"
+          width="170"
+          align="center"
+        >
           <template slot-scope="{ row }">
             <pre>{{ row.otherPrincipalList | formatList }}</pre>
           </template>
@@ -101,13 +109,14 @@
         </el-table-column>
         <el-table-column label="操作" width="125" align="center">
           <template slot-scope="{ row }">
-            <router-link
+            <!-- <router-link
               :to="{
                 name: 'segmentation',
                 params: { id: row.specialPowerId, type: 2 },
               }"
               >分项</router-link
-            >
+            > -->
+            <el-link @click="toSegmentation(row)" type="primary">分项</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -157,13 +166,25 @@ export default {
     mergeSpan([
       { name: "quota1", col: [1] },
       { name: "quota2", col: [2] },
-      { name: "content", col: [3,13] },
+      { name: "content", col: [3, 13] },
     ]),
   ],
   created() {
     this.getDataList();
+    this.getDataList();
+    let page = this.page;
+    page.page = this.$store.state.base.currentPage || 1;
+    this.$store.commit("base/SET_CURRENT_PAGE", null);
+    this.page = page;
   },
   methods: {
+    toSegmentation(row) {
+      this.$store.commit("base/SET_CURRENT_PAGE", this.page.page);
+      this.$router.push({
+        name: "segmentation",
+        params: { id: row.specialPowerId, type: 2 },
+      });
+    },
     updateParams(data) {
       this.searchParams = data;
       this.resetCurrentPage();