111

6853246e · wangxl · defb9d48 · 6853246e · 6853246e · 6853246e
Commit 6853246e authored Dec 04, 2024 by wangxl
6 changed files
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -295,7 +295,6 @@ export function changeProjType (type) {
      this.$store.commit('app/clearStore')
      setType(type + '')
      this.$store.commit('app/setProjType', type)
-      let menuList = JSON.parse(window.sessionStorage.getItem('menuList'))
      this.$store.commit('app/initStore', [menuList[0].id])
      this.$router.push('/')
      resolve(true)
@@ -319,9 +318,12 @@ router.beforeEach(async (to, from, next) => {
      } else {
        const hasUser = JSON.parse(window.sessionStorage.getItem('user'))
        const hasMenu = JSON.parse(window.sessionStorage.getItem('menuList'))
+        if (!!!hasMenu) {
+          await store.dispatch('user/getMenuList')
+        }
        if (hasUser && hasMenu) {
          if (to.path === '/sys') {
-            if (!hasUser.projType && hasUser.type === '3' && hasUser.roles != '4') {
+            if (!!!hasUser.projType && hasUser.type === '3' && hasUser.roles != '4') {
              next()
              NProgress.done()
            }
@@ -330,12 +332,11 @@ router.beforeEach(async (to, from, next) => {
              NProgress.done()
            }
          } else {
-            if (!hasUser.projType && hasUser.type === '3' && hasUser.roles != '4') {
+            if (!!!hasUser.projType && hasUser.type === '3' && hasUser.roles != '4') {
              next(`/sys`)
              NProgress.done()
            } else {
-              // setType(hasUser.type + '')
-              // await store.dispatch('app/auth', to.path)
+              await store.dispatch('app/auth', to.path)
              next()
              NProgress.done()
            }

--- a/src/views/audit/project/Index.vue
+++ b/src/views/audit/project/Index.vue
@@ -60,7 +60,7 @@
 </template>

 <script>
-import { getType, getUnitType } from '@/views/utils/auth'
+import { getType } from '@/views/utils/auth'
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
 import paraSelect from '@/views/components/common/paraSelect'
@@ -151,13 +151,11 @@ export default {
      this.getListByPage()
    },
    getYear () {
-      let type = getUnitType()
-      this.$api.batch.getCurrentYearBatch({ type: type, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
        if (data) {
          this.isButten = data.disabled
          this.description = data.description
          this.searchForm.reportYear = data.year
-          console.log('1')
          this.getListByPage()
        }
      }).catch(() => { })

--- a/src/views/report/project/components/projectEdit.vue
+++ b/src/views/report/project/components/projectEdit.vue
@@ -167,7 +167,7 @@
          </div>
        </a-col> 
      </a-row> -->
-      <a-row type="flex">
+      <!-- <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
            <div class="required">开户银行</div>
@@ -196,7 +196,7 @@
            </div>
          </div>
        </a-col>
-      </a-row>
+      </a-row> -->
      <!-- <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
@@ -227,7 +227,7 @@
          </div>
        </a-col>
      </a-row> -->
-      <a-row type="flex">
+      <!-- <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
            <div class="required">上年度研发经费支出总额(单位:万元)</div>
@@ -290,8 +290,8 @@
            </div>
          </div>
        </a-col>
-      </a-row>
-      
+      </a-row> -->
+
      <a-row>
        <a-col :span="24" style="border-top: 0px">
          <div class="tb-title">
@@ -330,9 +330,10 @@
          </div>
        </a-col>
        <a-col :span="20">
-          <a-form-model-item prop="recommendUnit">
+          {{ formData.appUnitName }}
+          <!-- <a-form-model-item prop="recommendUnit">
            <a-input placeholder="推荐部门" v-model="formData.recommendUnit" :maxLength="100" style="width: 80%" />
-          </a-form-model-item>
+          </a-form-model-item> -->
        </a-col>
      </a-row>
      <a-row type="flex">
@@ -357,7 +358,7 @@
          </a-form-model-item>
        </a-col>
      </a-row>
-      <a-row type="flex">
+      <!-- <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
            <div class="required">项目依托的科技创新基地</div>
@@ -368,7 +369,7 @@
            <a-input placeholder="项目依托的科技创新基地" v-model="formData.technologyInnovationBase" :maxLength="100" style="width: 80%" />
          </a-form-model-item>
        </a-col>
-      </a-row>
+      </a-row> -->
      <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
@@ -599,11 +600,11 @@
      <!-- 经费预算 -->
      <budget-edit :budget.sync="formData.budget" />
      <!-- 分年度用款计划 -->
-      <fund-plan-edit :fundPlan.sync="formData.fundPlan"/>
+      <fund-plan-edit :fundPlan.sync="formData.fundPlan" />
      <!-- 设备费-购置设备预算明细表 -->
-      <equipments-edit :equipments.sync="formData.equipments"/>
+      <equipments-edit :equipments.sync="formData.equipments" />
      <!-- 科技计划项目承担单位研究资金支出预算明细表 -->
-      <unit-payment-edit :unitPayment.sync="formData.unitPayment"/>
+      <unit-payment-edit :unitPayment.sync="formData.unitPayment" />

      <!-- 项目课题设置 -->
      <project-sub-edit :projectSubList.sync="formData.projectSubList" />
@@ -704,7 +705,7 @@ export default {
        cooperativeUnits: [],
        members: [],
        budget: [],
-        fundPlan:[],
+        fundPlan: [],
        equipments: [],
        projectSubList: [],
        managementRuleList: [],
@@ -720,17 +721,17 @@ export default {
        // workforce: [{ required: true, message: '请填写职工总数', trigger: 'blur' },],
        // specializedPersonnel: [{ required: true, message: '请填写其中专科以上人员', trigger: 'blur' },],
        // researchPersonnel: [{ required: true, message: '请填写研究开发人员', trigger: 'blur' },],
-        depositBank: [{ required: true, message: '请填写开户银行', trigger: 'blur' },],
-        bankAccount: [{ required: true, message: '请填写银行账号', trigger: 'blur' },],
-        depositBankAddress: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
-        interbankNumber: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
-        researchTotal: [{ required: true, message: '请填写上年度研发经费支出总额', trigger: 'blur' },],
-        isResearchActive: [{ required: true, message: '请选择上年度是否填报了研发活动情况', trigger: 'change' },],
-        researchCount: [{ required: true, message: '请填写上一年度填报的研发投入总数', trigger: 'blur' },],
-        researchPersonCount: [{ required: true, message: '请填写上一年度填报的研发人员数', trigger: 'blur' },],
+        // depositBank: [{ required: true, message: '请填写开户银行', trigger: 'blur' },],
+        // bankAccount: [{ required: true, message: '请填写银行账号', trigger: 'blur' },],
+        // depositBankAddress: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
+        // interbankNumber: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
+        // researchTotal: [{ required: true, message: '请填写上年度研发经费支出总额', trigger: 'blur' },],
+        // isResearchActive: [{ required: true, message: '请选择上年度是否填报了研发活动情况', trigger: 'change' },],
+        // researchCount: [{ required: true, message: '请填写上一年度填报的研发投入总数', trigger: 'blur' },],
+        // researchPersonCount: [{ required: true, message: '请填写上一年度填报的研发人员数', trigger: 'blur' },],
        projName: [{ required: true, message: '请填写项目名称', trigger: 'blur' },],
        leadUnit: [{ required: true, message: '请填写项目所属二级学院/部门名称(牵头单位)', trigger: 'blur' },],
-        recommendUnit: [{ required: true, message: '请填写推荐部门', trigger: 'blur' },],
+        // recommendUnit: [{ required: false, message: '请填写推荐部门', trigger: 'blur' },],
        startDate: { required: true, message: '请选择项日开始时间', trigger: 'change' },
        endDate: { required: true, message: '请选择项目结束时间', trigger: 'change' },
        technologyInnovationBase: [{ required: true, message: '请填写项目依托的科技创新基地', trigger: 'blur' },],

--- a/src/views/report/project/components/projectInfo.vue
+++ b/src/views/report/project/components/projectInfo.vue
@@ -145,7 +145,7 @@
          </div>
        </a-col>
      </a-row> -->
-      <a-row type="flex">
+      <!-- <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
            <div>开户银行</div>
@@ -196,8 +196,8 @@
            </div>
          </div>
        </a-col>
-      </a-row>
-      <a-row type="flex">
+      </a-row> -->
+      <!-- <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
            <div>上年度研发经费支出总额(单位:万元)</div>
@@ -252,7 +252,7 @@
            </div>
          </div>
        </a-col>
-      </a-row>
+      </a-row> -->

      <a-row>
        <a-col :span="24" style="border-top: 0px">
@@ -293,7 +293,7 @@
        </a-col>
        <a-col :span="20">
          <div class="special-middle">
-            {{ value.recommendUnit }}
+            {{ value.appUnitName }}
          </div>
        </a-col>
      </a-row>
@@ -319,7 +319,7 @@
          </div>
        </a-col>
      </a-row>
-      <a-row type="flex">
+      <!-- <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">
            <div>项目依托的科技创新基地</div>
@@ -330,7 +330,7 @@
            {{ value.technologyInnovationBase }}
          </div>
        </a-col>
-      </a-row>
+      </a-row> -->
      <a-row type="flex">
        <a-col :span="4" class="bg-gray">
          <div class="special-middle">

--- a/src/views/systemType/index.vue
+++ b/src/views/systemType/index.vue
@@ -32,22 +32,22 @@
        </div>
        <div class="content">
          <div class="content_list">
-            <div class="content_list_item " @click="onUser(1)">
+            <div class="content_list_item " @click="onChangeType(1)">
              <div class="item_header item_b"></div>
              <div class="item_center">
                <a-icon type="file-text" class="item_center-icon" theme="twoTone" two-tone-color="#f5b65c" />
              </div>
-              <div class="item_title">云南省卫生健康领域<br/>科技计划项目</div>
+              <div class="item_title">云南省卫生健康领域<br />科技计划项目</div>
              <div class="item_bottom">
                <a-icon type="right-circle" class="item_bottom-icon" />
              </div>
            </div>
-            <div style="margin-left: 70px;" class="content_list_item" @click="onUser(2)">
+            <div style="margin-left: 70px;" class="content_list_item" @click="onChangeType(2)">
              <div class="item_header item_r"></div>
              <div class="item_center">
                <a-icon type="book" class="item_center-icon" theme="twoTone" two-tone-color="#ff87a8" />
              </div>
-              <div class="item_title">云南省<br/>公立医院高水平临床专科建设<br/>科技项目</div>
+              <div class="item_title">云南省<br />公立医院高水平临床专科建设<br />科技项目</div>
              <div class="item_bottom">
                <a-icon type="right-circle" class="item_bottom-icon" />
              </div>
@@ -76,7 +76,7 @@ export default {
    this.userInfo = JSON.parse(window.sessionStorage.getItem('user'))
  },
  methods: {
-    onUser (type) {
+    onChangeType (type) {
      this.loading = true
      this.$changeProjType(type)
      this.loading = false

--- a/src/views/utils/auth.js
+++ b/src/views/utils/auth.js
@@ -32,21 +32,4 @@ export function setType (type) {
  return type
 }

-export function getUnitType () {
-  let user = JSON.parse(window.sessionStorage.getItem("user"))
-  let type = 0
-  //最高级行政单位管理员
-  if (user && user.roles && (user.roles.indexOf("0") != -1)) {}
-  else if (user && user.roles && (user.roles.indexOf("1") != -1)) {//行政管理员
-    type = 3
-  } else if (user && user.roles && (user.roles.indexOf("2") != -1)) {//单位管理员
-    if (user.unitCode.length == (Vue.prototype.$defaultLength * 2))
-      type = 4//省直单位
-    else
-      type = 2//州市级及以下单位
-  } else if (user && user.roles && (user.roles.indexOf("5") != -1)) {//专家
-    type = 5
-  }
-  return type
-}