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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!241
This commit is contained in:
王夏晖
2021-12-22 11:00:16 +08:00
parent 17940776d9 ad001cbf72
commit 54bfe05e76
29 changed files with 139 additions and 121 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 <van-action-sheet
v-model="isShowPhone2" v-model="isShowPhone2"
:title="roleTitle" :title="roleTitle"
v-if="isShowPhone2"
> >
<el-form <el-form
ref="phoneForm" ref="phoneForm"
@@ -32,7 +33,7 @@
:immediate-check="false" :immediate-check="false"
:offset="300" :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-group>
<van-cell <van-cell
v-for="(item, index) in roleList" v-for="(item, index) in roleList"
@@ -42,12 +43,12 @@
@click="toggle(index)" @click="toggle(index)"
> >
<template #right-icon> <template #right-icon>
<van-checkbox :name="item" ref="checkbox"/> <van-checkbox :name="item.usId" ref="checkbox"/>
</template> </template>
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
</van-checkbox-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-group>
<van-cell <van-cell
v-for="(item, index) in roleList" v-for="(item, index) in roleList"
@@ -57,7 +58,7 @@
@click="toggle(index)" @click="toggle(index)"
> >
<template #right-icon> <template #right-icon>
<van-checkbox :name="item" ref="checkbox"/> <van-checkbox :name="item.usId" ref="checkbox"/>
</template> </template>
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
@@ -125,21 +126,18 @@ export default {
}, },
isShowPhone2(val) { isShowPhone2(val) {
this.$emit('update:isShowPhone', val) this.$emit('update:isShowPhone', val)
},
resultList (val) {
this.result = val
},
result() {
this.$emit('resultList', this.result)
} }
}, },
mounted() { mounted() {
this.getPhoneData() this.getPhoneData()
}, },
methods: { methods: {
itemChange (data) {
},
/** 查询 */ /** 查询 */
queryPhone() { queryPhone() {
this.getPhoneData() this.getPhoneData()
this.finished = false
}, },
/** 获取人员数据 */ /** 获取人员数据 */
async getPhoneData() { async getPhoneData() {
@@ -170,22 +168,41 @@ export default {
}, },
roleSumit() { roleSumit() {
this.$emit('checkedRole', this.result) let ids = ''
this.isShowPhone2 = false 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() { roleClear() {
this.result = [] this.result = []
this.isShowPhone2 = false this.isShowPhone2 = false
this.phoneForm.name = ''
this.getPhoneData()
}, },
// 下滑加载数据 // 下滑加载数据
onLoad() { onLoad() {
this.phoneForm.page++
phoneUser(this.phoneForm).then(res => { phoneUser(this.phoneForm).then(res => {
this.roleList = this.roleList.concat(res.data) this.roleList = this.roleList.concat(res.data)
this.total = this.roleList[0].total this.total = this.roleList[0].total
this.loading = false this.loading = false
if (this.roleList.length < this.total) { if (this.roleList.length < this.total) {
this.phoneForm.page ++
this.loading = false this.loading = false
} else { } else {
this.finished = true this.finished = true
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -179,7 +179,7 @@
align="center"> align="center">
<template slot-scope="scope"> <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="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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -474,7 +474,7 @@
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150> <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-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -183,7 +183,7 @@
align="center"> align="center">
<template slot-scope="scope"> <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="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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -483,7 +483,7 @@
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150> <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-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+2 -2
View File
@@ -188,7 +188,7 @@
align="center"> align="center">
<template slot-scope="scope"> <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="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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -357,7 +357,7 @@
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150> <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-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="editForm.technicalRequir"--> <!-- v-model="editForm.technicalRequir"-->
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+1
View File
@@ -177,6 +177,7 @@
<el-table-column <el-table-column
label="操作" label="操作"
width="140" width="140"
v-if="form.itemsNum1"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button> <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>
<el-table-column <el-table-column
label="操作" label="操作"
v-if="form.itemsNum1"
width="140" width="140"
align="center"> align="center">
<template slot-scope="scope"> <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>
<el-table-column <el-table-column
label="操作" label="操作"
v-if="form.itemsNum1"
width="140" width="140"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+1 -1
View File
@@ -245,7 +245,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+27 -23
View File
@@ -198,7 +198,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -212,7 +212,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
@@ -566,28 +566,32 @@ export default {
}, },
//流程驳回 //流程驳回
beforeBack(){ beforeBack(){
this.isSubmit = true if(!this.commentText){
this.wbbzform.signFlag = '0', this.$message.warning('请填写审批意见')
this.wbbzform.passUser = this.$store.getters.userInfo.userId, }else{
this.wbbzform.commentText = this.commentText; this.isSubmit = true
this.wbbzform.participantsData = this.participantsData this.wbbzform.signFlag = '0',
this.wbbzform.associationData = this.associationData this.wbbzform.passUser = this.$store.getters.userInfo.userId,
var json = JSON.stringify( this.wbbzform) this.wbbzform.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { this.wbbzform.participantsData = this.participantsData
taskIds: this.taskIds, this.wbbzform.associationData = this.associationData
userId: this.userId, var json = JSON.stringify( this.wbbzform)
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
this.isSubmit = false this.$message.success(res.message);
}, e => { this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
}); });
}
}, },
}, },
mounted() { mounted() {
src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+27 -23
View File
@@ -198,7 +198,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -212,7 +212,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
@@ -566,28 +566,32 @@ export default {
}, },
//流程驳回 //流程驳回
beforeBack(){ beforeBack(){
this.isSubmit = true if(!this.commentText){
this.wbbzform.bzFlag = '2', this.$message.warning('请填写审批意见')
this.wbbzform.passUser = this.$store.getters.userInfo.userId, }else{
this.wbbzform.commentText = this.commentText; this.isSubmit = true
this.wbbzform.participantsData = this.participantsData this.wbbzform.bzFlag = '2',
this.wbbzform.associationData = this.associationData this.wbbzform.passUser = this.$store.getters.userInfo.userId,
var json = JSON.stringify( this.wbbzform) this.wbbzform.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { this.wbbzform.participantsData = this.participantsData
taskIds: this.taskIds, this.wbbzform.associationData = this.associationData
userId: this.userId, var json = JSON.stringify( this.wbbzform)
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
this.isSubmit = false this.$message.success(res.message);
}, e => { this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
}); });
}
}, },
}, },
mounted() { mounted() {
src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list" style="height: 100%">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
src/pages/processCenter/pages/newProcess/index.vue
+17 -17
View File
@@ -80,7 +80,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="''"> <el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">
<div class="card-box" @click="handleCreateProcess('12')"> <div class="card-box" @click="handleCreateProcess('12')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -125,7 +125,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'"> <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
<div class="card-box" @click="handleCreateProcess('13')"> <div class="card-box" @click="handleCreateProcess('13')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -140,7 +140,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
<div class="card-box" @click="handleCreateProcess('11')"> <div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -155,7 +155,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
<div class="card-box" @click="handleCreateProcess('laws1')"> <div class="card-box" @click="handleCreateProcess('laws1')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -190,7 +190,7 @@
<el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider> <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
<div class="process-box"> <div class="process-box">
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="''"> <el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
<div class="card-box" @click="handleCreateProcess('buss1')"> <div class="card-box" @click="handleCreateProcess('buss1')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -205,7 +205,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
<div class="card-box" @click="handleCreateProcess('23')"> <div class="card-box" @click="handleCreateProcess('23')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -220,7 +220,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'5104360fd3822e73b45e65d2337cf143'">
<div class="card-box" @click="handleCreateProcess('24')"> <div class="card-box" @click="handleCreateProcess('24')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -235,7 +235,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
<div class="card-box" @click="handleCreateProcess('25')"> <div class="card-box" @click="handleCreateProcess('25')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -256,7 +256,7 @@
<el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider> <el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
<div class="process-box"> <div class="process-box">
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'"> <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
<div class="card-box" @click="handleCreateProcess('17')"> <div class="card-box" @click="handleCreateProcess('17')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -271,7 +271,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'"> <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
<div class="card-box" @click="handleCreateProcess('18')"> <div class="card-box" @click="handleCreateProcess('18')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -286,7 +286,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'7845345e5fa2b0a93eb0e021bd3486f1'">
<div class="card-box" @click="handleCreateProcess('20')"> <div class="card-box" @click="handleCreateProcess('20')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -301,7 +301,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'321e497259b08734941a308960da2bae'">
<div class="card-box" @click="handleCreateProcess('21')"> <div class="card-box" @click="handleCreateProcess('21')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -316,7 +316,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'8f65a365dd67634e29925098162ee8d5'">
<div class="card-box" @click="handleCreateProcess('16')"> <div class="card-box" @click="handleCreateProcess('16')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -331,14 +331,14 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'0efd0f4b7a15fd1b687cc0ac36e9e7d9'">
<div class="card-box" @click="handleCreateProcess('15')"> <div class="card-box" @click="handleCreateProcess('14')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))"> <img :src="getImg(Math.floor(Math.random() * 6))">
</div> </div>
<div class="card-top-right"> <div class="card-top-right">
<div class="card-top-right-text">加入标准化协会信息提报流程</div> <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
<div class="card-top-right-line"></div> <div class="card-top-right-line"></div>
</div> </div>
</div> </div>
@@ -346,7 +346,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover" v-btn-permission="'e5217a4776525b1ba63511b730a2e02d'">
<div class="card-box" @click="handleCreateProcess('15')"> <div class="card-box" @click="handleCreateProcess('15')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
src/pages/processCenter/pages/phone/bzdy/step2.vue
+7 -17
View File
@@ -122,23 +122,13 @@
:is-show-phone.sync="drawerModal" :is-show-phone.sync="drawerModal"
@checkedRole="checkedRole" @checkedRole="checkedRole"
/> />
<!-- <Role-tree--> <phone-role
<!-- is-title="转办处理人"--> check-more
<!-- :is-visible.sync="drawerModal"--> role-title="选择责任部门对接人"
<!-- @checkedRole="checkedRole"--> :result-list="nodeList2"
<!-- ></Role-tree>--> :is-show-phone.sync="modalshowflag2"
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" />
></Role-tree>
<!-- <phone-role-->
<!-- role-title="选择责任部门对接人"-->
<!-- :result-list="nodeList2"-->
<!-- :is-show-phone.sync="modalshowflag2"-->
<!-- @checkedRole="checkedRole2"-->
<!-- />-->
</div> </div>
</template> </template>
@@ -233,7 +223,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step4.vue
+1 -1
View File
@@ -284,7 +284,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step6.vue
+1 -1
View File
@@ -261,7 +261,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step7.vue
+1 -1
View File
@@ -186,7 +186,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step8.vue
+1 -1
View File
@@ -186,7 +186,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzdy/step9.vue
+1 -1
View File
@@ -186,7 +186,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step8.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+1 -1
View File
@@ -334,7 +334,7 @@
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+5 -5
View File
@@ -311,7 +311,7 @@ export default {
this.turnLoading = true this.turnLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.taskIds, // 任务id taskId: this.taskIds, // 任务id
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人 userId: this.userId, // 委托人
pId: this.pId // 流程实例 pId: this.pId // 流程实例
}).then(res =>{ }).then(res =>{
@@ -329,12 +329,12 @@ export default {
this.roleRow = data[0] this.roleRow = data[0]
// 选取负责人时的操作 // 选取负责人时的操作
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.userName this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.usId this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else { }else {
this.multipleSelection.forEach(item => { this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.userName item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.usId item.dutyPeopleInfoId = this.roleRow.id
}) })
this.$refs.multipleTable.clearSelection() 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 this.turnLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.taskIds, // 任务id taskId: this.taskIds, // 任务id
assignee: this.phoneRoleList[0].usId, // 被委托人 assignee: this.phoneRoleList[0].id, // 被委托人
userId: this.userId, // 委托人 userId: this.userId, // 委托人
pId: this.pId // 流程实例 pId: this.pId // 流程实例
}).then(res =>{ }).then(res =>{
src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+1 -1
View File
@@ -250,7 +250,7 @@ export default {
this.phoneRoleList = data this.phoneRoleList = data
changeAssigneeNew({ changeAssigneeNew({
taskId: this.taskIds, // 任务id taskId: this.taskIds, // 任务id
assignee: data[0].usId, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人 userId: this.userId, // 委托人
pId: this.pId // 流程实例 pId: this.pId // 流程实例
}).then(res =>{ }).then(res =>{