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:
yuezhihang
2022-07-01 16:14:01 +08:00
parent ec0dbcc0be ce615c034c
commit 8ed1e58bf7
24 changed files with 190 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+2 -1
View File
@@ -308,7 +308,8 @@
}
})
this.$http.get('SarInstitution/institution/getNextById', {
ids: ids
ids: ids,
topNum: 3,
}, {
_this: this
}, res => {
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+44 -1
View File
@@ -63,6 +63,38 @@
- -
</div>
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button
size="small"
@click="updateFile2(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button
size="small"
@click="updateFile2(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<!-- <el-form-item label="批准意见" prop="textpz" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.textpz"-->
@@ -263,7 +295,9 @@
date: '', // 完成时间
hzfileId: '',
hzfileName: '',
textpz: ''
textpz: '',
modelList:[],
fjList: []
},
formRules: {
textpz: [
@@ -285,6 +319,10 @@
const attId = file
this.$preview(attId)
},
clickButtonToUpload(file) {
const attId = file.attId
this.$preview(attId)
},
handleTransfer() {
this.drawerModal = true
},
@@ -331,6 +369,10 @@
updateFile (fileId) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
},
updateFile2 (item) {
let id = item.id
window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
},
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
@@ -428,6 +470,7 @@
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText9 = data.commentText9 || ''
this.form.modelList = data.form ? data.form.modelList : data.modelList
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+2 -2
View File
@@ -321,8 +321,8 @@ export default {
this.formKey++
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+6 -6
View File
@@ -316,12 +316,12 @@ export default {
this.qbfsForm.QCRBUSS=nameList;
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+4 -2
View File
@@ -1868,11 +1868,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
checkedRole (data) {
if (this.type === 0) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+17 -2
View File
@@ -1340,7 +1340,24 @@
}else if(this.userType === 'hqUserId'){
this.roleForm.hqUserId=idList;
this.roleForm.hqUserName=nameList;
}else if(this.userType === 'QCRBUSS'){
this.form.QCRBUSSID=idList;
this.form.QCRBUSS=nameList;
this.formKey++
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
@@ -2459,8 +2476,6 @@
this.form.reviseStatus = 'buss2_'+this.form.standStatus
this.form.textStatusBuss = '6jnqba2mby'
const json = JSON.stringify(this.form);
this.processCreateBuss(json)
return
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+4 -2
View File
@@ -1397,11 +1397,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+4 -2
View File
@@ -1485,11 +1485,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+4 -2
View File
@@ -1398,11 +1398,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+4 -2
View File
@@ -1495,11 +1495,13 @@
}
if(data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+4 -3
View File
@@ -1790,9 +1790,10 @@
this.roleForm.bzUserName = nameList
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
if(data && data.length > 0){
console.log(data)
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+16
View File
@@ -1378,7 +1378,23 @@
}else if(this.userType === 'hqUserId'){
this.roleForm.hqUserId=idList;
this.roleForm.hqUserName=nameList;
}else if(this.userType === 'QCRBUSS'){
this.form.QCRBUSSID=idList;
this.form.QCRBUSS=nameList;
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+2 -2
View File
@@ -1433,8 +1433,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+2 -2
View File
@@ -1768,8 +1768,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+12
View File
@@ -1640,6 +1640,18 @@
this.roleForm.bzUserId = idList
this.roleForm.bzUserName = nameList
}
if(data && data.length > 0){
console.log(data)
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+2 -2
View File
@@ -1421,8 +1421,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+2 -2
View File
@@ -1767,8 +1767,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+4 -4
View File
@@ -856,8 +856,8 @@ export default {
let idList = "", nameList = ""
let unitList = "", unitNameList = ""
data.forEach(item => {
unList.push(item.institutionName)
uidList.push(item.institutionId)
unList.push(item.topUnit)
uidList.push(item.topUnitId)
if (nameList.length) {
nameList += ",";
idList += ",";
@@ -866,8 +866,8 @@ export default {
}
idList += item.id;
nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
unitList += item.topUnit
unitNameList += item.topUnitId
});
let unNameList = []
let unIdList = []
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+2 -2
View File
@@ -717,8 +717,8 @@ export default {
}
idList += item.id;
nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
unitList += item.topUnitId
unitNameList += item.topUnit
});
if(this.roleType === '1'){
this.$set(this.addQblxData, 'drafter', idList)
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+2 -2
View File
@@ -1254,8 +1254,8 @@ export default {
}
idList += item.id;
nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
unitList += item.topUnitId
unitNameList += item.topUnit
});
if(this.roleType === '1'){
this.$set(this.qbfsForm, 'drafter', idList)
src/pages/processCenter/pages/phone/bzdy/step2.vue
+3
View File
@@ -108,6 +108,7 @@
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
import hwh5 from '@/api/hwh5-cloudonline.js'
import axios from "axios";
export default {
@@ -170,6 +171,7 @@
this.drawerModal = false
this.$message.success('调整成功')
this.processNum()
hwh5.close()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
@@ -258,6 +260,7 @@
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
hwh5.close()
this.$router.push('/processCenter')
}
this.isSubmit = false
src/pages/processCenter/pages/phone/bzpg/step6.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="phoneXmpgStep6 phoneBox">
<ProcessHeaderPhone toggle>
<template slot="proName">标准合规评估流程</template>
<template slot="proNode">审核2</template>
<template slot="proNode">审核</template>
</ProcessHeaderPhone>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+2 -2
View File
@@ -1111,8 +1111,8 @@
}
idList += item.id
nameList += item.name
bmIdList += item.institutionId
bmNameList += item.institutionName
bmIdList += item.topUnitId
bmNameList += item.topUnit
})
if (this.type === 'resPerson') {
this.addForm.resPerson = idList
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+45 -13
View File
@@ -197,19 +197,30 @@
width="150"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a>
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)" >
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
</template>
</el-table-column>
<el-table-column
@@ -225,6 +236,9 @@
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
@@ -243,6 +257,9 @@
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
@@ -260,6 +277,9 @@
<div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else style="color: #333333">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
@@ -277,6 +297,9 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.SSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
scope.row.SSRQ
}}</span>
<span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
</template>
@@ -292,6 +315,9 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.XCXSSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
scope.row.XCXSSRQ
}}</span>
<span v-else style="color: #333333">{{
scope.row.XCXSSRQ
}}</span>
@@ -308,6 +334,9 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.ZCCSSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
scope.row.ZCCSSRQ
}}</span>
<span v-else style="color: #333333">{{
scope.row.ZCCSSRQ
}}</span>
@@ -329,6 +358,9 @@
<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: #98E165">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>