FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
zhutianqi
2021-12-22 10:14:05 +08:00
parent 4f01901e8f
commit 9547f5a992
20 changed files with 62 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/phoneRole/index.vue
+30 -13
View File
@@ -3,6 +3,7 @@
<van-action-sheet
v-model="isShowPhone2"
:title="roleTitle"
v-if="isShowPhone2"
>
<el-form
ref="phoneForm"
@@ -32,7 +33,7 @@
:immediate-check="false"
:offset="300"
>
<van-checkbox-group v-if="!checkMore" v-model="result" :max="1">
<van-checkbox-group v-if="!checkMore" v-model="result" :max="1" @change="itemChange">
<van-cell-group>
<van-cell
v-for="(item, index) in roleList"
@@ -42,12 +43,12 @@
@click="toggle(index)"
>
<template #right-icon>
<van-checkbox :name="item" ref="checkbox"/>
<van-checkbox :name="item.usId" ref="checkbox"/>
</template>
</van-cell>
</van-cell-group>
</van-checkbox-group>
<van-checkbox-group v-if="checkMore" v-model="result">
<van-checkbox-group v-if="checkMore" v-model="result" @change="itemChange">
<van-cell-group>
<van-cell
v-for="(item, index) in roleList"
@@ -57,7 +58,7 @@
@click="toggle(index)"
>
<template #right-icon>
<van-checkbox :name="item" ref="checkbox"/>
<van-checkbox :name="item.usId" ref="checkbox"/>
</template>
</van-cell>
</van-cell-group>
@@ -125,21 +126,18 @@ export default {
},
isShowPhone2(val) {
this.$emit('update:isShowPhone', val)
},
resultList (val) {
this.result = val
},
result() {
this.$emit('resultList', this.result)
}
},
mounted() {
this.getPhoneData()
},
methods: {
itemChange (data) {
},
/** 查询 */
queryPhone() {
this.getPhoneData()
this.finished = false
},
/** 获取人员数据 */
async getPhoneData() {
@@ -170,22 +168,41 @@ export default {
},
roleSumit() {
this.$emit('checkedRole', this.result)
this.isShowPhone2 = false
let ids = ''
this.result.map(item => {
if (ids.length > 0) {
ids += ','
ids += item
} else {
ids = item
}
})
this.$http.get('SarInstitution/institution/getNextById', {
ids: ids
}, {
_this: this
}, res => {
this.$emit('checkedRole', res)
this.isShowPhone2 = false
this.phoneForm.name = ''
this.getPhoneData()
})
},
roleClear() {
this.result = []
this.isShowPhone2 = false
this.phoneForm.name = ''
this.getPhoneData()
},
// 下滑加载数据
onLoad() {
this.phoneForm.page++
phoneUser(this.phoneForm).then(res => {
this.roleList = this.roleList.concat(res.data)
this.total = this.roleList[0].total
this.loading = false
if (this.roleList.length < this.total) {
this.phoneForm.page ++
this.loading = false
} else {
this.finished = true
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -179,7 +179,7 @@
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
<el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
</template>
</el-table-column>
</el-table>
@@ -474,7 +474,7 @@
size="800px">
<div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
<el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
<el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="plForm.technicalRequir"
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -183,7 +183,7 @@
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
<el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
</template>
</el-table-column>
</el-table>
@@ -483,7 +483,7 @@
size="800px">
<div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
<el-button v-if="PLmodalType === 1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
<el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="plForm.technicalRequir"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+2 -2
View File
@@ -188,7 +188,7 @@
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
<el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
</template>
</el-table-column>
</el-table>
@@ -357,7 +357,7 @@
size="800px">
<div class="demo-drawer-content">
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<el-button style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
<el-button v-if="form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
<!-- <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">-->
<!-- <el-input-->
<!-- v-model="editForm.technicalRequir"-->
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+1
View File
@@ -177,6 +177,7 @@
<el-table-column
label="操作"
width="140"
v-if="form.itemsNum1"
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1
View File
@@ -176,6 +176,7 @@
</el-table-column>
<el-table-column
label="操作"
v-if="form.itemsNum1"
width="140"
align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1
View File
@@ -177,6 +177,7 @@
</el-table-column>
<el-table-column
label="操作"
v-if="form.itemsNum1"
width="140"
align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/phone/bzdy/step2.vue
+7 -17
View File
@@ -122,23 +122,13 @@
:is-show-phone.sync="drawerModal"
@checkedRole="checkedRole"
/>
<!-- <Role-tree-->
<!-- is-title="转办处理人"-->
<!-- :is-visible.sync="drawerModal"-->
<!-- @checkedRole="checkedRole"-->
<!-- ></Role-tree>-->
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag2"
<phone-role
check-more
role-title="选择责任部门对接人"
:result-list="nodeList2"
:is-show-phone.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<!-- <phone-role-->
<!-- role-title="选择责任部门对接人"-->
<!-- :result-list="nodeList2"-->
<!-- :is-show-phone.sync="modalshowflag2"-->
<!-- @checkedRole="checkedRole2"-->
<!-- />-->
/>
</div>
</template>
@@ -233,7 +223,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step4.vue
+1 -1
View File
@@ -284,7 +284,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step6.vue
+1 -1
View File
@@ -261,7 +261,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step7.vue
+1 -1
View File
@@ -186,7 +186,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step8.vue
+1 -1
View File
@@ -186,7 +186,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step9.vue
+1 -1
View File
@@ -186,7 +186,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step8.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
if (res.success) {
src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+5 -5
View File
@@ -311,7 +311,7 @@ export default {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
@@ -329,12 +329,12 @@ export default {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.userName
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.usId
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.userName
item.dutyPeopleInfoId = this.roleRow.usId
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
src/pages/processCenter/pages/phone/wfhxzg/step3.vue
+1 -1
View File
@@ -356,7 +356,7 @@ export default {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: this.phoneRoleList[0].usId, // 被委托人
assignee: this.phoneRoleList[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+1 -1
View File
@@ -250,7 +250,7 @@ export default {
this.phoneRoleList = data
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].usId, // 被委托人
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{