fix: BUG修改

src/assets/js/http.js

@@ -83,12 +83,12 @@ 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.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/' //嘉兴王江泾公用码头
-  // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
+  axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
   // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
   // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址

src/components/header.vue

@@ -271,6 +271,7 @@ export default {
     },
     //生成人员录入 二维码
     bindQRCode: function() {
+      console.log('人员录入二维码')
       document.getElementById('qrCode').innerHTML = ''
       let httpUrl = window.location.origin
       let userId = this.$store.state.userInfo.userId

src/views/companyAdmin/companyDiagram.vue

@@ -3089,7 +3089,7 @@ export default {
     getRelativeKeys(arr){
       let keysArr = [];
       arr.map(item => {
-        if(item.isProjectSn && !item.hasSubList){
+        if(!item.hasSubList){
           keysArr.push(item.sn)
         }
       })

src/views/companyAdmin/supplierManage/index.vue

@@ -181,6 +181,9 @@ import {
   updateFileDownloadReNameApi,
 } from "@/assets/js/api/doc.js";
 
+import {
+  getUserAuditListApi
+} from "@/assets/js/api/account.js";
 export default {
   name: "registerAudit",
   data() {
@@ -195,10 +198,6 @@ export default {
       tableData: [],
       authorizedDialog: false,
       detail: {},
-      totalInfo: {
-        downloadNum: 0,
-        fileNum: 0,
-      },
       fileList: [],
       editForm: {},
       editDialog: false,
@@ -296,15 +295,11 @@ export default {
     },
     //获取列表数据
     getListData() {
-      let data = this.searchForm;
+      let data = this.treeSelectData;
-      data.pageNo = this.pageNo;
+      let sn = this.$store.state.userInfo.sn;
-      data.pageSize = this.pageSize;
+      getUserAuditListApi({ sn: sn, accountType: 2 }).then((res) => {
-      data.companySn = this.$store.state.userInfo.sn;
+        this.userAuditList = res.result.records;
-      getCompanyFileListApi(data).then((res) => {
+        this.total = res.result.total;
-        console.log(res);
-        this.tableData = res.result.page.records;
-        this.total = res.result.page.total;
-        this.totalInfo = res.result.totalNum;
       });
     },
     resetForm() {

src/views/projectFront/projectSummary/baseInfo.vue

@@ -410,10 +410,10 @@
               :placeholder="$t('message.companyDiagram.PleaseSelect')"
             >
               <el-option
-                v-for="item in $t('message.companyDiagram.PROJECTTYPE')"
+                v-for="item in projectTypeList"
-                :key="item.id"
+                :key="item.data"
                 :label="item.name"
-                :value="item.id"
+                :value="Number(item.data)"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -870,7 +870,8 @@ export default {
       projectAuditStatus: '',//审核状态
       company: '',
       constructionStageList: [],
-      structureTypeList: []
+      structureTypeList: [],
+      projectTypeList: []
     };
   },
   created() {
@@ -878,12 +879,24 @@ export default {
     this.company = COMPANY
     this.getDataDateils();
     this.loadProvincesCityList();
-    this.getProjectConfigList()
+    this.getProjectConfigList();
-    this.getDictionaryList()
+    this.getDictionaryList();
-    this.getDictionaryByStructure()
+    this.getDictionaryByStructure();
+    this.getDicProjectTypeList();
   },
 
   methods: {
+    // 获取字典工程类别列表
+    getDicProjectTypeList(){
+      getDictionaryItemApi({
+        dictionaryEncoding: 'project_type',
+        projectSn: this.projectSn
+      }).then(res => {
+        if (res.result.length > 0) {
+          this.projectTypeList = res.result
+        }
+      })
+    },
     //获取字典施工阶段
     getDictionaryList() {
       getDictionaryItemApi({