Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -308,7 +308,8 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.$http.get('SarInstitution/institution/getNextById', {
|
this.$http.get('SarInstitution/institution/getNextById', {
|
||||||
ids: ids
|
ids: ids,
|
||||||
|
topNum: 3,
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
|
|||||||
@@ -63,6 +63,38 @@
|
|||||||
- -
|
- -
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</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-form-item label="批准意见" prop="textpz" class="add-form-item form-item-disabled">-->
|
||||||
<!-- <el-input-->
|
<!-- <el-input-->
|
||||||
<!-- v-model="form.textpz"-->
|
<!-- v-model="form.textpz"-->
|
||||||
@@ -263,7 +295,9 @@
|
|||||||
date: '', // 完成时间
|
date: '', // 完成时间
|
||||||
hzfileId: '',
|
hzfileId: '',
|
||||||
hzfileName: '',
|
hzfileName: '',
|
||||||
textpz: ''
|
textpz: '',
|
||||||
|
modelList:[],
|
||||||
|
fjList: []
|
||||||
},
|
},
|
||||||
formRules: {
|
formRules: {
|
||||||
textpz: [
|
textpz: [
|
||||||
@@ -285,6 +319,10 @@
|
|||||||
const attId = file
|
const attId = file
|
||||||
this.$preview(attId)
|
this.$preview(attId)
|
||||||
},
|
},
|
||||||
|
clickButtonToUpload(file) {
|
||||||
|
const attId = file.attId
|
||||||
|
this.$preview(attId)
|
||||||
|
},
|
||||||
handleTransfer() {
|
handleTransfer() {
|
||||||
this.drawerModal = true
|
this.drawerModal = true
|
||||||
},
|
},
|
||||||
@@ -331,6 +369,10 @@
|
|||||||
updateFile (fileId) {
|
updateFile (fileId) {
|
||||||
window.location.href = '/api/att/attFile/downloadFile?fileId=' + 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) {
|
beginImportFile (file) {
|
||||||
var filename = file.name
|
var filename = file.name
|
||||||
@@ -428,6 +470,7 @@
|
|||||||
this.form.hzfileId = data.hzfileId || data.form.hzfileId
|
this.form.hzfileId = data.hzfileId || data.form.hzfileId
|
||||||
this.form.hzfileName = data.hzfileName || data.form.hzfileName
|
this.form.hzfileName = data.hzfileName || data.form.hzfileName
|
||||||
this.commentText9 = data.commentText9 || ''
|
this.commentText9 = data.commentText9 || ''
|
||||||
|
this.form.modelList = data.form ? data.form.modelList : data.modelList
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -321,8 +321,8 @@ export default {
|
|||||||
this.formKey++
|
this.formKey++
|
||||||
}
|
}
|
||||||
if(data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.qbfsForm.QCDWID = institutionIdList
|
this.qbfsForm.QCDWID = institutionIdList
|
||||||
this.qbfsForm.QCDW = institutionNameList
|
this.qbfsForm.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -316,12 +316,12 @@ export default {
|
|||||||
this.qbfsForm.QCRBUSS=nameList;
|
this.qbfsForm.QCRBUSS=nameList;
|
||||||
this.formKey++
|
this.formKey++
|
||||||
}
|
}
|
||||||
if(data !== undefined && data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.qbfsForm.QCDWID = institutionIdList
|
this.qbfsForm.QCDWID = institutionIdList
|
||||||
this.qbfsForm.QCDW = institutionNameList
|
this.qbfsForm.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|
||||||
this.modalShowRoleFlag = false
|
this.modalShowRoleFlag = false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1868,11 +1868,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.modalShowRoleFlag = false
|
||||||
},
|
},
|
||||||
checkedRole (data) {
|
checkedRole (data) {
|
||||||
if (this.type === 0) {
|
if (this.type === 0) {
|
||||||
|
|||||||
@@ -1340,7 +1340,24 @@
|
|||||||
}else if(this.userType === 'hqUserId'){
|
}else if(this.userType === 'hqUserId'){
|
||||||
this.roleForm.hqUserId=idList;
|
this.roleForm.hqUserId=idList;
|
||||||
this.roleForm.hqUserName=nameList;
|
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) {
|
checkedRole (data) {
|
||||||
if (this.type === 0) {
|
if (this.type === 0) {
|
||||||
@@ -2459,8 +2476,6 @@
|
|||||||
this.form.reviseStatus = 'buss2_'+this.form.standStatus
|
this.form.reviseStatus = 'buss2_'+this.form.standStatus
|
||||||
this.form.textStatusBuss = '6jnqba2mby'
|
this.form.textStatusBuss = '6jnqba2mby'
|
||||||
const json = JSON.stringify(this.form);
|
const json = JSON.stringify(this.form);
|
||||||
this.processCreateBuss(json)
|
|
||||||
return
|
|
||||||
this.$http.post('lawss/activiti/completeTask', {
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
taskIds: this.taskIds,
|
taskIds: this.taskIds,
|
||||||
userId : this.userId,
|
userId : this.userId,
|
||||||
|
|||||||
@@ -1397,11 +1397,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.modalShowRoleFlag = false
|
||||||
},
|
},
|
||||||
unique(newArr) {
|
unique(newArr) {
|
||||||
const res = new Map();
|
const res = new Map();
|
||||||
|
|||||||
@@ -1485,11 +1485,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.modalShowRoleFlag = false
|
||||||
},
|
},
|
||||||
unique(newArr) {
|
unique(newArr) {
|
||||||
const res = new Map();
|
const res = new Map();
|
||||||
|
|||||||
@@ -1398,11 +1398,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.modalShowRoleFlag = false
|
||||||
},
|
},
|
||||||
unique(newArr) {
|
unique(newArr) {
|
||||||
const res = new Map();
|
const res = new Map();
|
||||||
|
|||||||
@@ -1495,11 +1495,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.modalShowRoleFlag = false
|
||||||
},
|
},
|
||||||
unique(newArr) {
|
unique(newArr) {
|
||||||
const res = new Map();
|
const res = new Map();
|
||||||
|
|||||||
@@ -1790,9 +1790,10 @@
|
|||||||
this.roleForm.bzUserName = nameList
|
this.roleForm.bzUserName = nameList
|
||||||
}
|
}
|
||||||
|
|
||||||
if(data !== undefined && data && data.length > 0){
|
if(data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
console.log(data)
|
||||||
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.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1378,7 +1378,23 @@
|
|||||||
}else if(this.userType === 'hqUserId'){
|
}else if(this.userType === 'hqUserId'){
|
||||||
this.roleForm.hqUserId=idList;
|
this.roleForm.hqUserId=idList;
|
||||||
this.roleForm.hqUserName=nameList;
|
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) {
|
checkedRole (data) {
|
||||||
if (this.type === 0) {
|
if (this.type === 0) {
|
||||||
|
|||||||
@@ -1433,8 +1433,8 @@
|
|||||||
this.formKey++
|
this.formKey++
|
||||||
}
|
}
|
||||||
if(data !== undefined && data && data.length > 0){
|
if(data !== undefined && data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1768,8 +1768,8 @@
|
|||||||
this.formKey++
|
this.formKey++
|
||||||
}
|
}
|
||||||
if(data !== undefined && data && data.length > 0){
|
if(data !== undefined && data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1640,6 +1640,18 @@
|
|||||||
this.roleForm.bzUserId = idList
|
this.roleForm.bzUserId = idList
|
||||||
this.roleForm.bzUserName = nameList
|
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) {
|
checkedRole (data) {
|
||||||
if (this.type === 0) {
|
if (this.type === 0) {
|
||||||
|
|||||||
@@ -1421,8 +1421,8 @@
|
|||||||
this.formKey++
|
this.formKey++
|
||||||
}
|
}
|
||||||
if(data !== undefined && data && data.length > 0){
|
if(data !== undefined && data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1767,8 +1767,8 @@
|
|||||||
this.formKey++
|
this.formKey++
|
||||||
}
|
}
|
||||||
if(data !== undefined && data && data.length > 0){
|
if(data !== undefined && data && data.length > 0){
|
||||||
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
|
const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
|
||||||
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
|
const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
|
||||||
this.form.QCDWID = institutionIdList
|
this.form.QCDWID = institutionIdList
|
||||||
this.form.QCDW = institutionNameList
|
this.form.QCDW = institutionNameList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -856,8 +856,8 @@ export default {
|
|||||||
let idList = "", nameList = ""
|
let idList = "", nameList = ""
|
||||||
let unitList = "", unitNameList = ""
|
let unitList = "", unitNameList = ""
|
||||||
data.forEach(item => {
|
data.forEach(item => {
|
||||||
unList.push(item.institutionName)
|
unList.push(item.topUnit)
|
||||||
uidList.push(item.institutionId)
|
uidList.push(item.topUnitId)
|
||||||
if (nameList.length) {
|
if (nameList.length) {
|
||||||
nameList += ",";
|
nameList += ",";
|
||||||
idList += ",";
|
idList += ",";
|
||||||
@@ -866,8 +866,8 @@ export default {
|
|||||||
}
|
}
|
||||||
idList += item.id;
|
idList += item.id;
|
||||||
nameList += item.name;
|
nameList += item.name;
|
||||||
unitList += item.institutionId
|
unitList += item.topUnit
|
||||||
unitNameList += item.institutionName
|
unitNameList += item.topUnitId
|
||||||
});
|
});
|
||||||
let unNameList = []
|
let unNameList = []
|
||||||
let unIdList = []
|
let unIdList = []
|
||||||
|
|||||||
@@ -717,8 +717,8 @@ export default {
|
|||||||
}
|
}
|
||||||
idList += item.id;
|
idList += item.id;
|
||||||
nameList += item.name;
|
nameList += item.name;
|
||||||
unitList += item.institutionId
|
unitList += item.topUnitId
|
||||||
unitNameList += item.institutionName
|
unitNameList += item.topUnit
|
||||||
});
|
});
|
||||||
if(this.roleType === '1'){
|
if(this.roleType === '1'){
|
||||||
this.$set(this.addQblxData, 'drafter', idList)
|
this.$set(this.addQblxData, 'drafter', idList)
|
||||||
|
|||||||
@@ -1254,8 +1254,8 @@ export default {
|
|||||||
}
|
}
|
||||||
idList += item.id;
|
idList += item.id;
|
||||||
nameList += item.name;
|
nameList += item.name;
|
||||||
unitList += item.institutionId
|
unitList += item.topUnitId
|
||||||
unitNameList += item.institutionName
|
unitNameList += item.topUnit
|
||||||
});
|
});
|
||||||
if(this.roleType === '1'){
|
if(this.roleType === '1'){
|
||||||
this.$set(this.qbfsForm, 'drafter', idList)
|
this.$set(this.qbfsForm, 'drafter', idList)
|
||||||
|
|||||||
@@ -108,6 +108,7 @@
|
|||||||
import ProcessFooter from '../../components/ProcessFooter'
|
import ProcessFooter from '../../components/ProcessFooter'
|
||||||
import ProcessTitle from '../../components/ProcessTitle'
|
import ProcessTitle from '../../components/ProcessTitle'
|
||||||
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
|
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
|
||||||
|
import hwh5 from '@/api/hwh5-cloudonline.js'
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -170,6 +171,7 @@
|
|||||||
this.drawerModal = false
|
this.drawerModal = false
|
||||||
this.$message.success('调整成功')
|
this.$message.success('调整成功')
|
||||||
this.processNum()
|
this.processNum()
|
||||||
|
hwh5.close()
|
||||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning(res.message)
|
this.$message.warning(res.message)
|
||||||
@@ -258,6 +260,7 @@
|
|||||||
}, {}, res => {
|
}, {}, res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$message.success('提交成功')
|
this.$message.success('提交成功')
|
||||||
|
hwh5.close()
|
||||||
this.$router.push('/processCenter')
|
this.$router.push('/processCenter')
|
||||||
}
|
}
|
||||||
this.isSubmit = false
|
this.isSubmit = false
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div class="phoneXmpgStep6 phoneBox">
|
<div class="phoneXmpgStep6 phoneBox">
|
||||||
<ProcessHeaderPhone toggle>
|
<ProcessHeaderPhone toggle>
|
||||||
<template slot="proName">标准合规评估流程</template>
|
<template slot="proName">标准合规评估流程</template>
|
||||||
<template slot="proNode">审核2</template>
|
<template slot="proNode">审核</template>
|
||||||
</ProcessHeaderPhone>
|
</ProcessHeaderPhone>
|
||||||
<div class="headerTabs">
|
<div class="headerTabs">
|
||||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||||
|
|||||||
@@ -1111,8 +1111,8 @@
|
|||||||
}
|
}
|
||||||
idList += item.id
|
idList += item.id
|
||||||
nameList += item.name
|
nameList += item.name
|
||||||
bmIdList += item.institutionId
|
bmIdList += item.topUnitId
|
||||||
bmNameList += item.institutionName
|
bmNameList += item.topUnit
|
||||||
})
|
})
|
||||||
if (this.type === 'resPerson') {
|
if (this.type === 'resPerson') {
|
||||||
this.addForm.resPerson = idList
|
this.addForm.resPerson = idList
|
||||||
|
|||||||
@@ -197,19 +197,30 @@
|
|||||||
width="150"
|
width="150"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<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)">{{
|
<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.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
|
||||||
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
|
</a>
|
||||||
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
|
<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.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
|
||||||
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
|
</a>
|
||||||
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
|
<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.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
|
||||||
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
|
</a>
|
||||||
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
|
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
|
||||||
scope.row.standSortShow
|
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
|
||||||
}}
|
</a>
|
||||||
{{ scope.row.standNumber }}</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>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<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">{{
|
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||||
scope.row.standName
|
scope.row.standName
|
||||||
}}</a>
|
}}</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">{{
|
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||||
scope.row.standName
|
scope.row.standName
|
||||||
}}</a>
|
}}</a>
|
||||||
@@ -243,6 +257,9 @@
|
|||||||
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
|
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||||
scope.row.standEnName
|
scope.row.standEnName
|
||||||
}}</a>
|
}}</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">{{
|
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||||
scope.row.standEnName
|
scope.row.standEnName
|
||||||
}}</a>
|
}}</a>
|
||||||
@@ -260,6 +277,9 @@
|
|||||||
<div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
|
<div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
|
||||||
{{ formatIssueDate(scope.row.issueTime) }}
|
{{ formatIssueDate(scope.row.issueTime) }}
|
||||||
</div>
|
</div>
|
||||||
|
<div v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">
|
||||||
|
{{ formatIssueDate(scope.row.issueTime) }}
|
||||||
|
</div>
|
||||||
<div v-else style="color: #333333">
|
<div v-else style="color: #333333">
|
||||||
{{ formatIssueDate(scope.row.issueTime) }}
|
{{ formatIssueDate(scope.row.issueTime) }}
|
||||||
</div>
|
</div>
|
||||||
@@ -277,6 +297,9 @@
|
|||||||
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
||||||
scope.row.SSRQ
|
scope.row.SSRQ
|
||||||
}}</span>
|
}}</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>
|
<span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
@@ -292,6 +315,9 @@
|
|||||||
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
||||||
scope.row.XCXSSRQ
|
scope.row.XCXSSRQ
|
||||||
}}</span>
|
}}</span>
|
||||||
|
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
|
||||||
|
scope.row.XCXSSRQ
|
||||||
|
}}</span>
|
||||||
<span v-else style="color: #333333">{{
|
<span v-else style="color: #333333">{{
|
||||||
scope.row.XCXSSRQ
|
scope.row.XCXSSRQ
|
||||||
}}</span>
|
}}</span>
|
||||||
@@ -308,6 +334,9 @@
|
|||||||
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
||||||
scope.row.ZCCSSRQ
|
scope.row.ZCCSSRQ
|
||||||
}}</span>
|
}}</span>
|
||||||
|
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
|
||||||
|
scope.row.ZCCSSRQ
|
||||||
|
}}</span>
|
||||||
<span v-else style="color: #333333">{{
|
<span v-else style="color: #333333">{{
|
||||||
scope.row.ZCCSSRQ
|
scope.row.ZCCSSRQ
|
||||||
}}</span>
|
}}</span>
|
||||||
@@ -329,6 +358,9 @@
|
|||||||
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
|
||||||
textStatusMap[scope.row.textStatus]
|
textStatusMap[scope.row.textStatus]
|
||||||
}}</span>
|
}}</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>
|
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
Reference in New Issue
Block a user