企业端首页跳转，项目分类的跳转、新增用户的企业信息修改

.env.development

@@ -5,11 +5,11 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.110:9031'
+# VUE_APP_BASE_API = 'http://192.168.0.117:9031'
 # 测试环境数据库
 # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # 脱敏三方测试用数据库
-# VUE_APP_BASE_API = 'http://39.101.188.84:9031'
+VUE_APP_BASE_API = 'http://39.101.188.84:9031'
 # 正式环境数据库
 # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408121626",
+  "version": "1.0.202408131732",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",

src/assets/styles/public.scss

@@ -2444,6 +2444,17 @@
                     word-break: break-all;
                     white-space: nowrap;
                   }
+                  .project-type-box {
+                    width: 65%;
+                    .right-value {
+                      font-family: AlibabaPuHuiTiM;
+                      width: 100%;
+                      text-overflow: ellipsis;
+                      overflow: hidden;
+                      word-break: break-all;
+                      white-space: nowrap;
+                    }
+                  }
                   .right-number {
                     font-family: ArialB;
                   }

src/views/enterpriselibrary/index.vue

@@ -338,9 +338,9 @@ export default {
     frontDownload() {
       var a = document.createElement("a"); //创建一个<a></a>标签
       // 测试环境下载地址
-      // a.href = "/demo/JinJiHu/static/企业库数据模板.xlsx";
+      a.href = "/demo/JinJiHu/static/企业库数据模板.xlsx";
       // 脱敏三方测试用下载地址
-      a.href = "/demo/JinJiHuTest/static/企业库数据模板.xlsx";
+      // a.href = "/demo/JinJiHuTest/static/企业库数据模板.xlsx";
       // 正式环境下载地址
       // a.href = "./static/企业库数据模板.xlsx";
         //给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.

src/views/home/index.vue

@@ -21,7 +21,10 @@
                   <div class="project-name" @click="goProjectInfoLeft(item)">【{{item.projectName}}】</div>
                   <div class="project-type">
                     <span class="left-title">项目类别：</span>
-                    <span class="right-value">自主品牌先进技术研究院</span>
+                    <div class="project-type-box" v-if="item.projectBigType">
+                      <dict-tag class="right-value" :options="dict.type.project_categories" :value="item.projectBigType"/>
+                    </div>
+                    <span class="right-value" v-else>其他</span>
                   </div>
                   <div class="declare-time">
                     <span class="left-title">拨付时间：</span>
@@ -63,12 +66,15 @@
               <el-table v-loading="loadingTab" class="dataMap-two-table" :data="tableData" :height="tableTwoHeight" border :header-cell-style="{background:'#E8F3FC'}">
                 <el-table-column label="项目类别" prop="projectType" align="center">
                   <template slot-scope="scope">
-                    <dict-tag :options="dict.type.projectBigType" :value="item.projectBigType"/>
+                    <div v-if="scope.row.projectBigType">
+                      <dict-tag :options="dict.type.project_categories" :value="scope.row.projectBigType"/>
+                    </div>
+                    <span v-else>其他</span>
                   </template>
                 </el-table-column>
                 <el-table-column label="项目名称" prop="projectName" align="center">
                   <template slot-scope="scope">
-                    <div class="project-trace-table" @click="goProjectInfo(item)">{{ scope.row.projectName }}</div>
+                    <div class="project-trace-table" @click="goProjectInfoLeft(scope.row)">{{ scope.row.projectName }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column label="专项资金拨付时间" prop="time" align="center">
@@ -305,11 +311,14 @@ export default {
     },
     // 往年专项资金申报
     goProjectInfoLeft(item){
+      console.log(item,"item");
       if(item.projectName == "区级总部" || item.projectName == "市级服务业领军") {
-        this.$router.push({
+        if(item.projectId) {
-          name: 'projectInfo',
+          this.$router.push({
-          query: { userId: Number(item.id) }
+            name: 'projectInfo',
-        })
+            query: { userId: Number(item.projectId) }
+          })
+        }
       }
     },
     // 智能提醒跳转

src/views/onlineDeclaration/enterpriseDirectory/index.vue

@@ -847,9 +847,9 @@ export default {
     frontDownload() {
       var a = document.createElement("a"); //创建一个<a></a>标签
       // 测试环境下载地址
-      // a.href = "/demo/JinJiHu/static/企业名录模板.xlsx";
+      a.href = "/demo/JinJiHu/static/企业名录模板.xlsx";
       // 脱敏三方测试用下载地址
-      a.href = "/demo/JinJiHuTest/static/企业名录模板.xlsx";
+      // a.href = "/demo/JinJiHuTest/static/企业名录模板.xlsx";
       // 正式环境下载地址
       // a.href = "./static/企业名录模板.xlsx";
         //给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.

src/views/system/user/index.vue

@@ -319,14 +319,24 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="企业信息" prop="enterpriseId">
-              <el-select v-model="form.enterpriseId" placeholder="请选择企业信息" clearable style="width: 100%">
+              <!-- <el-select v-model="form.enterpriseId" placeholder="请选择企业信息" clearable style="width: 100%">
                 <el-option
                   v-for="item in enterpriseList"
                   :key="item.id"
-                  :label="item.enterpriseName"
+                  :label="item.qymc"
                   :value="item.id"
                   ></el-option>
-                </el-select>
+              </el-select> -->
+              <el-autocomplete 
+                style="width: 100%;"
+                placeholder="请输入企业名称" 
+                v-model="form.enterpriseId" 
+                :fetch-suggestions="querySearch" 
+                :trigger-on-focus="false" 
+                @select="handleSelect"
+              >
+              <!--   -->
+              </el-autocomplete>
             </el-form-item>
           </el-col>
         </el-row>
@@ -497,6 +507,7 @@ export default {
       // 企业数组
       enterpriseList: [],
       tabHeader: undefined,
+      enterpriseId:null,
     };
   },
   watch: {
@@ -518,11 +529,24 @@ export default {
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
-    listEnterpriseBasicInfo({}).then((response) => {
+    
-      this.enterpriseList = response.rows
-    })
   },
   methods: {
+    handleSelect(item) {
+      this.enterpriseId = item.id;
+    },
+    querySearch(queryString, cb) {
+      let results = []
+      listEnterpriseBasicInfo({qymc:queryString}).then((response) => {
+        response.data.records.map((item)=>{
+          results.push({
+            id: item.id,
+            value: item.qymc,
+          })
+        })
+      })
+      cb(results);
+    },
     // 屏幕尺寸变化
     cancalDebounce(){
       const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
@@ -679,6 +703,7 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.enterpriseId = this.enterpriseId
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");