Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

Your Name

2022-07-19 4f23d16c5f9788e44b83280bf6d3c2e1d2280a07

 src/views/accidentHidden/fillProgress.vue

@@ -5,8 +5,8 @@
            <div class="whole">
                <el-form ref="form" :model="form" label-width="100px">
                    <el-form-item style="text-align: right;">
                        <el-button class="btn" type="primary" size="small" icon="el-icon-plus" @click="addProgress">添加</el-button>
                        <el-button size="small" @click="deleteBatch">批量删除</el-button>
                        <el-button class="btn" type="primary" size="small" icon="el-icon-plus" @click="addProgress" v-if="type!=1">添加</el-button>
                        <el-button size="small" @click="deleteBatch" v-if="type!=1">批量删除</el-button>
                    </el-form-item>
                </el-form>
                <el-table
@@ -19,6 +19,7 @@
                    <el-table-column
                       type="selection"
                       align="center"
                       v-if="type!=1"
                       width="55">
                    </el-table-column>
                    <el-table-column
@@ -42,18 +43,19 @@
                        align="center">
                    </el-table-column>
                    <el-table-column
                        prop="Remark "
                        prop="Remark"
                        label="备注"
                        align="center">
                    </el-table-column>
                    <el-table-column
                        v-if="type!=1"
                        label="操作"
                        align="center"
                        width="200">
                        <template slot-scope="scope">
                            <el-button type="text" size="small" @click="updateClick(scope.row)">编辑</el-button>
                            <el-button type="text" size="small" @click="updateClick(scope.row)" v-if="type!=1">编辑</el-button>
                           <!-- <el-button @click="save(scope.row)" type="text" size="small">保存</el-button>-->
                            <el-button type="text" size="small" style="color: #f56c6c" @click="deleteClick(scope.row)">删除</el-button>
                            <el-button type="text" size="small" style="color: #f56c6c" @click="deleteClick(scope.row)" v-if="type!=1">删除</el-button>
                        </template>
                    </el-table-column>
                </el-table>
@@ -73,6 +75,7 @@
            </div>
        </div>

        <el-button @click="returnIndex">返回</el-button>
        <el-dialog
            :title="title"
            :visible.sync="dialogVisible"
@@ -346,6 +349,11 @@
                })
                this.clickCellMap[id] = []
            },
            returnIndex(){
                this.$router.push({
                    path:"/accidentHidden/accidentHidden/majorHidden"
                })
            },
        }
    }
</script>