Browse Source

修复批量发送bug

master
李磊 3 years ago
parent
commit
2e9262d69b
  1. 31
      src/views/bggl/components/original_db_list.vue
  2. 14
      src/views/flow/definition.vue

31
src/views/bggl/components/original_db_list.vue

@ -173,7 +173,7 @@
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
<el-table-column align="center" label="处理人" prop="nickname" min-width="40" />
<el-table-column :formatter="formatter.getChineseName" align="center" label="处理人" prop="userId" min-width="40" />
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">
@ -823,12 +823,14 @@ export default {
this.batchSendTo(isQianming, linkname, idStr)
}
},
batchSendTo(isQianming, linkname, idStr) {
batchSendTo(isQianming, flowstatus, idStr) {
if (isQianming) {
this.dialogSignVisible = true
this.flowstatus = linkname
this.flowstatus = flowstatus
return false
}
const departmentId = this.multipleSelection[0].departmentId
const bglx = this.multipleSelection[0].bglx
//
if (this.multipleSelection[0].flowstatus === 2 && (this.multipleSelection[0].shebeizhongleidaima === 'F000' || this.multipleSelection[0].bglx === 2)) {
this.end(this.ysjlId, this.multipleSelection, false) //
@ -838,11 +840,12 @@ export default {
return false
}
this.api({
url: '/flow/getUser',
url: '/flow/getNextLinkUsers',
method: 'get',
params: {
id: idStr,
flowstatus: linkname
bglx: bglx,
flowstatus: flowstatus + 1,
departmentId: departmentId
}
}).then(data => {
this.flowUserList = data
@ -1065,6 +1068,9 @@ export default {
ids: this.ysjlId,
riqi: this.passForm.signDate,
flowstatus: this.flowstatus
},
paramsSerializer: function(params) {
return require('qs').stringify(params, { indices: false })
}
}).then(() => {
this.$message({
@ -1186,18 +1192,17 @@ export default {
this.$message('请在列表选择要签名的数据。')
return false
}
let idStr = this.multipleSelection[0].id
const linkname = this.multipleSelection[0].flowstatus
for (let i = 1; i < this.multipleSelection.length; i++) {
idStr = idStr + ',' + this.multipleSelection[i].id
if (linkname !== this.multipleSelection[i].flowstatus) {
this.ysjlId = []
const flowstatus = this.multipleSelection[0].flowstatus
for (let i = 0; i < this.multipleSelection.length; i++) {
this.ysjlId.push(this.multipleSelection[i].id)
if (flowstatus !== this.multipleSelection[i].flowstatus) {
this.$message('请选择同环节签名!')
return false
}
}
this.ysjlId = idStr
this.isBatchSign = true
this.flowstatus = linkname
this.flowstatus = flowstatus
this.dialogSignVisible = true
},
clearSignName() {

14
src/views/flow/definition.vue

@ -242,7 +242,7 @@
</el-col>
<el-col :offset="1" :span="3">
<el-button type="danger" icon="el-icon-delete" @click="deleteLink">
删除 - TODO
删除
</el-button>
</el-col>
</el-row>
@ -252,9 +252,9 @@
border
style="width: 100%"
>
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="50" />
<el-table-column prop="nickname" label="环节人员" width="180">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" type="index" label="序号" width="50" />
<el-table-column align="center" prop="nickname" label="环节人员" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.userId" filterable clearable placeholder="请选择">
<el-option
@ -266,13 +266,12 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序">
<el-table-column align="center" prop="sort" label="排序">
<template slot-scope="scope">
<el-input-number
v-model="scope.row.sort"
:min="1"
:max="100"
@change="handleChange"
/>
</template>
</el-table-column>
@ -410,9 +409,6 @@ export default {
this.getSpanArr(this.list)
})
},
handleChange(value) {
console.log(value)
},
getAllDepartment() {
this.api({
url: '/department/all',

Loading…
Cancel
Save