3333333

src/api/index.js

@@ -593,9 +593,6 @@ export default {
         updateBatch (params) {
             return fetch('/v1/science-admin/com-batch/updateBatch', params, 'post', 'json')
         },
-        getMaxBatch (params) {
-            return fetch('/v1/science-admin/com-batch/getMaxBatch', params)
-        },
         deleteBatch (params) {
             return fetch(`/v1/science-admin/com-batch/deleteBatch/${params.id}`, params, 'delete', 'json')
         },

src/views/assign/components/assignDetail.vue

@@ -132,7 +132,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.assignYear = data.year
           this.getListByPage()
@@ -177,7 +177,7 @@ export default {
       this.pagination.pageIndex = 1
       this.getListByPage()
     },
-    groupChange(value) {
+    groupChange (value) {
       this.searchForm.groupId = value
     },
     recordClick (record, type) {

src/views/audit/project/Index.vue

@@ -173,7 +173,7 @@ export default {
       this.getListByPage()
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/audit/project/final.vue

@@ -48,7 +48,6 @@
         </span>
       </template>
       <template slot="option" slot-scope="record">
-        <!-- <a-button type="link" size="small" v-if="record.projState >= 50" @click="recordClick(record, 'viewProjectTask')">查看任务书</a-button> -->
         <a-button type="link" size="small" @click="recordClick(record, 'evaluation')">专家评审明细</a-button>
         <a-button type="link" size="small" v-if="record.auditResult == 1" @click="recordClick(record, 'audit')">审核</a-button>
       </template>
@@ -227,7 +226,7 @@ export default {
       this.getListByPage()
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 2, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 2, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/audit/project/finalJudgment.vue

@@ -174,7 +174,7 @@ export default {
   methods: {
     isEmptyParams,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year

src/views/components/common/cascaderSelect.vue

@@ -53,11 +53,13 @@ export default {
       })
     },
     getSpecInfo (key) {
+      console.log(this.specArray, this.value,1)
       let newArray = this.specArray.filter(
         function (el) {
           return el.key == key
         }
       );
+      console.log(this.specArray, newArray, this.value,2)
       if (!!newArray && newArray.length > 0)
         return [newArray[0].ppkey, newArray[0].pkey, newArray[0].key]
       else

src/views/evaluation/components/score.vue

@@ -274,7 +274,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.comBatch = data
         }

src/views/evaluation/evaluation.vue

@@ -85,7 +85,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/evaluation/index.vue

@@ -110,7 +110,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/expert/evaluationStatistic.vue

@@ -125,7 +125,7 @@ export default {
       })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.groupYear = data.year
           this.getListByPage()

src/views/home/components/dashboardGov.vue

@@ -92,7 +92,7 @@ export default {
       }).catch(() => { })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.changeType()

src/views/home/components/dashboardTop.vue

@@ -92,7 +92,7 @@ export default {
       }).catch(() => { })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.changeType()

src/views/home/components/dashboardUnit.vue

@@ -67,7 +67,7 @@ export default {
       }).catch(() => { })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() , timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
         }

src/views/peAssign/components/evaluationStatistic.vue

@@ -38,7 +38,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.getEvaluationStatistic()

src/views/peAssign/components/groupEdit.vue

@@ -135,7 +135,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.formData.groupYear = data.year + ''
         }

src/views/peAssign/components/knowledgeSelect.vue

@@ -60,7 +60,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.totalTitle = this.reportYear + '项目二级学科选择'

src/views/peAssign/components/projectSelect.vue

@@ -76,7 +76,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.reportYear = data.year
           this.getListByPage()

src/views/peAssign/components/projectSelectIntoGroup.vue

@@ -90,7 +90,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.searchForm.reportYear = data.year
           this.getListByPage()

src/views/peAssign/components/projectStatistic.vue

@@ -49,7 +49,7 @@ export default {
   },
   methods: {
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.getProjectExpertGroupStatistic()

src/views/peAssign/index.vue

@@ -172,7 +172,7 @@ export default {
   methods: {
     isEmptyParams,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year

src/views/peAssign/projKeyAssign.vue

@@ -188,7 +188,7 @@ export default {
       })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year

src/views/peAssign/projKnowledgeAssign.vue

@@ -196,7 +196,7 @@ export default {
       })
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() , timeType: 1 }).then(({ data = {} }) => {
         if (data) {
           this.reportYear = data.year
           this.searchForm.groupYear = data.year

src/views/report/project/Index.vue

@@ -142,7 +142,7 @@ export default {
       this.visibleEdit = true
     },
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 1, projType: getType(), timeType: 1  }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/timeSet/batch/components/batchEdit.vue

@@ -40,26 +40,6 @@
             </a-form-model-item>
           </a-col>
         </a-row>
-        <!-- <a-row>
-          <a-col :span="6" class="bg-gray">
-            <div class="required">州市级行政单位审核时间</div>
-          </a-col>
-          <a-col :span="18">
-            <a-form-model-item ref="prefectureRange" prop="prefectureRange">
-              <a-range-picker v-model="formData.prefectureRange" show-time format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" @change="prefectureDateChange" :placeholder="['开始时间', '结束时间']" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="6" class="bg-gray">
-            <div class="required">省直单位上报时间</div>
-          </a-col>
-          <a-col :span="18">
-            <a-form-model-item ref="provinceRange" prop="provinceRange">
-              <a-range-picker v-model="formData.provinceRange" show-time format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" @change="provinceDateChange" :placeholder="['开始时间', '结束时间']" />
-            </a-form-model-item>
-          </a-col>
-        </a-row> -->
         <a-row>
           <a-col :span="6" class="bg-gray">
             <div class="required">专家审核时间</div>
@@ -107,6 +87,7 @@ export default {
         id: null,
         year: moment().format('YYYY'),
         batch: '1',
+        timeType: 1,
         reportStart: '',
         reportEnd: '',
         auditStart: '',
@@ -154,6 +135,7 @@ export default {
         if (data) {
           this.formData.id = data.id
           this.formData.year = data.year + ''
+          this.formData.timeType = data.timeType
           this.formData.projType = data.projType
           this.formData.reportStart = data.reportStart
           this.formData.reportEnd = data.reportEnd

src/views/timeSet/taskTimeSet/components/timeEdit.vue

@@ -77,6 +77,7 @@ export default {
         id: null,
         year: moment().format('YYYY'),
         batch: '1',
+        timeType: 2,
         reportStart: '',
         reportEnd: '',
         auditStart: '',
@@ -120,6 +121,7 @@ export default {
         if (data) {
           this.formData.id = data.id
           this.formData.year = data.year + ''
+          this.formData.timeType = data.timeType
           this.formData.projType = data.projType
           this.formData.reportStart = data.reportStart
           this.formData.reportEnd = data.reportEnd