FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-09 16:07:00 +08:00
parent ef0242e7b6 52c5ecae01
commit 501708f03e
14 changed files with 144 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+2 -2
View File
@@ -135,11 +135,11 @@ export default {
// // // title: '本地产品/项目库', // // // title: '本地产品/项目库',
// // // path: '/localProductsOrProjectLibrary' // // // path: '/localProductsOrProjectLibrary'
// // // }, // // // },
{ /*{
title: '企业标准库', title: '企业标准库',
path: '/enterpriseStandardDatabase', path: '/enterpriseStandardDatabase',
menuId: '01ed8f752748227777b3572d56ee9ab5' menuId: '01ed8f752748227777b3572d56ee9ab5'
}, },*/
// { // {
// title: '企标制修订计划', // title: '企标制修订计划',
// path: '/enterBSysRevPlanManaLib', // path: '/enterBSysRevPlanManaLib',
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+24 -7
View File
@@ -135,6 +135,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -155,7 +156,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default { export default {
name: "bzdyStep2", name: "bzdyStep2",
@@ -229,7 +230,21 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => { this.$refs['qbkwForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -261,11 +276,13 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.form.model = data.model this.form.model = data.model || data.form.model
this.form.modelName = data.modelName this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+26 -9
View File
@@ -147,6 +147,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -180,7 +181,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default { export default {
name: "bzdyStep3", name: "bzdyStep3",
@@ -273,7 +274,21 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => { this.$refs['qbkwForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -305,13 +320,15 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.form.model = data.model this.form.model = data.model || data.form.model
this.form.modelName = data.modelName this.form.modelName = data.modelName || data.form.modelName
this.form.fileName = data.fileName || '' this.form.responUserList = data.form.responUserList
this.form.fileId = data.fileId || '' this.form.responUserListName = data.form.responUserListName
this.form.fileName = data.form.fileName || data.fileName || ''
this.form.fileId = data.form.fileId || data.fileId || ''
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+8 -7
View File
@@ -252,13 +252,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title console.log(data);
this.form.date = data.date this.form.title = data.title || data.form.title
this.json = data this.form.date = data.date || data.form.date
this.form.file = data.fileId this.json = data || data.form
this.form.fileName = data.fileName this.form.file = data.fileId || data.form.fileId
this.form.model = data.model this.form.fileName = data.fileName || data.form.fileName
this.form.modelName = data.modelName this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+22 -7
View File
@@ -174,6 +174,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -297,7 +298,21 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => { this.$refs['qbkwForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -327,12 +342,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
-1
View File
@@ -321,7 +321,6 @@
this.active = name this.active = name
}, },
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+3
View File
@@ -282,6 +282,7 @@ export default {
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
standType: '', standType: '',
standId: '',
}, },
formRules: { formRules: {
cid: [ cid: [
@@ -299,6 +300,7 @@ export default {
standSort: '', standSort: '',
standNumber: '', standNumber: '',
standType: '', standType: '',
standId: '',
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent pageSize: this.$store.getters.userInfo.configContent
}, },
@@ -456,6 +458,7 @@ export default {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
} }
this.form.standType = bringData[0].standType this.form.standType = bringData[0].standType
this.form.standId = bringData[0].id
this.form.cname = bringData[0].standName; this.form.cname = bringData[0].standName;
this.listModel = false; this.listModel = false;
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+9 -3
View File
@@ -190,12 +190,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="XCXSSRQ" prop="SSRQ"
sortable="putTime" sortable="custom"
width="150px" width="150px"
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatIssueDate(scope.row.putTime) }} <!-- {{ formatIssueDate(scope.row.putTime) }}-->
<span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -3509,6 +3511,10 @@ export default {
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
} }
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
console.log(res.data.list[i].SSRQ);
}
} }
this.stahndinfoList = res.data.list this.stahndinfoList = res.data.list
this.total = res.data.count this.total = res.data.count
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+2 -1
View File
@@ -30,7 +30,7 @@
<el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col> <el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
</el-row> </el-row>
<el-row style="margin-top: 10px"> <el-row style="margin-top: 10px">
<el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col> <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="1"> 项目计划开始时间: <span <el-col :span="5" :push="1"> 项目计划开始时间: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col> class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="5" :push="2">项目计划完成时间: <span <el-col :span="5" :push="2">项目计划完成时间: <span
@@ -599,6 +599,7 @@ export default {
showLocalProductData(item) { showLocalProductData(item) {
console.log(item) console.log(item)
this.localProEO = JSON.parse(JSON.stringify(item)) this.localProEO = JSON.parse(JSON.stringify(item))
console.log(this.localProEO)
this.proId = this.localProEO.id this.proId = this.localProEO.id
// 查询详情表格数据 // 查询详情表格数据
this.$http.get('sarStandProjectLibrary/queryStandInfo', { this.$http.get('sarStandProjectLibrary/queryStandInfo', {
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+24 -19
View File
@@ -11,19 +11,27 @@
<div v-show="heightShow" class="transition-box"> <div v-show="heightShow" class="transition-box">
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准号：</label> <label class="transition-box-label">标准号：</label>
<span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span> <span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cid }}
</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准名称：</label> <label class="transition-box-label">标准名称：</label>
<span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span> <span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cname || '-' }}
</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">上传时间：</label> <label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span> <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label> <label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span> <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span" v-else>-</span> <span class="transition-box-span" v-else>-</span>
</p> </p>
</div> </div>
@@ -120,6 +128,7 @@
name: 'consultationDetails', name: 'consultationDetails',
data () { data () {
return { return {
itemData: this.$route.query.item,
id: '', // 选中id id: '', // 选中id
type: '', // 选中状态 type: '', // 选中状态
spinShow: false, spinShow: false,
@@ -152,6 +161,17 @@
} }
}, },
methods: { methods: {
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
exportAll () { exportAll () {
window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid) window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
}, },
@@ -166,21 +186,6 @@
} }
}) })
}, },
//点击查看
handlePreview(data) {
console.log(data);
return
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: data.id,
pageType: data.standType
}
});
window.open(routeUrl.href, "_blank");
},
// 获取详情信息列表 // 获取详情信息列表
getList() { getList() {
this.spinShow = true this.spinShow = true