刘湘琪 vor 2 Jahren
Ursprung
Commit
03d2958c15

+ 8 - 0
src/api/common/common.js

@@ -16,3 +16,11 @@ export function getRegionChildrenApi(id) {
     // params: query
   })
 }
+//首页数据
+export function getIndexDataApi(query) {
+  return request({
+    url: `/index/report`,
+    method: 'get',
+    params: query
+  })
+}

+ 10 - 0
src/api/ent/ent.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 企业角色获取企业信息
+export function listEntUserApi(query) {
+  return request({
+    url: '/ent/user/ent',
+    method: 'get',
+    params: query
+  })
+}

+ 19 - 0
src/api/gov/gov.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 税务人员查询企业信息列表
+export function listEntTaxApi(query) {
+  return request({
+    url: '/gov/enterprise/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//获取企业详细信息
+export function getEntInfoByIdTaxApi(id,query) {
+  return request({
+    url: `/gov/enterprise/${id}`,
+    method: 'get',
+    params: query
+  })
+}

+ 0 - 5
src/router/index.js

@@ -36,11 +36,6 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/registerSecond',
-    component: () => import('@/views/common/registerSecond'),
-    hidden: true
-  },
-  {
     path: '/redirect',
     component: Layout,
     hidden: true,

+ 31 - 17
src/views/common/registerFirst.vue

@@ -96,7 +96,6 @@
                 <el-checkbox-group v-model="registerForm.mainProductArray">
                   <el-checkbox v-for="(item, index) in mainProductsOptions" :label="item.dictLabel" :key="index">{{item.dictLabel}}</el-checkbox>
                 </el-checkbox-group>
-
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -225,8 +224,7 @@
             <el-col :span="12">
               <el-form-item label="企业是否上市" prop="listedFlag">
                 <el-radio-group v-model="registerForm.listedFlag">
-                  <el-radio label="1">是</el-radio>
-                  <el-radio label="0">否</el-radio>
+                  <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -243,8 +241,7 @@
             <el-col :span="12">
               <el-form-item label="是否引入风险投资" prop="investFlag">
                 <el-radio-group v-model="registerForm.investFlag">
-                  <el-radio label="1">是</el-radio>
-                  <el-radio label="0">否</el-radio>
+                  <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -261,8 +258,7 @@
             <el-col :span="12">
               <el-form-item label="是否为高新企业" prop="techFlag">
                 <el-radio-group v-model="registerForm.techFlag">
-                  <el-radio label="1">是</el-radio>
-                  <el-radio label="0">否</el-radio>
+                  <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -279,8 +275,7 @@
             <el-col :span="12">
               <el-form-item label="是否引入风险投资" prop="deductionFlag">
                 <el-radio-group v-model="registerForm.deductionFlag">
-                  <el-radio label="1">是</el-radio>
-                  <el-radio label="0">否</el-radio>
+                  <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -288,17 +283,20 @@
         </el-collapse-item>
         <el-collapse-item title="附件" name="10">
           <el-form-item label="企业营业执照" prop="licensePath">
-            <FileUpload :file="{url: registerForm.licensePath, name: registerForm.fileName}" @input="handleSuccess">上传材料</FileUpload>
+            <ImageUpload @input="handleLicenseSuccess" :params="params" :limit="limit" :value="registerForm.licensePath" :fileSize="fileSize"></ImageUpload>
+            <!-- <FileUpload :file="{url: registerForm.licensePath, name: registerForm.fileName}" @input="handleSuccess">上传材料</FileUpload> -->
           </el-form-item>
           <el-form-item label="其他附件" prop="attachIds">
-            <FileUpload :files="registerForm.attachIds" @input="handleSaleSuccess" :multiple="true">上传材料</FileUpload>
+            <FileUpload :files="registerForm.fileList" @input="handleSaleSuccess" :multiple="true" :params="params">上传材料</FileUpload>
+            <!-- <FileUpload :files="registerForm.attachIds" @input="handleSaleSuccess" :multiple="true">上传材料</FileUpload> -->
           </el-form-item>
         </el-collapse-item>
         <el-collapse-item title="文件水印" name="11">
           <el-row :gutter="40">
             <el-col :span="24">
               <el-form-item label="文件水印" prop="logo">
-                <ImageUpload @input="handleLogoSuccess"></ImageUpload>
+                <ImageUpload @input="handleLogoSuccess" :params="params" :limit="limit" :value="registerForm.logo" :fileSize="fileSize"></ImageUpload>
+                <!-- <ImageUpload @input="handleLogoSuccess"></ImageUpload> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -337,7 +335,7 @@
 
 import { getCodeImg, registerEntApi } from "@/api/login";
 import {getProvinceDataApi,getRegionChildrenApi} from "@/api/common/common"
-import { regTypeOptions,mainProductsOptions,signatoriesOptions } from "@/utils/dataFormat"
+import { regTypeOptions,mainProductsOptions,yesOrNoOptions } from "@/utils/dataFormat"
 import FileUpload from '@/components/FileUpload'
 import ImageUpload from '@/components/ImageUpload'
 
@@ -356,6 +354,12 @@ export default {
       }
     };
     return {
+      limit: 1, //长传图片数量
+      fileSize: 1,
+      params: {
+        attachType: 'ENT',
+        dataId: ''
+      },
       activeName: '1',
       provinceName: '',
       cityName: '',
@@ -363,7 +367,7 @@ export default {
       codeUrl: "",
       regTypeOptions: regTypeOptions,
       mainProductsOptions: mainProductsOptions,
-      signatoriesOptions: signatoriesOptions,
+      yesOrNoOptions: yesOrNoOptions,
       provinceDataList: [],
       cityDataList: [],
       districtDataList: [],
@@ -409,7 +413,14 @@ export default {
       this.registerForm.licensePath = file.url;
       this.registerForm.fileName = file.name;
     },
+    // handleSaleSuccess(files) {
+    //   files.forEach(item => {
+    //     this.registerForm.attachIds.push(item.response.data.id)
+    //   });
+    // },
     handleSaleSuccess(files) {
+      this.registerForm.fileList = files
+      this.registerForm.attachIds = []
       files.forEach(item => {
         this.registerForm.attachIds.push(item.response.data.id)
       });
@@ -417,6 +428,9 @@ export default {
     handleLogoSuccess(file) {
       this.registerForm.logo = file
     },
+    handleLicenseSuccess(file) {
+      this.registerForm.licensePath = file
+    },
     //选择省份
     getCityData() {
       this.registerForm.cityId = ''
@@ -486,9 +500,9 @@ export default {
             }).catch(() => {});
           }).catch(() => {
             this.loading = false;
-            if (this.captchaOnOff) {
-              this.getCode();
-            }
+            // if (this.captchaOnOff) {
+            //   this.getCode();
+            // }
           })
         }
       });

+ 0 - 278
src/views/common/registerSecond.vue

@@ -1,278 +0,0 @@
-<template>
-  <div class="register">
-    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form" label-width="auto">
-      <h3 class="title">企业基本信息</h3>
-      <el-form-item label="企业名称" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="统一社会信用代码" prop="password">
-        <el-input
-          v-model="registerForm.password"
-          type="password"
-          auto-complete="new-password"
-          placeholder="密码"
-          @keyup.enter.native="handleRegister">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="注册资金" prop="confirmPassword">
-        <el-input
-          v-model="registerForm.confirmPassword"
-          type="password"
-          auto-complete="new-password"
-          placeholder="确认密码"
-          @keyup.enter.native="handleRegister">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="工商注册时间" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="姓名">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="工商注册类型" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="主营产品(服务)所属技术领域" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="邮箱地址">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="通信地址" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="邮政编码" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="企业所属行政区域" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="企业所得税主管税务机关" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="姓名" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="身份证号码" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="手机号码" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="固定电话" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="传真" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="E-mail" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="企业是否上市" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="企业上市代码" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="是否引入风险投资" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="风险投资金额" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="是否为高新企业" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="高新企业编号" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="上年度是否做加计扣除" prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="手机号码">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="省市区">
-        <el-cascader placeholder="请选择省份" :options="options" filterable></el-cascader>
-      </el-form-item>
-      <el-form-item style="width:100%;text-align: center;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          @click.native.prevent="handleRegister" style="width: 100px;">
-          <span v-if="!loading">下一步</span>
-          <span v-else>注 册 中...</span>
-        </el-button>
-        <el-button size="medium" type="primary" style="width: 100px;">取消</el-button>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-register-footer">
-      <span>Copyright © 2022 All Rights Reserved.</span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getCodeImg, register } from "@/api/login";
-import {getProvinceDataApi} from "@/api/common/common"
-
-export default {
-  name: "First",
-  data() {
-    const equalToPassword = (rule, value, callback) => {
-      if (this.registerForm.password !== value) {
-        callback(new Error("两次输入的密码不一致"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      options: [],
-      codeUrl: "",
-      registerForm: {
-        username: "",
-        password: "",
-        confirmPassword: "",
-        code: "",
-        uuid: ""
-      },
-      registerRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" },
-          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-        confirmPassword: [
-          { required: true, trigger: "blur", message: "请再次输入您的密码" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      },
-      loading: false,
-      captchaOnOff: true
-    };
-  },
-  created() {
-    this.getCode();
-    this.getProvinceData();
-  },
-  methods: {
-    getProvinceData() {
-      getProvinceDataApi().then(res => {
-        console.log(res)
-      })
-    },
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
-        if (this.captchaOnOff) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.registerForm.uuid = res.uuid;
-        }
-      });
-    },
-    handleRegister() {
-
-      // this.$refs.registerForm.validate(valid => {
-      //   if (valid) {
-      //     this.loading = true;
-      //     register(this.registerForm).then(res => {
-      //       const username = this.registerForm.username;
-      //       this.$alert("<font color='red'>恭喜你,您的账号 " + username + " 注册成功!</font>", '系统提示', {
-      //         dangerouslyUseHTMLString: true,
-      //         type: 'success'
-      //       }).then(() => {
-      //         this.$router.push("/login");
-      //       }).catch(() => {});
-      //     }).catch(() => {
-      //       this.loading = false;
-      //       if (this.captchaOnOff) {
-      //         this.getCode();
-      //       }
-      //     })
-      //   }
-      // });
-    }
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-.register {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  background-image: url("../../assets/images/login-background.jpg");
-  background-size: cover;
-}
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
-}
-
-.register-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 1000px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 38px;
-    input {
-      height: 38px;
-    }
-  }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
-  }
-}
-.register-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-.register-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
-}
-.el-register-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-.register-code-img {
-  height: 38px;
-}
-</style>

+ 4 - 4
src/views/enterprise/declare/index.vue

@@ -20,16 +20,16 @@
         <el-date-picker v-model="queryParams.year" type="year" placeholder="选择年" style="width: 200px;"></el-date-picker>
       </el-form-item>
       <el-form-item label="企业名称">
-        <el-input v-model="queryParams.entName" clearable style="width: 200px;"></el-input>
+        <el-input v-model="queryParams.entName" clearable style="width: 200px;" placeholder="请输入企业名称"></el-input>
       </el-form-item>
       <el-form-item label="社会信用代码">
-        <el-input v-model="queryParams.license" style="width: 200px;"></el-input>
+        <el-input v-model="queryParams.license" style="width: 200px;" placeholder="请输入社会信用代码"></el-input>
       </el-form-item>
       <el-form-item label="项目编号">
-        <el-input v-model="queryParams.projectNo" style="width: 200px;"></el-input>
+        <el-input v-model="queryParams.projectNo" style="width: 200px;" placeholder="请输入项目编号"></el-input>
       </el-form-item>
       <el-form-item label="项目名称">
-        <el-input v-model="queryParams.projectName" style="width: 200px;"></el-input>
+        <el-input v-model="queryParams.projectName" style="width: 200px;" placeholder="请输入项目名称"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">搜索</el-button>

+ 219 - 0
src/views/enterprise/ent/basicInfo.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <h3 class="toolbar">
+      <span class="title">企业信息</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>企业名称</th>
+        <td>{{info.entName}}</td>
+        <th>统一社会信用代码</th>
+        <td>{{info.license}}</td>
+      </tr>
+      <tr>
+        <th>注册资金(万元)</th>
+        <td>{{info.regCapital}}</td>
+        <th>工商注册时间</th>
+        <td>{{info.regDate}}</td>
+      </tr>
+      <tr>
+        <th>工商注册类型</th>
+        <td>{{regTypeFormat}}</td>
+        <th>主营产品(服务)所属技术领域</th>
+        <td>{{info.mainProducts}}</td>
+      </tr>
+      <tr>
+        <th>通信地址</th>
+        <td>{{info.address}}</td>
+        <th>邮政编码</th>
+        <td>{{info.zipCode}}</td>
+      </tr>
+      <tr>
+        <th>企业所属行政区域</th>
+        <td>{{info.provinceId}}</td>
+        <th>企业所得税主管税务机关</th>
+        <td>{{info.taxOffice}}</td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">法人信息</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>姓名</th>
+        <td>{{info.legalName}}</td>
+        <th>身份证号码</th>
+        <td>{{info.legalIdCard}}</td>
+      </tr>
+      <tr>
+        <th>手机号码</th>
+        <td>{{info.legalMobile}}</td>
+        <th>固定电话</th>
+        <td>{{info.legalPhone}}</td>
+      </tr>
+      <tr>
+        <th>传真</th>
+        <td>{{info.legalFax}}</td>
+        <th>E-mail</th>
+        <td>{{info.legalEmail}}</td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">联系人信息</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>姓名</th>
+        <td>{{info.linkName}}</td>
+        <th>身份证号码</th>
+        <td>{{info.linkIdCard}}</td>
+      </tr>
+      <tr>
+        <th>手机号码</th>
+        <td>{{info.linkMobile}}</td>
+        <th>固定电话</th>
+        <td>{{info.linkPhone}}</td>
+      </tr>
+      <tr>
+        <th>传真</th>
+        <td>{{info.linkFax}}</td>
+        <th>E-mail</th>
+        <td>{{info.linkEmail}}</td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">企业上市信息</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>企业是否上市</th>
+        <td>{{listedFlag}}</td>
+        <th>企业上市代码</th>
+        <td>{{info.listingCode}}</td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">风险投资信息</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>是否引入风险投资</th>
+        <td>{{investFlag}}</td>
+        <th>风险投资金额</th>
+        <td>{{info.investCapital}}</td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">高新企业</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>是否为高新企业</th>
+        <td>{{techFlag}}</td>
+        <th>高新企业编号</th>
+        <td>{{info.techCode}}</td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">上年度是否做加计扣除</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>上年度是否做加计扣除</th>
+        <td>{{deductionFlag}}</td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">附件</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>企业营业执照</th>
+        <td>
+          <img :src="info.licensePath" alt="license">
+        </td>
+        <th>其他附件</th>
+        <td>
+          <div v-for="(file, index) in list" :key="index"><a class="link" :href="file.url" target="_blank">{{file.fileName}}</a></div>
+        </td>
+      </tr>
+    </table>
+    <h3 class="toolbar mt20">
+      <span class="title">文件水印</span>
+    </h3>
+    <table class="table_view">
+      <tr>
+        <th>公司logo</th>
+        <td>
+          <img :src="info.logo" alt="logo">
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+  import { listEntUserApi } from "@/api/ent/ent"
+  import {getEnclosureApi} from "@/api/enterprise/project/project"
+  import {regTypeOptions, getLabel,yesOrNoOptions} from '@/utils/dataFormat'
+  export default {
+    name: 'EntInfo',
+    data () {
+      return {
+        loading: false,
+        id: undefined,
+        dataId: undefined,
+        list: [],
+        attachType: 'ENT',
+        info: {
+        },
+      }
+    },
+    computed: {
+      scopeId() {
+        return this.$store.state.user.scopeId
+      },
+      regTypeFormat() {
+        return getLabel(regTypeOptions, this.info.regType);
+      },
+      listedFlag() {
+        return getLabel(yesOrNoOptions, this.info.listedFlag);
+      },
+      investFlag() {
+        return getLabel(yesOrNoOptions, this.info.investFlag)
+      },
+      techFlag() {
+        return getLabel(yesOrNoOptions, this.info.techFlag)
+      },
+      deductionFlag() {
+        return getLabel(yesOrNoOptions, this.info.deductionFlag)
+      }
+    },
+    created () {
+      this.id = this.scopeId
+      this.dataId = this.scopeId
+      if(this.id) {
+        this.getData()
+        this.getEnclosureData()
+      }
+    },
+    methods: {
+      getEnclosureData() {
+        getEnclosureApi(this.attachType, this.dataId).then(res => {
+          this.list = res.data.records || []
+        })
+      },
+      getData() {
+        const id = this.id
+        this.loading = true
+        listEntUserApi().then(res => {
+          this.loading = false
+          this.info = res.data || {}
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

+ 107 - 0
src/views/enterprise/ent/components/UploadEnclosure.vue

@@ -0,0 +1,107 @@
+<template>
+  <el-dialog title="上传附件" :visible.sync="open" width="500px" append-to-body>
+    <el-upload
+      ref="upload"
+      multiple
+      accept=".xlsx, .xls"
+      :headers="upload.headers"
+      :action="upload.url"
+      :disabled="upload.isUploading"
+      :on-success="successHandleList"
+      :auto-upload="false"
+      :data="params"
+      :file-list="fileList"
+      drag>
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">
+        将文件拖到此处,或
+        <em>点击上传</em>
+      </div>
+      <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
+    </el-upload>
+  </el-dialog>
+</template>
+
+<script>
+  import FileUpload from '@/components/FileUpload'
+  import { getToken } from "@/utils/auth";
+  export default {
+    components: {
+      FileUpload
+    },
+    props: {
+      attachType: {
+        type: String
+      }
+    },
+    data() {
+      return {
+        // 项目导入参数
+        upload: {
+          title: "导入资料附件",
+          // 是否禁用上传
+          isUploading: false,
+          // 设置上传的请求头部
+          headers: { Authorization: "Bearer " + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/common/attach/upload"
+        },
+        open: false,
+        disabled: false,
+        form: {
+          fileList: ''
+        },
+        rules: {
+        },
+        params: {
+          attachType: this.attachType
+        }
+      }
+    },
+    methods: {
+      init() {
+        this.open = true;
+        this.form.fileList = '';
+        this.resetForm("form");
+      },
+      handleSuccess(files) {
+        this.form.fileList = files;
+        this.$refs.form.validateField('fileList');
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+        this.$emit('refreshData')
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      cancel() {
+        this.open = false;
+      },
+      successHandleList (response, file, fileList) {
+      	this.fileList = fileList;
+        fileList.forEach((item, index) => {
+          if (item.url == undefined && item.response != undefined) {
+            fileList[index].fileName = item.response.data.fileName;
+            fileList[index].filePath = item.response.data.url;
+            fileList[index].url = item.response.url;
+          }
+        });
+        console.log(this.fileList)
+      	// if(this.index == -1){
+      	// 	this.$emit('input', this.fileList)
+      	// }else{
+      	// 	this.$emit('input', this.fileList, this.index)
+      	// }
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

+ 72 - 16
src/views/enterprise/ent/edit.vue

@@ -296,12 +296,23 @@
       <el-row :gutter="40">
         <el-col :span="24">
           <el-form-item label="企业营业执照" prop="licensePath">
-            <FileUpload :file="{url: form.licensePath, name: form.fileName}" @input="handleSuccess">上传材料</FileUpload>
+            <ImageUpload @input="handleLicenseSuccess" :params="params" :limit="limit" :value="form.licensePath" :fileSize="fileSize"></ImageUpload>
+            <!-- <FileUpload :file="{url: form.licensePath, name: form.fileName}" @input="handleSuccess" :params="params">上传材料</FileUpload> -->
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="其他附件" prop="attachIds">
-            <FileUpload :files="form.attachIds" @input="handleSaleSuccess" :multiple="true">上传材料</FileUpload>
+            <FileUpload :files="form.fileList" @input="handleSaleSuccess" :multiple="true" :params="params">上传材料</FileUpload>
+            <el-table v-loading="loading" :data="list" border style="width: 100%;margin-top: 5px;" v-if="type == 'update'">
+              <el-table-column label="序号" type="index" width="50" align="center"></el-table-column>
+              <el-table-column label="文件名称" prop="fileName" align="center"></el-table-column>
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="handleView(scope.row)">查看</el-button>
+                  <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-form-item>
         </el-col>
       </el-row>
@@ -311,7 +322,7 @@
       <el-row :gutter="40">
         <el-col :span="24">
           <el-form-item label="文件水印" prop="logo">
-            <ImageUpload @input="handleLogoSuccess"></ImageUpload>
+            <ImageUpload @input="handleLogoSuccess" :params="params" :limit="limit" :value="form.logo" :fileSize="fileSize"></ImageUpload>
           </el-form-item>
         </el-col>
       </el-row>
@@ -335,7 +346,8 @@
           </el-form-item>
         </el-col>
       </el-row>
-    </el-form>
+    </el-form>
+    <upload-enclosure ref="uploadEnclosure" v-if="enclosureVisible" @refreshData="getList()" :attachType="attachType"></upload-enclosure>
   </div>
 </template>
 <script>
@@ -346,12 +358,16 @@ import {getProvinceDataApi,getRegionChildrenApi} from "@/api/common/common"
 import { regTypeOptions,mainProductsOptions,yesOrNoOptions } from "@/utils/dataFormat"
 import FileUpload from '@/components/FileUpload'
 import ImageUpload from '@/components/ImageUpload'
+import {getEnclosureApi} from "@/api/enterprise/project/project"
+import UploadEnclosure from "./components/UploadEnclosure"
+import {deleteEnclosureApi} from '@/api/enterprise/project/project'
 
 export default {
   name: "First",
   components: {
     FileUpload,
-    ImageUpload
+    ImageUpload,
+    UploadEnclosure
   },
   data() {
     const equalToPassword = (rule, value, callback) => {
@@ -362,8 +378,18 @@ export default {
       }
     };
     return {
+      limit: 1, //长传图片数量
+      fileSize: 1,
+      enclosureVisible: false,
       type: this.$route.query.type,
+      attachType: 'ENT',
+      dataId: this.$route.params.id,
+      params: {
+        attachType: 'ENT',
+        dataId: ''
+      }, //附件上传需要
       activeName: '3',
+      list: [],
       provinceName: '',
       cityName: '',
       districtName: '',
@@ -375,7 +401,10 @@ export default {
       cityDataList: [],
       districtDataList: [],
       form: {
+        id: '',
+        fileList: [],
         serviceDate: [],
+        fileList: [],
         listedFlag: 1,
         investFlag: 1,
         startDate: '',
@@ -389,9 +418,8 @@ export default {
         userName: "",
         password: "",
         confirmPassword: "",
-        code: "",
-        // uuid: ""
-      },
+      },
+      total: 0,
       registerRules: {
         userName: [
           { required: true, trigger: "blur", message: "请输入您的账号" },
@@ -416,19 +444,41 @@ export default {
     this.form.id = this.$route.params.id || undefined;
     this.type = this.$route.query.type || undefined
     if(this.form.id) {
+      this.params.dataId = this.$route.params.id
       this.getData()
+      this.getEnclosureData()
     }
   },
   methods: {
+    getEnclosureData() {
+      getEnclosureApi(this.attachType, this.dataId).then(res => {
+        this.list = res.data.records
+      })
+    },
+    handleUpload() {
+      this.enclosureVisible = true
+      this.$nextTick(() => {
+        this.$refs.uploadEnclosure.init()
+      })
+    },
+    handleDelete(row) {
+      const id = row.id;
+      this.$confirm('是否确认删除该数据?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return deleteEnclosureApi(id);
+        }).then(() => {
+          this.getEnclosureData()
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
     getData() {
       this.loading = true
       getEntInfoByIdApi(this.form.id).then(res => {
         this.loading = false
         this.form = res.data || {}
-        this.form.listedFlag = res.data.listedFlag + ''
-        this.form.investFlag = res.data.investFlag + ''
-        this.form.techFlag = res.data.techFlag + ''
-        this.form.deductionFlag = res.data.deductionFlag +''
         let mainProductArray = this.form.mainProducts.split(',') || ['电子信息'];
         this.$set(this.form, 'mainProductArray', mainProductArray);
         this.form.serviceDate = []
@@ -436,6 +486,7 @@ export default {
           this.form.serviceDate[0] = this.form.startDate
           this.form.serviceDate[1] = this.form.endDate
         }
+        this.form.provinceId = res.data.provinceId
         if(this.form.provinceId) {
           this.getCityData()
         }
@@ -451,15 +502,20 @@ export default {
     handleLogoSuccess(file) {
       this.form.logo = file
     },
+    handleLicenseSuccess(file) {
+      this.form.licensePath = file
+    },
     handleSaleSuccess(files) {
+      this.form.fileList = files
+      this.form.attachIds = []
       files.forEach(item => {
         this.form.attachIds.push(item.response.data.id)
       });
     },
     //选择省份
     getCityData() {
-      this.form.cityId = ''
-      this.form.districtId = ''
+      // this.form.cityId = ''
+      // this.form.districtId = ''
       getRegionChildrenApi(this.form.provinceId).then(res => {
         if(res.code == 200) {
           this.cityDataList = res.data
@@ -475,7 +531,7 @@ export default {
     },
     //选择市
     getDistrictData() {
-      this.form.districtId = ''
+      // this.form.districtId = ''
       getRegionChildrenApi(this.form.cityId).then(res => {
         if(res.code == 200) {
           this.districtDataList = res.data
@@ -511,7 +567,7 @@ export default {
             this.loading = true;
             updateEntInfoApi(this.form).then(res => {
               const userName = this.form.userName;
-              this.$alert("<font color='red'>恭喜你,您的账号 " + userName + " 信息修改成功!</font>", '系统提示', {
+              this.$alert("<font color='red'>信息修改成功!</font>", '系统提示', {
                 dangerouslyUseHTMLString: true,
                 type: 'success'
               }).then(() => {

+ 18 - 8
src/views/enterprise/ent/index.vue

@@ -41,8 +41,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
-        >新增企业</el-button>
+          @click="handleAdd" v-if="roleType =='manager'">新增企业</el-button>
       </div>
     </h3>
     <el-table v-loading="loading" :data="list" border>
@@ -105,6 +104,7 @@
   import {getProvinceDataApi,getRegionChildrenApi} from "@/api/common/common"
   import {listEntApi, deleteEntApi, resetPwdApi, remindUserApi, stopEntUserApi} from '@/api/admin/ent/ent'
   import {entStateOptions, getLabel, authStateOptions} from '@/utils/dataFormat'
+  import {listEntTaxApi} from '@/api/gov/gov'
   export default {
     data () {
       return {
@@ -130,9 +130,9 @@
       }
     },
     created() {
+      this.roleType = this.roles.join(',')
       this.getList()
       this.getProvinceData()
-      this.roleType = this.roles.join(',')
     },
     computed: {
       roles() {
@@ -166,13 +166,23 @@
           }
         })
       },
+      //列表数据区分科德管理员还是税务人员
       getList() {
         this.loading = true;
-        listEntApi(this.queryParams).then(response => {
-          this.list = response.data.records;
-          this.total = response.data.total;
-          this.loading = false;
-        });
+        if(this.roleType == 'manager') {
+          listEntApi(this.queryParams).then(response => {
+            this.list = response.data.records;
+            this.total = response.data.total;
+            this.loading = false;
+          });
+        }else if(this.roleType == 'gov') {
+          listEntTaxApi(this.queryParams).then(response => {
+            this.list = response.data.records;
+            this.total = response.data.total;
+            this.loading = false;
+          });
+        }
+
       },
       handleAdd() {
         this.$router.push("/ent/add"+'?type=add')

+ 65 - 17
src/views/enterprise/ent/info.vue

@@ -18,7 +18,7 @@
       </tr>
       <tr>
         <th>工商注册类型</th>
-        <td>{{info.regType}}</td>
+        <td>{{regTypeFormat}}</td>
         <th>主营产品(服务)所属技术领域</th>
         <td>{{info.mainProducts}}</td>
       </tr>
@@ -87,7 +87,7 @@
     <table class="table_view">
       <tr>
         <th>企业是否上市</th>
-        <td>{{info.listedFlag}}</td>
+        <td>{{listedFlag}}</td>
         <th>企业上市代码</th>
         <td>{{info.listingCode}}</td>
       </tr>
@@ -98,7 +98,7 @@
     <table class="table_view">
       <tr>
         <th>是否引入风险投资</th>
-        <td>{{info.investFlag}}</td>
+        <td>{{investFlag}}</td>
         <th>风险投资金额</th>
         <td>{{info.investCapital}}</td>
       </tr>
@@ -109,7 +109,7 @@
     <table class="table_view">
       <tr>
         <th>是否为高新企业</th>
-        <td>{{info.techFlag}}</td>
+        <td>{{techFlag}}</td>
         <th>高新企业编号</th>
         <td>{{info.techCode}}</td>
       </tr>
@@ -120,7 +120,7 @@
     <table class="table_view">
       <tr>
         <th>上年度是否做加计扣除</th>
-        <td>{{info.deductionFlag}}</td>
+        <td>{{deductionFlag}}</td>
       </tr>
     </table>
     <h3 class="toolbar mt20">
@@ -129,10 +129,12 @@
     <table class="table_view">
       <tr>
         <th>企业营业执照</th>
-        <td><a class="link" :href="info.licensePath" target="_blank">{{info.licensePath}}</a></td>
+        <td>
+          <img :src="info.licensePath" alt="license">
+        </td>
         <th>其他附件</th>
         <td>
-          <div v-for="(file, index) in info.attachIds" :key="index"><a class="link" :href="attachIds" target="_blank">{{info.attachIds}}</a></div>
+          <div v-for="(file, index) in list" :key="index"><a class="link" :href="file.url" target="_blank">{{file.fileName}}</a></div>
         </td>
       </tr>
     </table>
@@ -142,7 +144,9 @@
     <table class="table_view">
       <tr>
         <th>公司logo</th>
-        <td><a class="link" :href="info.logo" target="_blank">{{info.logo}}</a></td>
+        <td>
+          <img :src="info.logo" alt="logo">
+        </td>
       </tr>
     </table>
     <div class="oper">
@@ -162,6 +166,9 @@
 <script>
   import { getEntInfoByIdApi, auditEntApi } from "@/api/admin/ent/ent"
   import AuditEnt from "./components/audit"
+  import {getEnclosureApi} from "@/api/enterprise/project/project"
+  import {getEntInfoByIdTaxApi} from "@/api/gov/gov"
+  import {regTypeOptions, getLabel,yesOrNoOptions} from '@/utils/dataFormat'
   export default {
     name: 'EntInfo',
     components: {
@@ -172,7 +179,10 @@
         loading: false,
         id: undefined,
         type: undefined,
+        list: [],
         auditEntVisible: false,
+        attachType: 'ENT',
+        roleType: '',
         info: {
         },
       }
@@ -181,23 +191,61 @@
       scopeId() {
         return this.$store.state.user.scopeId
       },
+      roles() {
+        return this.$store.state.user.roles
+      },
+      regTypeFormat() {
+        return getLabel(regTypeOptions, this.info.regType);
+      },
+      listedFlag() {
+        return getLabel(yesOrNoOptions, this.info.listedFlag);
+      },
+      investFlag() {
+        return getLabel(yesOrNoOptions, this.info.investFlag)
+      },
+      techFlag() {
+        return getLabel(yesOrNoOptions, this.info.techFlag)
+      },
+      deductionFlag() {
+        return getLabel(yesOrNoOptions, this.info.deductionFlag)
+      }
     },
     created () {
-      this.id = this.$route.params.id || undefined;
       this.type = this.$route.query.type || undefined
-      console.log(this.type)
-      if(this.id || this.scopeId) {
+      this.roleType = this.roles.join(',')
+      if(this.roleType == 'entAdmin' || this.roleType == 'entUser') {
+        this.id = this.scopeId
+        this.dataId = this.scopeId
+      }else {
+        this.id = this.$route.params.id
+        this.dataId = this.$route.params.id
+      }
+      if(this.id) {
         this.getData()
+        this.getEnclosureData()
       }
     },
     methods: {
+      getEnclosureData() {
+        getEnclosureApi(this.attachType, this.dataId).then(res => {
+          this.list = res.data.records
+        })
+      },
       getData() {
-        const id = this.id || this.scopeId
+        const id = this.id
         this.loading = true
-        getEntInfoByIdApi(id).then(res => {
-          this.loading = false
-          this.info = res.data || {}
-        })
+        if(this.roleType == 'gov') {
+          getEntInfoByIdTaxApi(id).then(res => {
+            this.loading = false
+            this.info = res.data || {}
+          })
+        }else if(this.roleType == 'manager') {
+          getEntInfoByIdApi(id).then(res => {
+            this.loading = false
+            this.info = res.data || {}
+          })
+        }
+
       },
       handleAudit() {
         this.auditEntVisible = true
@@ -225,7 +273,7 @@
           })
       },
       handleUpdate() {
-        
+
       },
       cancel() {
         this.$store.dispatch("tagsView/delView", this.$route); // 关闭当前tab

+ 24 - 241
src/views/index.vue

@@ -8,14 +8,14 @@
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_1"></i>
-            <span class="num">10</span>
+            <span class="num">{{info.entSumCnt}}</span>
             <span class="label">企业总数</span>
           </div>
         </el-col>
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_9"></i>
-            <span class="num"></span>
+            <span class="num">{{info.entValidCnt}}</span>
             <span class="label">服务中企业</span>
           </div>
         </el-col>
@@ -29,45 +29,24 @@
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_5"></i>
-            <span class="num"></span>
+            <span class="num">{{info.entExpiredCnt}}</span>
             <span class="label">项目总数</span>
           </div>
         </el-col>
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_6"></i>
-            <span class="num"></span>
+            <span class="num">{{info.proFinishCnt}}</span>
             <span class="label">已完成项目</span>
           </div>
         </el-col>
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_7"></i>
-            <span class="num"></span>
+            <span class="num">{{info.proUnfinishCnt}}</span>
             <span class="label">待完成项目</span>
           </div>
         </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_2"></i>
-            <span class="num"></span>
-            <span class="label">财务资料总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_3"></i>
-            <span class="num"></span>
-            <span class="label">已完成财务资料</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_4"></i>
-            <span class="num"></span>
-            <span class="label">待完成财务资料</span>
-          </div>
-        </el-col>
       </el-row>
     </template>
     <template v-if="userType == 'GOV_PROV' || userType == 'GOV_CITY' || userType == 'GOV_DISTRI'">
@@ -75,7 +54,7 @@
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_1"></i>
-            <span class="num">10</span>
+            <span class="num">{{info.entSumCnt}}</span>
             <span class="label">企业总数</span>
           </div>
         </el-col>
@@ -88,241 +67,36 @@
         </el-col>
       </el-row>
     </template>
-    <template v-if="userType == 'ENT_ADMIN'">
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_5"></i>
-            <span class="num"></span>
-            <span class="label">项目总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_6"></i>
-            <span class="num"></span>
-            <span class="label">已完成项目</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_7"></i>
-            <span class="num"></span>
-            <span class="label">待完成项目</span>
-          </div>
-        </el-col>
-      </el-row>
-    </template>
-    <template v-if="userType == 'ENT_TECH'">
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_1"></i>
-            <span class="num">10</span>
-            <span class="label">企业总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_9"></i>
-            <span class="num"></span>
-            <span class="label">服务中企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_8"></i>
-            <span class="num"></span>
-            <span class="label">服务已到期企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_5"></i>
-            <span class="num"></span>
-            <span class="label">项目总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_6"></i>
-            <span class="num"></span>
-            <span class="label">已完成项目</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_7"></i>
-            <span class="num"></span>
-            <span class="label">待完成项目</span>
-          </div>
-        </el-col>
-      </el-row>
-    </template>
-    <template v-if="userType == 'ENT_ADMIN_TECH'">
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_1"></i>
-            <span class="num">10</span>
-            <span class="label">企业总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_9"></i>
-            <span class="num"></span>
-            <span class="label">服务中企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_8"></i>
-            <span class="num"></span>
-            <span class="label">服务已到期企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_5"></i>
-            <span class="num"></span>
-            <span class="label">项目总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_6"></i>
-            <span class="num"></span>
-            <span class="label">已完成项目</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_7"></i>
-            <span class="num"></span>
-            <span class="label">待完成项目</span>
-          </div>
-        </el-col>
-      </el-row>
-    </template>
-    <template v-if="userType == 'ENT_FIN'">
+    <template v-if="userType == 'ENT_ADMIN' || userType == 'ENT_TECH' || userType == 'ENT_ADMIN_TECH' || userType == 'ENT_FIN' || userType == 'ENT_ADMIN_FIN'">
       <el-row :gutter="20">
         <el-col :span="8">
           <div class="stat_box">
-            <i class="icon icon_1"></i>
-            <span class="num">10</span>
-            <span class="label">企业总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_9"></i>
-            <span class="num"></span>
-            <span class="label">服务中企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_8"></i>
-            <span class="num"></span>
-            <span class="label">服务已到期企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
             <i class="icon icon_5"></i>
-            <span class="num"></span>
+            <span class="num">{{info.proSumCnt}}</span>
             <span class="label">项目总数</span>
           </div>
         </el-col>
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_6"></i>
-            <span class="num"></span>
+            <span class="num">{{info.proFinishCnt}}</span>
             <span class="label">已完成项目</span>
           </div>
         </el-col>
         <el-col :span="8">
           <div class="stat_box">
             <i class="icon icon_7"></i>
-            <span class="num"></span>
+            <span class="num">{{info.proUnfinishCnt}}</span>
             <span class="label">待完成项目</span>
           </div>
         </el-col>
       </el-row>
-    </template>
-    <template v-if="userType == 'ENT_ADMIN_FIN'">
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_1"></i>
-            <span class="num">10</span>
-            <span class="label">企业总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_9"></i>
-            <span class="num"></span>
-            <span class="label">服务中企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_8"></i>
-            <span class="num"></span>
-            <span class="label">服务已到期企业</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_5"></i>
-            <span class="num"></span>
-            <span class="label">项目总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_6"></i>
-            <span class="num"></span>
-            <span class="label">已完成项目</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_7"></i>
-            <span class="num"></span>
-            <span class="label">待完成项目</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_7"></i>
-            <span class="num"></span>
-            <span class="label">财务报表总数</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_7"></i>
-            <span class="num"></span>
-            <span class="label">已完成财务报表</span>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_7"></i>
-            <span class="num"></span>
-            <span class="label">待完成财务报表</span>
-          </div>
-        </el-col>
-      </el-row>
-    </template>
-
+    </template>
   </div>
 </template>
 
-<script>
+<script>
+  import {getIndexDataApi} from "@/api/common/common.js"
 export default {
   name: "Index",
   computed: {
@@ -333,13 +107,22 @@ export default {
   data() {
     return {
       // 版本号
-      version: "1.0.0",
+      version: "1.0.0",
+      info: {}
     };
+  },
+  created() {
+    this.getData()
   },
   methods: {
     goTarget(href) {
       window.open(href, "_blank");
-    },
+    },
+    getData() {
+      getIndexDataApi().then(res => {
+        this.info = res.data || {}
+      })
+    }
   },
 };
 </script>

+ 9 - 1
src/views/tax/components/AddTaxUser.vue

@@ -87,7 +87,6 @@
          if(this.form.id) {
            this.getData()
          }
-         console.log(this.form.id)
          this.resetForm("form");
          this.getProvinceData()
        },
@@ -95,6 +94,15 @@
          getTaxInfoByIdApi(this.form.id).then(res => {
            if(res.code == 200) {
              this.form = res.data
+             let list = []
+             list = res.data
+             if(list.userType == 'GOV_PROV') {
+               this.form.dutyArea = 1
+             }else if(list.userType == 'GOV_CITY') {
+               this.form.dutyArea = 2
+             }else if(list.userType == 'GOV_DISTRI') {
+               this.form.dutyArea = 3
+             }
            }
          })
        },

+ 1 - 1
src/views/tax/index.vue

@@ -17,7 +17,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="用户名称">
-        <el-input v-model="queryParams.entName" clearable style="width: 200px;"></el-input>
+        <el-input v-model="queryParams.entName" clearable style="width: 200px;" placeholder="请输入用户名称"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">搜索</el-button>