Merge branch 'fix_foton_20240430' into fix_foton_20240619

This commit is contained in:
wxyclub
2024-06-19 15:06:54 +08:00
19 changed files with 81 additions and 41 deletions
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">起草<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">起草<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -1603,6 +1603,7 @@ export default {
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -2120,8 +2121,9 @@ export default {
this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': planId }, {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
if (res.ok) {
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">审定<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">审定<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -536,6 +536,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -985,7 +986,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">批准<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">批准<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -527,6 +527,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -975,7 +976,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">批准<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">批准<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -535,6 +535,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -983,7 +984,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">主起草人培训<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">主起草人培训<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -665,6 +665,7 @@ export default {
};
return {
PlanStandDraftCompleteTime:'',
ReleaseTime: '',
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -1168,7 +1169,8 @@ export default {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">发布<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">发布<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -744,6 +744,7 @@ export default {
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
openModifyFileNameDialog: false,
modifyFile: {
fileName: '',
@@ -1276,7 +1277,8 @@ export default {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">企标编写<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">企标编写<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" v-show="form.fsRejectStatus === 2" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
@@ -661,6 +661,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
nowEsId: '',
pickerOptions: {
shortcuts: [{
@@ -1111,8 +1112,9 @@
this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': planId }, {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
if (res.ok) {
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">企标编写汇总<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">企标编写汇总<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -706,6 +706,7 @@ export default {
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -1198,8 +1199,9 @@ export default {
this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': nowEsId }, {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
if (res.ok) {
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">标准化初审<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">标准化初审<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -538,6 +538,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -983,8 +984,9 @@
this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': nowEsId }, {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
if (res.ok) {
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">征求意见<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">征求意见<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
@@ -850,6 +850,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -1342,7 +1343,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">技术委员会评审评审意见修改<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">技术委员会评审评审意见修改<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
@@ -954,6 +954,8 @@ export default {
callback()
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -1472,7 +1474,8 @@ export default {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">标准化复审<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">标准化复审<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
@@ -683,6 +683,7 @@
};
return {
PlanStandDraftCompleteTime:'',
ReleaseTime:'',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -1140,7 +1141,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">审核<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">审核<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -549,6 +549,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -1009,7 +1010,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">审核<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">审核<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
@@ -668,6 +668,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -1129,7 +1130,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">重新起草<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">重新起草<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
@@ -772,6 +772,7 @@ export default {
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -1276,7 +1277,8 @@ export default {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">重新企标编写汇总<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">重新企标编写汇总<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -703,6 +703,7 @@ export default {
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -1196,7 +1197,8 @@ export default {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -3,7 +3,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">重新技术委员会评审评审意见修改<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">重新技术委员会评审评审意见修改<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
@@ -950,6 +950,7 @@ export default {
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [ {
text: '最近一周',
@@ -1468,7 +1469,8 @@ export default {
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">发布<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}</span></template>
<template slot="proNode">发布<span v-if="form.reviseStatus!== '3' && PlanStandDraftCompleteTime">-计划标准初稿完成时:{{PlanStandDraftCompleteTime}}-计划标准发布时间:{{ReleaseTime}}</span></template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -474,6 +474,7 @@
};
return {
PlanStandDraftCompleteTime: '',
ReleaseTime: '',
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -912,7 +913,8 @@
_this: this
}, res => {
if (res.ok){
this.PlanStandDraftCompleteTime = res.data
this.PlanStandDraftCompleteTime = res.data.draftTime
this.ReleaseTime = res.data.releaseTime
}
})
},
@@ -2117,6 +2117,7 @@ export default {
props: {},
data () {
return {
advancedSearchOrNot: false, //
editCheckd:[],
rootNode: '', //
systemCategoryId: [], // Id
@@ -5245,6 +5246,7 @@ export default {
},
//
getBussionStandTableBtn (item, advancedSearch, type) {
this.advancedSearchOrNot = type === 'sel'
item.page = 1
this.tableFlag = item
// item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
@@ -5253,6 +5255,7 @@ export default {
},
//
clearAllSearch (flag) {
this.advancedSearchOrNot = false
if (flag === 'sarBussionessSearch') {
console.log('1');
//
@@ -5406,7 +5409,7 @@ export default {
formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder
formData.userId = this.$store.getters.userInfo.userId
if (type === 'sel') {
if (type === 'sel' || this.advancedSearchOrNot) {
const advanceSearchVOList = [];
if (this.formFieldListData !== undefined && this.formFieldListData !== null) {
const formFieldList = this.formFieldListData