yangys
2025-09-11 1752dc60cced88ff7fc1b1e652769161ac54fa3c
修复替换流程bug
已修改4个文件
23 ■■■■ 文件已修改
src/views/flow/components/TodolistLeft.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/donelist.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/todolist.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wel/shemi.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/components/TodolistLeft.vue
@@ -31,9 +31,17 @@
                    <div style="display: flex;align-items: center;">
                        <span style="margin-right: 8px;">{{ row.name }}</span>
                        <el-icon v-if="row.fileType === 'other'">
                            <el-tooltip class="box-item" effect="light" content="其他文件"  placement="right">
                            <FolderOpened />
                            </el-tooltip>
                        </el-icon>
                        <img v-else src="./app.jpg" alt="" width="16" height="16">
                        <el-icon v-if="row.fileType === 'program'">
                            <el-tooltip class="box-item" effect="light" content="程序文件"  placement="right">
                                <Tickets/>
                            </el-tooltip>
                        </el-icon>
                        <!--<img v-else src="./app.jpg" alt="" width="16" height="16">-->
                    </div>
                </template>
            </el-table-column>
src/views/flow/donelist.vue
@@ -211,7 +211,7 @@
                    {
                        label: '状态',
                        prop: 'status',
                        //cleerable:true,
                        hide: true,
                        search: true,
                        type: 'select',
                        dicData: [
src/views/flow/todolist.vue
@@ -522,7 +522,11 @@
                if (["approveTask", 'seniorApproveTask','replaceApprove','appendApproveTask'].includes(row.taskDefinitionKey)) {
                    //审批节点,不通过给编制:编制是责任人,给实际编程员
                    this.formApprove.assignee = row.variables.actProgrammer;//给实际编程员
                    if(row.variables.actProgrammer){
                        this.formApprove.assignee = row.variables.actProgrammer;//给实际编程员
                    }else{
                        this.formApprove.assignee = row.variables.programmer;//无编程员给主管工艺
                    }
                }else if(['unlockApproveTask'].includes(row.taskDefinitionKey)){
                    //解锁高师审批节点,上一步是编程
                    this.formApprove.assignee = row.variables.programmer;//给主管工艺
src/views/wel/shemi.vue
@@ -43,8 +43,7 @@
        <template #name="{ row }">
          <span>{{ row.name }}</span>
          
          <!-- 替换  v-if="permission.auto_dispatch"   icon="el-icon-unlock"-->
          <el-button class="treebtn" :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
          <el-button class="treebtn" :size="size" text v-if="permission.replace_button && row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
            icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="替换" title="替换"></el-button>
      <!---->
           <el-button icon="el-icon-unlock" class="treebtn" v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked != 1"text type="primary" @click="showLockDlg(row)" placeholder="锁定" title="锁定"></el-button>
@@ -102,7 +101,7 @@
          <span>{{ row.name }}</span>
          
          <!-- 替换  v-if="permission.auto_dispatch"-->
          <el-button class="treebtn" :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
          <el-button class="treebtn" :size="size" text v-if="permission.replace_button && row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
            icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="替换" title="替换"></el-button>
          <el-button class="treebtn" :size="size" text
            v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked != 1"