修改拼错单词及流程进度展示

prod
吕天方 9 months ago
parent 869bf015c9
commit 11b3581377

@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.112:9040'
VUE_APP_BASE_API = 'http://192.168.0.105:9040'
# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# 路由懒加载

@ -327,11 +327,11 @@
<template slot="label">
<span class="f_validate">*</span>平台(项目)名称
</template>
<el-form-item label-width="0" prop="platfromName">
<el-form-item label-width="0" prop="platformName">
<el-input
type="text"
placeholder="请输入平台(项目)"
v-model="form.platfromName"
v-model="form.platformName"
maxlength="50"
show-word-limit
>
@ -1210,7 +1210,7 @@ export default {
'work-break': 'break-all'
},
rules: {
platfromName: [
platformName: [
{ required: true, message: "请输入平台(项目)名称", trigger: "blur" }
],
fileList: [
@ -1530,7 +1530,7 @@ export default {
})
}
if(this.templateId == "4") {
params.platfromName = this.form.platfromName
params.platformName = this.form.platformName
params.fillingTime = dealFormatDate(new Date())
params.agreement = ''
this.uploadList.forEach((item,index) => {

@ -394,18 +394,18 @@
<span v-if="pageType == 'edit'" class="f_validate">*</span>
<span v-if="pageType == 'edit'">()</span>
</template>
<el-form-item v-if="pageType == 'edit'" label-width="0" prop="platfromName">
<el-form-item v-if="pageType == 'edit'" label-width="0" prop="platformName">
<el-input
v-if="pageType == 'edit'"
type="text"
placeholder="请输入平台(项目)"
v-model="form.platfromName"
v-model="form.platformName"
maxlength="50"
show-word-limit
>
</el-input>
</el-form-item>
<span v-if="pageType == 'detail'">{{ form.platfromName }}</span>
<span v-if="pageType == 'detail'">{{ form.platformName }}</span>
</el-descriptions-item>
</el-descriptions>
</div>
@ -1760,7 +1760,7 @@ export default {
'work-break': 'break-all'
},
rules: {
platfromName: [
platformName: [
{ required: true, message: "请输入平台(项目)名称", trigger: "blur" }
],
fileList: [

@ -147,13 +147,13 @@
<el-form-item label="审批状态" prop="approvalStatus">
<el-radio-group v-model="form.approvalStatus">
<el-radio label="1">审批通过</el-radio>
<el-radio label="0">审批驳回</el-radio>
<el-radio label="2">审批驳回</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审批意见" prop="approvalOptions">
<el-input v-model="form.approvalOptions" type="textarea" placeholder="请输入审批意见" maxlength="200"></el-input>
<el-form-item label="审批意见" prop="approvalOpinions">
<el-input v-model="form.approvalOpinions" type="textarea" placeholder="请输入审批意见" maxlength="200"></el-input>
</el-form-item>
</el-col>
@ -220,14 +220,14 @@ export default {
//
form: {
enterpriseDirectoryList: [],
approvalOptions: ''
approvalOpinions: ''
},
//
rules: {
approvalStatus: [
{ required: true, message: "请选择日期", trigger: "blur" }
],
approvalOptions: [
approvalOpinions: [
{ required: true, message: "名录维护方式不能为空", trigger: "blur" }
],
},
@ -302,7 +302,7 @@ export default {
//
reset() {
this.form = {
approvalOptions: '',
approvalOpinions: '',
approvalStatus: '1',
approvalAttachment: '',
};

@ -339,11 +339,11 @@
<template slot="label">
<span class="f_validate">*</span>平台(项目)名称
</template>
<el-form-item label-width="0" prop="platfromName">
<el-form-item label-width="0" prop="platformName">
<el-input
type="text"
placeholder="请输入平台(项目)"
v-model="form.platfromName"
v-model="form.platformName"
maxlength="50"
show-word-limit
>
@ -1221,7 +1221,7 @@ export default {
templateRecordId: [
{ required: true, message: "请选择申报类别", trigger: "blur" }
],
platfromName: [
platformName: [
{ required: true, message: "请输入平台(项目)名称", trigger: "blur" }
],
fileList: [
@ -1546,7 +1546,7 @@ export default {
})
}
if(this.templateId == "4") {
params.platfromName = this.form.platfromName
params.platformName = this.form.platformName
params.fillingTime = dealFormatDate(new Date())
params.agreement = ''
this.uploadList.forEach((item,index) => {

@ -15,8 +15,9 @@
<el-card> <!-- 去除阴影 shadow="never -->
<div class="schedule-content">
<div class="card-content-left">
<div class="schedule-card-title" v-if="false"></div>
<div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 0"></div>
<div class="schedule-card-title">{{ activity.approvalByName }}</div>
<!-- <div class="schedule-card-title" v-if="false"></div> -->
<!-- <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 0"></div>
<div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 1"></div>
<div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 2"></div>
<div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 0"></div>
@ -27,15 +28,15 @@
<div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 2"></div>
<div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 0"></div>
<div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 1"></div>
<div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 2"></div>
<div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 2"></div> -->
<div class="card-content-one" v-show="activity.approvalStatus == 0 && activity.approvalAttachment">
<span>提醒</span>
<span>已提交xxx材料</span>
</div>
<div class="card-content-one" v-show="activity.approvalStatus == 2">
<!-- <div class="card-content-one" v-show="activity.approvalStatus == 2">
<span>提醒</span>
<span>请xxx专家审核</span>
</div>
</div> -->
<div class="card-content-one" v-show="activity.approvalStatus == 1">
<span>审核结果</span>
<span>{{ activity.approvalByName }}审核通过</span>
@ -44,13 +45,17 @@
<span>审核结果</span>
<span>{{ activity.approvalByName }}审核不通过</span>
</div>
<div class="card-content-two" v-show="activity.approvalOpinions">
<div class="card-content-two">
<span>审核意见</span>
<span>{{ activity.approvalOpinions }}</span>
</div>
<div class="card-content-two" v-show="activity.approvalStatus == 0">
<div class="card-content-two" v-if="activity.approvalAttachment">
<span>附件</span>
<a :href="activity.approvalAttachment" target="_blank">{{ activity.approvalAttachment.split("/")[activity.approvalAttachment.split("/").length - 1] }}</a>
</div>
<div class="card-content-two" v-if="!activity.approvalAttachment">
<span>附件</span>
<a :href="activity.approvalAttachment" target="_blank">xxx.doc</a>
<a></a>
</div>
<div class="card-content-three">{{ activity.approvalTime }}</div>
<!-- <div class="card-content-three-red" v-show="activity.approvalStatus == 2">2023-06-20</div> -->

@ -4,7 +4,7 @@
* @Author: JC9527
* @Date: 2024-03-25 15:37:35
* @LastEditors: JC9527
* @LastEditTime: 2024-04-18 10:22:07
* @LastEditTime: 2024-04-18 18:24:39
-->
<template>
<div class="project-info-box">
@ -61,7 +61,15 @@ export default {
let obj = {};
obj["key"] = key;
obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
if(key == "是否获得园区其他经营奖励") {
obj["value"] = newInfo[key] == 0 ? '是' : newInfo[key] == 1 ? '否':'';
} else if(key == "申报类型") {
obj["value"] = newInfo[key] == 1 ? '两业融合示范企业' : newInfo[key] == 2 ? '制造业企业设立财务独立核算的制造服务业职能部门' : newInfo[key] == 3 ? "制造业企业剥离服务业务成立独立的法人制造业企业剥离服务业务成立独立的法人" : "";
} else if(key == "所属类型"){
obj["value"] = newInfo[key] == 0 ? '市场服务类' : newInfo[key] == 1 ? '公共服务类' : "";
} else {
obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
}
obj["span"] = 1;
arr.push(obj)
}

Loading…
Cancel
Save