confict

Helius

2021-02-03 fed1f885b03a5b4b7c62d44320c3ff2068ca02e6

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -226,9 +226,11 @@
                            <el-table id="proj" v-show="projTab.projType=='proj'" :data="projTab.projTableData"
                                    style="width: 100%">
                                <el-table-column
                                        prop="projName"
                                        label="项目名称"
                                        width="180">
                                    <template slot-scope="scope">
                                        <span >{{scope.row.projName}}({{scope.row.projInfo.code}})</span>
                                    </template>
                                </el-table-column>
                                <el-table-column
                                        prop="source"
@@ -267,9 +269,11 @@
                                    style="width: 100%;"
                                    row-key="id" :tree-props="{children: 'taocanProjUse', hasChildren: 'hasChildren'}">
                                <el-table-column
                                        prop="projName"
                                        label="名称"
                                        width="240">
                                        width="280">
                                    <template slot-scope="scope">
                                        <span >{{scope.row.projName}}({{scope.row.projInfo.code}})</span>
                                    </template>
                                </el-table-column>
                                <el-table-column
                                        prop="status"