Merge remote-tracking branch 'origin/master-dev' into feature-Beta-dev-renpy
This commit is contained in:
		
						commit
						9c755377a4
					
				| 
						 | 
					@ -196,11 +196,11 @@
 | 
				
			||||||
    </custom-modal>
 | 
					    </custom-modal>
 | 
				
			||||||
    <!-- 增加/编辑排班弹窗结束 -->
 | 
					    <!-- 增加/编辑排班弹窗结束 -->
 | 
				
			||||||
    <custom-modal title="Failure record" v-model="visibleRes" :footer="null">
 | 
					    <custom-modal title="Failure record" v-model="visibleRes" :footer="null">
 | 
				
			||||||
      <custom-table size="middle" :columns="columns" :list="dataSource">
 | 
					      <a-table size="middle" :columns="columns" :dataSource="dataSource" :pagination="false" :scroll="{ y: 600 }">
 | 
				
			||||||
        <template slot="index" slot-scope="{ index }">
 | 
					        <template slot="index" slot-scope="{ index }">
 | 
				
			||||||
          {{ index + 1 }}
 | 
					          {{ index + 1 }}
 | 
				
			||||||
        </template>
 | 
					        </template>
 | 
				
			||||||
      </custom-table>
 | 
					      </a-table>
 | 
				
			||||||
    </custom-modal>
 | 
					    </custom-modal>
 | 
				
			||||||
  </div>
 | 
					  </div>
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user