Browse Source

税务人员的省市区 省级只能选市区 市级选区级

刘湘琪 2 years ago
parent
commit
918bbc4ba7

+ 3 - 0
src/api/admin/project/project.js

@@ -8,3 +8,6 @@ export function listProjectAdminApi(query) {
     params: query
   })
 }
+
+//项目提交审核
+// export function projectAuditApi()

+ 67 - 27
src/views/enterprise/declare/index.vue

@@ -1,34 +1,48 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" label-width="100px">
-      <el-form-item label="省" prop="provinceId">
-        <el-select v-model="queryParams.provinceId" placeholder="请选择省" @change="getCityData" filterable style="width: 200px;">
-          <el-option v-for="(item,index) in provinceDataList" :key="index" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="市" prop="cityId">
-        <el-select v-model="queryParams.cityId" placeholder="请选择市" @change="getDistrictData" filterable style="width: 200px;">
-          <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="区" prop="districtId">
-        <el-select v-model="queryParams.districtId" placeholder="请选择区" filterable style="width: 200px;">
-          <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="年份">
+      <template v-if="roleType == 'gov'">
+        <el-form-item label="市" prop="cityId"  v-if="userType == 'GOV_PROV'">
+          <el-select v-model="queryParams.cityId" placeholder="请选择市" @change="getDistrictData" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区" prop="districtId" v-if="userType == 'GOV_PROV' || userType == 'GOV_CITY'">
+          <el-select v-model="queryParams.districtId" placeholder="请选择区" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
+      <template v-else>
+        <el-form-item label="省" prop="provinceId">
+          <el-select v-model="queryParams.provinceId" placeholder="请选择省" @change="getCityData" filterable style="width: 200px;">
+            <el-option v-for="(item,index) in provinceDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="市" prop="cityId">
+          <el-select v-model="queryParams.cityId" placeholder="请选择市" @change="getDistrictData" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区" prop="districtId">
+          <el-select v-model="queryParams.districtId" placeholder="请选择区" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
+      <el-form-item label="年份" prop="year">
         <el-date-picker v-model="queryParams.year" type="year" placeholder="选择年" style="width: 200px;"></el-date-picker>
       </el-form-item>
-      <el-form-item label="企业名称">
+      <el-form-item label="企业名称" prop="entName">
         <el-input v-model="queryParams.entName" clearable style="width: 200px;" placeholder="请输入企业名称"></el-input>
       </el-form-item>
-      <el-form-item label="社会信用代码">
+      <el-form-item label="社会信用代码" prop="license">
         <el-input v-model="queryParams.license" style="width: 200px;" placeholder="请输入社会信用代码"></el-input>
       </el-form-item>
-      <el-form-item label="项目编号">
+      <el-form-item label="项目编号" prop="projectNo">
         <el-input v-model="queryParams.projectNo" style="width: 200px;" placeholder="请输入项目编号"></el-input>
       </el-form-item>
-      <el-form-item label="项目名称">
+      <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" style="width: 200px;" placeholder="请输入项目名称"></el-input>
       </el-form-item>
       <el-form-item>
@@ -69,7 +83,7 @@
     />
   </div>
 </template>
-
+<!-- 科德管理员、企业角色、税务角色都有项目申报角色 -->
 <script>
   import {getProvinceDataApi,getRegionChildrenApi} from "@/api/common/common"
   import {listDeclareApi,listDeclareCommonApi} from '@/api/enterprise/declare/declare'
@@ -83,15 +97,13 @@
         districtDataList: [],
         entStateOptions: entStateOptions,
         authStateOptions: authStateOptions,
-        // 模板状态
-        // statusOptions: accessStatus,
-        dateRange: [],
         queryParams: {
           pageNum: 1,
           pageSize: 10,
           provinceId: undefined,
           cityId: undefined,
-          districtId: undefined
+          districtId: undefined,
+          year: ''
         },
         list: [],
         total: 0,
@@ -100,10 +112,39 @@
       }
     },
     created() {
+      this.roleType = this.roles.join(',')
       this.getList()
-      this.getProvinceData()
+      if(this.userType == 'GOV_PROV' || this.userType == 'GOV_CITY') {
+        this.getAreaData()
+      }
+      if(this.roleType != 'gov') {
+        this.getProvinceData()
+      }
+    },
+    computed: {
+      roles() {
+        return this.$store.state.user.roles
+      },
+      scopeId() {
+        return this.$store.state.user.scopeId
+      },
+      userType() {
+        return this.$store.state.user.userType
+      }
     },
     methods: {
+      getAreaData() {
+        getRegionChildrenApi(this.scopeId).then(res => {
+          if(res.code == 200) {
+            if(this.userType == 'GOV_PROV') {
+              this.cityDataList = res.data
+            }else if(this.userType == 'GOV_CITY') {
+              this.districtDataList = res.data
+            }
+
+          }
+        })
+      },
       //选择省份
       getCityData() {
         this.queryParams.cityId = ''
@@ -162,7 +203,6 @@
       },
       // 重置
       resetQuery() {
-        this.dateRange = [];
         this.resetForm("queryForm");
         this.handleQuery();
       },

+ 56 - 19
src/views/enterprise/ent/index.vue

@@ -1,28 +1,42 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" label-width="100px">
-      <el-form-item label="省" prop="provinceId">
-        <el-select v-model="queryParams.provinceId" placeholder="请选择省" @change="getCityData" filterable style="width: 200px;">
-          <el-option v-for="(item,index) in provinceDataList" :key="index" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="市" prop="cityId">
-        <el-select v-model="queryParams.cityId" placeholder="请选择市" @change="getDistrictData" filterable style="width: 200px;">
-          <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="区" prop="districtId">
-        <el-select v-model="queryParams.districtId" placeholder="请选择区" filterable style="width: 200px;">
-          <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="企业名称">
+      <template v-if="roleType == 'gov'">
+        <el-form-item label="市" prop="cityId" v-if="userType == 'GOV_PROV'">
+          <el-select v-model="queryParams.cityId" placeholder="请选择市" @change="getDistrictData" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区" prop="districtId" v-if="userType == 'GOV_PROV' || userType == 'GOV_CITY'">
+          <el-select v-model="queryParams.districtId" placeholder="请选择区" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
+      <template v-else>
+        <el-form-item label="省" prop="provinceId">
+          <el-select v-model="queryParams.provinceId" placeholder="请选择省" @change="getCityData" filterable style="width: 200px;">
+            <el-option v-for="(item,index) in provinceDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="市" prop="cityId">
+          <el-select v-model="queryParams.cityId" placeholder="请选择市" @change="getDistrictData" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区" prop="districtId">
+          <el-select v-model="queryParams.districtId" placeholder="请选择区" filterable style="width: 200px;">
+            <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
+      <el-form-item label="企业名称" prop="entName">
         <el-input v-model="queryParams.entName" clearable style="width: 200px;" placeholder="请输入企业名称"></el-input>
       </el-form-item>
-      <el-form-item label="社会信用代码">
+      <el-form-item label="社会信用代码" prop="license">
         <el-input v-model="queryParams.license" style="width: 200px;" placeholder="请输入社会信用代码"></el-input>
       </el-form-item>
-      <el-form-item label="服务状态">
+      <el-form-item label="服务状态" prop="entState">
         <el-select v-model="queryParams.entState" style="width: 200px;" placeholder="请选择">
           <el-option v-for="(item, index) in entStateOptions" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
@@ -132,14 +146,37 @@
     created() {
       this.roleType = this.roles.join(',')
       this.getList()
-      this.getProvinceData()
+      if(this.userType == 'GOV_PROV' || this.userType == 'GOV_CITY') {
+        this.getAreaData()
+      }
+      if(this.roleType != 'gov') {
+        this.getProvinceData()
+      }
     },
     computed: {
       roles() {
         return this.$store.state.user.roles
+      },
+      scopeId() {
+        return this.$store.state.user.scopeId
+      },
+      userType() {
+        return this.$store.state.user.userType
       }
     },
     methods: {
+      getAreaData() {
+        getRegionChildrenApi(this.scopeId).then(res => {
+          if(res.code == 200) {
+            if(this.userType == 'GOV_PROV') {
+              this.cityDataList = res.data
+            }else if(this.userType == 'GOV_CITY') {
+              this.districtDataList = res.data
+            }
+
+          }
+        })
+      },
       //选择省份
       getCityData() {
         this.queryParams.cityId = ''