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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!56
This commit is contained in:
高嵩
2023-04-17 19:14:42 +08:00
parent 63bead1613 699e044a2c
commit 8ebb9e5132
7 changed files with 143 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/axios/index.js
+49 -1
View File
@@ -536,5 +536,53 @@ export default {
}).catch(err => {
exeFun.call(this, err)
})
}
},
_getData (url, params, config = {}) {
return new Promise((resolve,reject)=>{
// 参数包含this
let _this = config._this || false
// 参数包含loading
let loading = config.loading || false
if (_this && loading) {
_this[loading] = true
}
_axios.get(api() + url + '?_t=' + new Date().getTime(), { params }).then(res => {
resolve(res.data)
}).catch(err => {
reject(err)
}).finally(()=>{
if (_this && loading) { _this[loading] = false }
})
})
},
_postData (url, param, config = {}) {
return new Promise((resolve,reject) => {
var _formData = formData(param)
// 参数包含this
let _this = config._this || false
// 参数包含loading
let loading = config.loading || false
// 是否显示操作提示
let showTips = config.showTips === undefined ? true : config.showTips
if (_this && loading) { _this[loading] = true }
_axios.post(api() + url + '?' + new Date().getTime(), _formData).then(res => {
if (res.data.ok !== undefined && showTips) {
let type = res.data.ok ? 'success' : 'warning'
if (_this && res.data.message !== '' && res.data.message !== null) {
Message[type](res.data.message)
}
}
resolve(res.data)
}).catch(err => {
reject(err)
}).finally(()=>{
if (_this && loading) { _this[loading] = false }
})
})
},
}
src/pages/details/otherStandardDetails/index.vue
+6 -2
View File
@@ -3577,10 +3577,14 @@ export default {
type: 'warning'
}).then(() => {
if (this.selectedItemList != null && this.selectedItemList.length > 0) {
window.open('/api/lawss/sarStandItems/exportStandardItemExcel?idList=' + this.selectedItemList.join(','))
const ids = this.selectedItemList.reduce((init,item,index,arr)=>{
init.push(item.id)
return init
},[])
window.open('/api/lawss/sarFileSplitItems/exportStandardItemExcel?idList=' + ids.join(','))
this.$message.success('导出成功')
} else if (this.standItemList.length > 0) {
window.open('/api/lawss/sarStandItems/exportStandardItemExcel?standId=' + this.$route.params.id + '&fileType=' + this.fileType)
window.open('/api/lawss/sarFileSplitItems/exportStandardItemExcel?standId=' + this.$route.params.id + '&fileType=' + this.fileType)
} else {
this.$message.warning('暂无可导出的数据')
}
src/pages/home2/components/releaseQA2/index.vue
+25 -16
View File
@@ -124,26 +124,35 @@ export default {
},
methods: {
getDate(){
this.loading = true
// this.loading = true
let form = this.form
form.userId = this.$store.getters.userInfo.account
form.pageSize = this.pageSize
form.page = this.currentPage
return new Promise((resolve,reject)=>{
this.$http.get('lawss/AskQuestions/getAskQuestionsPage', form, {_this: this }, res => {
if(res.data){
const data = res.data
this.data = data.records
this.total = data.total
this.currentPage = data.current
this.pageSize = data.size
}
this.loading = false
resolve(res)
}, e => {
this.loading = false
reject(e)
})
// return new Promise((resolve,reject)=>{
// this.$http.get('lawss/AskQuestions/getAskQuestionsPage', form, {_this: this }, res => {
// if(res.data){
// const data = res.data
// this.data = data.records
// this.total = data.total
// this.currentPage = data.current
// this.pageSize = data.size
// }
// this.loading = false
// resolve(res)
// }, e => {
// this.loading = false
// reject(e)
// })
// })
this.$http._getData('lawss/AskQuestions/getAskQuestionsPage', form, {_this: this, loading: 'loading' }).then(res => {
if(res.data){
const data = res.data
this.data = data.records
this.total = data.total
this.currentPage = data.current
this.pageSize = data.size
}
})
},
onSubmit(){
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+5 -1
View File
@@ -652,6 +652,7 @@
multiple
:action="importExcelUrl"
ref="importfile"
:headers="headers"
name="file"
drag
:on-success="importItemsSuccess"
@@ -805,6 +806,9 @@ export default {
},
data () {
return {
headers:{
token: JSON.parse(localStorage.getItem('userInfo')).token
},
editFlag: '',
splitStatus: this.$route.query.splitStatus,
auditFlag: this.$route.query.auditFlag,
@@ -1462,7 +1466,7 @@ export default {
if (!this.jurisdictionCheck()) {
return
}
window.open('/api/att/attFile/uploadModalFile?fileName=标准拆分导入模板.zip')
window.open('/api/lawss/sarFileSplitItems/exportTemplate')
},
// 导入事件
importItemInfo () {
src/pages/personal/pages/my-questions/index.vue
+19 -12
View File
@@ -828,7 +828,7 @@
<el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
</el-form-item>
<el-form-item label="标准号" class="serch-form-item">
{{ questionForm.standSortShow }} {{questionForm.standNumber }} {{ questionForm.standYear === '' ? '' : '-' }} {{ questionForm.standYear }}
{{ questionForm.standSortShow }} {{questionForm.standNumber }}{{ questionForm.standYear === '' ? '' : '-' }}{{ questionForm.standYear }}
</el-form-item>
<el-form-item label="标准名称" class="serch-form-item">
{{questionForm.standardName}}
@@ -1984,17 +1984,24 @@ export default {
{
_this: this
}, val => {
this.$http.post('lawss/activiti/completeTask',{
taskIds: val.data,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(res.data),
},
{
_this: this
}, res => {
this.submitGetData();
}, e => {
})
// this.$http.post('lawss/activiti/completeTask',{
// taskIds: val.data,
// userId : this.$store.getters.userInfo.userId,
// json: JSON.stringify(res.data),
// },
// {
// _this: this
// }, res => {
// this.submitGetData();
// }, e => {
// })
this.$http._postData('lawss/activiti/completeTask',{
taskIds: val.data,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(res.data),
}).then(res => {
this.submitGetData();
})
}, e => {
})
}, e => {
src/pages/processCenter/pages/phone/bzrk/step2.vue
+32 -22
View File
@@ -151,87 +151,87 @@
<div class="prc-content-border">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('xgd',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item prop="fbgbjbdName" class="add-form-item form-item-disabled">
<span slot="label" title="发布稿（原文）" style="width: 112px">发布稿（原文）</span>
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('fbg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else style="padding-left: 10px" class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item prop="fbgywbdName" class="add-form-item form-item-disabled">
<span slot="label" title="发布稿（译文）" style="width: 112px">发布稿（译文）</span>
<div v-if="fbgywbdFileMap.length>0" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="fbgywbdFileMap.length>0" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('zbjbd',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('ssg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('ca',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('kwj',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('jdwj',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('bpg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" class="paddingLeft">
<span style="" @click="downloadFile('zqyjg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
<div v-else class="paddingLeft">
- -
</div>
</el-form-item>
@@ -1005,8 +1005,14 @@ export default {
/deep/ .el-form-item__label{
width: 112px !important;
}
/deep/ .van-field__label{
width: 112px !important;
}
/deep/ .el-form-item__content{
margin-left: 112px !important;
.wrap,.el-radio-group{
padding-left: 10px;
}
}
/deep/.el-select .el-input .el-select__caret {
font-size: 0;
@@ -1023,8 +1029,12 @@ export default {
min-height: 300px;
padding: 10px;
}
/deep/ .van-field__control{
padding-left: 10px !important;
}
.paddingLeft{
padding-left: 10px;;
}
position: relative;
height: 100%;
src/pages/regulatoryRepository/standQA/index.vue
+7 -2
View File
@@ -103,7 +103,7 @@
<el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
</el-form-item>
<el-form-item label="标准号" class="serch-form-item">
{{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }}
{{ questionForm.standSortShow }} {{questionForm.standNumber }}{{ questionForm.standYear === '' ? '' : '-' }}{{ questionForm.standYear }}
</el-form-item>
<el-form-item label="标准名称" class="serch-form-item">
{{questionForm.standardName}}
@@ -1057,16 +1057,21 @@ export default {
},
//提交问题
queSubmit(){
this.isSubmit = true
// this.isSubmit = true
if(this.standType === 'OTHER'){
this.questionForm.standardId = this.questionForm.pubQue
this.questionForm.standardName = this.questionForm.pubQue
this.questionForm.standardEncdoing = this.questionForm.pubQue
}
if(!this.questionForm.standardId){
this.$message.warning('请选择至少一条标准')
return
}
if(this.questionForm.standardId){
this.questionForm.fileList = this.fileList
this.$refs['queForm'].validate((valid) => {
if(valid){
this.isSubmit = true
this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },
{
_this: this