更新地址

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/chain/coordinationManage/approvalCooperation.vue

@@ -25,7 +25,7 @@
         <el-table-column
           label="申请时间"
           align="center"
-          width="150"
+          width="160"
           prop="createTime"
         ></el-table-column
         ><el-table-column
@@ -49,7 +49,7 @@
         <el-table-column
           label="指标名称"
           align="center"
-          width="100"
+          min-width="200"
           prop="content"
         ></el-table-column>
         <el-table-column
@@ -61,7 +61,7 @@
         <el-table-column
           label="第一牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="leaderDeptName"
         >
           <template slot-scope="{ row }">
@@ -71,7 +71,7 @@
         <el-table-column
           label="其它牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="otherDeptName"
         >
           <template slot-scope="{ row }">
@@ -81,7 +81,7 @@
         <el-table-column
           label="配合部门"
           align="center"
-          width="180"
+          width="130"
           prop="cooperateDeptName"
         >
           <template slot-scope="{ row }">
@@ -255,7 +255,7 @@ export default {
         this.warning = {
           title: "确定不同意此申请？",
           info:
-            "点击确定后，该部门申请将驳回，如需再次添加，则有管理员确认后增加",
+            "点击确定后，该部门申请将驳回，如需再次添加，则由管理员确认后增加",
         };
       }
     },

src/views/chain/coordinationManage/cooperateList.vue

@@ -25,7 +25,7 @@
         <el-table-column
           label="申请时间"
           align="center"
-          width="150"
+          width="160"
           prop="createTime"
         ></el-table-column
         ><el-table-column
@@ -44,12 +44,12 @@
           label="类型"
           align="center"
           width="100"
-          prop="type"
+          prop="typeName"
         ></el-table-column>
         <el-table-column
           label="指标名称"
           align="center"
-          width="100"
+          min-width="200"
           prop="content"
         ></el-table-column>
         <el-table-column
@@ -61,7 +61,7 @@
         <el-table-column
           label="第一牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="leaderDeptName"
         >
           <template slot-scope="{ row }">
@@ -71,7 +71,7 @@
         <el-table-column
           label="其它牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="otherDeptName"
         >
           <template slot-scope="{ row }">
@@ -81,14 +81,14 @@
         <el-table-column
           label="配合部门"
           align="center"
-          width="180"
+          width="130"
           prop="cooperateDeptName"
         >
           <template slot-scope="{ row }">
             <pre>{{ row.cooperateDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="120">
+        <el-table-column label="状态" align="center" width="80">
           <template slot-scope="{ row }">
             <el-link type="primary" v-if="row.status == 0">审核中</el-link>
             <el-link type="primary" v-if="row.status == 1">审核通过</el-link>
@@ -173,6 +173,13 @@ export default {
         });
     },
   },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join("\n");
+      }
+    },
+  },
 };
 </script>
 

src/views/chain/industryClassify.vue

@@ -29,9 +29,9 @@
       </div>
       <div class="operating">
         <el-button size="small" type="warning" @click="add">新增</el-button>
-        <el-button size="small" type="default" @click="remove()"
+        <!-- <el-button size="small" type="default" @click="remove()"
           >批量删除</el-button
-        >
+        > -->
         <!-- <el-button size="small" type="default">批量导入</el-button> -->
       </div>
       <el-table
@@ -42,11 +42,11 @@
         @selection-change="selectionChange"
         v-loading="loading"
       >
-        <el-table-column
+        <!-- <el-table-column
           type="selection"
           width="50"
           align="center"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           type="index"
           width="50"
@@ -257,32 +257,32 @@ export default {
       this.ischecked = "edit";
     },
     remove(row) {
-      if (!row) {
-        // 批量删除
-        if (this.multipleSelection.length === 0)
-          return this.$message.error("请至少选择一条数据");
-        let ids = this.multipleSelection.map((d) => d.id);
-        ids.join(",");
-        this.$confirm("确定要删除选中表格?", "提示", { type: "warning" })
-          .then(() => {
-            this.loading = true;
-            api
-              .delete(ids)
-              .then(() => {
-                this.loading = false;
-                this.$message({ type: "success", message: "删除成功" });
-              })
-              .catch(() => {
-                this.loading = fa;
-                se;
-                this.$message.error("删失败");
-              })
-              .finally(() => {
-                this.getDataList();
-              });
-          })
-          .catch(() => 0);
-      } else {
+      // if (!row) {
+      //   // 批量删除
+      //   if (this.multipleSelection.length === 0)
+      //     return this.$message.error("请至少选择一条数据");
+      //   let ids = this.multipleSelection.map((d) => d.id);
+      //   ids.join(",");
+      //   this.$confirm("确定要删除选中表格?", "提示", { type: "warning" })
+      //     .then(() => {
+      //       this.loading = true;
+      //       api
+      //         .delete(ids)
+      //         .then(() => {
+      //           this.loading = false;
+      //           this.$message({ type: "success", message: "删除成功" });
+      //         })
+      //         .catch(() => {
+      //           this.loading = fa;
+      //           se;
+      //           this.$message.error("删失败");
+      //         })
+      //         .finally(() => {
+      //           this.getDataList();
+      //         });
+      //     })
+      //     .catch(() => 0);
+      // } else {
         // 单个删除
         this.loading = true;
         api
@@ -298,7 +298,7 @@ export default {
           .finally(() => {
             this.getDataList();
           });
-      }
+      // }
     },
     save() {
       this.$refs["editForm"].validate((valid) => {

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

@@ -5,6 +5,7 @@
       @search:task="updateParams($event)"
       @export="exportData($event)"
       :show-export="true"
+      :approval="false"
     />
     <el-table
       :data="dataList"
@@ -280,7 +281,7 @@ export default {
         this.warning = {
           title: "确定不同意此申请？",
           info:
-            "点击确定后，该部门申请将驳回，如需再次添加，则有管理员确认后增加",
+            "点击确定后，该部门申请将驳回，如需再次添加，则由管理员确认后增加",
         };
       }
     },

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

@@ -5,6 +5,7 @@
       @search:task="updateParams($event)"
       @export="exportData($event)"
       :show-export="true"
+      :approval="false"
     />
     <el-table
       :data="dataList"
@@ -272,7 +273,7 @@ export default {
         this.warning = {
           title: "确定不同意此申请？",
           info:
-            "点击确定后，该部门申请将驳回，如需再次添加，则有管理员确认后增加",
+            "点击确定后，该部门申请将驳回，如需再次添加，则由管理员确认后增加",
         };
       }
     },

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

@@ -5,6 +5,7 @@
       @search:task="updateParams($event)"
       @export="exportData($event)"
       :show-export="true"
+      :approval="false"
     />
     <el-table
       :data="dataList"
@@ -279,7 +280,7 @@ export default {
         this.warning = {
           title: "确定不同意此申请？",
           info:
-            "点击确定后，该部门申请将驳回，如需再次添加，则有管理员确认后增加",
+            "点击确定后，该部门申请将驳回，如需再次添加，则由管理员确认后增加",
         };
       }
     },

src/views/second/search.vue

@@ -58,7 +58,7 @@
           v-model="searchParams.content"
         ></el-input>
       </el-form-item>
-      <el-form-item label="第一牵头部门:">
+      <el-form-item label="第一牵头部门:" v-if="approval">
         <treeselect
           :disable-branch-nodes="true"
           v-model="searchParams.leaderDept"
@@ -127,6 +127,12 @@ export default {
         return 1;
       },
     },
+    approval:{
+      type:Boolean,
+      default(){
+        return true
+      }
+    },
     showExport:{
       type:Boolean,
       default(){

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>
@@ -95,13 +85,13 @@
             >添加</el-button
           >
         </div>
-        <div>
+        <div style="overflow-x:scroll">
           <el-table
             :data="detailList"
             border
             highlight-current-row
             v-loading="tableLoading"
-            style="min-height:400px"
+            style="min-height:400px;min-width:1500px"
           >
             <el-table-column
               type="index"
@@ -112,7 +102,7 @@
             <el-table-column
               label="小项内容"
               align="center"
-              min-width="120"
+              min-width="160"
               max-width="200"
             >
               <template slot-scope="{ row }">
@@ -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"
@@ -307,7 +309,7 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="135">
+            <el-table-column label="操作" align="center" >
               <template slot-scope="{ row, $index }">
                 <template v-if="row.add || row.edit">
                   <el-link
@@ -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) {
@@ -844,8 +851,11 @@ export default {
             }
           }
           for (let item of form[param]) {
-            if (!item && item != 0) {
-              debugger;
+            if(item==0){
+              continue;
+            }
+            if (!item ) {
+              debugger
               this.$message({
                 type: "warning",
                 message: "请完善信息",
@@ -855,7 +865,7 @@ export default {
           }
         } else {
           if (!form[param]) {
-            debugger;
+            debugger
             this.$message({
               type: "warning",
               message: "请完善信息",
@@ -867,7 +877,7 @@ export default {
             typeof form[param] == "string" &&
             form[param].trim() == ""
           ) {
-            debugger;
+            debugger
             this.$message({
               type: "warning",
               message: "请完善信息",
@@ -1042,4 +1052,10 @@ export default {
 /deep/ .el-table__body-wrapper {
   overflow: visible;
 }
+.table{
+  box-sizing: border-box;
+}
+/deep/ .el-table--border th.gutter:last-of-type {
+  width:0!important;
+}
 </style>

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();

src/views/system/dept/index.vue

@@ -202,6 +202,7 @@ export default {
               return false;
             }
           });
+          this.query()
         } else {
           this.$message.error(res.data.msg);
         }

src/views/system/user/index.vue

@@ -61,7 +61,7 @@
               </el-tag>
             </template>
           </el-table-column>
-           <el-table-column prop="deptId" label="部门" sortable="custom" show-overflow-tooltip min-width="100"/>
+           <el-table-column prop="deptName" label="部门" sortable="custom" show-overflow-tooltip min-width="130"/>
           <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">