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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-08 08:53:09 +08:00
parent 8808629f9e dd58d319d6
commit bbca861b25
28 changed files with 139 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/languages/cn.js
+1
View File
@@ -260,6 +260,7 @@ export const m = {
findByTheResponsibilityDepartment: '根据责任部门查找',
findByNormativeReferenceStandard: '根据规范性引用标准查找',
lookupByStandardStatus: '根据标准状态查找',
lookupByStandardStatusText: '根据文本状态查找',
findByPrincipalCompiler: '根据主要编制者查找',
contentInThisPaper: '内容摘要',
substituteForStandNumber: '代替标准号',
src/components/roleTree/index.vue
+16 -1
View File
@@ -125,6 +125,7 @@
data () {
return {
visible: false,
selectList: [],
nodeList2: [],
delList: [],
roleList: [],
@@ -300,7 +301,21 @@
this.delList = [data]
}
} else { // 多选
this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
if (this.roleList.length === 0) {
this.roleList.push(data)
} else {
let delFlag = true
this.roleList.forEach((item, index) => {
if (item.id === data.id) {
this.roleList.splice(index, 1)
delFlag = false
}
})
if (delFlag) {
this.roleList.push(data)
}
}
// this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
}
},
loadNode(node, resolve) {
src/pages/details/otherStandardDetails/index.vue
+11 -5
View File
@@ -64,15 +64,15 @@
sarStandardsInfoEO.standEnName || '-'
}}</span></p>
<!--发布稿（必读）-->
<template v-for="(child, childIndex) in item.child1">
<div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
<template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
<p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
<label style="float: left">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0">
<!-- 单个文件时-->
<div style="position: relative;margin-left: 214px; line-height: 32px">
<div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
<span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
<a style="font-size: 16px;color: #409EFF;cursor: pointer;"
<a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
<i
@@ -251,7 +251,13 @@
<template v-if="child.value === null">-</template>
</p>
</template>
</div>
</p>
<p class="half" style="margin-left: -48px">
<label style=" margin-right: 150px;"
title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -3907,7 +3913,7 @@ export default {
a {
overflow: hidden;
text-overflow: ellipsis;
width: calc(~'100% - 40px');
max-width: 780px;
white-space: nowrap;
display: block;
}
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+2
View File
@@ -1506,6 +1506,8 @@ export default {
}, res => {
if (res.data) {
this.batchDeleteItem()
} else if(this.selectedList != null && this.selectedList.length > 20){
this.$message.warning('单次最多删除20个条款')
} else {
this.deleteItemsModal = true
}
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+3
View File
@@ -500,7 +500,10 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText2 = data.commentText2 || ''
this.form.endTime = data.endTime || data.form.endTime
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+2
View File
@@ -905,6 +905,8 @@
this.AOLIGEI = data.AOLIGEI
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
if (data.form) {
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2
View File
@@ -486,6 +486,8 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.endTime = data.endTime || data.form.endTime
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText4 = data.commentText4 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+5
View File
@@ -442,6 +442,8 @@
var json = this.json
json.zrApplyFlag = 1
json.commentText = this.commentText5
json.deptUserId = this.form.deptUserId
json.deptUserIdName = this.form.deptUserIdName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -482,9 +484,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.commentText5 = data.commentText5 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+2
View File
@@ -486,6 +486,8 @@
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.commentText6 = data.commentText6 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+2
View File
@@ -378,6 +378,8 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText2 = data.commentText2 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
this.form.startUser = data.form ? data.form.startUser : data.startUser
this.form.cid = data.form ? data.form.cid : data.cid
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+2
View File
@@ -701,6 +701,8 @@
this.submitShow = true
}
this.commentText3 = data.commentText3 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
this.form.textType = data.form ? data.form.textType : data.textType
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+2
View File
@@ -455,6 +455,8 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+2
View File
@@ -440,6 +440,8 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.commentText42 = data.commentText42 || ''
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+2
View File
@@ -703,6 +703,8 @@ export default {
this.submitShow = true
}
this.commentText4 = data.commentText || data.commentText4 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.spId = data.form ? data.form.spId : ''
this.form.spName = data.form ? data.form.spName : ''
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+2
View File
@@ -619,6 +619,8 @@
let data = JSON.parse(res.mesg);
console.log(data);
this.commentText5 = data.commentText5 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
this.form.textType = data.form ? data.form.textType : data.textType
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+2
View File
@@ -530,6 +530,8 @@
}).then(res => {
let data = JSON.parse(res.mesg);
this.commentText6 = data.commentText6 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+2
View File
@@ -491,6 +491,8 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText7 = data.commentText7 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+2
View File
@@ -491,6 +491,8 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText8 = data.commentText8 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+2
View File
@@ -491,6 +491,8 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText9 = data.commentText9 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+25 -23
View File
@@ -283,6 +283,7 @@ export default {
qbfsForm: {},
formLoading: false,
approvalFlag: false,
saveFlag: false,
showFlag: true,
taskIds: '',
bpnId: '',
@@ -333,6 +334,7 @@ export default {
this.taskIds = this.$route.query.taskIds
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.saveFlag = true
this.getData()
}
if(this.taskIds){
@@ -387,6 +389,7 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.toggleType= item.type || item.qbfsForm.type
this.$nextTick(() => {
switch (this.toggleType){
@@ -440,28 +443,7 @@ export default {
},
//流程保存
handleSave() {
if(!this.approvalFlag){
//第一次正常保存
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
qbzxdFrom.type = this.toggleType
this.saveLoading = true
let _formData = new FormData()
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '25')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
}else{
if(this.approvalFlag || this.saveFlag){
//被驳回后的保存
this.saveLoading = true;
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
@@ -484,7 +466,27 @@ export default {
}).catch(e => {
this.saveLoading = false;
});
}else{
//第一次正常保存
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
qbzxdFrom.type = this.toggleType
this.saveLoading = true
let _formData = new FormData()
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '25')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
}
},
//流程提交
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+2 -2
View File
@@ -825,8 +825,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
id: item.id || item.standId,
pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+2 -2
View File
@@ -925,8 +925,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
id: item.id || item.standId,
pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+5 -3
View File
@@ -832,8 +832,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
id: item.id || item.standId,
pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
@@ -919,7 +919,9 @@ export default {
//提交事件
handleSubmit() {
this.dataList.forEach(item => {
this.$set(item, 'standId', item.id)
if(!item.standId){
this.$set(item, 'standId', item.id)
}
})
this.isSubmit = true;
this.qdform.commentText = this.commentText;
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+5 -3
View File
@@ -832,8 +832,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
id: item.id || item.standId,
pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
@@ -919,7 +919,9 @@ export default {
//提交事件
handleSubmit() {
this.dataList.forEach(item => {
this.$set(item, 'standId', item.id)
if(!item.standId){
this.$set(item, 'standId', item.id)
}
})
this.isSubmit = true;
this.qdform.commentText = this.commentText;
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+5 -3
View File
@@ -824,8 +824,8 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
id: item.id || item.standId,
pageType: item.standType + '_STAND'
}
});
window.open(routeUrl.href, "_blank");
@@ -891,7 +891,9 @@ export default {
//提交事件
handleSubmit() {
this.dataList.forEach(item => {
this.$set(item, 'standId', item.id)
if(!item.standId){
this.$set(item, 'standId', item.id)
}
})
this.isSubmit = true;
this.qdform.commentText = this.commentText;
src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+1 -1
View File
@@ -165,7 +165,7 @@
import axios from "axios";
export default {
name: "bzzqyjStep2",
name: "phoneBzzqyjStep2",
data() {
return {
drawerModal: false,
src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+21 -19
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程-->
<ProcessHeaderPhone toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">审批人审批</template>
<template slot="proNode">意见审批</template>
</ProcessHeaderPhone>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -396,26 +396,28 @@
}
})
},
handleSubmitNo() {
if (this.commentText41) {
var json = this.json
json.spFlag = '1'
json.commentText = this.commentText41
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
handleSubmitNo() {
if (this.commentText41) {
this.isSubmit = true
var json = this.json
json.spFlag = '1'
json.commentText = this.commentText41
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
this.isSubmit = false
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+9 -6
View File
@@ -105,7 +105,7 @@
size="mini"
class="common-button-primary"
v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
@click="searchBtnClick(standCommonlySearch)">
@click="searchBtnClick(standCommonlySearch, 1)">
查询
</el-button>
<el-button
@@ -1636,7 +1636,7 @@
</el-form-item>
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')"
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatusText')"
clearable>
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
@@ -3723,9 +3723,9 @@ export default {
this.getDomesticStandardTable(this.standCommonlySearch)
},
// 点击搜索按钮
searchBtnClick(standCommonlySearch) {
searchBtnClick(standCommonlySearch, type) {
let item = this.standCommonlySearch
this.getDomesticStandardTable(item)
this.getDomesticStandardTable(item, type)
},
// 搜索
getDomesticStandardTableBtn(item) {
@@ -3823,7 +3823,7 @@ export default {
// 高级检索
selectMoreBtn() {
this.isAdvancedSearch = true
this.sarStandardsSearch = {}
// this.sarStandardsSearch = {}
},
treeCollapse() {
this.sideClose = !this.sideClose
@@ -4547,7 +4547,7 @@ export default {
// 此处需要调用接口，修改个人配置
},
// 分页查询国内标准
getDomesticStandardTable(item) {
getDomesticStandardTable(item, type) {
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
@@ -4670,6 +4670,9 @@ export default {
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
this.pageChange(1)
}
if (type === 1) {
this.sarStandardsSearch = {}
}
} else {
this.$message.error(res.message)
}