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
2021-12-22 15:20:53 +08:00
parent f78853d4c5 910cfcea02
commit 9b03a8b05c
30 changed files with 185 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/phoneRole/index.vue
+26 -11
View File
@@ -3,6 +3,7 @@
<van-action-sheet
v-model="isShowPhone2"
:title="roleTitle"
v-if="isShowPhone2"
>
<el-form
ref="phoneForm"
@@ -42,7 +43,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>
@@ -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,12 +126,6 @@ export default {
},
isShowPhone2(val) {
this.$emit('update:isShowPhone', val)
},
resultList (val) {
this.result = val
},
result() {
this.$emit('resultList', this.result)
}
},
mounted() {
@@ -140,6 +135,7 @@ export default {
/** 查询 */
queryPhone() {
this.getPhoneData()
this.finished = false
},
/** 获取人员数据 */
async getPhoneData() {
@@ -170,22 +166,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/localTool/standAutoSplit/index.vue
+1 -1
View File
@@ -963,7 +963,7 @@ export default {
_this: this
}, res => {
this.addSpiltStandList = res.data.list
this.addFileStandtotal = res.data.list.length
this.addFileStandtotal = res.data.count
this.loadData = false
}, e => {
this.loadData = false
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+4 -4
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"
@@ -535,8 +535,8 @@
size="1100px">
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+4 -4
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"
@@ -544,8 +544,8 @@
size="1100px">
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+4 -4
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"-->
@@ -432,8 +432,8 @@
size="1100px">
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+3 -2
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>
@@ -285,8 +286,8 @@
size="1100px">
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+3 -2
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">
@@ -290,8 +291,8 @@
size="1100px">
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading>
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+3 -2
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">
@@ -289,8 +290,8 @@
size="1100px">
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
<div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading>
src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+14 -10
View File
@@ -155,21 +155,21 @@
align="center">
</el-table-column>
<el-table-column
prop="account"
prop="accounts"
label="账户"
width="300"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.account" placeholder="请输入账户"></el-input>
<el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
</template>
</el-table-column>
<el-table-column
prop="password"
prop="passwords"
label="密码"
width="300"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.password" placeholder="请输入密码"></el-input>
<el-input v-model="scope.row.passwords" placeholder="请输入密码"></el-input>
</template>
</el-table-column>
</el-table>
@@ -245,7 +245,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
@@ -382,8 +382,8 @@ export default {
institutionName: '', //所在部门
email: '', //联系方式
tenure:'', //任期
account:'', //账户
password:'', //密码
accounts:'', //账户
passwords:'', //密码
}],
associationData: [{
contactPerson: '', //协议联络人
@@ -567,13 +567,17 @@ export default {
//流程提交
handleSubmit() {
this.isSubmit = true
this.wbbzform.dlFlag = '1',
this.wbbzform.dlFlag = '1'
this.wbbzform.comityOptionsOne = this.comityOptionsOne
this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
this.wbbzform.fileName = this.fileInfoList
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.passUser = this.$store.getters.userInfo.userId
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
let json = JSON.stringify( this.wbbzform)
console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+47 -27
View File
@@ -130,6 +130,7 @@
<el-table-column
prop="duties"
label="职务"
width="180"
align="center">
</el-table-column>
<el-table-column
@@ -146,17 +147,18 @@
</el-table-column>
<el-table-column
prop="tenure"
width="200"
label="任期"
align="center">
</el-table-column>
<el-table-column
prop="account"
prop="accounts"
label="账户"
width="200"
align="center">
</el-table-column>
<el-table-column
prop="password"
prop="passwords"
label="密码"
width="350"
align="center">
@@ -198,7 +200,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -212,7 +214,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
@@ -479,9 +481,23 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.wbbzform = JSON.parse(JSON.stringify(item));
this.wbbzform.comityOptionsOne.forEach(item =>{
if(this.wbbzform.associationName === item.id){
this.wbbzform.associationName = item.name
}
})
this.wbbzform.comityOptionsTwo.forEach(item =>{
if(this.wbbzform.committee === item.id){
this.wbbzform.committee = item.name
}
})
this.wbbzform.comityOptionsOneThree.forEach(item =>{
if(this.wbbzform.workingGroup === item.id){
this.wbbzform.workingGroup = item.name
}
})
this.associationData = item.associationData
this.participantsData = item.participantsData
item.fileName.forEach(itemId => {
@@ -547,7 +563,7 @@ export default {
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
let json = JSON.stringify( this.wbbzform)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -566,28 +582,32 @@ export default {
},
//流程驳回
beforeBack(){
this.isSubmit = true
this.wbbzform.signFlag = '0',
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.isSubmit = true
this.wbbzform.signFlag = '0',
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
});
});
}
},
},
mounted() {
src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+31 -25
View File
@@ -130,6 +130,7 @@
<el-table-column
prop="duties"
label="职务"
width="180"
align="center">
</el-table-column>
<el-table-column
@@ -146,17 +147,18 @@
</el-table-column>
<el-table-column
prop="tenure"
width="200"
label="任期"
align="center">
</el-table-column>
<el-table-column
prop="account"
prop="accounts"
label="账户"
width="200"
align="center">
</el-table-column>
<el-table-column
prop="password"
prop="passwords"
label="密码"
width="350"
align="center">
@@ -198,7 +200,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -212,7 +214,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
@@ -566,28 +568,32 @@ export default {
},
//流程驳回
beforeBack(){
this.isSubmit = true
this.wbbzform.bzFlag = '2',
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.isSubmit = true
this.wbbzform.bzFlag = '2',
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
});
});
}
},
},
mounted() {
src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
+1 -1
View File
@@ -74,7 +74,7 @@
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/newProcess/index.vue
+17 -17
View File
@@ -80,7 +80,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -125,7 +125,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -140,7 +140,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -155,7 +155,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -190,7 +190,7 @@
<el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
<div class="process-box">
<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-top">
<div class="card-top-left">
@@ -205,7 +205,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -220,7 +220,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -235,7 +235,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -256,7 +256,7 @@
<el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
<div class="process-box">
<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-top">
<div class="card-top-left">
@@ -271,7 +271,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -286,7 +286,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -301,7 +301,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -316,7 +316,7 @@
</el-card>
</div>
<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-top">
<div class="card-top-left">
@@ -331,14 +331,14 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('15')">
<el-card shadow="hover" v-btn-permission="'0efd0f4b7a15fd1b687cc0ac36e9e7d9'">
<div class="card-box" @click="handleCreateProcess('14')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<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>
</div>
@@ -346,7 +346,7 @@
</el-card>
</div>
<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-top">
<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"
@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 =>{