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:
yanyizhou
2021-12-21 14:52:24 +08:00
parent 8575ebaf79 7b5611d1ac
commit aac231d1b8
7 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+4 -4
View File
@@ -348,7 +348,7 @@
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="totalLeader" style="margin-bottom: 0">
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>总院技术委员会主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -749,8 +749,8 @@ export default {
} else {
this.roleForm.dockUser = idList
this.roleForm.dockUserName = nameList
this.rh_pageData.comityInRole = nameList
this.rh_pageData.comityInRoleId = idList
// this.rh_pageData.comityInRole = nameList
// this.rh_pageData.comityInRoleId = idList
}
this.roleShowflag = false
},
@@ -810,7 +810,7 @@ export default {
roleList: this.roleForm,
rh_pageData: this.rh_pageData,
commentText: this.commentText,
directorList: this.rh_pageData.comityInRoleId,
directorList: this.roleForm.dockUser,
}
this.$refs['rh_pageData'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+1 -1
View File
@@ -84,7 +84,7 @@
<template slot="title">拆分信息</template>
</ProcessTitle>
<div class="action-bar">
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
<el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
批量编辑
</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+1 -1
View File
@@ -85,7 +85,7 @@
<template slot="title">拆分信息</template>
</ProcessTitle>
<div class="action-bar">
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
<el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="PLedit">
批量编辑
</el-button>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+1 -1
View File
@@ -66,7 +66,7 @@
<template slot="title">拆分信息</template>
</ProcessTitle>
<div class="action-bar">
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
<el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
</div>
<el-table border
ref="selection"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+1 -1
View File
@@ -66,7 +66,7 @@
<template slot="title">拆分信息</template>
</ProcessTitle>
<div class="action-bar">
<el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
<el-button type="primary" :disabled="acceptShow && !itemList.length" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
</div>
<el-table border
ref="selection"
src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+13 -11
View File
@@ -827,17 +827,19 @@
</el-formItem>
<el-form-item>
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
@click="handleSearchStandard"
round>
size="mini"
style="margin-left: 5px"
@click="handleSearchStandard">
查询
</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
@click="handleResetSearch"
round></el-button>
size="mini"
@click="handleResetSearch">
清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -1664,11 +1666,11 @@
this.standardCheckedList = data
},
handleResetSearch() {
this.standardSearchForm.standType = 'INLAND'
this.standardSearchForm.standNumber = ''
this.standardSearchForm.standSort = ''
this.standardSearchForm.standName = ''
this.standardSearchForm.standEnName = ''
// this.standardSearchForm.standType = 'INLAND'
this.standardSearchForm.lawsNumber = ''
this.standardSearchForm.lawsName = ''
this.standardSearchForm.lawsEnName = ''
this.standardSearchForm.lawsTextState = ''
setTimeout(() => {
this.handleSearchStandard()
}, 100)
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+21 -13
View File
@@ -475,19 +475,27 @@ export default {
}
},
mounted() {
this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
let json = JSON.parse(this.$route.query.item.files)[0]
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
standId: json.standId,
fileType: json.standFileClassify,
pageSize: 9999,
page: 1
}, {}, res => {
if (res.ok) {
this.options = res.data.list
}
}, e => {
})
if (JSON.parse(this.$route.query.item.wkfiles).length) {
this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
} else {
this.fileInfoLists = []
}
if (JSON.parse(this.$route.query.item.files).length) {
let json = JSON.parse(this.$route.query.item.files)[0]
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
standId: json.standId,
fileType: json.standFileClassify,
pageSize: 9999,
page: 1
}, {}, res => {
if (res.ok) {
this.options = res.data.list
}
}, e => {
})
} else {
this.options = []
}
this.getList()
this.getIdeaKey()
this.getFileInfo()