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-05-24 17:07:25 +08:00
parent e3c4456a99 70cd152344
commit af536305ff
10 changed files with 178 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/searchGroup/index.vue
+59 -3
View File
@@ -5,6 +5,7 @@
v-model="checkState"
class="search-group-item"
placeholder="请选择"
@change="checkStateFunc"
>
<el-option
v-for="item in jumpPage"
@@ -14,6 +15,21 @@
></el-option>
</el-select>
<el-select
v-if="showType"
v-model="checkStateType"
class="search-group-itemType"
placeholder="请选择"
@change="checkStateTypeFunc"
>
<el-option
v-for="item in jumpPageType"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
<div class="search-condition">
<el-input
@keyup.native.enter="search"
@@ -37,6 +53,8 @@ export default {
return {
// 当前查询状态
checkState: 'All',
showType: false,
checkStateType: 'titleSearch',
// 查询内容
checkContent: '',
jumpPage: [
@@ -61,17 +79,39 @@ export default {
value: 'enterprise'
}
],
jumpPageType: [
{
label: '标题检索',
value: 'titleSearch'
},
{
label: '全文检索',
value: 'allTextSearch'
},
],
}
},
computed: {},
watch: {},
methods: {
checkStateTypeFunc(data){
this.checkStateType = data
this.$forceUpdate()
},
checkStateFunc(data){
if(data === 'All'){
this.showType = true
}else {
this.showType = false
}
},
search() {
this.$router.push({
name: 'StandardSearch',
params: {
selectKey: this.checkState,
searchValue: this.checkContent || undefined
searchValue: this.checkContent || undefined,
allType: this.checkStateType,
}
})
},
@@ -86,12 +126,28 @@ export default {
},
},
mounted(){
this.checkStateFunc(this.checkState)
},
}
</script>
<style lang="less" scoped>
/deep/ .search-group-itemType {
margin-right: 20px;
border-radius: 5px;
.el-input__inner {
text-align: center;
width: 10vw !important;
height: 40px;
color: #333333;
font-size: 15px;
border: 0;
border-radius: 3px;
background-color: #FFFFFF;
box-shadow:1px -2px 10px rgba(0,0,0,0.1);
}
}
.search-group {
display: flex;
width: 100%;
@@ -103,7 +159,7 @@ export default {
::v-deep {
.el-input__inner {
text-align: center;
width: 18vm;
width: 12vw !important;
height: 40px;
color: #333333;
font-size: 15px;
src/pages/home2/components/todoList/index.vue
+2 -13
View File
@@ -1584,18 +1584,7 @@ export default {
}
break
case '24':
if (row.taskInfo === '标准法规部部长审核') {
this.$router.push({
name: 'qbfzStep2',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '会签') {
if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep3',
query:{
@@ -1617,7 +1606,7 @@ export default {
prcType: row.prcType
}
})
} else if(row.taskInfo === '标准法规部部长审核1') {
} else if(row.taskInfo === '审核') {
this.$router.push({
name: 'qbfzStep5',
query:{
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+19 -14
View File
@@ -138,20 +138,6 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审核" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" readonly placeholder="选择标准法规部部长"
@click.native="choiceZRR('dockUser', '选择标准法规部部长', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="会签" placement="top"
:color="roleForm.countersigner ? '#66b1ff' : ''" >
<el-card>
@@ -166,6 +152,20 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审核" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" readonly placeholder="选择标准法规部部长"
@click.native="choiceZRR('dockUser', '选择标准法规部部长', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审定" placement="top"
:color="roleForm.examine ? '#66b1ff' : ''" >
<el-card>
@@ -596,6 +596,7 @@ export default {
},
//流程保存
handleSave(){
this.isSubmit = true
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
@@ -608,10 +609,12 @@ export default {
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.isSubmit = false
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.isSubmit = false
this.saveLoading = false
})
},
@@ -624,6 +627,7 @@ export default {
if (valid) {
if (this.$route.query.type == '2') {
this.isSubmit = true
this.saveLoading = true
this.standardSearch.commentText = this.commentText
var json = Object.assign( this.roleForm,this.standardSearch)
this.$http.post('lawss/activiti/completeTaskNew', {
@@ -641,6 +645,7 @@ export default {
if (res.success) {
this.$message.success(res.message)
this.isSubmit = false
this.saveLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
})
src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
+4 -1
View File
@@ -354,6 +354,8 @@ export default {
},
//确认转办
checkedRoles (data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -361,7 +363,8 @@ export default {
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
this.isTransfer = false;
this.isSubmit = false;
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+15 -6
View File
@@ -64,6 +64,14 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item">
<el-input
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +133,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="opinion"
align="center"
min-width="80%"
label="会签意见">
</el-table-column>
<el-table-column
prop="people"
align="center"
min-width="20%"
label="会签人">
</el-table-column>
</el-table>
@@ -284,7 +289,8 @@ export default {
releaseDate: "",
implementDate: "",
reviewDate: "",
nextStatus: ""
nextStatus: "",
nextStatusDetils: ""
},
formRules: {
nextStatus: [
@@ -397,6 +403,8 @@ export default {
},
//确认转办
checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -405,6 +413,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+18 -6
View File
@@ -64,6 +64,15 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item form-item-disabled">
<el-input
readonly
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +134,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="opinion"
align="center"
min-width="80%"
label="会签意见">
</el-table-column>
<el-table-column
prop="people"
align="center"
min-width="20%"
label="会签人">
</el-table-column>
</el-table>
@@ -231,8 +237,9 @@
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:isSubmitBack="isSubmit"
:approval="true"
@back="beforeBack"
@over2="beforeBack"
@transfer="handleTransfer"
@submit="handleSubmit"
>
@@ -386,6 +393,7 @@ export default {
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.isTransfer = true;
this.qbfsForm.commentText = this.commentText;
this.qbfsForm.bzFlag = '0'
this.qbfsForm.dataList = this.dataList;
@@ -402,6 +410,7 @@ export default {
this.$router.push("/processCenter");
}
this.isSubmit = false;
this.isTransfer = false;
}, e => {
});
}else{
@@ -424,6 +433,8 @@ export default {
},
//确认转办
checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +443,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+15 -5
View File
@@ -64,6 +64,15 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item form-item-disabled">
<el-input
readonly
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +134,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="opinion"
align="center"
min-width="80%"
label="会签意见">
</el-table-column>
<el-table-column
prop="people"
align="center"
min-width="20%"
label="会签人">
</el-table-column>
</el-table>
@@ -231,6 +237,7 @@
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:isSubmitBack="isSubmit"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@@ -424,6 +431,8 @@ export default {
},
//确认转办
checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +441,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+15 -5
View File
@@ -64,6 +64,15 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item form-item-disabled">
<el-input
readonly
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +134,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="opinion"
align="center"
min-width="80%"
label="会签意见">
</el-table-column>
<el-table-column
prop="people"
align="center"
min-width="20%"
label="会签人">
</el-table-column>
</el-table>
@@ -231,6 +237,7 @@
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:isSubmitBack="isSubmit"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@@ -424,6 +431,8 @@ export default {
},
//确认转办
checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +441,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -22
View File
@@ -2072,27 +2072,7 @@ export default {
}
break
case '24':
if (row.taskInfo === '标准法规部部长审核') {
this.$router.push({
name: 'qbfzStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '重新起草') {
this.$router.push({
name: 'qbfzStep1',
query:{
type: 2,
taskIds: row.taskIds,
prcId: row.prcId
}
})
} else if(row.taskInfo === '会签') {
if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep3',
query:{
@@ -2114,7 +2094,7 @@ export default {
prcType: row.prcType
}
})
} else if(row.taskInfo === '标准法规部部长审核1') {
} else if(row.taskInfo === '审核') {
this.$router.push({
name: 'qbfzStep5',
query:{
src/pages/searchCenter/pages/standardSearch.vue
+29 -1
View File
@@ -35,6 +35,21 @@
<div class="search-condition">
<div class="condition-btn" @click="conditionBtnOpen = !conditionBtnOpen" v-if="showConditionBtn">{{ toggleConditionTips }}</div>
<div class="condition-content">
<div class="condition-item" v-if="selectIndex === 'All'">
<div class="condition-item-title">检索方式</div>
<ul>
<li>
<span :class="{'selected': selectType === 'allTextSearch'}" @click="searchClick('allTextSearch')">
全文检索
</span>
</li>
<li>
<span :class="{'selected': selectType === 'titleSearch'}" @click="searchClick('titleSearch')">
标题检索
</span>
</li>
</ul>
</div>
<div class="condition-item" v-for="(condition, key) of searchOptions" :key="condition.index + key" v-if="condition.index < 5 || conditionBtnOpen">
<div class="condition-item-title">{{ condition.title }}</div>
<ul :class="[key, {'is-close': condition.isClose}]">
@@ -251,7 +266,7 @@
<div v-for="(item,key) in Allitems" :key="key" class="AllBox">
<div class="AllBoxTitle">
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="filterTitle(item.title)" @click="toPage(item)"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
@@ -343,6 +358,7 @@
},
data () {
return {
selectType: '',
externalStatus:'',
itermsConditionsTitle1: '',
itermsConditionsTitle2: '',
@@ -482,6 +498,10 @@
}
},
methods: {
searchClick(type) {
this.selectType = type
this.searchSarByInputKey()
},
optionsFun(items){
if(Object.prototype.toString.call(items) === '[object Object]'){
return items;
@@ -1379,6 +1399,7 @@
}
AllList.selectIndex = 'fulltextserch'
AllList.selectValue = this.keywords
AllList.selectType = this.selectType
AllList.page = this.pageAll
AllList.pageSize = this.$store.getters.userInfo.configContent
this.$http.post('search/searchCenter/searchSarBykey', AllList, {
@@ -1438,6 +1459,7 @@
if(condition.selectValue === undefined){
condition.selectValue = ''
}
condition.selectType = this.selectType
this.$http.post('search/searchCenter/searchSarBykey', condition, {
_this: this,
loading: 'resultLoading'
@@ -2668,6 +2690,12 @@
}
},
mounted () {
let selectType = this.$route.params.allType
if(selectType !== undefined && selectType !== null && selectType !== ''){
this.selectType = selectType
}else {
this.selectType = 'titleSearch'
}
let external = localStorage.getItem("external");
if(external !== undefined && external !== null){
this.externalStatus = external