fix: BUG修改

2024-04-13 16:49:55 +08:00 · 2024-04-13 16:49:55 +08:00 · ce471e0f21
commit ce471e0f21
parent 533ac0f20d
14 changed files with 152 additions and 76 deletions
--- a/src/assets/js/api/configManage.js
+++ b/src/assets/js/api/configManage.js
@ -56,6 +56,7 @@ export const selectNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/l

 // 组织机构管理
 export const getTreeGroupApi = data => get('xmgl/xzProjectOrg/tree/list', data); 
+export const getTreeGroupPageApi = data => get('xmgl/xzProjectOrg/tree/page', data); 
 export const addTreeGroupApi = data => post('xmgl/xzProjectOrg/add', data); 
 export const editTreeGroupApi = data => post('xmgl/xzProjectOrg/edit', data); 
 export const deleteTreeGroupApi = data => post('xmgl/xzProjectOrg/delete', data); 
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@ -83,8 +83,8 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
  // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
  // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
-  // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
  // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
  // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
  // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
--- a/src/components/header.vue
+++ b/src/components/header.vue
@ -52,10 +52,10 @@
        >>{{ item.name }}</span
      >
    </div>
-    <div class="title_near flex" v-if="![11].includes($store.state.userInfo.accountType)">
+    <div class="title_near flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
      <userChange></userChange>
    </div>
-    <div class="title_near-tow flex" v-if="![11].includes($store.state.userInfo.accountType)">
+    <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
      <div class="divider-line"></div>
      <centerChange></centerChange>
    </div>
--- a/src/components/userChange.vue
+++ b/src/components/userChange.vue
@ -169,7 +169,7 @@ export default {
          this.selectProject(item);
        });
      } else {
-        if (!this.selectedProjectSn && !this.$store.state.projectSn) {
+        if (!this.selectedProjectSn || !this.$store.state.projectSn) {
          // 加判断是为了在循环中只选中第一个
          this.selectedProjectSn = obj.sn;
          // 修改全局projectSn
@ -233,6 +233,7 @@ export default {
        // 收起popover
        this.visible = false;
      }
+      this.$router.push("/workSpace")
    },
    filterNode(value, data) {
      if (!value) return true;
--- a/src/store/index.js
+++ b/src/store/index.js
@ -48,20 +48,20 @@ export default new Vuex.Store({
    PAGESIZRS: [10, 20, 30, 50],
    // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
    // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
-    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
+    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
    WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
    // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
    // FILEURL:'http://10.0.1.43:6023/image/',//测试
-    BASEURL: baseUrl
-      ? baseUrl
-      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    UPLOADURL:
-      window.location.protocol +
-      "//" +
-      window.location.host +
-      "/upload/image", //正式环境
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // BASEURL: baseUrl
+    //   ? baseUrl
+    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    // UPLOADURL:
+    //   window.location.protocol +
+    //   "//" +
+    //   window.location.host +
+    //   "/upload/image", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
    // WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
    //---------------------------------------------------------------------------------------------
    // BASEURL: baseUrl
--- a/src/views/companyAdmin/layout.vue
+++ b/src/views/companyAdmin/layout.vue
@ -12,10 +12,10 @@
        <!-- 南昌地铁头部样式 -->
        <span v-if="company == 'nanchang'" style="cursor: pointer" @click="back">{{$t('message.companyDiagram.pageTitle')}}</span>
      </div>
-      <div class="title_near flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <userChange></userChange>
      </div>
-      <div class="title_near-tow flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <div class="divider-line"></div>
        <centerChange></centerChange>
      </div>
--- a/src/views/infoCenter/layout.vue
+++ b/src/views/infoCenter/layout.vue
@ -12,10 +12,10 @@
        <!-- 南昌地铁头部样式 -->
        <span v-if="company == 'nanchang'" style="cursor: pointer" @click="back">{{$t('message.companyDiagram.pageTitle')}}</span>
      </div>
-      <div class="title_near flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <userChange></userChange>
      </div>
-      <div class="title_near-tow flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <div class="divider-line"></div>
        <centerChange></centerChange>
      </div>
--- a/src/views/projectFront/configManage/groupStructureManagement.vue
+++ b/src/views/projectFront/configManage/groupStructureManagement.vue
@ -37,18 +37,18 @@
      </el-form>
    </div>
    <div class="table_wrap whiteBlock">
-      <vue-scroll style="height: 70%">
        <el-table
          class="tables"
-          :data="List"
+          :data="tabelList"
          row-key="id"
          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
        >
          <el-table-column
            prop="deptName"
            label="组织名称"
-            align="center"
-          ></el-table-column>
+            align="left"
+          >
+        </el-table-column>
          <el-table-column
            prop="orderNum"
            label="排序"
@ -99,8 +99,7 @@
            </template>
          </el-table-column>
        </el-table>
-      </vue-scroll>
-      <!-- <el-pagination
+      <el-pagination
          class="pagerBox"
          @size-change="SizeChange"
          @current-change="CurrentChange"
@ -110,7 +109,7 @@
          layout="total, sizes, prev, pager, next"
          :total="pagInfo.total"
          background
-        ></el-pagination> -->
+        ></el-pagination>
    </div>
    <el-dialog
      :modal-append-to-body="false"
@ -221,6 +220,7 @@ import {
  editProjectUserApi,
  getProjectChilderSystemUserListApi,
  getTreeGroupApi,
+  getTreeGroupPageApi,
  addTreeGroupApi,
  editTreeGroupApi,
  deleteTreeGroupApi,
@ -295,6 +295,7 @@ export default {
          },
        ],
      },
+      tabelList: [],
      List: [],
      Popup: {
        type: "add",
@ -325,6 +326,7 @@ export default {
    };
  },
  created() {
+    this.getTableList();
    this.getList();
  },
  methods: {
@ -362,7 +364,7 @@ export default {
    },
    query() {
      console.log("查询的参数", this.queryInfo);
-      this.getList();
+      this.getTableList();
    },
    add() {
      this.title = "添加组织";
@ -444,7 +446,7 @@ export default {
          deleteTreeGroupApi({ id: obj.id }).then((result) => {
            if (result.success) {
              this.$message.success(result.message);
-              this.getList();
+              this.getTableList();
            }
          });
        })
@ -463,7 +465,7 @@ export default {
            addTreeGroupApi(params).then((result) => {
              if (result.success) {
                this.$message.success(result.message);
-                this.getList();
+                this.getTableList();
                this.groupDialogVisible = false;
              }
            });
@ -472,7 +474,7 @@ export default {
            editTreeGroupApi(params).then((result) => {
              if (result.success) {
                this.$message.success(result.message);
-                this.getList();
+                this.getTableList();
                this.groupDialogVisible = false;
              }
            });
@ -488,7 +490,23 @@ export default {
        name: "",
        status: null,
      };
-      this.getList();
+      this.getTableList();
+    },
+    getTableList(){
+      let requestData = {
+        projectSn: this.$store.state.projectSn,
+        deptName: this.queryInfo.name,
+        status: this.queryInfo.status,
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize
+      }
+      getTreeGroupPageApi(requestData).then((res) => {
+        if (res.success) {
+          this.tabelList = res.result.records;
+          this.pagInfo.total = +res.result.total;
+          console.log("列表", result);
+        }
+      });
    },
    getList() {
      getTreeGroupApi({
@ -510,11 +528,11 @@ export default {
    },
    SizeChange(val) {
      this.pagInfo.pageSize = val;
-      this.getList();
+      this.getTableList();
    },
    CurrentChange(val) {
      this.pagInfo.pageNo = val;
-      this.getList();
+      this.getTableList();
    },
  },
 };
--- a/src/views/projectFront/configManage/personnelAccess.vue
+++ b/src/views/projectFront/configManage/personnelAccess.vue
@ -924,4 +924,7 @@ export default {
 ::v-deep .el-checkbox__input {
  position: absolute;
 }
+/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background-color: transparent;
+}
 </style>
--- a/src/views/projectFront/projectSummary/supplierAudit.vue
+++ b/src/views/projectFront/projectSummary/supplierAudit.vue
@ -32,7 +32,7 @@
            <el-button type="primary" plain @click="searchData">{{
              $t("message.laborMange.inquire")
            }}</el-button>
-            <el-button type="warning" plain>{{
+            <el-button type="warning" plain @click="refresh">{{
              $t("message.laborMange.refresh")
            }}</el-button>
          </el-form-item>
@ -141,7 +141,7 @@
          <span
            :class="activeTab == 2 ? 'activeStyle' : ''"
            @click="activeTab = 2"
-            v-if="[2,3].includes(rowData.applyStatus)"
+            v-if="[2, 3].includes(rowData.applyStatus)"
            >审批回复</span
          >
        </div>
@ -339,7 +339,10 @@
            ></el-table-column>
          </el-table>
        </div>
-        <div class="dialog-footer relative-group" v-show="activeTab == 1 && rowData.applyStatus == 1">
+        <div
+          class="dialog-footer relative-group"
+          v-show="activeTab == 1 && rowData.applyStatus == 1"
+        >
          <el-button
            type="primary"
            @click="auditReplyDialog = true"
@ -351,11 +354,11 @@
          <div class="audit-content">
            <div class="audit-content-item">
              <span>审批人：</span>
-              <span>{{replyData.applyUser}}</span>
+              <span>{{ replyData.applyUser }}</span>
            </div>
            <div class="audit-content-item">
              <span>审批回复时间：</span>
-              <span>{{replyData.replyTime}}</span>
+              <span>{{ replyData.replyTime }}</span>
            </div>
            <div class="audit-content-item">
              <span>审批回复：</span>
@ -383,7 +386,7 @@
      <div class="reply-content">
        <div class="reply-content-item">
          <span>审批人：</span>
-          <span>{{$store.state.userInfo.realName}}</span>
+          <span>{{ $store.state.userInfo.realName }}</span>
        </div>
        <div class="reply-content-item">
          <span>审批回复：</span>
@ -431,10 +434,10 @@ import {
  getSupplierInfoRecordApi,
  getQualificationFileRecordApi,
  auditQualificationApplyApi,
-  qualificationApplyInfoApi
+  qualificationApplyInfoApi,
 } from "@/assets/js/api/supplier.js";
 import { getComapnyStatisticsListApi } from "@/assets/js/api/company/project";
-import moment from 'moment'
+import moment from "moment";
 export default {
  name: "temporary",
  data() {
@ -492,7 +495,7 @@ export default {
        projectDirectorPhone: "",
      },
      rowData: {},
-      replyData: {}
+      replyData: {},
    };
  },
  created() {
@ -547,6 +550,14 @@ export default {
        }
      });
    },
+    // 刷新
+    refresh() {
+      this.tableParameter = {
+        applyStatus: "",
+        timeRange: [],
+      };
+      this.searchData();
+    },
    // 表格搜索
    searchData() {
      this.page = 1; // 回归第一页
@ -559,7 +570,7 @@ export default {
        pageNo: this.page,
        pageSize: this.pageSize,
        applyStatus: this.tableParameter.applyStatus,
-        projectSn: this.$store.state.projectSn
+        projectSn: this.$store.state.projectSn,
      };
      if (
        this.tableParameter.timeRange &&
@ -583,7 +594,7 @@ export default {
      this.auditReplyVal = ""; // 审核回复内容框回归默认
      this.loadBasicInfoRecord();
      this.loadCompanyQulificationRecord();
-      if([2,3].includes(this.rowData.applyStatus)){
+      if ([2, 3].includes(this.rowData.applyStatus)) {
        this.loadqulificationReplyRecord();
      }
      this.relativeGroupDialog = true;
@ -611,25 +622,31 @@ export default {
    },
    // 拒绝申请
    noPassFn() {
-        let item = this.rowData;
-        this.$confirm(
-          `确定要拒绝审核吗？`,
-          this.$t("message.companyDiagram.Tips"),
-          {
-            confirmButtonText: this.$t(
-              "message.companyDiagram.confirmButtonText"
-            ), //确定
-            cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
-            type: "warning",
-          }
-        ).then(() => {
-          auditQualificationApplyApi({ id: item.id, applyStatus:3, applyContent: this.auditReplyVal, applyUser: this.$store.state.userInfo.realName, replyTime: moment().format('YYYY-MM-DD HH:mm:ss')  }).then((res) => {
-            this.$message.error("已拒绝");
-            this.relativeGroupDialog = false;
-            this.auditReplyDialog = false;
-            this.getTableList();
-          });
+      let item = this.rowData;
+      this.$confirm(
+        `确定要拒绝审核吗？`,
+        this.$t("message.companyDiagram.Tips"),
+        {
+          confirmButtonText: this.$t(
+            "message.companyDiagram.confirmButtonText"
+          ), //确定
+          cancelButtonText: this.$t("message.companyDiagram.cancelButtonText"), //取消
+          type: "warning",
+        }
+      ).then(() => {
+        auditQualificationApplyApi({
+          id: item.id,
+          applyStatus: 3,
+          applyContent: this.auditReplyVal,
+          applyUser: this.$store.state.userInfo.realName,
+          replyTime: moment().format("YYYY-MM-DD HH:mm:ss"),
+        }).then((res) => {
+          this.$message.error("已拒绝");
+          this.relativeGroupDialog = false;
+          this.auditReplyDialog = false;
+          this.getTableList();
        });
+      });
    },
    // 审批通过
    auditPass() {
@ -645,12 +662,18 @@ export default {
          type: "warning",
        }
      ).then(() => {
-        auditQualificationApplyApi({ id: item.id, applyStatus:2, applyContent: this.auditReplyVal, applyUser: this.$store.state.userInfo.realName, replyTime: moment().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
-            this.$message.success("已通过");
-            this.relativeGroupDialog = false;
-            this.auditReplyDialog = false;
-            this.getTableList();
-          });
+        auditQualificationApplyApi({
+          id: item.id,
+          applyStatus: 2,
+          applyContent: this.auditReplyVal,
+          applyUser: this.$store.state.userInfo.realName,
+          replyTime: moment().format("YYYY-MM-DD HH:mm:ss"),
+        }).then((res) => {
+          this.$message.success("已通过");
+          this.relativeGroupDialog = false;
+          this.auditReplyDialog = false;
+          this.getTableList();
+        });
      });
    },
    //切换数量
--- a/src/views/supplierAdmin/layout.vue
+++ b/src/views/supplierAdmin/layout.vue
@ -12,10 +12,10 @@
        <!-- 南昌地铁头部样式 -->
        <span v-if="company == 'nanchang'" style="cursor: pointer" @click="back">{{$t('message.companyDiagram.pageTitle')}}</span>
      </div>
-      <div class="title_near flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <userChange></userChange>
      </div>
-      <div class="title_near-tow flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <div class="divider-line"></div>
        <centerChange></centerChange>
      </div>
--- a/src/views/supplierAdmin/qualificationApply/components/qualification-info.vue
+++ b/src/views/supplierAdmin/qualificationApply/components/qualification-info.vue
@ -10,7 +10,7 @@
      <el-table
      class="tables"
        :data="tableList"
-        height="calc(100% - 90px)"
+        height="calc(100% - 100px)"
      >
        <el-table-column
          width="50"
--- a/src/views/userCenter/layout.vue
+++ b/src/views/userCenter/layout.vue
@ -12,10 +12,10 @@
        <!-- 南昌地铁头部样式 -->
        <span v-if="company == 'nanchang'" style="cursor: pointer" @click="back">{{$t('message.companyDiagram.pageTitle')}}</span>
      </div>
-      <div class="title_near flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <userChange></userChange>
      </div>
-      <div class="title_near-tow flex" v-if="![11].includes($store.state.userInfo.accountType)">
+      <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
        <div class="divider-line"></div>
        <centerChange></centerChange>
      </div>
@ -62,6 +62,15 @@
        </div>
        <!-- <el-menu-item :index="item.modulePath" v-for="(item,index) in menuList" :key="index">{{item.moduleName}}</el-menu-item> -->
      </el-menu>
+      <el-button
+        class="backtoIndex"
+        type="primary"
+        plain
+        @click="backTo()"
+        size="mini"
+        style="margin-right: 30px;"
+        >返回</el-button
+      >
    </div>
    <div class="pageContainer">
      <div class="pageDataContainer">
@ -109,6 +118,9 @@ export default {
    
  },
  methods: {
+    backTo(){
+      this.$router.back();
+    },
    hasSubMenu(list) {
      //用于判断有没有下级菜单
      let onoff = false;
@ -225,6 +237,9 @@ export default {
 // }
 .menuBox{
  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 .title {
  width: 100%;
--- a/src/views/workSpace/index.vue
+++ b/src/views/workSpace/index.vue
@ -148,7 +148,7 @@ export default {
            iframe.contentWindow.postMessage(
              {
                type: "emitData",
-                data: JSON.stringify(this.$store.state.userInfo),
+                data: JSON.stringify({...this.$store.state.userInfo, projectSn: this.$store.state.projectSn}),
                authMenuList:
                  responseMenuList.length > 0
                    ? JSON.stringify(responseMenuList)
@ -210,7 +210,6 @@ export default {
        projectSn: this.projectSn,
      };
      getProjectDetail(data).then((res) => {
-        // console.log(res);
        if (res.code == 200) {
          this.projectName = res.result.projectName;
          document.title = this.projectName;
@ -219,6 +218,22 @@ export default {
      });
    },
  },
+  watch: {
+    params: {
+      deep: true,
+      handler() {
+        this.getUserNotify();
+      },
+    },
+    '$store.state.projectSn': {
+      deep: true,
+      immediate: true,
+      handler(to, from) {
+        console.log(to,'最新值')
+        if(this.$store.state.projectSn) this.getModuleList();
+      },
+    }
+  },
 };
 </script>
 <style lang="less" scoped>