suzhou-jichuang-lanhai
/
jin_ji_hu
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

申报详情、修改去除多余请求

Browse Source
prod
吕天方 9 months ago
parent 513e6dbdc4
commit e838c00cfd
6 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File

15
src/views/onlineDeclaration/declareDetailContent/index.vue
Unescape View File

@ -1674,10 +1674,11 @@
<div class="top"> <div class="top">
同步获取表单流程 同步获取表单流程
</div> </div>
<p v-if="pageType == 'edit'" class="bottom"> <!-- <p v-if="pageType == 'edit'" class="bottom">
暂无审批流程 暂无审批流程
</p> </p> -->
<div v-if="pageType == 'detail'"> <!-- v-if="pageType == 'detail'" -->
<div >
<div class="step_contain" :class="index == approvalInfoList.length - 1 ? 'step_contain_one' : 'step_contain'" v-for="(item,index) in approvalInfoList" :key="item.id"> <div class="step_contain" :class="index == approvalInfoList.length - 1 ? 'step_contain_one' : 'step_contain'" v-for="(item,index) in approvalInfoList" :key="item.id">
<span class="drop_style"> <span class="drop_style">
</span> </span>
@ -1701,6 +1702,7 @@
<img v-if="item.approvalStatus == 1" class="approval_img" src="../../../assets/images/approvalAgree.jpg" alt=""> <img v-if="item.approvalStatus == 1" class="approval_img" src="../../../assets/images/approvalAgree.jpg" alt="">
<img v-if="item.approvalStatus == 2" class="approval_img" src="../../../assets/images/approvalReject.jpg" alt=""> <img v-if="item.approvalStatus == 2" class="approval_img" src="../../../assets/images/approvalReject.jpg" alt="">
<img v-if="item.approvalStatus == 0" class="approval_img" src="../../../assets/images/approvalPrimary.jpg" alt=""> <img v-if="item.approvalStatus == 0" class="approval_img" src="../../../assets/images/approvalPrimary.jpg" alt="">
<img v-if="item.approvalStatus == 3" class="approval_img" src="../../../assets/images/approvalReject.jpg" alt="">
</div> </div>
</div> </div>
</div> </div>
@ -1936,9 +1938,9 @@ export default {
break; break;
} }
// getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => { // getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => {
getBasicInfo({enterpriseId:this.enterpriseId}).then((response) => { // getBasicInfo({enterpriseId:this.enterpriseId}).then((response) => {
this.baseInfo = response.data // this.baseInfo = response.data
}) // })
// getOpenInterface({templateRecordId: templateRecordId}).then((response) => { // getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
// this.openInterfaceInfo = response.data // this.openInterfaceInfo = response.data
// }) // })
@ -1956,6 +1958,7 @@ export default {
}, },
getDetailInfo(id) { getDetailInfo(id) {
getDeclarationRecords({id}).then((response) => { getDeclarationRecords({id}).then((response) => {
this.baseInfo = response.data.bmsEnterpriseBasicInfo
let approvalInfoList = response.data.approvalInfoList let approvalInfoList = response.data.approvalInfoList
this.templateInfo.enterpriseDirectory = response.data.enterpriseDirectory this.templateInfo.enterpriseDirectory = response.data.enterpriseDirectory
// this.templateInfo.enterpriseName = response.data.bmsEnterpriseBasicInfo.enterpriseName // this.templateInfo.enterpriseName = response.data.bmsEnterpriseBasicInfo.enterpriseName

38
src/views/onlineDeclaration/enterpriseDirectory/index.vue
Unescape View File

@ -53,7 +53,7 @@
> >
<el-table-column label="序号" align="center" width="50" fixed> <el-table-column label="序号" align="center" width="50" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span> <span>{{(queryParams.current - 1) * queryParams.size + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="enterpriseDirectory" label="申报任务标题" :show-overflow-tooltip="true" min-width="190"></el-table-column> <el-table-column prop="enterpriseDirectory" label="申报任务标题" :show-overflow-tooltip="true" min-width="190"></el-table-column>
@ -123,8 +123,8 @@
id="L-pagination" id="L-pagination"
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.current"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.size"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改申报企业名录对话框 --> <!-- 添加或修改申报企业名录对话框 -->
@ -308,6 +308,13 @@ export default {
// 'sys_show_hide', 'sys_normal_disable', 'bms_template_type', // 'sys_show_hide', 'sys_normal_disable', 'bms_template_type',
dicts: ['bms_responsibility_unit', 'bms_declaration_channels', 'bms_level', 'jjh_project_type'], dicts: ['bms_responsibility_unit', 'bms_declaration_channels', 'bms_level', 'jjh_project_type'],
data() { data() {
let validateTime = (rule, value, callback) => {
if (new Date(value[1]) < new Date()) {
callback(new Error('选择结束时间需大于当前时间'))
} else {
callback()
}
}
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
@ -330,8 +337,8 @@ export default {
enterpriseDirectory: undefined, enterpriseDirectory: undefined,
templateName: undefined, templateName: undefined,
responsibilityUnit: undefined, responsibilityUnit: undefined,
pageNum: 1, current: 1,
pageSize: 10, size: 10,
}, },
// 表单参数 // 表单参数
form: { form: {
@ -358,7 +365,8 @@ export default {
{ required: true, message: "请选择申报途径", trigger: "blur" } { required: true, message: "请选择申报途径", trigger: "blur" }
], ],
reportTime: [ reportTime: [
{ required: true, message: "请选择日期", trigger: "blur" } { required: true, message: "请选择日期", trigger: "blur" },
{validator: validateTime, trigger: 'blur'},
], ],
isFrame: [ isFrame: [
{ required: true, message: "名录维护方式不能为空", trigger: "blur" } { required: true, message: "名录维护方式不能为空", trigger: "blur" }
@ -481,6 +489,7 @@ export default {
let isFrame let isFrame
fileList.length > 0 ? isFrame = 1 : isFrame = 0 fileList.length > 0 ? isFrame = 1 : isFrame = 0
this.$set(this.form, 'isFrame', isFrame) this.$set(this.form, 'isFrame', isFrame)
// this.enterpriseDirectoryList = this.form.enterpriseDirectoryList
} else { } else {
this.$set(this.form, 'isFrame', 0) this.$set(this.form, 'isFrame', 0)
} }
@ -532,6 +541,11 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.title == "申报补录") { if(this.title == "申报补录") {
if(this.form.isFrame == 0) {
delete this.form['enterpriseDirectoryList'];
delete this.form['fileName'];
delete this.form['fileList'];
}
supplementation(this.form).then(res=>{ supplementation(this.form).then(res=>{
this.$modal.msgSuccess("补录成功"); this.$modal.msgSuccess("补录成功");
this.open = false; this.open = false;
@ -609,8 +623,9 @@ export default {
// this.templateList = this.templateListLock.filter((item) => { // this.templateList = this.templateListLock.filter((item) => {
// return item.responsibilityUnit == valid // return item.responsibilityUnit == valid
// }) // })
this.templateList = []
allList({responsibilityUnit:Number(valid),projectClassify:Number(this.projectId)}).then(res=>{ allList({responsibilityUnit:Number(valid),projectClassify:Number(this.projectId)}).then(res=>{
console.log(res); // console.log(res);
this.templateList = res.data || [] this.templateList = res.data || []
}) })
} }
@ -624,8 +639,9 @@ export default {
// this.templateList = this.templateListLock.filter((item) => { // this.templateList = this.templateListLock.filter((item) => {
// return item.responsibilityUnit == valId // return item.responsibilityUnit == valId
// }) // })
this.templateList = []
allList({responsibilityUnit:Number(this.unitId),projectClassify:Number(valId)}).then(res=>{ allList({responsibilityUnit:Number(this.unitId),projectClassify:Number(valId)}).then(res=>{
console.log(res); // console.log(res);
this.templateList = res.data || [] this.templateList = res.data || []
}) })
} }
@ -675,8 +691,10 @@ export default {
uploadFile(form).then(response => { uploadFile(form).then(response => {
this.fileList = [] this.fileList = []
this.fileList.push(file) this.fileList.push(file)
this.form.fileList = this.fileList // this.form.fileList = this.fileList
console.log('this.fileList: ', this.fileList); this.$set(this.form, 'fileList', this.fileList)
// console.log('this.fileList: ', this.fileList);
// console.log('this.form.fileList: ', this.form.fileList);
}) })
}, },

4
src/views/onlineDeclaration/pendingReview/index.vue
Unescape View File

@ -522,7 +522,7 @@ list-style: none; /* 清除列表项前的标记 */
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.approval_status0 { .approval_status0 {
color: #5EFCE8; color: #14ecd0;
position: relative; position: relative;
padding-left: 15px; padding-left: 15px;
} }
@ -532,7 +532,7 @@ list-style: none; /* 清除列表项前的标记 */
width: 7px; width: 7px;
height: 7px; height: 7px;
border-radius: 50%; border-radius: 50%;
background-color: #5EFCE8; background-color: #14ecd0;
left: 5px; left: 5px;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);

17
src/views/onlineDeclaration/records/index.vue
Unescape View File

@ -151,10 +151,10 @@
background:'#cfcccc',color:'#000000'}" --> background:'#cfcccc',color:'#000000'}" -->
<el-row id="I-rowTwo" class="radio_btn" v-if="userType == '01'"> <el-row id="I-rowTwo" class="radio_btn" v-if="userType == '01'">
<el-col> <el-col>
<el-radio-group v-model="radioEnter" @change="toggleOptionsEnter"> <el-radio-group v-model="queryParams.statusChange" @change="toggleOptionsEnter">
<el-radio-button label="">全部</el-radio-button> <el-radio-button label="">全部</el-radio-button>
<el-radio-button label="1,8">未填报</el-radio-button> <el-radio-button label="0">未填报</el-radio-button>
<el-radio-button label="2,7">已填报</el-radio-button> <el-radio-button label="1">已填报</el-radio-button>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
</el-row> </el-row>
@ -390,7 +390,7 @@ export default {
queryParams: { queryParams: {
enterpriseDirectory: undefined, enterpriseDirectory: undefined,
responsibilityUnit: undefined, responsibilityUnit: undefined,
// type: undefined, statusChange: "",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
@ -469,7 +469,8 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
if(this.userType == '01'){ if(this.userType == '01'){
this.queryParams.enterpriseId = this.$store.state.user.enterpriseId // this.queryParams.enterpriseId = this.$store.state.user.enterpriseId
this.queryParams.creditCode = this.$store.state.user.name
} }
/** 获取市级需评定数量 */ /** 获取市级需评定数量 */
// listRecords({ // listRecords({
@ -559,7 +560,7 @@ export default {
}, },
// 政务端切换是否填报 // 政务端切换是否填报
toggleOptionsEnter(val){ toggleOptionsEnter(val){
this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
// handleAdd(row) { // handleAdd(row) {
@ -862,7 +863,7 @@ export default {
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.approval_status0 { .approval_status0 {
color: #5EFCE8; color: #14ecd0;
position: relative; position: relative;
padding-left: 15px; padding-left: 15px;
} }
@ -872,7 +873,7 @@ export default {
width: 7px; width: 7px;
height: 7px; height: 7px;
border-radius: 50%; border-radius: 50%;
background-color: #5EFCE8; background-color: #14ecd0;
left: 5px; left: 5px;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);

2
src/views/project/projectInfo/index.vue
Unescape View File

@ -5,7 +5,7 @@
<div class="left-info" id="L-header"> <div class="left-info" id="L-header">
<div class="project-info-title">【{{ info.projectName }}】</div> <div class="project-info-title">【{{ info.projectName }}】</div>
<el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading"> <el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
<el-descriptions-item label="项目名称"><dict-tag :options="dict.type.jjh_status" :value="info.status"/></el-descriptions-item> <el-descriptions-item label="项目名称">{{ info.projectName }}</el-descriptions-item>
<el-descriptions-item label="项目分类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectClassify)"><dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/></a></el-descriptions-item> <el-descriptions-item label="项目分类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectClassify)"><dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/></a></el-descriptions-item>
<el-descriptions-item label="申报单位" contentClassName="info-link">{{ info.declareUnit }}<a v-show="info.declareUnit">查看详情</a></el-descriptions-item> <el-descriptions-item label="申报单位" contentClassName="info-link">{{ info.declareUnit }}<a v-show="info.declareUnit">查看详情</a></el-descriptions-item>
<el-descriptions-item label="年份">{{ info.projectYear }}</el-descriptions-item> <el-descriptions-item label="年份">{{ info.projectYear }}</el-descriptions-item>

5
src/views/workbench/index.vue
Unescape View File

@ -42,8 +42,9 @@
</div> </div>
<div class="right-main" v-if="backlogArray.length > 0"> <div class="right-main" v-if="backlogArray.length > 0">
<div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'"> <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
<div>{{ item.projectName }}</div> <div>{{ item.matter }}</div>
<div>审批【知识产权】材料</div> <div>{{ item.enterpriseName }}</div>
<!-- <div>审批【知识产权】材料</div> -->
<div @click="MoreRecords">去审批</div> <div @click="MoreRecords">去审批</div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save