fix : 修复年度计划创建及状态
This commit is contained in:
@@ -149,7 +149,7 @@
|
|||||||
:file-list-show="fileListShow"/>
|
:file-list-show="fileListShow"/>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<div v-if="data.taskId||data.state==='5'">
|
<div v-if="data.taskId||data.state==='4'">
|
||||||
<baseTitle title="审核意见"></baseTitle>
|
<baseTitle title="审核意见"></baseTitle>
|
||||||
<el-form-item prop="_value">
|
<el-form-item prop="_value">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -182,7 +182,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='5'">
|
<div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='4'">
|
||||||
<el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
|
<el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
|
||||||
<el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
|
<el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -3,10 +3,11 @@
|
|||||||
<collection-detail :formData="collectData.formData" :data="collectData" type="singleDetail"
|
<collection-detail :formData="collectData.formData" :data="collectData" type="singleDetail"
|
||||||
:fileListShow="fileListShow"
|
:fileListShow="fileListShow"
|
||||||
:processViewer="processViewer" :loading="loading" v-model:value="auditOpinion"/>
|
:processViewer="processViewer" :loading="loading" v-model:value="auditOpinion"/>
|
||||||
<!-- <div class="oper-page-btn" v-if="collectData.state==4">-->
|
<div class="oper-page-btn" v-if="collectData.formData?.report">
|
||||||
<!-- <el-button color="#DED0B2" @click="handleDemandReport">需求上报</el-button>-->
|
<el-button color="#DED0B2" @click="handleDemandReport">需求上报</el-button>
|
||||||
<!-- </div>-->
|
</div>
|
||||||
<opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId" v-model:value="auditOpinion"></opinion>
|
<opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"
|
||||||
|
v-model:value="auditOpinion"></opinion>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="jsx">
|
<script setup lang="jsx">
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ const headBtnClick = (key) => {
|
|||||||
handleAdd()
|
handleAdd()
|
||||||
break;
|
break;
|
||||||
case 'export':
|
case 'export':
|
||||||
handleExport()
|
createAnnualPlan()
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -298,7 +298,7 @@ const selectionChange = (data) => {
|
|||||||
})
|
})
|
||||||
projectSelectList.value = data
|
projectSelectList.value = data
|
||||||
}
|
}
|
||||||
const handleExport = () => {
|
const createAnnualPlan = () => {
|
||||||
let projectIds = []
|
let projectIds = []
|
||||||
projectSelectList.value.map(item => {
|
projectSelectList.value.map(item => {
|
||||||
projectIds.push(item.projectId)
|
projectIds.push(item.projectId)
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ const init = () => {
|
|||||||
context: '审批进行中'
|
context: '审批进行中'
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
case '5':
|
case '4':
|
||||||
timeline.value = {
|
timeline.value = {
|
||||||
color: '#f78f5f',
|
color: '#f78f5f',
|
||||||
icon: 'MoreFilled',
|
icon: 'MoreFilled',
|
||||||
@@ -110,14 +110,7 @@ const init = () => {
|
|||||||
context: '审核已驳回'
|
context: '审核已驳回'
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
case '4':
|
case '5':
|
||||||
timeline.value = {
|
|
||||||
color: '#0bbd87',
|
|
||||||
icon: 'CircleCheckFilled',
|
|
||||||
context: '审批通过'
|
|
||||||
}
|
|
||||||
break
|
|
||||||
case '6':
|
|
||||||
timeline.value = {
|
timeline.value = {
|
||||||
color: '#0bbd87',
|
color: '#0bbd87',
|
||||||
icon: 'CircleCheckFilled',
|
icon: 'CircleCheckFilled',
|
||||||
|
|||||||
Reference in New Issue
Block a user