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:
zhangjun
2022-08-31 09:18:01 +08:00
parent 73b311bd6b 806dd53e32
commit b46e3ecad7
8 changed files with 180 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/File.vue
+33 -21
View File
@@ -366,27 +366,39 @@ export default {
obj.name = file.response.data.oldFileName
obj.response.data = file.response.data
this.showFileList.push(obj)
// this.value += res.data.id + ','
this.$emit('input', this.value ? (this.value + ','+ res.data.id + ',').replaceAll(",,",',') : (this.value+ res.data.id + ',').replaceAll(',,',','))
this.$emit('success')
this.$message({
message: '文件上传成功',
type: 'success'
})
switch (this.config.attrField) {
case 'recordsAttr':
this.$emit('recordsAttrTime', res.data.uploadTime)
break
case 'signAttr':
this.$emit('signAttrTime', res.data.uploadTime)
break
case 'otherAttr':
this.$emit('otherAttrTime', res.data.uploadTime)
break
}
// 国内外标准法规返回文件上传成功状态
this.$emit('fileSuccess', true)
// this.importModalshowflagtemp = false
let attrIds=""
if(this.value != null && this.value !== ''){
let attrArray= this.value.split(',')
// 方法二：filter方法 [推荐写法]
let attrIdsArray = attrArray.filter((s) => {
return s && s.trim(); // 注：IE9(不包含IE9)以下的版本没有trim()方法
});
attrIdsArray.push(res.data.id);
console.log(attrIdsArray)
attrIds = attrIdsArray.join(',')+","
}else{
attrIds =res.data.id+","
}
this.$emit('input', attrIds)
this.$emit('success')
this.$message({
message: '文件上传成功',
type: 'success'
})
switch (this.config.attrField) {
case 'recordsAttr':
this.$emit('recordsAttrTime', res.data.uploadTime)
break
case 'signAttr':
this.$emit('signAttrTime', res.data.uploadTime)
break
case 'otherAttr':
this.$emit('otherAttrTime', res.data.uploadTime)
break
}
// 国内外标准法规返回文件上传成功状态
this.$emit('fileSuccess', true)
// this.importModalshowflagtemp = false
} else {
this.$message({
message: res.message,
src/pages/config/pages/mechanismManage/pages/mechanism.vue
+33 -2
View File
@@ -72,6 +72,9 @@
<el-button size="mini" type="primary" @click="selectEdit" v-btn-permission="'786a941b255a4fe4d13b7e67f100a4e5'">
批量配置岗位
</el-button>
<el-button size="mini" type="primary" @click="selectEditOfOrg" v-btn-permission="'786a941b255a4fe4d13b7e67f100a4e5'">
根据部门批量配置岗位
</el-button>
</el-form-item>
</el-form>
</div>
@@ -186,7 +189,6 @@
<loading :loading="Loading">加载中...</loading>
<pagination :page="page" :total="total" :pageSize="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div>
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
<el-drawer
class="postPage"
:title="drawerTitle"
@@ -236,12 +238,14 @@
class="common-button-primary"
icon="el-icon-check"
type="primary"
:loading="butionLoading"
@click="PostSubmit"
>确定
</el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetFormPost">取消</el-button>
</div>
</el-drawer>
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
</div>
</template>
@@ -284,9 +288,11 @@ export default {
data: [], // table数据
treeLoading: false,
Loading: false,
butionLoading: false,
id: '',
// 批量配置岗位勾选暂存
manageData: [],
configOrgManage:false,
drawerTitle: '配置岗位'
}
},
@@ -301,26 +307,43 @@ export default {
},
resetFormPost() {
this.modalPost = false
this.postList = []
this.page1 = 1
},
PostSubmit() {
this.butionLoading = true
if (this.drawerTitle === '配置岗位') {
this.$http.postData('sarUser/user/position', {
positionIds: this.$refs.tree2.getCheckedKeys(),
userId: this.userId
}, {}, res => {
if (res.ok) {
this.butionLoading = false
this.$message.success('配置岗位成功')
this.modalPost = false
this.getData()
}
})
} else {
} else if(this.configOrgManage){
//批量配置岗位信息
this.$http.postData('sarUser/user/positionBatchByOrgId', {
positionIds: this.$refs.tree2.getCheckedKeys(),
orgId: this.id
}, {}, res => {
if (res.ok) {
this.butionLoading = false
this.$message.success('批量配置岗位成功')
this.modalPost = false
this.getData()
}
})
}else{
this.$http.postData('sarUser/user/positionBatch', {
positionIds: this.$refs.tree2.getCheckedKeys(),
userId: this.userId
}, {}, res => {
if (res.ok) {
this.butionLoading = false
this.$message.success('配置岗位成功')
this.modalPost = false
this.getData()
@@ -539,6 +562,7 @@ export default {
},
selectEdit() {
this.configOrgManage = false
this.getTree2()
if(this.manageData.length){
this.userId = []
@@ -551,6 +575,13 @@ export default {
this.$message.warning('请选择需要批量配置岗位的角色')
}
},
selectEditOfOrg() {
this.configOrgManage = true
this.getTree2()
this.drawerTitle = '批量配置岗位'
this.modalPost = true
},
},
computed: {},
watch: {
src/pages/details/otherStandardDetails/index.vue
+7 -3
View File
@@ -98,11 +98,13 @@
</el-button>
</div>
</template>
<template v-else-if="child.value === null">-</template>
<template v-else-if="child.value === null">
<div style="position: relative;margin-left: 214px; line-height: 32px">-</div>
</template>
</p>
</template>
<!--发布稿（必读）-->
<template v-for="(child, childIndex) in item.child6" v-if="child.value && child.value.length > 0">
<template v-for="(child, childIndex) in item.child6" >
<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" >
@@ -137,7 +139,9 @@
</el-button>
</div>
</template>
<template v-else-if="child.value === null">-</template>
<template v-else-if="child.value === null">
<div style="position: relative;margin-left: 214px; line-height: 32px">-</div>
</template>
</p>
</template>
<!--修订本-->
src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
+32 -10
View File
@@ -147,16 +147,38 @@
}
},
closePage(){
window.opener = null;
window.open("about:blank", "_top").close()
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
this.$refs['formAdd'].validate((valid) => {
if (valid) {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
var form = {
id: id,
oldText: this.opinionContent.oldText,
newText: this.opinionContent.newText,
reason: this.opinionContent.reason,
chapterNumber: this.opinionContent.partCode,
chapterName: this.opinionContent.chapterName,
}
this.$store.commit('SET_REFRESH_FLAG', true)
localStorage.setItem('bzzqyjForm', JSON.stringify(form))
localStorage.setItem('freshClueNum', new Date().getTime())
this.opinionContent.partCode = ''
this.opinionContent.reason = ''
this.opinionContent.oldText = ''
this.opinionContent.newText = ''
this.opinionContent.chapterName = ''
window.opener = null;
window.open("about:blank", "_top").close()
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}
})
}
},
mounted() {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+22 -20
View File
@@ -247,6 +247,27 @@
class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="textStatus"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
<!-- <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
<!-- </el-tooltip>-->
<!-- </template>-->
<template slot-scope="scope">
<span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #35720B">{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
sortable="custom"
@@ -321,26 +342,7 @@
<span v-else>{{ scope.row.dtbzh }}</span>
</template>
</el-table-column>
<el-table-column
prop="textStatus"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
<!-- <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
<!-- </el-tooltip>-->
<!-- </template>-->
<template slot-scope="scope">
<span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span
v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
style="color: #35720B">{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column fixed="right"
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
label="收藏" align="center" width="50px"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+19 -18
View File
@@ -352,6 +352,25 @@
}}</a>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standStatusShow"
label="文本状态"
width="110"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
{{ scope.row.standStatusShow }}
</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #35720B">
{{ scope.row.standStatusShow }}
</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
{{ scope.row.standStatusShow }}
</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="dtqbbhbuss"
@@ -401,25 +420,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standStatusShow"
label="文本状态"
width="110"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
{{ scope.row.standStatusShow }}
</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #35720B">
{{ scope.row.standStatusShow }}
</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
{{ scope.row.standStatusShow }}
</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="reviseStatus"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+23 -22
View File
@@ -265,6 +265,28 @@
}}</a>
</template>
</el-table-column>
<el-table-column
prop="textStatus"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
<!-- <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
<!-- </el-tooltip>-->
<!-- </template>-->
<template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
width="120"
@@ -342,28 +364,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="textStatus"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
<!-- <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
<!-- </el-tooltip>-->
<!-- </template>-->
<template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc')>0" label="收藏" align="center" width="50">
<template slot-scope="scope">
<!-- <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+11 -1
View File
@@ -163,11 +163,13 @@
align="center"
width="100"
label="来源"
v-if="showOther"
>
</el-table-column>
<el-table-column
prop="state"
align="center"
v-if="showOther"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
@@ -177,6 +179,7 @@
prop="cause"
align="center"
label="原因"
v-if="showOther"
width="170"
>
</el-table-column>
@@ -317,7 +320,8 @@ export default {
endTime: ''
}, // 详情数据
ideaKey: false,
refreshTimer: null
refreshTimer: null,
showOther:false
}
},
methods: {
@@ -385,6 +389,12 @@ export default {
_this: this
}, res => {
this.standinfoList = res.data.records
if(this.standinfoList && this.standinfoList.length>0){
const oneData = this.standinfoList[0]
if(oneData.state && oneData != ''){
this.showOther =true
}
}
console.log(res.data.records);
this.total = res.data.total
this.spinShow = false