diff --git a/src/api/index.js b/src/api/index.js
index edc6dc9b10684d22b2c10961cbda845692fbc465..b2e9dc3325e2f9f1198e8e83a6f3baf34c63a1ac 100644
--- a/src/api/index.js
+++ b/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')
},
diff --git a/src/views/assign/components/assignDetail.vue b/src/views/assign/components/assignDetail.vue
index fa7babc2f8dcd1324debebe195729f4382959a81..4eb5853c3f5a4388149f183ee9918dc5f7988da6 100644
--- a/src/views/assign/components/assignDetail.vue
+++ b/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) {
diff --git a/src/views/audit/project/Index.vue b/src/views/audit/project/Index.vue
index 0e8ec3f4d7b21de4dfcaad2b01f0a81853e94d68..8fa1f07fe5c61bbd1098669fc3a40e1cca932b2f 100644
--- a/src/views/audit/project/Index.vue
+++ b/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
diff --git a/src/views/audit/project/final.vue b/src/views/audit/project/final.vue
index a02d37ef82b33dcf0cc5cd063e62cde847442c15..61e5fb12ad801fe72c6e9096b624d561d9fece92 100644
--- a/src/views/audit/project/final.vue
+++ b/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
diff --git a/src/views/audit/project/finalJudgment.vue b/src/views/audit/project/finalJudgment.vue
index 89a2baf77b2c9c7dbcc81fec939d5b3a33560f7f..7037e864de3c81ba77334005d2c9f2533b3c77d5 100644
--- a/src/views/audit/project/finalJudgment.vue
+++ b/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
diff --git a/src/views/components/common/cascaderSelect.vue b/src/views/components/common/cascaderSelect.vue
index 326cfc2dcf1cb251f1e114e391fb0e09ca486ed7..e449990710e9c56631ca2490f5465aba25ea25ed 100644
--- a/src/views/components/common/cascaderSelect.vue
+++ b/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
diff --git a/src/views/evaluation/components/score.vue b/src/views/evaluation/components/score.vue
index a700dcf17e8bbfbab0f242661d96c9d0c74e64d1..cb76ba6c0a44865010719fcce4c14c1eadf6481b 100644
--- a/src/views/evaluation/components/score.vue
+++ b/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
}
diff --git a/src/views/evaluation/evaluation.vue b/src/views/evaluation/evaluation.vue
index 9d883636899d57538f6e5a0a2a61c49f9616875f..be96fb56e204a058cea36b64f3b1a781f0455739 100644
--- a/src/views/evaluation/evaluation.vue
+++ b/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
diff --git a/src/views/evaluation/index.vue b/src/views/evaluation/index.vue
index b2781c4ad63cd933d9cc44d97e4301f2c8cb5c6e..44fef5ebabc9a23e10cf1c7a9f9da74ea58ae708 100644
--- a/src/views/evaluation/index.vue
+++ b/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
diff --git a/src/views/expert/evaluationStatistic.vue b/src/views/expert/evaluationStatistic.vue
index e5f10226bbc09550684f59538bc849139c836779..5eae66042a47fe84593a2397291fdd3ca4735d42 100644
--- a/src/views/expert/evaluationStatistic.vue
+++ b/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()
diff --git a/src/views/home/components/dashboardGov.vue b/src/views/home/components/dashboardGov.vue
index a7fb69f13d42f1d6559387d912ecf9b079d8f9e4..d1cc7369600fe8340d6730c644e25204cf0fb61b 100644
--- a/src/views/home/components/dashboardGov.vue
+++ b/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()
diff --git a/src/views/home/components/dashboardTop.vue b/src/views/home/components/dashboardTop.vue
index a1be0009f9f9839636df5987e0cc6b3bafea68f1..9c71b56ab072c828d6070982d7d0e69bdd2d4444 100644
--- a/src/views/home/components/dashboardTop.vue
+++ b/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()
diff --git a/src/views/home/components/dashboardUnit.vue b/src/views/home/components/dashboardUnit.vue
index 49973c159ed8e6e218b0861efa78bfea3c6b6017..960ea3a5369e1b66ac75f76e848851ee7f1d1901 100644
--- a/src/views/home/components/dashboardUnit.vue
+++ b/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
}
diff --git a/src/views/peAssign/components/evaluationStatistic.vue b/src/views/peAssign/components/evaluationStatistic.vue
index 54435950cd281b83e86dcaf1719c3b4aa8eadd8e..69575fe35b8d1f5b0d3e4c7f8ceb9249e38ee31f 100644
--- a/src/views/peAssign/components/evaluationStatistic.vue
+++ b/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()
diff --git a/src/views/peAssign/components/groupEdit.vue b/src/views/peAssign/components/groupEdit.vue
index c82fb0564e99247806ac3fd4c55e8eea66af36c7..4f945881291a6820914f7e634b3ce450f5622cac 100644
--- a/src/views/peAssign/components/groupEdit.vue
+++ b/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 + ''
}
diff --git a/src/views/peAssign/components/knowledgeSelect.vue b/src/views/peAssign/components/knowledgeSelect.vue
index 0ea704d6b3c796c6cbeeb4b0f7988a9ac52c643d..2f6ce5750f4359ff916d29828ee3714d655a191c 100644
--- a/src/views/peAssign/components/knowledgeSelect.vue
+++ b/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 + '项目二级学科选择'
diff --git a/src/views/peAssign/components/projectSelect.vue b/src/views/peAssign/components/projectSelect.vue
index 907dcac21f82cdfa38e86e3d2e407bf8898d60a3..276c5926d8ed76496ccc22b3f0af0945be9c3c52 100644
--- a/src/views/peAssign/components/projectSelect.vue
+++ b/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()
diff --git a/src/views/peAssign/components/projectSelectIntoGroup.vue b/src/views/peAssign/components/projectSelectIntoGroup.vue
index 78c4afd3d278d162cb3328b6a4d0bf77e414ae30..628636f9b157b4cc910c236c0b4e933296be3871 100644
--- a/src/views/peAssign/components/projectSelectIntoGroup.vue
+++ b/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()
diff --git a/src/views/peAssign/components/projectStatistic.vue b/src/views/peAssign/components/projectStatistic.vue
index 65d9ecc223e994c896b7586ec2da721756bd28cb..e741992b2ef18401321a2928a68baf5ac9de937c 100644
--- a/src/views/peAssign/components/projectStatistic.vue
+++ b/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()
diff --git a/src/views/peAssign/index.vue b/src/views/peAssign/index.vue
index 70b94c27c62eb5070b7051b9f0eedac180dcaabb..d229099cc11f0e91b614bba8c40cdcbb5504cfe8 100644
--- a/src/views/peAssign/index.vue
+++ b/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
diff --git a/src/views/peAssign/projKeyAssign.vue b/src/views/peAssign/projKeyAssign.vue
index 9648b24232c099f97077e58f64fb816227cd88a9..986aee20f0db82d45e227c648e14f8035159ccc4 100644
--- a/src/views/peAssign/projKeyAssign.vue
+++ b/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
diff --git a/src/views/peAssign/projKnowledgeAssign.vue b/src/views/peAssign/projKnowledgeAssign.vue
index 1a2be42f38c7bea61110ed5396301cb2efa6fcb3..e4b9ed85f4a669ba916ba47aaa983db15d081f0a 100644
--- a/src/views/peAssign/projKnowledgeAssign.vue
+++ b/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
diff --git a/src/views/report/project/Index.vue b/src/views/report/project/Index.vue
index a4134e688ca9f65bb437072e9f09b2f214202368..c8f44a042625aa448a8590eb72dfecd805b3622e 100644
--- a/src/views/report/project/Index.vue
+++ b/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
diff --git a/src/views/timeSet/batch/components/batchEdit.vue b/src/views/timeSet/batch/components/batchEdit.vue
index 45371d1a4f03ebc23d607c9e358bc1dadcdd7826..9db67b1cc8b822e12655b0d16019823862d61e2b 100644
--- a/src/views/timeSet/batch/components/batchEdit.vue
+++ b/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
diff --git a/src/views/timeSet/taskTimeSet/components/timeEdit.vue b/src/views/timeSet/taskTimeSet/components/timeEdit.vue
index 5efef920765f875fecd6b042c6a219ab02e035d2..62e2abcc6d600cb7c41d99ebf09b2de832b7bcde 100644
--- a/src/views/timeSet/taskTimeSet/components/timeEdit.vue
+++ b/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