Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Resource/OpTicketBlackCode.vue

@@ -120,16 +120,16 @@
             </el-form>
 
         </div>
-        <div id="testTable">
+        <!-- <div id="testTable">
             <el-table border :data="tableData" style="width: 100%">
                 <el-table-column v-for="column in columns" :key="column.prop" :prop="column.prop" :label="column.label"
                     :width="column.width">
                     <template slot-scope="scope">
                         <el-input v-model="scope.row[column.prop]" :disabled="column.prop === 'id'"></el-input>
                     </template>
-                </el-table-column>
-            </el-table>
-        </div>
+</el-table-column>
+</el-table>
+</div> -->
     </div>
 </template>
 <script>